Remove support for the RDF-star CG version of quoted triples, leaving only triple terms.

gkellogg · gkellogg · commit 6876b7638017 · 2025-07-02T14:58:12.000-07:00
diff --git a/README.md b/README.md
@@ -265,12 +265,6 @@ A separate [SPARQL][SPARQL doc] gem builds on basic BGP support to provide full
     foaf[:name]   #=> RDF::URI("http://xmlns.com/foaf/0.1/name")
     foaf['mbox']  #=> RDF::URI("http://xmlns.com/foaf/0.1/mbox")
 
-## RDF-star CG
-
-[RDF.rb][] includes provisional support for [RDF-star][] with an N-Triples/N-Quads syntax for quoted triples in the _subject_ or _object_ position.
-
-Support for RDF-star quoted triples is now deprecated, use RDF 1.2 triple terms instead.
-
 ## RDF 1.2
 
 [RDF.rb][] includes provisional support for [RDF 1.2][] with an N-Triples/N-Quads syntax for triple terms in the _object_ position.
diff --git a/lib/rdf/mixin/enumerable.rb b/lib/rdf/mixin/enumerable.rb
@@ -84,7 +84,6 @@ def to_a
     #   * `: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.
     #   * `:rdf_full` supports RDF 1.2 Full profile, including support for embedded Triple Terms.
-    #   * `:quoted_triples` supports RDF-star quoted triples. (DEPRECATED)
     #   * `:base_direction` supports RDF 1.2 directional language-tagged strings.
     #
     # @param  [Symbol, #to_sym] feature
diff --git a/lib/rdf/mixin/writable.rb b/lib/rdf/mixin/writable.rb
@@ -127,9 +127,8 @@ def insert_graph(graph)
     def insert_statements(statements)
       each = statements.respond_to?(:each_statement) ? :each_statement : :each
       statements.__send__(each) do |statement|
-        # FIXME: quoted triples are now deprecated
-        if statement.embedded? && respond_to?(:supports?) && !(supports?(:quoted_triples) || supports?(:rdf_full))
-          raise ArgumentError, "Writable does not support quoted triples"
+        if statement.embedded? && respond_to?(:supports?) && !supports?(:rdf_full)
+          raise ArgumentError, "Writable does not support triple terms"
         end
         if statement.object && statement.object.literal? && statement.object.direction? && respond_to?(:supports?) && !supports?(:base_direction)
           raise ArgumentError, "Writable does not support directional languaged-tagged strings"
diff --git a/lib/rdf/model/dataset.rb b/lib/rdf/model/dataset.rb
@@ -104,8 +104,7 @@ def isolation_level
     # @private
     # @see RDF::Enumerable#supports?
     def supports?(feature)
-      # FIXME: quoted triples are now deprecated
-      return true if %i(graph_name quoted_triples rdf_full).include?(feature)
+      return true if %i(graph_name rdf_full).include?(feature)
       super
     end
 
diff --git a/lib/rdf/model/graph.rb b/lib/rdf/model/graph.rb
@@ -335,8 +335,7 @@ def query_pattern(pattern, **options, &block)
     # @private
     # @see RDF::Mutable#insert
     def insert_statement(statement)
-      # FIXME: quoted triples are now deprecated
-      if statement.embedded? && !(@data.supports?(:quoted_triples) || @data.supports?(:rdf_full))
+      if statement.embedded? && !@data.supports?(:rdf_full)
         raise ArgumentError, "Graph does not support the RDF Full profile"
       end
       if statement.object && statement.object.literal? && statement.object.direction? &&  !@data.supports?(:base_direction)
diff --git a/lib/rdf/model/statement.rb b/lib/rdf/model/statement.rb
@@ -72,7 +72,6 @@ def self.from(statement, graph_name: nil, **options)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
     #   @option options [Boolean] :tripleTerm used as a marker to record that this statement appears as the object of another RDF::Statement.
-    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement (deprecated).
     #   @return [RDF::Statement]
     #
     # @overload initialize(subject, predicate, object, **options)
@@ -86,7 +85,6 @@ def self.from(statement, graph_name: nil, **options)
     #     Note, in RDF 1.1, a graph name MUST be an {Resource}.
     #   @option options [Boolean] :inferred used as a marker to record that this statement was inferred based on semantic relationships (T-Box).
     #   @option options [Boolean] :tripleTerm used as a marker to record that this statement appears as the object of another RDF::Statement.
-    #   @option options [Boolean] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement (deprecated).
     #   @return [RDF::Statement]
     def initialize(subject = nil, predicate = nil, object = nil, options = {})
       if subject.is_a?(Hash)
@@ -187,7 +185,7 @@ def variable?(*args)
     # Note: Nomenclature is evolving, alternatives could include `#complex?` and `#nested?`
     # @return [Boolean]
     def embedded?
-      subject && subject.statement? || object && object.statement?
+      object && object.statement?
     end
 
     ##
@@ -208,7 +206,7 @@ def valid?
     ##
     # @return [Boolean]
     def asserted?
-      !quoted?
+      !embedded?
     end
 
     ##
@@ -217,13 +215,6 @@ def tripleTerm?
       !!@options[:tripleTerm]
     end
 
-    ##
-    # @return [Boolean]
-    # @deprecated Quoted triples are now deprecated
-    def quoted?
-      !!@options[:quoted]
-    end
-
     ##
     # @return [Boolean]
     def inferred?
diff --git a/lib/rdf/nquads.rb b/lib/rdf/nquads.rb
@@ -75,10 +75,9 @@ def read_triple
             elsif version = read_version
               @options[:version] = version
             else
-              # FIXME: quoted triples are now deprecated
-              subject   = read_uriref || read_node || read_quotedTriple || fail_subject
+              subject   = read_uriref || read_node || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate
-              object    = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple || fail_object
+              object    = read_uriref || read_node || read_literal || read_tripleTerm || fail_object
               graph_name    = read_uriref || read_node
               if validate? && !read_eos
                 log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
diff --git a/lib/rdf/ntriples.rb b/lib/rdf/ntriples.rb
@@ -17,11 +17,7 @@ module RDF
   #
   # ## Triple terms
   #
-  # Supports statements as resources using `<<(s p o)>>`.
-
-  # ## Quoted Triples (Deprecated)
-  #
-  # Supports statements as resources using `<<s p o>>`.
+  # Supports statements as resources in the object postion using `<<(s p o)>>`.
   #
   # ## Installation
   #
diff --git a/lib/rdf/ntriples/reader.rb b/lib/rdf/ntriples/reader.rb
@@ -203,7 +203,7 @@ def read_value
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple
+        value = read_uriref || read_node || read_literal || read_tripleTerm
         log_recover
         value
       end
@@ -223,9 +223,9 @@ def read_triple
           elsif version = read_version
             @options[:version] = version
           else
-            subject   = read_uriref || read_node || read_quotedTriple || fail_subject
+            subject   = read_uriref || read_node || fail_subject
             predicate = read_uriref(intern: true) || fail_predicate
-            object    = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple || fail_object
+            object    = read_uriref || read_node || read_literal || read_tripleTerm || fail_object
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -256,23 +256,6 @@ def read_tripleTerm
       end
     end
 
-    ##
-    # @return [RDF::Statement]
-    # @deprecated Quoted triples are now deprecated (not supported when validating)
-    def read_quotedTriple
-      if @options[:rdfstar] && !match(TT_START) && match(QT_START) && !validate?
-        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
-        predicate = read_uriref(intern: true) || fail_predicate
-        object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
-        if !match(QT_END)
-          log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
-        end
-        RDF::Statement.new(subject, predicate, object, quoted: true)
-      end
-    end
-
     ##
     # @return [Boolean]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_grammar (comment)
diff --git a/lib/rdf/ntriples/writer.rb b/lib/rdf/ntriples/writer.rb
@@ -243,18 +243,6 @@ def format_tripleTerm(statement, **options)
       "<<( %s %s %s )>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
 
-    ##
-    # Returns the N-Triples representation of an RDF-star quoted triple.
-    #
-    # @param  [RDF::Statement] statement
-    # @param  [Hash{Symbol => Object}] options ({})
-    # @return [String]
-    # @deprecated Quoted triples are now deprecated
-    def format_quotedTriple(statement, **options)
-      # FIXME: quoted triples are now deprecated
-      "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
-    end
-
     ##
     # Returns the N-Triples representation of a triple.
     #
diff --git a/lib/rdf/repository.rb b/lib/rdf/repository.rb
@@ -183,8 +183,6 @@ def supports?(feature)
       when :literal_equality then true
       when :atomic_write     then false
       when :rdf_full         then false
-      # FIXME: quoted triples are now deprecated
-      when :quoted_triples   then false
       when :base_direction   then false
       when :snapshots        then false
       else false
@@ -273,7 +271,6 @@ def supports?(feature)
         when :literal_equality then true
         when :atomic_write     then true
         when :rdf_full         then true
-        when :quoted_triples   then true  # DEPRECATED
         when :base_direction   then true
         when :snapshots        then true
         else false
diff --git a/lib/rdf/writer.rb b/lib/rdf/writer.rb
@@ -545,8 +545,7 @@ def format_term(term, **options)
         when RDF::Literal   then format_literal(term, **options)
         when RDF::URI       then format_uri(term, **options)
         when RDF::Node      then format_node(term, **options)
-        # FIXME: quoted triples are now deprecated
-        when RDF::Statement then term.tripleTerm? ? format_tripleTerm(term, **options) : format_quotedTriple(term, **options)
+        when RDF::Statement then format_tripleTerm(term, **options)
         else nil
       end
     end
@@ -608,22 +607,6 @@ def format_tripleTerm(value, **options)
       raise NotImplementedError.new("#{self.class}#format_tripleTerm") # override in subclasses
     end
 
-    ##
-    # Formats a referenced quoted triple.
-    #
-    # @example
-    #     <<<s> <p> <o>>> <p> <o> .
-    #
-    # @param  [RDF::Statement] value
-    # @param  [Hash{Symbol => Object}] options = ({})
-    # @return [String]
-    # @raise  [NotImplementedError] unless implemented in subclass
-    # @abstract
-    # @deprecated Quoted Triples are now deprecated in favor of Triple Terms
-    def format_quotedTriple(value, **options)
-      raise NotImplementedError.new("#{self.class}#format_quotedTriple") # override in subclasses
-    end
-
   protected
 
     ##
diff --git a/spec/model_statement_spec.rb b/spec/model_statement_spec.rb
@@ -76,7 +76,6 @@
     its(:object) {is_expected.not_to be_nil}
     it {is_expected.to be_asserted}
     it {is_expected.not_to be_tripleTerm}
-    it {is_expected.not_to be_quoted} # FIXME: quoted triples are deprecated
     it {is_expected.to be_statement}
     it {is_expected.not_to be_inferred}
     its(:terms) {is_expected.to include(s, p, o)}
@@ -216,12 +215,6 @@
     it {is_expected.to be_tripleTerm}
   end
 
-  # FIXME: quoted triples are deprecated
-  context "when marked as quoted" do
-    subject {RDF::Statement.new(RDF::Node.new, p, o, quoted: true)}
-    it {is_expected.to be_quoted}
-  end
-
   it {is_expected.to respond_to(:to_h)}
   its(:to_h) do
     is_expected.to eql({
@@ -332,10 +325,6 @@
       expect(RDF::Statement(:s, :p, :o)).not_to be_embedded
     end
 
-    it "is embedded for statements having a statement subject" do
-      expect(RDF::Statement(RDF::Statement(:s1, :p1, :o1), :p, :o)).to be_embedded
-    end
-
     it "is embedded for statements having a statement object" do
       expect(RDF::Statement(:s, :p, RDF::Statement(:s1, :p1, :o1))).to be_embedded
     end
diff --git a/spec/ntriples_spec.rb b/spec/ntriples_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ def to_a`
`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`	`86`	# * `:rdf_full` supports RDF 1.2 Full profile, including support for embedded Triple Terms.
`87`		- # * `:quoted_triples` supports RDF-star quoted triples. (DEPRECATED)
`88`	`87`	# * `:base_direction` supports RDF 1.2 directional language-tagged strings.
`89`	`88`	`#`
`90`	`89`	`# @param [Symbol, #to_sym] feature`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,7 @@ module RDF`
`17`	`17`	`#`
`18`	`18`	`# ## Triple terms`
`19`	`19`	`#`
`20`		- # Supports statements as resources using `<<(s p o)>>`.
`21`		`-`
`22`		`- # ## Quoted Triples (Deprecated)`
`23`		`- #`
`24`		- # Supports statements as resources using `<<s p o>>`.
	`20`	+ # Supports statements as resources in the object postion using `<<(s p o)>>`.
`25`	`21`	`#`
`26`	`22`	`# ## Installation`
`27`	`23`	`#`