rdf 3.2.6 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58dcc9836c4302cad4bb46a86596235794a664d508cc002ce298b6c964265ba9
-  data.tar.gz: 941a3daf3a379acf33fe09688ea9cabefd25eb88dc80a7b31d05ac380b2cb2f9
+  metadata.gz: 73bbb2bcc84c974f9ecfe2b1f9a41cf445273e76cfdbd6fd84b6141790b85092
+  data.tar.gz: 5a339b4166238e83c491555bc084e9132491da17c54234252b4bc60b5b8451db
 SHA512:
-  metadata.gz: f384a93b62b93d574c3dae02e8285f77a3ea6fa26c60eb30aa387e7213343e763a00d9a58f33d0caf4acc5f68a4b27e55361beb792127486059e8afeb333053e
-  data.tar.gz: ed8a19309a2b2f042a3f10df60465b56bd5ea9ace1a305cbe595bab507a7606eae99438fe3ce1edbcd653f513bd015aaf19d5e7203c5903278e275dc591e9d15
+  metadata.gz: d083cfe87a7894a616966a8d0bdc9a4d0b11814fde48a95bf94f83cc0fcc6ffd939b0ddd765079e0ca2514fbc7df182bebea0870d4a7d8f2817bba72cb7c4bab
+  data.tar.gz: ce59b7a5f8340f9fee88ad374c1452df356312ad3621e64e678054508616b32648e7cb49fc9fd42563cc8c8079d99500d9c779a9dcf1924e0804ca97e17ea69e

data/VERSION

@@ -1 +1 @@
-3.2.6
+3.2.9

data/lib/rdf/cli.rb

@@ -25,6 +25,7 @@ rescue LoadError
      rdf/xsd
      shacl
      shex
+     yaml_ld
   ).each do |ser|
     begin
       require ser
@@ -177,7 +178,10 @@ module RDF
     # * `parse` Boolean value to determine if input files should automatically be parsed into `repository`.
     # * `help` used for the CLI help output.
     # * `lambda` code run to execute command.
-    # * `filter` Option values that must match for command to be used
+    # * `filter` value is a Hash whose keys are matched against selected command options. All specified `key/value` pairs are compared against the equivalent key in the current invocation.
+    #            If an Array, option value (as a string) must match any value of the array (as a string)
+    #            If a Proc, it is passed the option value and must return `true`.
+    #            Otherwise, the option value (as a string) must equal the  `value` (as a string).
     # * `control` Used to indicate how (if) command is displayed
     # * `repository` Use this repository, if set
     # * `options` an optional array of `RDF::CLI::Option` describing command-specific options.
@@ -505,9 +509,22 @@ module RDF
       # Make sure any selected command isn't filtered out
       cmds.each do |c|
         COMMANDS[c.to_sym].fetch(:filter, {}).each do |opt, val|
-          if options[opt].to_s != val.to_s
-            usage(option_parser, banner: "Command #{c.inspect} requires #{opt}: #{val}, not #{options.fetch(opt, 'null')}")
-            raise ArgumentError, "Incompatible command #{c} used with option #{opt}=#{options[opt]}"
+          case val
+          when Array
+            unless val.map(&:to_s).include?(options[opt].to_s)
+              usage(option_parser, banner: "Command #{c.inspect} requires #{opt} in #{val.map(&:to_s).inspect}, not #{options.fetch(opt, 'null')}")
+              raise ArgumentError, "Incompatible command #{c} used with option #{opt}=#{options[opt]}"
+            end
+          when Proc
+            unless val.call(options[opt])
+              usage(option_parser, banner: "Command #{c.inspect} #{opt} inconsistent with #{options.fetch(opt, 'null')}")
+              raise ArgumentError, "Incompatible command #{c} used with option #{opt}=#{options[opt]}"
+            end
+          else
+            unless val.to_s == options[opt].to_s
+              usage(option_parser, banner: "Command #{c.inspect} requires compatible value for #{opt}, not #{options.fetch(opt, 'null')}")
+              raise ArgumentError, "Incompatible command #{c} used with option #{opt}=#{options[opt]}"
+            end
           end
         end
 
@@ -572,7 +589,8 @@ module RDF
     #   @param [Hash{Symbol => Object}] options already set
     #   @return [Array<String>] list of executable commands
     # @overload commands(format: :json, **options)
-    #   @param [:json] format (:json)
+    #   Returns commands as JSON, for API usage.
+    #   @param [:json] format
     #   @param [Hash{Symbol => Object}] options already set
     #   @return [Array{Object}]
     #     Returns an array of commands including the command symbol
@@ -593,7 +611,14 @@ module RDF
         # Subset commands based on filter options
         cmds = COMMANDS.reject do |k, c|
           c.fetch(:filter, {}).any? do |opt, val|
-            options[opt].to_s != val.to_s
+            case val
+            when Array
+              !val.map(&:to_s).include?(options[opt].to_s)
+            when Proc
+              !val.call(options[opt])
+            else
+              val.to_s != options[opt].to_s
+            end
           end
         end
 

data/lib/rdf/format.rb

@@ -23,7 +23,9 @@ module RDF
   #
   # @example Defining a new RDF serialization format class
   #   class RDF::NTriples::Format < RDF::Format
-  #     content_type     'application/n-triples', extension: :nt
+  #     content_type     'application/n-triples',
+  #                      extension: :nt,
+  #                      uri: RDF::URI("http://www.w3.org/ns/formats/N-Triples")
   #     content_encoding 'utf-8'
   #     
   #     reader RDF::NTriples::Reader
@@ -222,6 +224,19 @@ module RDF
       @@file_extensions
     end
 
+    ##
+    # Returns the unique URI for the format.
+    #
+    # @example retrieving a list of supported file format URIs
+    #
+    #     RDF::Format.uris.keys
+    #
+    # @see https://www.w3.org/ns/formats/
+    # @return [Hash{Symbol => URI}]
+    def self.uris
+      @@uris
+    end
+
     ##
     # Returns the set of format symbols for available RDF::Reader subclasses.
     #
@@ -465,6 +480,7 @@ module RDF
     #   @option options [Array<String>]  :aliases (nil)
     #   @option options [Symbol]         :extension  (nil)
     #   @option options [Array<Symbol>]  :extensions (nil)
+    #   @option options [URI]            :uri   (nil)
     #   @return [void]
     #
     # @overload content_type
@@ -504,6 +520,10 @@ module RDF
             @@content_types[aa] << self unless @@content_types[aa].include?(self)
           end
         end
+        # URI identifying this format
+        if uri = options[:uri]
+          @@uris[RDF::URI(uri)] = self
+        end
       end
     end
 
@@ -517,7 +537,7 @@ module RDF
     end
 
     ##
-    # Retrieves or defines file extensions for this RDF serialization format.
+    # Retrieves file extensions for this RDF serialization format.
     #
     # The return is an array where the first element is the cannonical
     # file extension for the format and following elements are alias file extensions.
@@ -527,6 +547,17 @@ module RDF
       @@file_extensions.map {|ext, formats| ext if formats.include?(self)}.compact
     end
 
+    ##
+    # Retrieves any format URI defined for this format..
+    #
+    # @return [URI]
+    def self.uri
+      @@uris.invert[self]
+    end
+    class << self
+      alias_method :to_uri, :uri
+    end
+
   protected
 
     ##
@@ -568,6 +599,7 @@ module RDF
     @@readers          = {} # @private
     @@writers          = {} # @private
     @@subclasses       = [] # @private
+    @@uris             = {} # @private
 
     ##
     # @private

data/lib/rdf/model/dataset.rb

@@ -79,7 +79,7 @@ module RDF
     #
     # @return [String]
     def inspect
-      sprintf("#<%s:%#0x(%s)>", self.class.name, __id__, uri.to_s)
+      sprintf("#<%s:%#0x(%s)>", self.class.name, __id__, count.to_s)
     end
 
     ##

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

@@ -3,10 +3,11 @@ module RDF; class Literal
   # A date literal.
   #
   # @see   http://www.w3.org/TR/xmlschema11-2/#date
+  # @see   https://www.w3.org/TR/xmlschema11-2/#rf-lexicalMappings-datetime
   # @since 0.2.1
   class Date < Temporal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#date")
-    GRAMMAR  = %r(\A(-?\d{4}-\d{2}-\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
+    GRAMMAR  = %r(\A(#{YEARFRAG}-#{MONTHFRAG}-#{DAYFRAG})(#{TZFRAG})?\z).freeze
     FORMAT   = '%Y-%m-%d'.freeze
 
     ##

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

@@ -3,10 +3,22 @@ module RDF; class Literal
   # A date/time literal.
   #
   # @see   http://www.w3.org/TR/xmlschema11-2/#dateTime
+  # @see   https://www.w3.org/TR/xmlschema11-2/#rf-lexicalMappings-datetime
   # @since 0.2.1
   class DateTime < Temporal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#dateTime")
-    GRAMMAR  = %r(\A(-?(?:\d{4}|[1-9]\d{4,})-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
+    GRAMMAR  = %r(\A
+      (#{YEARFRAG}
+      -#{MONTHFRAG}
+      -#{DAYFRAG}
+      T
+      (?:
+       (?:
+        #{HOURFRAG}
+       :#{MINUTEFRAG}
+       :#{SECONDFRAG})
+      | #{EODFRAG}))
+     (#{TZFRAG})?\z)x.freeze
     FORMAT   = '%Y-%m-%dT%H:%M:%S.%L'.freeze
 
     ##

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

@@ -10,6 +10,15 @@ module RDF; class Literal
       |(?:(?<si>-)?PT(?<hr>\d{1,2})H(?:(?<mi>\d{1,2})M)?)
     \z)x.freeze
 
+    YEARFRAG = %r(-?(?:(?:[1-9]\d{3,})|(?:0\d{3})))
+    MONTHFRAG = %r((?:(?:0[1-9])|(?:1[0-2])))
+    DAYFRAG = %r((?:(?:0[1-9])|(?:[12]\d)|(?:3[01])))
+    HOURFRAG = %r((?:[01]\d)|(?:2[0-3]))
+    MINUTEFRAG = %r([0-5]\d)
+    SECONDFRAG = %r([0-5]\d(?:\.\d+)?)
+    EODFRAG = %r(24:00:00(?:\.0+)?)
+    TZFRAG = %r((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)
+
     ##
     # Compares this literal to `other` for sorting purposes.
     #

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

@@ -8,10 +8,11 @@ module RDF; class Literal
   # following time zone indicator.
   #
   # @see   http://www.w3.org/TR/xmlschema11-2/#time
+  # @see   https://www.w3.org/TR/xmlschema11-2/#rf-lexicalMappings-datetime
   # @since 0.2.1
   class Time < Temporal
     DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#time")
-    GRAMMAR  = %r(\A(\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
+    GRAMMAR  = %r(\A((?:#{HOURFRAG}:#{MINUTEFRAG}:#{SECONDFRAG})|#{EODFRAG})(#{TZFRAG})?\z).freeze
     FORMAT   = '%H:%M:%S.%L'.freeze
 
     ##

data/lib/rdf/model/uri.rb

@@ -76,6 +76,7 @@ module RDF
     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
 
     # Remove dot expressions regular expressions
@@ -872,6 +873,12 @@ module RDF
       parts = {}
       if matchdata = IRI_PARTS.match(value)
         scheme, authority, path, query, fragment = matchdata[1..-1]
+
+        if Gem.win_platform? && scheme && !authority && scheme.match?(/^[a-zA-Z]$/)
+          # A drive letter, not a scheme
+          scheme, path = nil, "#{scheme}:#{path}"
+        end
+
         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

@@ -20,7 +20,10 @@ module RDF
     # @see http://www.w3.org/TR/n-quads/
     # @since  0.4.0
     class Format < RDF::Format
-      content_type     'application/n-quads', extension: :nq, alias: 'text/x-nquads;q=0.2'
+      content_type     'application/n-quads',
+                       extension: :nq,
+                       alias: 'text/x-nquads;q=0.2',
+                       uri: RDF::URI("http://www.w3.org/ns/formats/N-Quads")
       content_encoding 'utf-8'
 
       reader { RDF::NQuads::Reader }

data/lib/rdf/ntriples/format.rb

@@ -16,7 +16,10 @@ module RDF::NTriples
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   # @see http://www.w3.org/TR/n-triples/
   class Format < RDF::Format
-    content_type     'application/n-triples', extension: :nt, alias: 'text/plain;q=0.2'
+    content_type     'application/n-triples',
+                     extension: :nt,
+                     alias: 'text/plain;q=0.2',
+                     uri: RDF::URI("http://www.w3.org/ns/formats/N-Triples")
     content_encoding 'utf-8'
 
     reader { RDF::NTriples::Reader }

data/lib/rdf/query/pattern.rb

@@ -160,7 +160,7 @@ module RDF; class Query
     #
     # @param  [RDF::Queryable] queryable
     #   the graph or repository to query
-    # @param  [Hash{Symbol => RDF::Term}] bindings
+    # @param  [Hash{Symbol => RDF::Term}, RDF::Query::Solution] bindings
     #   optional variable bindings to use
     # @yield  [statement]
     #   each matching statement
@@ -171,6 +171,7 @@ module RDF; class Query
     # @see    RDF::Queryable#query
     # @since  0.3.0
     def execute(queryable, bindings = {}, &block)
+      bindings = bindings.to_h if bindings.is_a?(Solution)
       query = {
         subject:    subject.is_a?(Variable)     && bindings[subject.to_sym]     ? bindings[subject.to_sym]    : subject,
         predicate:  predicate.is_a?(Variable)   && bindings[predicate.to_sym]   ? bindings[predicate.to_sym]  : predicate,

data/lib/rdf/query.rb

@@ -294,7 +294,7 @@ module RDF
     #   Alias for `:graph_name`.
     # @param  [Hash{Symbol => Object}] options
     #   any additional keyword options
-    # @option options [Hash{Symbol => RDF::Term}] bindings
+    # @option options [Hash{Symbol => RDF::Term}, RDF::Query::Solution] bindings
     #   optional variable bindings to use
     # @option options [Boolean] :optimize
     #   Optimize query before execution.
@@ -313,6 +313,7 @@ module RDF
       # Otherwise, a quick empty solution simplifies the logic below; no special case for
       # the first pattern
       @solutions = Query::Solutions(solutions)
+      bindings = bindings.to_h if bindings.is_a?(Solution)
 
       # If there are no patterns, just return the empty solution
       if empty?
@@ -341,7 +342,7 @@ module RDF
         bindings.each_key do |variable|
           if pattern.variables.include?(variable)
             unbound_solutions, old_solutions = old_solutions, Query::Solutions()
-            bindings[variable].each do |binding|
+            Array(bindings[variable]).each do |binding|
               unbound_solutions.each do |solution|
                 old_solutions << solution.merge(variable => binding)
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.9
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header