Cleanup RDF* nomenclature, and use :quoted_triples instead of :rdfstar for supports?.

gkellogg · gkellogg · commit 0d1aea3fa6b4 · 2023-07-26T15:35:10.000-07:00
diff --git a/lib/rdf/mixin/enumerable.rb b/lib/rdf/mixin/enumerable.rb
@@ -83,7 +83,7 @@ def to_a
     #   * `:literal_equality' preserves [term-equality](https://www.w3.org/TR/rdf11-concepts/#dfn-literal-term-equality) for literals. Literals are equal only if their lexical values and datatypes are equal, character by character. Literals may be "inlined" to value-space for efficiency only if `:literal_equality` is `false`.
     #   * `:validity` allows a concrete Enumerable implementation to indicate that it does or does not support valididty checking. By default implementations are assumed to support validity checking.
     #   * `:skolemize` supports [Skolemization](https://www.w3.org/wiki/BnodeSkolemization) of an `Enumerable`. Implementations supporting this feature must implement a `#skolemize` method, taking a base URI used for minting URIs for BNodes as stable identifiers and a `#deskolemize` method, also taking a base URI used for turning URIs having that prefix back into the same BNodes which were originally skolemized.
-    #   * `:rdfstar` supports RDF* where statements may be subjects or objects of other statements.
+    #   * `:quoted_triples` supports RDF 1.2 quoted triples.
     #
     # @param  [Symbol, #to_sym] feature
     # @return [Boolean]
diff --git a/lib/rdf/mixin/queryable.rb b/lib/rdf/mixin/queryable.rb
@@ -140,7 +140,7 @@ def query_execute(query, **options, &block)
     # method in order to provide for storage-specific optimized triple
     # pattern matching.
     #
-    # ## RDFStar (RDF*)
+    # ## RDF-star
     #
     # Statements may have embedded statements as either a subject or object, recursively.
     #
diff --git a/lib/rdf/mixin/writable.rb b/lib/rdf/mixin/writable.rb
@@ -127,8 +127,8 @@ def insert_graph(graph)
     def insert_statements(statements)
       each = statements.respond_to?(:each_statement) ? :each_statement : :each
       statements.__send__(each) do |statement|
-        if statement.embedded? && respond_to?(:supports?) && !supports?(:rdfstar)
-          raise ArgumentError, "Wriable does not support embedded statements"
+        if statement.embedded? && respond_to?(:supports?) && !supports?(:quoted_triples)
+          raise ArgumentError, "Wriable does not support quoted triples"
         end
         insert_statement(statement)
       end
diff --git a/lib/rdf/model/dataset.rb b/lib/rdf/model/dataset.rb
@@ -104,7 +104,7 @@ def isolation_level
     # @private
     # @see RDF::Enumerable#supports?
     def supports?(feature)
-      return true if %i(graph_name rdfstar).include?(feature)
+      return true if %i(graph_name quoted_triples).include?(feature)
       super
     end
 
diff --git a/lib/rdf/model/graph.rb b/lib/rdf/model/graph.rb
@@ -305,8 +305,8 @@ def query_pattern(pattern, **options, &block)
     # @private
     # @see RDF::Mutable#insert
     def insert_statement(statement)
-      if statement.embedded? && !@data.supports?(:rdfstar)
-        raise ArgumentError, "Graph does not support embedded statements"
+      if statement.embedded? && !@data.supports?(:quoted_triples)
+        raise ArgumentError, "Graph does not support quoted triples"
       end
       statement = statement.dup
       statement.graph_name = graph_name
diff --git a/lib/rdf/model/statement.rb b/lib/rdf/model/statement.rb
@@ -182,6 +182,7 @@ def variable?(*args)
     ##
     # Returns `true` if any element of the statement is, itself, a statement.
     #
+    # Note: Nomenclature is evolving, alternatives could include `#complex?` and `#nested?`
     # @return [Boolean]
     def embedded?
       subject && subject.statement? || object && object.statement?
diff --git a/lib/rdf/ntriples/reader.rb b/lib/rdf/ntriples/reader.rb
@@ -28,7 +28,7 @@ module RDF::NTriples
   #     end
   #   end
   #
-  # ** RDFStar (RDF*)
+  # ** RDF=star
   #
   # Supports statements as resources using `<<s p o>>`.
   #
diff --git a/lib/rdf/ntriples/writer.rb b/lib/rdf/ntriples/writer.rb
@@ -224,7 +224,7 @@ def format_statement(statement, **options)
     end
 
     ##
-    # Returns the N-Triples representation of an RDF* reified statement.
+    # Returns the N-Triples representation of an RDF-star quoted triple.
     #
     # @param  [RDF::Statement] statement
     # @param  [Hash{Symbol => Object}] options ({})
diff --git a/lib/rdf/query/solution.rb b/lib/rdf/query/solution.rb
@@ -209,7 +209,7 @@ def []=(name, value)
     # Merges the bindings from the given `other` query solution into this
     # one, overwriting any existing ones having the same name.
     #
-    # ## RDFStar (RDF*)
+    # ## RDF-star
     #
     # If merging a binding for a statement to a pattern,
     # merge their embedded solutions.
diff --git a/lib/rdf/reader.rb b/lib/rdf/reader.rb
@@ -163,7 +163,7 @@ def self.options
           datatype: TrueClass,
           control: :checkbox,
           on: ["--rdfstar"],
-          description: "Parse RDF*."),
+          description: "Parse RDF-star for preliminary RDF 1.2 support."),
         RDF::CLI::Option.new(
           symbol: :validate,
           datatype: TrueClass,
@@ -277,7 +277,7 @@ def to_sym
     # @param [Boolean]  intern       (true)
     #   whether to intern all parsed URIs
     # @param [Boolean] rdfstar      (false)
-    #   support parsing RDF* statement resources.
+    #   Preliminary support for RDF 1.2.
     # @param [Hash]     prefixes     (Hash.new)
     #   the prefix mappings to use (not supported by all readers)
     # @param  [Hash{Symbol => Object}] options
diff --git a/lib/rdf/repository.rb b/lib/rdf/repository.rb
@@ -182,7 +182,7 @@ def supports?(feature)
       when :validity         then @options.fetch(:with_validity, true)
       when :literal_equality then true
       when :atomic_write     then false
-      when :rdfstar          then false
+      when :quoted_triples   then false
       when :snapshots        then false
       else false
       end
@@ -269,7 +269,7 @@ def supports?(feature)
         when :validity         then @options.fetch(:with_validity, true)
         when :literal_equality then true
         when :atomic_write     then true
-        when :rdfstar          then true
+        when :quoted_triples   then true
         when :snapshots        then true
         else false
         end
diff --git a/spec/model_statement_spec.rb b/spec/model_statement_spec.rb
@@ -296,7 +296,7 @@
     end
   end
 
-  context "RDF*" do
+  context "RDF-star" do
     it "is not embedded for plain statements" do
       expect(RDF::Statement(:s, :p, :o)).not_to be_embedded
     end
diff --git a/spec/nquads_spec.rb b/spec/nquads_spec.rb
@@ -180,7 +180,7 @@
     end
   end
 
-  context "RDF*" do
+  context "RDF-star" do
     statements = {
       "subject-iii": '<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/g> .',
       "subject-iib": '<<<http://example/s1> <http://example/p1> _:o1>> <http://example/p> <http://example/o> <http://example/g> .',
diff --git a/spec/ntriples_spec.rb b/spec/ntriples_spec.rb
@@ -420,7 +420,7 @@
     end
   end
 
-  context "RDF*" do
+  context "quoted triples" do
     statements = {
       "subject-iii": '<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> .',
       "subject-iib": '<<<http://example/s1> <http://example/p1> _:o1>> <http://example/p> <http://example/o> .',
@@ -746,7 +746,7 @@
     end
   end
 
-  context "RDF*" do
+  context "quoted triples" do
     {
       "subject-iii": {
         input: RDF::Statement(
diff --git a/spec/query_pattern_spec.rb b/spec/query_pattern_spec.rb
@@ -282,7 +282,7 @@
     end
   end
 
-  context "RDF*" do
+  context "quoted triples" do
     let(:s) {RDF::Query::Variable.new(:s)}
     let(:p) {RDF::Query::Variable.new(:p)}
     let(:o) {RDF::Query::Variable.new(:o)}

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ def to_a`
`83`	`83`	# * `:literal_equality' preserves [term-equality](https://www.w3.org/TR/rdf11-concepts/#dfn-literal-term-equality) for literals. Literals are equal only if their lexical values and datatypes are equal, character by character. Literals may be "inlined" to value-space for efficiency only if `:literal_equality` is `false`.
`84`	`84`	# * `:validity` allows a concrete Enumerable implementation to indicate that it does or does not support valididty checking. By default implementations are assumed to support validity checking.
`85`	`85`	# * `:skolemize` supports [Skolemization](https://www.w3.org/wiki/BnodeSkolemization) of an `Enumerable`. Implementations supporting this feature must implement a `#skolemize` method, taking a base URI used for minting URIs for BNodes as stable identifiers and a `#deskolemize` method, also taking a base URI used for turning URIs having that prefix back into the same BNodes which were originally skolemized.
`86`		- # * `:rdfstar` supports RDF* where statements may be subjects or objects of other statements.
	`86`	+ # * `:quoted_triples` supports RDF 1.2 quoted triples.
`87`	`87`	`#`
`88`	`88`	`# @param [Symbol, #to_sym] feature`
`89`	`89`	`# @return [Boolean]`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ def query_execute(query, **options, &block)`
`140`	`140`	`# method in order to provide for storage-specific optimized triple`
`141`	`141`	`# pattern matching.`
`142`	`142`	`#`
`143`		`- # ## RDFStar (RDF*)`
	`143`	`+ # ## RDF-star`
`144`	`144`	`#`
`145`	`145`	`# Statements may have embedded statements as either a subject or object, recursively.`
`146`	`146`	`#`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ def variable?(*args)`
`182`	`182`	`##`
`183`	`183`	# Returns `true` if any element of the statement is, itself, a statement.
`184`	`184`	`#`
	`185`	+ # Note: Nomenclature is evolving, alternatives could include `#complex?` and `#nested?`
`185`	`186`	`# @return [Boolean]`
`186`	`187`	`def embedded?`
`187`	`188`	`subject && subject.statement? \|\| object && object.statement?`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ module RDF::NTriples`
`28`	`28`	`# end`
`29`	`29`	`# end`
`30`	`30`	`#`
`31`		`- # ** RDFStar (RDF*)`
	`31`	`+ # ** RDF=star`
`32`	`32`	`#`
`33`	`33`	# Supports statements as resources using `<<s p o>>`.
`34`	`34`	`#`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ def format_statement(statement, **options)`
`224`	`224`	`end`
`225`	`225`
`226`	`226`	`##`
`227`		`- # Returns the N-Triples representation of an RDF* reified statement.`
	`227`	`+ # Returns the N-Triples representation of an RDF-star quoted triple.`
`228`	`228`	`#`
`229`	`229`	`# @param [RDF::Statement] statement`
`230`	`230`	`# @param [Hash{Symbol => Object}] options ({})`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ def []=(name, value)`
`209`	`209`	# Merges the bindings from the given `other` query solution into this
`210`	`210`	`# one, overwriting any existing ones having the same name.`
`211`	`211`	`#`
`212`		`- # ## RDFStar (RDF*)`
	`212`	`+ # ## RDF-star`
`213`	`213`	`#`
`214`	`214`	`# If merging a binding for a statement to a pattern,`
`215`	`215`	`# merge their embedded solutions.`