rdf 3.3.2 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b8e26b43854ef02542acbc81b88426f3b5989df1156e010bfb5250f3fb31c6
-  data.tar.gz: 7a4303eccec6cd20b29bcfcba87a9cffb36c3db7f7045bbd375264922e2a4a66
+  metadata.gz: 0b4ec33ae5dd1070409bb56bf6391519dc56fe9e2455e0a9710ea7ec4cbb5308
+  data.tar.gz: 628f0e9bb2ad05d3889f1d9e0003c11fa11ec2e664dd762ccc3a0a75782782da
 SHA512:
-  metadata.gz: 31e5f916ecc25dddf44f6b6057311b784afa1a593b406e6ba1944481c3f5a2ac8f4de752a86d779d415e21c3292064c363bb9369c86ba8d401b0aebade755195
-  data.tar.gz: 68d96d55bc4a4ad89472b212db1b6e64a03f30936b0cc7cbc8e802505a133117c1fcf0a311f1a0f6b5c4e91255841f95cd7d4ef2963db665bb648d900aa2e05b
+  metadata.gz: 5f67156c9411d9a2f1249c4ad7369faaaf76131be64aae3668553a38d4e102ca5d3a7b329cf5e35a8a5688fb815b6a6ecb9cec311f8324a2450b0e4607f175ee
+  data.tar.gz: a8bb3b7a87d49fd2dc78cec8ebb2f92690d0de80d60abcf9e9d14dd949ac3f2395a228fedc892e51c58bc7ddb08bd1f5a5a64390777048b854ec7a67c053e427

data/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.
@@ -280,19 +274,24 @@ Internally, an `RDF::Statement` is treated as another resource, along with `RDF:
 
 **Note: This feature is subject to change or elimination as the standards process progresses.**
 
-### Serializing a Graph containing quoted triples
+### Serializing a Graph containing triple terms
 
     require 'rdf/ntriples'
     statement = RDF::Statement(RDF::URI('bob'), RDF::Vocab::FOAF.age, RDF::Literal(23))
-    graph = RDF::Graph.new << [statement, RDF::URI("ex:certainty"), RDF::Literal(0.9)]
+    reifier = RDF::Node.new
+    graph = RDF::Graph.new do |g|
+      g << [reifier, RDF.reifies, statement]
+      g << [reifier, RDF::URI("ex:certainty"), RDF::Literal(0.9)]
+    end
     graph.dump(:ntriples, validate: false)
-    # => '<<<bob> <http://xmlns.com/foaf/0.1/age> "23"^^<http://www.w3.org/2001/XMLSchema#integer>>> <ex:certainty> "0.9"^^<http://www.w3.org/2001/XMLSchema#double> .'
+    # ==> '_:bn <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<bob> <http://xmlns.com/foaf/0.1/age> "23"^^<http://www.w3.org/2001/XMLSchema#integer>)>> .
+           _:bn <ex:certainty> "0.9"^^<http://www.w3.org/2001/XMLSchema#double> .'
 
-### Reading a Graph containing quoted triples
+### Reading a Graph containing triple terms
 
 By default, the N-Triples reader will reject a document containing a subject resource.
 
-    nt = '<<<bob> <http://xmlns.com/foaf/0.1/age> "23"^^<http://www.w3.org/2001/XMLSchema#integer>>> <ex:certainty> "0.9"^^<http://www.w3.org/2001/XMLSchema#double> .'
+    nt = '<<(<bob> <http://xmlns.com/foaf/0.1/age> "23"^^<http://www.w3.org/2001/XMLSchema#integer>)>> <ex:certainty> "0.9"^^<http://www.w3.org/2001/XMLSchema#double> .'
     graph = RDF::Graph.new do |graph|
       RDF::NTriples::Reader.new(nt) {|reader| graph << reader}
     end
@@ -346,6 +345,7 @@ other gems:
 * [RDF::TriG][] (extension)
 * [RDF::TriX][] (extension)
 * [RDF::Turtle][] (extension)
+* [RDF::Borsh][] (extension)
 
 The meta-gem [LinkedData][LinkedData doc] includes many of these gems.
 
@@ -511,6 +511,7 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [RDF 1.2]:          https://www.w3.org/TR/rdf12-concepts/
 [SPARQL 1.1]:       https://www.w3.org/TR/sparql11-query/
 [RDF.rb]:           https://ruby-rdf.github.io/
+[RDF::Borsh]:       https://ruby-rdf.github.io/rdf-borsh
 [RDF::DO]:          https://ruby-rdf.github.io/rdf-do
 [RDF::Mongo]:       https://ruby-rdf.github.io/rdf-mongo
 [RDF::Sesame]:      https://ruby-rdf.github.io/rdf-sesame

data/VERSION

@@ -1 +1 @@
-3.3.2
+3.3.4

data/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.
     #

data/lib/rdf/mixin/enumerable.rb

@@ -84,7 +84,6 @@ module RDF
     #   * `: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.
     #   * `:base_direction` supports RDF 1.2 directional language-tagged strings.
     #
     # @param  [Symbol, #to_sym] feature

data/lib/rdf/mixin/writable.rb

@@ -127,9 +127,8 @@ module RDF
     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"

data/lib/rdf/model/dataset.rb

@@ -104,8 +104,7 @@ module RDF
     # @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
 

data/lib/rdf/model/graph.rb

@@ -20,7 +20,7 @@ module RDF
   #
   # @example Loading graph data from a URL
   #   require 'rdf/rdfxml'  # for RDF/XML support
-  #   
+  #
   #   graph = RDF::Graph.load("http://www.bbc.co.uk/programmes/b0081dq5.rdf")
   #
   # @example Accessing a specific named graph within a {RDF::Repository}
@@ -250,6 +250,36 @@ module RDF
     end
     alias_method :has_statement?, :statement?
 
+    ##
+    # Returns `true` if `self` contains the given RDF subject term.
+    #
+    # @param  [RDF::Resource] value
+    # @return [Boolean]
+    def subject? value
+      !@data.query({ subject: value, graph_name: graph_name || false }).empty?
+    end
+    alias_method :has_subject?, :subject?
+
+    ##
+    # Returns `true` if `self` contains the given RDF predicate term.
+    #
+    # @param  [RDF::URI] value
+    # @return [Boolean]
+    def predicate? value
+      !@data.query({ predicate: value, graph_name: graph_name || false }).empty?
+    end
+    alias_method :has_predicate?, :predicate?
+
+    ##
+    # Returns `true` if `self` contains the given RDF object term.
+    #
+    # @param  [RDF::Term] value
+    # @return [Boolean]
+    def object? value
+      !@data.query({ object: value, graph_name: graph_name || false }).empty?
+    end
+    alias_method :has_object?, :object?
+
     ##
     # Enumerates each RDF statement in this graph.
     #
@@ -305,8 +335,7 @@ module RDF
     # @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)

data/lib/rdf/model/literal/date.rb

@@ -26,9 +26,7 @@ module RDF; class Literal
           # Use midnight as midpoint of the interval
           ::DateTime.parse(value.strftime('%FT00:00:00'))
         when value.respond_to?(:to_datetime)
-          dt = value.to_datetime
-          @zone = dt.zone
-          dt
+          value.to_datetime
         else
           md = value.to_s.match(GRAMMAR)
           _, dt, tz = Array(md)

data/lib/rdf/model/literal/decimal.rb

@@ -12,10 +12,10 @@ module RDF; class Literal
   # @since 0.2.1
   class Decimal < Numeric
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#decimal")
-    GRAMMAR  = /^[\+\-]?\d+(\.\d*)?$/.freeze
+    GRAMMAR  = /^[\+\-]?(?:(?:\d+(?:\.\d*)?)|(?:\.\d+))$/.freeze
 
     ##
-    # @param  [String, BidDecimal, Numeric] value
+    # @param  [String, BigDecimal, Numeric] value
     # @param  (see Literal#initialize)
     def initialize(value, datatype: nil, lexical: nil, **options)
       @datatype = RDF::URI(datatype || self.class.const_get(:DATATYPE))

data/lib/rdf/model/literal/double.rb

@@ -12,7 +12,7 @@ module RDF; class Literal
   # @since 0.2.1
   class Double < Numeric
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#double")
-    GRAMMAR  = /^(?:NaN|\-?INF|[+\-]?(?:\d+(:?\.\d*)?|\.\d+)(?:[eE][\+\-]?\d+)?)$/.freeze
+    GRAMMAR  = /^(?:NaN|[+\-]?INF|[+\-]?(?:\d+(:?\.\d*)?|\.\d+)(?:[eE][\+\-]?\d+)?)$/.freeze
 
     ##
     # @param  [String, Float, #to_f] value
@@ -26,7 +26,7 @@ module RDF; class Literal
           when 'INF'  then 1/0.0
           when '-INF' then -1/0.0
           when 'NAN'  then 0/0.0
-          else Float(value.sub(/\.[eE]/, '.0E')) rescue nil
+          else Float(value.sub(/\.[eE]/, '.0E').sub(/\.$/, '.0')) rescue nil
         end
         when value.is_a?(::Float)     then value
         when value.respond_to?(:to_f) then value.to_f

data/lib/rdf/model/statement.rb

@@ -72,7 +72,6 @@ module RDF
     #     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 @@ module RDF
     #     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 @@ module RDF
     # 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 @@ module RDF
     ##
     # @return [Boolean]
     def asserted?
-      !quoted?
+      !embedded?
     end
 
     ##
@@ -217,13 +215,6 @@ module RDF
       !!@options[:tripleTerm]
     end
 
-    ##
-    # @return [Boolean]
-    # @deprecated Quoted triples are now deprecated
-    def quoted?
-      !!@options[:quoted]
-    end
-
     ##
     # @return [Boolean]
     def inferred?
@@ -476,7 +467,7 @@ module RDF
     def to_s
       (graph_name ? to_quad : to_triple).map do |term|
         if term.is_a?(Statement)
-          "<<#{term.to_s[0..-3]}>>"
+          "<<(#{term.to_s[0..-3]})>>"
         elsif term.respond_to?(:to_base)
           term.to_base
         else

data/lib/rdf/model/uri.rb

@@ -80,6 +80,10 @@ module RDF
     # scheme, authority, path, query, fragment
     IRI_PARTS = /^(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*)(\?[^#]*)?(#.*)?$/.freeze
 
+    # Special version for file-scheme on Windows (path SHOULD begin with /, but may not)
+    # scheme, authority, path, query, fragment
+    FILE_PARTS = /^file:(?:\/\/(#{IHOST}))?(\/?[^?#]*)(\?[^#]*)?(#.*)?$/.freeze
+    
     # Remove dot expressions regular expressions
     RDS_2A = /^\.?\.\/(.*)$/.freeze
     RDS_2B1 = /^\/\.$/.freeze
@@ -160,7 +164,7 @@ module RDF
     # (see #initialize)
     # @return [RDF::URI] an immutable, frozen URI object
     def self.intern(str, *args, **options)
-      (cache[(str = str.to_s).to_sym] ||= self.new(str, *args, **options)).freeze
+      (cache[(str = str.to_s).to_sym] ||= self.new(str.to_s, *args, **options)).freeze
     end
 
     ##
@@ -716,8 +720,8 @@ module RDF
     ##
     # @private
     def freeze
-      unless frozen?
-        @mutex.synchronize do
+      @mutex.synchronize do
+        unless frozen?
           # Create derived components
           authority; userinfo; user; password; host; port
           @value  = value.freeze
@@ -851,8 +855,7 @@ module RDF
     # lexical representation of URI, either absolute or relative
     # @return [String] 
     def value
-      return @value if @value
-      @value = [
+      @value ||= [
         ("#{scheme}:" if absolute?),
         ("//#{authority}" if authority),
         path,
@@ -883,17 +886,35 @@ module RDF
     #
     # @param [String, to_s] value
     # @return [Object{Symbol => String}]
+    # @see https://datatracker.ietf.org/doc/html/rfc8089
     def parse(value)
-      value = value.to_s.dup.force_encoding(Encoding::ASCII_8BIT)
+      value = value.to_s.dup.force_encoding(Encoding::UTF_8) unless value && value.encoding == Encoding::UTF_8
       parts = {}
-      if matchdata = IRI_PARTS.match(value)
+      if matchdata = FILE_PARTS.match(value)
+        # A file-based URI is always in the folloring form:
+        # * file:/path  - absolute path, no host name
+        # * file:///path - absolute path, empty host name
+        # * file://hostname/path - absolute path with authority.
+        # * file://path – is invalid, but treated as file:///path
+        scheme = 'file'
+        authority, path, query, fragment = matchdata[1..-1]
+        if authority && authority.match?(/^[A-Za-z]$/) && Gem.win_platform?
+          # In this case, if the authority is a drive letter and part of the path
+          authority, path = nil, "#{authority}#{path}"
+        end
+        # We accept paths that aren't absolute, but coerce them to be absolute
+        path = "/#{path}" unless path.start_with?('/')
+      elsif matchdata = IRI_PARTS.match(value)
         scheme, authority, path, query, fragment = matchdata[1..-1]
+        authority = nil if authority && authority.empty?
 
-        if Gem.win_platform? && scheme && !authority && scheme.match?(/^[a-zA-Z]$/)
-          # A drive letter, not a scheme
-          scheme, path = nil, "#{scheme}:#{path}"
+        if scheme && scheme.match?(/^[A-Za-z]$/) && Gem.win_platform?
+          # On Windows treat D:/foo/bar as a path, not a scheme
+          scheme, authority, path = 'file', nil, "/#{scheme}:#{path}"
         end
+      end
 
+      if matchdata
         userinfo, hostport = authority.to_s.split('@', 2)
         hostport, userinfo = userinfo, nil unless hostport
         user, password = userinfo.to_s.split(':', 2)

data/lib/rdf/nquads.rb

@@ -70,11 +70,14 @@ module RDF
           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)

data/lib/rdf/ntriples/reader.rb

@@ -30,7 +30,7 @@ module RDF::NTriples
   #
   # ** RDF=star
   #
-  # Supports statements as resources using `<<s p o>>`.
+  # Supports statements as resources using `<<(s p o)>>`.
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   # @see http://www.w3.org/TR/n-triples/
@@ -40,8 +40,8 @@ module RDF::NTriples
 
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_strings
     ESCAPE_CHARS    = ["\b", "\f", "\t", "\n", "\r", "\"", "'", "\\"].freeze
-    UCHAR4          = /\\u([0-9A-Fa-f]{4,4})/.freeze
-    UCHAR8          = /\\U([0-9A-Fa-f]{8,8})/.freeze
+    UCHAR4          = /(?<!\\)\\(?!\\)u([0-9A-Fa-f]{4,4})/.freeze
+    UCHAR8          = /(?<!\\)\\(?!\\)U([0-9A-Fa-f]{8,8})/.freeze
     UCHAR           = Regexp.union(UCHAR4, UCHAR8).freeze
 
 
@@ -73,8 +73,8 @@ module RDF::NTriples
     TT_START              = /^<<\(/.freeze
     TT_END                = /^\s*\)>>/.freeze
 
-    QT_START              = /^<</.freeze
-    QT_END                = /^\s*>>/.freeze
+    QT_START              = /^<</.freeze      # DEPRECATED
+    QT_END                = /^\s*>>/.freeze   # DEPRECATED
 
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_grammar
     COMMENT               = /^#\s*(.*)$/.freeze
@@ -92,6 +92,7 @@ module RDF::NTriples
 
     # LANGTAG is deprecated
     LANGTAG               = LANG_DIR
+    RDF_VERSION          = /VERSION/.freeze
 
     ##
     # Reconstructs an RDF value from its serialized N-Triples
@@ -154,7 +155,8 @@ module RDF::NTriples
     def self.parse_literal(input, **options)
       case input
         when LITERAL_WITH_LANGUAGE
-          RDF::Literal.new(unescape($1), language: $4)
+          language, direction = $4.split('--')
+          RDF::Literal.new(unescape($1), language: language, direction: direction)
         when LITERAL_WITH_DATATYPE
           RDF::Literal.new(unescape($1), datatype: $4)
         when LITERAL_PLAIN
@@ -187,22 +189,12 @@ module RDF::NTriples
       # Note: avoiding copying the input string when no escaping is needed
       # greatly reduces the number of allocations and the processing time.
       string = string.dup.force_encoding(Encoding::UTF_8) unless string.encoding == Encoding::UTF_8
-      scanner = StringScanner.new(string)
-
-      buffer = ""
-
-      while !scanner.eos?
-        buffer << if scanner.scan(ESCAPE_CHARS_ESCAPED_REGEXP)
-          ESCAPE_CHARS_ESCAPED[scanner.matched]
-        elsif scanner.scan(UCHAR)
-          scanner.matched.sub(UCHAR) {[($1 || $2).hex].pack('U*')}
-        else
-          # Scan one character
-          scanner.getch
-        end
-      end
 
-      buffer
+      string
+        .gsub(UCHAR) do
+          [($1 || $2).hex].pack('U*')
+        end
+        .gsub(ESCAPE_CHARS_ESCAPED_REGEXP, ESCAPE_CHARS_ESCAPED)
     end
 
     ##
@@ -211,7 +203,7 @@ module RDF::NTriples
       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
@@ -226,15 +218,21 @@ module RDF::NTriples
         line = @line    # for backtracking input in case of parse error
 
         begin
-          unless blank? || read_comment
-            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
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
             end
-            return [subject, predicate, object]
+            spo = [subject, predicate, object]
+            # Only return valid triples if validating
+            return spo if !validate? || spo.all?(&:valid?)
           end
         rescue RDF::ReaderError => e
           @line = line  # this allows #read_value to work
@@ -247,6 +245,9 @@ module RDF::NTriples
     # @return [RDF::Statement]
     def read_tripleTerm
       if @options[:rdfstar] && match(TT_START)
+        if version && version != "1.2"
+          log_warn("Triple term used with version #{version}")
+        end
         subject   = read_uriref || read_node || fail_subject
         predicate = read_uriref(intern: true) || fail_predicate
         object    = read_uriref || read_node || read_literal || read_tripleTerm || fail_object
@@ -257,23 +258,6 @@ module RDF::NTriples
       end
     end
 
-    ##
-    # @return [RDF::Statement]
-    # @deprecated Quoted triples are now deprecated
-    def read_quotedTriple
-      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
-        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)
@@ -288,9 +272,8 @@ module RDF::NTriples
     def read_uriref(intern: false, **options)
       if uri_str = match(URIREF)
         uri_str = self.class.unescape(uri_str)
-        uri = RDF::URI.send(intern? && intern ? :intern : :new, uri_str)
+        uri = RDF::URI.send(intern? && intern ? :intern : :new, uri_str, canonicalize: canonicalize?)
         uri.validate!     if validate?
-        uri.canonicalize! if canonicalize?
         uri
       end
     rescue ArgumentError
@@ -317,6 +300,7 @@ module RDF::NTriples
           when lang_dir = match(LANG_DIR)
             language, direction = lang_dir.split('--')
             raise ArgumentError if direction && !@options[:rdfstar]
+            log_warn("Literal base direction used with version #{version}") if version && version == "1.1"
             RDF::Literal.new(literal_str, language: language, direction: direction)
           when datatype = match(/^(\^\^)/) # FIXME
             RDF::Literal.new(literal_str, datatype: read_uriref || fail_object)
@@ -330,7 +314,19 @@ module RDF::NTriples
     rescue ArgumentError
       v = literal_str
       v += "@#{lang_dir}" if lang_dir
-      log_error("Invalid Literal (found: \"#{v}\")", lineno: lineno, token: "#v", exception: RDF::ReaderError)
+      log_error("Invalid Literal (found: \"#{v}\")", lineno: lineno, token: v, exception: RDF::ReaderError)
+    end
+
+    ##
+    # @return [String]
+    def read_version
+      if match(RDF_VERSION)
+        ver_tok = match(LITERAL_PLAIN)
+        unless RDF::Format::VERSIONS.include?(ver_tok)
+          log_warn("Expected version to be one of #{RDF::Format::VERSIONS.join(', ')}, was #{ver_tok}")
+        end
+        ver_tok
+      end
     end
 
     ##

data/lib/rdf/ntriples/writer.rb

@@ -72,6 +72,10 @@ module RDF::NTriples
               buffer << case u.ord
               when (0x00..0x7F)
                 escape_ascii(u, encoding)
+              when (0xFFFE..0xFFFF)
+                # NOT A CHARACTER
+                # @see https://corp.unicode.org/~asmus/proposed_faq/private_use.html#history1
+                escape_uchar(u)
               else
                 u
               end
@@ -100,12 +104,10 @@ module RDF::NTriples
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
     def self.escape_unicode(u, encoding)
       case (u = u.ord)
-        when (0x00..0x7F)        # ASCII 7-bit
+        when (0x00..0x7F)        # ECHAR
           escape_ascii(u, encoding)
-        when (0x80..0xFFFF)      # Unicode BMP
-          escape_utf16(u)
-        when (0x10000..0x10FFFF) # Unicode
-          escape_utf32(u)
+        when (0x80...0x10FFFF)   # UCHAR
+          escape_uchar(u)
         else
           raise ArgumentError.new("expected a Unicode codepoint in (0x00..0x10FFFF), but got 0x#{u.to_s(16)}")
       end
@@ -132,18 +134,34 @@ module RDF::NTriples
       when (0x0D)       then "\\r"
       when (0x22)       then "\\\""
       when (0x5C)       then "\\\\"
-      when (0x00..0x1F) then escape_utf16(u)
-      when (0x7F)       then escape_utf16(u)
+      when (0x00..0x1F) then escape_uchar(u)
+      when (0x7F)       then escape_uchar(u)  # DEL
       when (0x20..0x7E) then u.chr
       else
         raise ArgumentError.new("expected an ASCII character in (0x00..0x7F), but got 0x#{u.to_s(16)}")
       end
     end
 
+    ##
+    # @param  [Integer, #ord] u
+    # @return [String]
+    # @see    https://www.w3.org/TR/rdf12-concepts/#rdf-stringshttps://www.w3.org/TR/rdf12-concepts/#rdf-strings
+    # @since 3.4.4
+    def self.escape_uchar(u)
+      #require 'byebug'; byebug
+      case u.ord
+      when (0x00..0xFFFF)
+        sprintf("\\u%04X", u.ord)
+      else
+        sprintf("\\U%08X", u.ord)
+      end
+    end
+
     ##
     # @param  [Integer, #ord] u
     # @return [String]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
+    # @deprecated use escape_uchar, this name is non-intuitive
     def self.escape_utf16(u)
       sprintf("\\u%04X", u.ord)
     end
@@ -152,6 +170,7 @@ module RDF::NTriples
     # @param  [Integer, #ord] u
     # @return [String]
     # @see    http://www.w3.org/TR/rdf-testcases/#ntrip_strings
+    # @deprecated use escape_uchar, this name is non-intuitive
     def self.escape_utf32(u)
       sprintf("\\U%08X", u.ord)
     end
@@ -193,6 +212,16 @@ module RDF::NTriples
       super
     end
 
+    ##
+    # Output VERSION directive, if specified and not canonicalizing
+    # @return [self]
+    # @abstract
+    def write_prologue
+      puts %(VERSION #{version.inspect}) if version && !canonicalize?
+      @logged_errors_at_prolog = log_statistics[:error].to_i
+      super
+    end
+
     ##
     # Outputs an N-Triples comment line.
     #
@@ -230,19 +259,7 @@ module RDF::NTriples
     # @param  [Hash{Symbol => Object}] options ({})
     # @return [String]
     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) }
+      "<<( %s %s %s )>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
 
     ##
@@ -285,9 +302,9 @@ module RDF::NTriples
             buffer.set_encoding(encoding)
             string.each_char do |u|
               buffer << case u.ord
-                when (0x00..0x20) then self.class.escape_utf16(u)
+                when (0x00..0x20) then self.class.escape_uchar(u)
                 when 0x22, 0x3c, 0x3e, 0x5c, 0x5e, 0x60, 0x7b, 0x7c, 0x7d # "<>\^`{|}
-                  self.class.escape_utf16(u)
+                  self.class.escape_uchar(u)
                 else u
               end
             end
@@ -299,11 +316,10 @@ module RDF::NTriples
             buffer.set_encoding(Encoding::ASCII)
             string.each_byte do |u|
               buffer << case u
-                when (0x00..0x20) then self.class.escape_utf16(u)
+                when (0x00..0x20) then self.class.escape_uchar(u)
                 when 0x22, 0x3c, 0x3e, 0x5c, 0x5e, 0x60, 0x7b, 0x7c, 0x7d # "<>\^`{|}
-                  self.class.escape_utf16(u)
-                when (0x80..0xFFFF)                then self.class.escape_utf16(u)
-                when (0x10000..0x10FFFF)           then self.class.escape_utf32(u)
+                  self.class.escape_uchar(u)
+                when (0x80..0x10FFFF) then self.class.escape_uchar(u)
                 else u
               end
             end

data/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
   #

data/lib/rdf/reader.rb

@@ -168,15 +168,21 @@ module RDF
           symbol: :validate,
           datatype: TrueClass,
           control: :checkbox,
-          on: ["--validate"],
-          description: "Validate input file."),
+          on: ["--[no-]validate"],
+          description: "Validate on input and output."),
         RDF::CLI::Option.new(
           symbol: :verifySSL,
           datatype: TrueClass,
           default: true,
           control: :checkbox,
           on: ["--[no-]verifySSL"],
-          description: "Verify SSL results on HTTP GET")
+          description: "Verify SSL results on HTTP GET"),
+        RDF::CLI::Option.new(
+          symbol: :version,
+          control: :select,
+          datatype: RDF::Format::VERSIONS, # 1.1, 1.2, or 1.2-basic
+          on: ["--version VERSION"],
+          description: "RDF Version."),
       ]
     end
 
@@ -284,6 +290,8 @@ module RDF
     #   any additional options
     # @param [Boolean]  validate     (false)
     #   whether to validate the parsed statements and values
+    # @option options [String] :version
+    #   Parse a specific version of RDF ("1.1', "1.2", or "1.2-basic"")
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
@@ -309,6 +317,13 @@ module RDF
         validate:       validate
       })
 
+      # The rdfstar option implies version 1.2, but can be overridden
+      @options[:version] ||= "1.2" if @options[:rdfstar]
+
+      unless self.version.nil? || RDF::Format::VERSIONS.include?(self.version)
+        log_error("Expected version to be one of #{RDF::Format::VERSIONS.join(', ')}, was #{self.version}")
+      end
+
       @input = case input
         when String then StringIO.new(input)
         else input
@@ -333,7 +348,7 @@ module RDF
     # Returns the base URI determined by this reader.
     #
     # @example
-    #   reader.prefixes[:dc]  #=> RDF::URI('http://purl.org/dc/terms/')
+    #   reader.base_uri  #=> RDF::URI('http://example.com/')
     #
     # @return [RDF::URI]
     # @since  0.3.0
@@ -391,6 +406,18 @@ module RDF
     end
     alias_method :prefix!, :prefix
 
+    ##
+    # Returns the RDF version determined by this reader.
+    #
+    # @example
+    #   reader.version  #=> "1.2"
+    #
+    # @return [String]
+    # @since  3.3.4
+    def version
+      @options[:version]
+    end
+
     ##
     # Iterates the given block for each RDF statement.
     #
@@ -417,7 +444,7 @@ module RDF
         begin
           loop do
             st = read_statement
-            block.call(st)
+            block.call(st) unless st.nil?
           end
         rescue EOFError
           rewind rescue nil
@@ -454,7 +481,7 @@ module RDF
         begin
           loop do
             triple = read_triple
-            block.call(*triple)
+            block.call(*triple) unless triple.nil?
           end
         rescue EOFError
           rewind rescue nil
@@ -513,7 +540,7 @@ module RDF
     def valid?
       super && !log_statistics[:error]
     rescue ArgumentError, RDF::ReaderError => e
-      log_error(e.message)
+      log_error(e.message + " at #{e.backtrace.first}")
       false
     end
 

data/lib/rdf/repository.rb

@@ -183,8 +183,6 @@ module RDF
       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 @@ module RDF
         when :literal_equality then true
         when :atomic_write     then true
         when :rdf_full         then true
-        when :quoted_triples   then true
         when :base_direction   then true
         when :snapshots        then true
         else false

data/lib/rdf/util/file.rb

@@ -297,7 +297,6 @@ module RDF; module Util
     # @yieldreturn [Object] returned from open_file
     # @raise [IOError] if not found
     def self.open_file(filename_or_url, proxy: nil, headers: {}, verify_none: false, **options, &block)
-      filename_or_url = $1 if filename_or_url.to_s.match(/^file:(.*)$/)
       remote_document = nil
 
       if filename_or_url.to_s.match?(/^https?/)
@@ -319,6 +318,16 @@ module RDF; module Util
           url_no_frag_or_query.query = nil
           url_no_frag_or_query.fragment = nil
           options[:encoding] ||= Encoding::UTF_8
+
+          # Just use path if there's a file scheme. This leaves out a potential host, which isn't supported anyway.
+          if url_no_frag_or_query.scheme == 'file'
+            url_no_frag_or_query = url_no_frag_or_query.path
+            if url_no_frag_or_query.match?(/^\/[A-Za-z]:/) && Gem.win_platform?
+              # Turns "/D:foo" into "D:foo"
+              url_no_frag_or_query = url_no_frag_or_query[1..-1]
+            end
+          end
+
           Kernel.open(url_no_frag_or_query, "r", **options) do |file|
             document_options = {
               base_uri:     filename_or_url.to_s,

data/lib/rdf/writer.rb

@@ -152,6 +152,12 @@ module RDF
           control: :checkbox,
           on: ["--unique-bnodes"],
           description: "Use unique Node identifiers.") {true},
+        RDF::CLI::Option.new(
+          symbol: :version,
+          control: :select,
+          datatype: RDF::Format::VERSIONS, # 1.1, 1.2, or 1.2-basic
+          on: ["--version VERSION"],
+          description: "RDF Version."),
       ]
     end
 
@@ -281,6 +287,8 @@ module RDF
     #   Use unique {Node} identifiers, defaults to using the identifier which the node was originall initialized with (if any). Implementations should ensure that Nodes are serialized using a unique representation independent of any identifier used when creating the node. See {NTriples::Writer#format_node}
     # @option options [Hash{Symbol => String}] :accept_params
     #   Parameters from ACCEPT header entry for the media-range matching this writer.
+    # @option options [String] :version
+    #   Parse a specific version of RDF ("1.1', "1.2", or "1.2-basic"")
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void]
@@ -288,6 +296,13 @@ module RDF
       @output, @options = output, options.dup
       @nodes, @node_id, @node_id_map  = {}, 0, {}
 
+      # The rdfstar option implies version 1.2, but can be overridden
+      @options[:version] ||= "1.2" if @options[:rdfstar]
+
+      unless self.version.nil? || RDF::Format::VERSIONS.include?(self.version)
+        log_warn("Expected version to be one of #{RDF::Format::VERSIONS.join(', ')}, was #{self.version}")
+      end
+
       if block_given?
         write_prologue
         case block.arity
@@ -412,6 +427,18 @@ module RDF
     end
     alias_method :flush!, :flush
 
+    ##
+    # Returns the RDF version determined by this reader.
+    #
+    # @example
+    #   writer.version  #=> "1.2"
+    #
+    # @return [String]
+    # @since  3.3.4
+    def version
+      @options[:version]
+    end
+
     ##
     # @return [self]
     # @abstract
@@ -482,7 +509,7 @@ module RDF
       end
       self
     rescue ArgumentError => e
-      log_error e.message
+      log_error e.message + " at #{e.backtrace.first}"
     end
     alias_method :insert_statement, :write_statement # support the RDF::Writable interface
 
@@ -518,8 +545,7 @@ module RDF
         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
@@ -581,22 +607,6 @@ module RDF
       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
 
     ##

metadata

@@ -1,17 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.4
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
 - Gregg Kellogg
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2025-07-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcp47_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
@@ -33,39 +66,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
-  name: bcp47_spec
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: bigdecimal
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +362,6 @@ metadata:
   homepage_uri: https://github.com/ruby-rdf/rdf
   mailing_list_uri: https://lists.w3.org/Archives/Public/public-rdf-ruby/
   source_code_uri: https://github.com/ruby-rdf/rdf
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,8 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.
 test_files: []