Finish 3.3.4

Author: gkellogg

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.

VERSION

@@ -1 +1 @@
-3.3.3
+3.3.4

etc/n-triples.ebnf

@@ -1,21 +1,24 @@
-ntriplesDoc       ::= triple? (EOL triple)* EOL?
+ntriplesDoc       ::= statement? (EOL statement)* EOL?
+statement         ::= directive | triple '.'
+directive         ::= versionDirective
+versionDirective  ::= 'VERSION' versionSpecifier
+versionSpecifier  ::= STRING_LITERAL_QUOTE
 triple            ::= subject predicate object '.'
-subject           ::= IRIREF | BLANK_NODE_LABEL | quotedTriple
+subject           ::= IRIREF | BLANK_NODE_LABEL
 predicate         ::= IRIREF
-object            ::= IRIREF | BLANK_NODE_LABEL | literal | tripleTerm | quotedTriple
+object            ::= IRIREF | BLANK_NODE_LABEL | literal | tripleTerm
 literal           ::= STRING_LITERAL_QUOTE ('^^' IRIREF | LANG_DIR )?
-tripleTerm        ::= '<<' subject predicate object '>>'
-quotedTriple      ::= '<<' subject predicate object '>>'
+tripleTerm        ::= '<<(' subject predicate object ')>>'
 
 @terminals
 
 IRIREF            ::=  '<' ([^#x00-#x20<>"{}|^`\] | UCHAR)* '>'
 BLANK_NODE_LABEL  ::= '_:' ( PN_CHARS_U | [0-9] ) ((PN_CHARS|'.')* PN_CHARS)?
-LANG_DIR          ::= "@" [a-zA-Z]+ ( "-" [a-zA-Z0-9]+ )* ('--' [a-zA-Z]+)?`
+LANG_DIR          ::= '@' [a-zA-Z]+ ( '-' [a-zA-Z0-9]+ )* ( '--' [a-zA-Z]+ )?
 STRING_LITERAL_QUOTE ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"'
-UCHAR             ::= ( "\u" HEX HEX HEX HEX )
-                    | ( "\U" HEX HEX HEX HEX HEX HEX HEX HEX )
-ECHAR             ::= ("\" [tbnrf"'])
+UCHAR             ::= ( '\u' HEX HEX HEX HEX )
+                    | ( '\U' HEX HEX HEX HEX HEX HEX HEX HEX )
+ECHAR             ::= ('\' [tbnrf\"'])
 PN_CHARS_BASE     ::= ([A-Z]
                     | [a-z]
                     | [#x00C0-#x00D6]
@@ -32,7 +35,7 @@ PN_CHARS_BASE     ::= ([A-Z]
                     | [#x10000-#xEFFFF])
 PN_CHARS_U        ::=  PN_CHARS_BASE | '_'
 PN_CHARS          ::= (PN_CHARS_U
-                    | "-"
+                    | '-'
                     | [0-9]
                     | #x00B7
                     | [#x0300-#x036F]

lib/rdf/format.rb

@@ -47,6 +47,10 @@ module RDF
   class Format
     extend ::Enumerable
 
+    ##
+    # RDF defines specific version strings, but does not define normative behavior
+    VERSIONS = %w{1.1 1.2-basic 1.2}.freeze
+
     ##
     # Enumerates known RDF serialization format classes.
     #

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

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"

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
 

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)

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?

lib/rdf/nquads.rb

@@ -70,11 +70,14 @@ def read_triple
           line = @line    # for backtracking input in case of parse error
 
           begin
-            unless blank? || read_comment
-              # FIXME: quoted triples are now deprecated
-              subject   = read_uriref || read_node || read_quotedTriple || fail_subject
+            if blank? || read_comment
+              # No-op
+            elsif version = read_version
+              @options[:version] = version
+            else
+              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)