rdf 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91c05a681e616afeaa013c0b52fc1c86579e4ce92ac7bdf34432e13e0792579
-  data.tar.gz: 92cba1715c9d596487db504a6ad5ad1c8cf7ea6134aa7b316a6e0309b86f6db7
+  metadata.gz: 061dd8c1cc1312a0637faec70a4aff5c8f6872e333c225563cd0f426e46b1021
+  data.tar.gz: 1abd0cfb43de3db148b5930165c0fdf494e1313c577a14b93d8385def05885d0
 SHA512:
-  metadata.gz: e38d2d520c333b02f657f0b99f0d1d517a45e2c582b5004e1e33b6153b1a33db8bb67e56b84276b6d5730361f768ad2aed9feaeee97239cd94708955214d04be
-  data.tar.gz: 7faa56d6a55c8bb5bd93ca41a5ae1f7b9cdeb55ebcd07266fb74af78750af2b7919dfb646e2e7d3a6971d11f10657cf1f9594977acbf4c4139c2946b7f40b604
+  metadata.gz: 272d88f2911164ecc3a2fa71f485e4f6f789252b9f7f5d2c5b222e60dd65ebf5acf0843de3c68910e6e795ebe3003eca2f956ca309eff8afae13694fe5de94a5
+  data.tar.gz: 385f3ff6159082e189d8cfb47bfe4c77243e7c5c18558e5d7a3cd5701d75cebab29f250d7ba28c1f4d7ba5e6564a51236ca367a832534d666c7fc4a4a831bb8a

data/README.md

@@ -265,28 +265,39 @@ 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 quoted triples in the _subject_ or _object_ position.
+[RDF.rb][] includes provisional support for [RDF 1.2][] with an N-Triples/N-Quads syntax for triple terms in the _object_ position.
 [RDF.rb][] includes provisional support for [RDF 1.2][] directional language-tagged strings, which are literals of type `rdf:dirLangString` having both a `language` and `direction`.
 
 Internally, an `RDF::Statement` is treated as another resource, along with `RDF::URI` and `RDF::Node`, which allows an `RDF::Statement` to have a `#subject` or `#object` which is also an `RDF::Statement`.
 
 **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
@@ -340,6 +351,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.
 
@@ -394,6 +406,9 @@ from BNode identity (i.e., they each entail the other)
 * {RDF::RDFV}   - RDF Vocabulary (RDFV)
 * {RDF::XSD}    - XML Schema (XSD)
 
+## Change Log
+
+See [Release Notes on GitHub](https://github.com/ruby-rdf/rdf/releases)
 
 ## Dependencies
 
@@ -498,9 +513,11 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [SPARQL doc]:       https://ruby-rdf.github.io/sparql
 [RDF 1.0]:          https://www.w3.org/TR/2004/REC-rdf-concepts-20040210/
 [RDF 1.1]:          https://www.w3.org/TR/rdf11-concepts/
+[RDF-star]:         https://www.w3.org/2021/12/rdf-star.html
 [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.1
+3.3.3

data/lib/rdf/mixin/enumerable.rb

@@ -83,7 +83,8 @@ module RDF
     #   * `: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.
-    #   * `:quoted_triples` supports RDF 1.2 quoted triples.
+    #   * `: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

data/lib/rdf/mixin/queryable.rb

@@ -146,6 +146,8 @@ module RDF
     #
     # Patterns may also have embedded patterns as either a subject or object, recursively.
     #
+    # Patterns with a variable `graph_name` do not match the default graph.
+    #
     # When matching, match an embedded pattern against embedded statements, recursively. (see {RDF::Query::Pattern#eql?})
     #
     # @param  [RDF::Query::Pattern] pattern

data/lib/rdf/mixin/writable.rb

@@ -127,10 +127,11 @@ module RDF
     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?(:quoted_triples)
+        # 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"
         end
-        if statement.object && statement.object.literal? && statement.object.direction? && !supports?(:base_direction)
+        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"
         end
         insert_statement(statement)

data/lib/rdf/model/dataset.rb

@@ -104,7 +104,8 @@ module RDF
     # @private
     # @see RDF::Enumerable#supports?
     def supports?(feature)
-      return true if %i(graph_name quoted_triples).include?(feature)
+      # FIXME: quoted triples are now deprecated
+      return true if %i(graph_name quoted_triples 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,9 @@ module RDF
     # @private
     # @see RDF::Mutable#insert
     def insert_statement(statement)
-      if statement.embedded? && !@data.supports?(:quoted_triples)
-        raise ArgumentError, "Graph does not support quoted triples"
+      # FIXME: quoted triples are now deprecated
+      if statement.embedded? && !(@data.supports?(:quoted_triples) || @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)
         raise ArgumentError, "Graph does not support directional languaged-tagged strings"

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/literal.rb

@@ -194,7 +194,7 @@ module RDF
       @string   = @string.encode(Encoding::UTF_8).freeze if instance_variable_defined?(:@string)
       @object   = @string if instance_variable_defined?(:@string) && @object.is_a?(String)
       @language = language.to_s.downcase.to_sym if language
-      @direction = direction.to_s.downcase.to_sym if direction
+      @direction = direction.to_s.to_sym if direction
       @datatype = RDF::URI(datatype).freeze if datatype
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
       @datatype ||= if instance_variable_defined?(:@language) && @language &&
@@ -451,6 +451,16 @@ module RDF
       false
     end
 
+    ##
+    # Returns `true` if this is a language-tagged literal in the English
+    # language.
+    #
+    # @return [Boolean] `true` or `false`
+    # @since  3.3.2
+    def english?
+      /\Aen(?:-[A-Za-z]{2})?\z/ === language.to_s
+    end
+
     ##
     # Validates the value using {RDF::Value#valid?}, raising an error if the value is
     # invalid.

data/lib/rdf/model/statement.rb

@@ -71,7 +71,8 @@ module RDF
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     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] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement.
+    #   @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)
@@ -84,7 +85,8 @@ module RDF
     #   @option options [RDF::Term]  :graph_name   (nil)
     #     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] :quoted used as a marker to record that this statement quoted and appears as the subject or object of another RDF::Statement.
+    #   @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)
@@ -211,6 +213,13 @@ module RDF
 
     ##
     # @return [Boolean]
+    def tripleTerm?
+      !!@options[:tripleTerm]
+    end
+
+    ##
+    # @return [Boolean]
+    # @deprecated Quoted triples are now deprecated
     def quoted?
       !!@options[:quoted]
     end
@@ -467,7 +476,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

@@ -70,16 +70,20 @@ module RDF
     IUSERINFO = Regexp.compile("(?:(?:#{IUNRESERVED})|(?:#{PCT_ENCODED})|(?:#{SUB_DELIMS})|:)*").freeze
     IAUTHORITY = Regexp.compile("(?:#{IUSERINFO}@)?#{IHOST}(?::#{PORT})?").freeze
     
-    IRELATIVE_PART = Regexp.compile("(?:(?://#{IAUTHORITY}(?:#{IPATH_ABEMPTY}))|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_NOSCHEME})|(?:#{IPATH_EMPTY}))").freeze
-    IRELATIVE_REF = Regexp.compile("^#{IRELATIVE_PART}(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
+    IRELATIVE_PART = Regexp.compile("//#{IAUTHORITY}(?:#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_NOSCHEME})|(?:#{IPATH_EMPTY})").freeze
+    IRELATIVE_REF = Regexp.compile("^(?:#{IRELATIVE_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
 
-    IHIER_PART = Regexp.compile("(?:(?://#{IAUTHORITY}#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY}))").freeze
+    IHIER_PART = Regexp.compile("//#{IAUTHORITY}(?:#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY})").freeze
     IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
 
     # Split an IRI into it's component parts
     # 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)
@@ -1240,17 +1261,18 @@ module RDF
       query.to_s.split('&').
         inject(return_type == Hash ? {} : []) do |memo,kv|
           k,v = kv.to_s.split('=', 2)
-          next if k.to_s.empty?
-          k = CGI.unescape(k)
-          v = CGI.unescape(v) if v
-          if return_type == Hash
-            case memo[k]
-            when nil then memo[k] = v
-            when Array then memo[k] << v
-            else memo[k] = [memo[k], v]
+          unless k.to_s.empty?
+            k = CGI.unescape(k)
+            v = CGI.unescape(v) if v
+            if return_type == Hash
+              case memo[k]
+              when nil then memo[k] = v
+              when Array then memo[k] << v
+              else memo[k] = [memo[k], v]
+              end
+            else
+              memo << [k, v].compact
             end
-          else
-            memo << [k, v].compact
           end
           memo
         end

data/lib/rdf/model/value.rb

@@ -197,19 +197,20 @@ module RDF
     alias_method :validate, :validate!
 
     ##
-    # Returns `true` if this Value starts with the given `string`.
+    # Returns `true` if this Value starts with any of the given strings.
     #
     # @example
     #   RDF::URI('http://example.org/').start_with?('http')     #=> true
     #   RDF::Node('_:foo').start_with?('_:bar')                 #=> false
     #   RDF::Litera('Apple').start_with?('Orange')              #=> false
+    #   RDF::Litera('Apple').start_with?('Orange', 'Apple')     #=> true
     #
-    # @param  [String, #to_s] string
+    # @param  [Array<#to_s>] *args Any number of strings to check against.
     # @return [Boolean] `true` or `false`
     # @see    String#start_with?
     # @since  0.3.0
-    def start_with?(string)
-      to_s.start_with?(string.to_s)
+    def start_with?(*args)
+      to_s.start_with?(*args.map(&:to_s))
     end
     alias_method :starts_with?, :start_with?
 

data/lib/rdf/nquads.rb

@@ -71,9 +71,10 @@ module RDF
 
           begin
             unless blank? || read_comment
+              # FIXME: quoted triples are now deprecated
               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
+              object    = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple || 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
 
 
@@ -51,14 +51,14 @@ module RDF::NTriples
     # @see http://www.w3.org/TR/turtle/
     ##
     # Unicode regular expressions.
-    U_CHARS1         = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
-                         [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
-                         [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
-                         [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
-                         [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
-                       EOS
-    U_CHARS2         = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
-    IRI_RANGE        = Regexp.compile("[[^<>\"{}\|\^`\\\\]&&[^\\x00-\\x20]]").freeze
+    U_CHARS1             = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
+                             [\\u00C0-\\u00D6]|[\\u00D8-\\u00F6]|[\\u00F8-\\u02FF]|
+                             [\\u0370-\\u037D]|[\\u037F-\\u1FFF]|[\\u200C-\\u200D]|
+                             [\\u2070-\\u218F]|[\\u2C00-\\u2FEF]|[\\u3001-\\uD7FF]|
+                             [\\uF900-\\uFDCF]|[\\uFDF0-\\uFFFD]|[\\u{10000}-\\u{EFFFF}]
+                           EOS
+    U_CHARS2             = Regexp.compile("\\u00B7|[\\u0300-\\u036F]|[\\u203F-\\u2040]").freeze
+    IRI_RANGE            = Regexp.compile("[[^<>\"{}\|\^`\\\\]&&[^\\x00-\\x20]]").freeze
 
     PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/.freeze
     PN_CHARS_U           = /_|#{PN_CHARS_BASE}/.freeze
@@ -70,8 +70,11 @@ module RDF::NTriples
     LANG_DIR             = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/.freeze
     STRING_LITERAL_QUOTE = /"((?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*)"/.freeze
 
-    ST_START              = /^<</.freeze
-    ST_END                = /^\s*>>/.freeze
+    TT_START              = /^<<\(/.freeze
+    TT_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
@@ -184,22 +187,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
 
     ##
@@ -208,7 +201,7 @@ module RDF::NTriples
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_quotedTriple
+        value = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple
         log_recover
         value
       end
@@ -226,7 +219,7 @@ module RDF::NTriples
           unless blank? || read_comment
             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
+            object    = read_uriref || read_node || read_literal || read_tripleTerm || read_quotedTriple || fail_object
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -242,12 +235,29 @@ module RDF::NTriples
 
     ##
     # @return [RDF::Statement]
+    def read_tripleTerm
+      if @options[:rdfstar] && match(TT_START)
+        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
+        if !match(TT_END)
+          log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
+        end
+        RDF::Statement.new(subject, predicate, object, tripleTerm: true)
+      end
+    end
+
+    ##
+    # @return [RDF::Statement]
+    # @deprecated Quoted triples are now deprecated (not supported when validating)
     def read_quotedTriple
-      if @options[:rdfstar] && match(ST_START)
+      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(ST_END)
+        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)

data/lib/rdf/ntriples/writer.rb

@@ -223,15 +223,28 @@ module RDF::NTriples
       format_triple(*statement.to_triple, **options)
     end
 
+    ##
+    # Returns the N-Triples representation of an RDF 1.2 triple term.
+    #
+    # @param  [RDF::Statement] statement
+    # @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) }
     end
+
     ##
     # Returns the N-Triples representation of a triple.
     #

data/lib/rdf/ntriples.rb

@@ -15,7 +15,11 @@ module RDF
   #
   #     <https://rubygems.org/gems/rdf> <http://purl.org/dc/terms/title> "rdf" .
   #
-  # ## Quoted Triples
+  # ## Triple terms
+  #
+  # Supports statements as resources using `<<(s p o)>>`.
+
+  # ## Quoted Triples (Deprecated)
   #
   # Supports statements as resources using `<<s p o>>`.
   #

data/lib/rdf/query/pattern.rb

@@ -23,7 +23,7 @@ module RDF; class Query
     #   @option options [Variable, URI, Symbol, nil]      :predicate (nil)
     #   @option options [Variable, Term, Symbol, nil]     :object    (nil)
     #   @option options [Variable, Resource, Symbol, nil, false] :graph_name   (nil)
-    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
+    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph. (See {RDF::Query#initialize})
     #   @option options [Boolean]            :optional  (false)
     #
     # @overload initialize(subject, predicate, object, options = {})
@@ -32,7 +32,7 @@ module RDF; class Query
     #   @param  [Variable, Termm, Symbol, nil]            object
     #   @param  [Hash{Symbol => Object}]          options
     #   @option options [Variable, Resource, Symbol, nil, false] :graph_name   (nil)
-    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph.
+    #     A graph_name of nil matches any graph, a graph_name of false, matches only the default graph. (See {RDF::Query#initialize})
     #   @option options [Boolean]                 :optional  (false)
     #
     # @note {Statement} treats symbols as interned {Node} instances, in a {Pattern}, they are treated as {Variable}.

data/lib/rdf/query/variable.rb

@@ -233,6 +233,8 @@ class RDF::Query
     # Returns `true` if this variable is equivalent to a given `other`
     # variable. Or, to another Term if bound, or to any other Term
     #
+    # @note when comparing against the default graph in an {RDF::Dataset}, `other` will be `false` and not be equal to an unbound variable.
+    #
     # @param  [Object] other
     # @return [Boolean] `true` or `false`
     # @since  0.3.0

data/lib/rdf/query.rb

@@ -151,10 +151,9 @@ module RDF
     #   @option options [RDF::Query::Solutions] :solutions (Solutions.new)
     #   @option options [RDF::Resource, RDF::Query::Variable, false] :graph_name (nil)
     #     Default graph name for matching against queryable.
-    #     Named queries either match against a specifically named
+    #     Queries with a graph name match against a specifically named
     #     graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
-    #     Names that are against unbound variables match either default
-    #     or named graphs.
+    #     Queries using an unbound variable as a graph name only match against named graphs, and will not match the default graph.
     #     The name of `false` will only match against the default graph.
     #   @option options [RDF::Resource, RDF::Query::Variable, false] :name (nil)
     #     Alias for `:graph_name`.
@@ -168,10 +167,9 @@ module RDF
     #   @param [RDF::Query::Solutions] solutions (Solutions.new)
     #   @param [RDF::Resource, RDF::Query::Variable, false] graph_name (false)
     #     Default graph name for matching against queryable.
-    #     Named queries either match against a specifically named
+    #     Queries with a graph name match against a specifically named
     #     graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
-    #     Names that are against unbound variables match either default
-    #     or named graphs.
+    #     Queries using an unbound variable as a graph name only match against named graphs, and will not match the default graph.
     #     The name of `false` will only match against the default graph.
     #   @param [RDF::Resource, RDF::Query::Variable, false] name (false)
     #     Alias for `:graph_name`.
@@ -285,10 +283,9 @@ module RDF
     # @param [RDF::Query::Solutions] solutions (Solutions.new)
     # @param [RDF::Resource, RDF::Query::Variable, false] graph_name (nil)
     #   Default graph name for matching against queryable.
-    #   Named queries either match against a specifically named
+    #   Queries with a graph name match against a specifically named
     #   graphs if the name is an {RDF::Resource} or bound {RDF::Query::Variable}.
-    #   Names that are against unbound variables match either default
-    #   or named graphs.
+    #   Queries using an unbound variable as a graph name only match against named graphs, and will not match the default graph.
     #   The name of `false` will only match against the default graph.
     # @param [RDF::Resource, RDF::Query::Variable, false] name (nil)
     #   Alias for `:graph_name`.

data/lib/rdf/reader.rb

@@ -333,7 +333,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

data/lib/rdf/repository.rb

@@ -182,6 +182,8 @@ module RDF
       when :validity         then @options.fetch(:with_validity, true)
       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
@@ -270,7 +272,8 @@ module RDF
         when :validity         then @options.fetch(:with_validity, true)
         when :literal_equality then true
         when :atomic_write     then true
-        when :quoted_triples   then true
+        when :rdf_full         then true
+        when :quoted_triples   then true  # DEPRECATED
         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/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 @@ module RDF
       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,

data/lib/rdf/writer.rb

@@ -518,7 +518,8 @@ 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)
-        when RDF::Statement then format_quotedTriple(term, **options)
+        # FIXME: quoted triples are now deprecated
+        when RDF::Statement then term.tripleTerm? ? format_tripleTerm(term, **options) : format_quotedTriple(term, **options)
         else nil
       end
     end
@@ -566,7 +567,7 @@ module RDF
     end
 
     ##
-    # Formats a referenced triple.
+    # Formats a referenced triple term.
     #
     # @example
     #     <<<s> <p> <o>>> <p> <o> .
@@ -576,8 +577,24 @@ module RDF
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
+    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_statement") # override in subclasses
+      raise NotImplementedError.new("#{self.class}#format_quotedTriple") # override in subclasses
     end
 
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,8 +10,42 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2025-06-24 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,14 +67,42 @@ 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: '1.5'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -122,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '3.23'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.