rdf 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b8e26b43854ef02542acbc81b88426f3b5989df1156e010bfb5250f3fb31c6
-  data.tar.gz: 7a4303eccec6cd20b29bcfcba87a9cffb36c3db7f7045bbd375264922e2a4a66
+  metadata.gz: 061dd8c1cc1312a0637faec70a4aff5c8f6872e333c225563cd0f426e46b1021
+  data.tar.gz: 1abd0cfb43de3db148b5930165c0fdf494e1313c577a14b93d8385def05885d0
 SHA512:
-  metadata.gz: 31e5f916ecc25dddf44f6b6057311b784afa1a593b406e6ba1944481c3f5a2ac8f4de752a86d779d415e21c3292064c363bb9369c86ba8d401b0aebade755195
-  data.tar.gz: 68d96d55bc4a4ad89472b212db1b6e64a03f30936b0cc7cbc8e802505a133117c1fcf0a311f1a0f6b5c4e91255841f95cd7d4ef2963db665bb648d900aa2e05b
+  metadata.gz: 272d88f2911164ecc3a2fa71f485e4f6f789252b9f7f5d2c5b222e60dd65ebf5acf0843de3c68910e6e795ebe3003eca2f956ca309eff8afae13694fe5de94a5
+  data.tar.gz: 385f3ff6159082e189d8cfb47bfe4c77243e7c5c18558e5d7a3cd5701d75cebab29f250d7ba28c1f4d7ba5e6564a51236ca367a832534d666c7fc4a4a831bb8a

data/README.md

@@ -280,19 +280,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 +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.
 
@@ -511,6 +517,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.3

data/lib/rdf/mixin/enumerable.rb

@@ -84,7 +84,7 @@ 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.
+    #   * `: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/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.
     #

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

@@ -476,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

@@ -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/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
@@ -187,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
 
     ##
@@ -259,9 +249,9 @@ module RDF::NTriples
 
     ##
     # @return [RDF::Statement]
-    # @deprecated Quoted triples are now deprecated
+    # @deprecated Quoted triples are now deprecated (not supported when validating)
     def read_quotedTriple
-      if @options[:rdfstar] && !match(TT_START) && match(QT_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

data/lib/rdf/ntriples/writer.rb

@@ -230,7 +230,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) }
+      "<<( %s %s %s )>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
 
     ##

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

@@ -273,7 +273,7 @@ module RDF
         when :literal_equality then true
         when :atomic_write     then true
         when :rdf_full         then true
-        when :quoted_triples   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,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,8 +10,42 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 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,39 +67,33 @@ 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'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -336,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.