From f5dd4e8b01e6908f866af6948c3908db54f4f3fe Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 26 Mar 2024 12:38:43 -0700 Subject: [PATCH] * Even though deprecated, when matching a quoted triple (`<< ... >>`) be sure it's not a triple term (`<<( ... )>>`). * Add `rdf:reifies` to the RDF vocabulary. --- lib/rdf/ntriples/reader.rb | 2 +- lib/rdf/vocab/rdfv.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/rdf/ntriples/reader.rb b/lib/rdf/ntriples/reader.rb index 93fe6d7a..7894d4d7 100644 --- a/lib/rdf/ntriples/reader.rb +++ b/lib/rdf/ntriples/reader.rb @@ -261,7 +261,7 @@ def read_tripleTerm # @return [RDF::Statement] # @deprecated Quoted triples are now deprecated def read_quotedTriple - if @options[:rdfstar] && match(QT_START) + if @options[:rdfstar] && !match(TT_START) && match(QT_START) warn "[DEPRECATION] RDF-star quoted triples are deprecated and will be removed in a future version.\n" + "Called from #{Gem.location_of_caller.join(':')}" subject = read_uriref || read_node || read_quotedTriple || fail_subject diff --git a/lib/rdf/vocab/rdfv.rb b/lib/rdf/vocab/rdfv.rb index 03560665..76f72d61 100644 --- a/lib/rdf/vocab/rdfv.rb +++ b/lib/rdf/vocab/rdfv.rb @@ -72,6 +72,10 @@ module RDF # # @return [RDF::Vocabulary::Term] # # @attr_reader :value # + # # Reification predicate + # # @return [RDF::Vocabulary::Term] + # # @attr_reader :reifies + # # # The datatype of RDF literals storing fragments of HTML content. # # @return [RDF::Vocabulary::Term] # # @attr_reader :HTML @@ -253,6 +257,12 @@ def name; "RDF"; end range: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze, isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze, type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze + property :reifies, + comment: %(Property relating to a Triple Term.).freeze, + domain: "http://www.w3.org/2000/01/rdf-schema#Resource".freeze, + label: "reifies".freeze, + isDefinedBy: %(http://www.w3.org/1999/02/22-rdf-syntax-ns#).freeze, + type: "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property".freeze # Datatype definitions term :HTML,