rdf 3.2.8 → 3.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a11f72b598d08137366e7d9d0796dc7a0f6bf822484c6809a9e7905270b0b06
-  data.tar.gz: 67a7699bef7b127a327ba1dd3b5d53c7155325da9d8520ccf91fe51f4688cca3
+  metadata.gz: 948292ebb4f6e10c59b67e873d2d14884c53c5fab199e901e4e4dadf768f379f
+  data.tar.gz: 8731942201a15bcef71284fe0a79a3bc9a97b878ef2c53b757869cadefdadf54
 SHA512:
-  metadata.gz: 46f34b3fd322934aa324b3977714d7a456a4fef2d9aa28c340c484abf2b593ffe3b753b1d4a82e4aa9837321c5232d1d6fce1f46f114bad37dd3f4bf3e6a0b85
-  data.tar.gz: 2f07ef6e2c199240232d7185153b0b9fa41dc885bbc0fed2b616fa061440ccb6439eb993ab463f81e6535b946d4e8301d2b6a76fb397c3d5b9ee048fa58654e0
+  metadata.gz: 41d8fca7513dc56c6447b3b40d995b04f407e986ffc4e1a7fc86de7632ca026b6effdb8e7d3d815ba7ddb27c44e6af53a08bbde43390a065170e9a58446231d8
+  data.tar.gz: 5c9895f52363ffee6bc408d5e476a9a345d7aec62ec8594a8ca49f5c3ef9016f307741c0ef8b537d6fc49f714a25d2a4b0bee64631951191c750ef53809533c4

data/VERSION

@@ -1 +1 @@
-3.2.8
+3.2.10

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
 
@@ -594,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.merge(format: format)[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/mixin/mutable.rb

@@ -41,7 +41,7 @@ module RDF
     def load(url, graph_name: nil, **options)
       raise TypeError.new("#{self} is immutable") if immutable?
 
-      Reader.open(url, base_uri: url, **options) do |reader|
+      Reader.open(url, **options.merge(base_uri: url)) do |reader|
         if graph_name
           statements = []
           reader.each_statement do |statement|

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/ntriples/writer.rb

@@ -125,16 +125,18 @@ module RDF::NTriples
     # @see    http://www.w3.org/TR/n-triples/
     def self.escape_ascii(u, encoding)
       case (u = u.ord)
-        when (0x00..0x07) then escape_utf16(u)
-        when (0x0A)       then "\\n"
-        when (0x0D)       then "\\r"
-        when (0x0E..0x1F) then escape_utf16(u)
-        when (0x22)       then "\\\""
-        when (0x5C)       then "\\\\"
-        when (0x7F)       then escape_utf16(u)
-        when (0x00..0x7F) then u.chr
-        else
-          raise ArgumentError.new("expected an ASCII character in (0x00..0x7F), but got 0x#{u.to_s(16)}")
+      when (0x08)       then "\\b"
+      when (0x09)       then "\\t"
+      when (0x0A)       then "\\n"
+      when (0x0C)       then "\\f"
+      when (0x0D)       then "\\r"
+      when (0x22)       then "\\\""
+      when (0x5C)       then "\\\\"
+      when (0x00..0x1F) then escape_utf16(u)
+      when (0x7F)       then escape_utf16(u)
+      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
 

data/lib/rdf/util/cache.rb

@@ -85,7 +85,7 @@ module RDF; module Util
           id = value.__id__
           @cache[key] = id
           @index[id] = key
-          ObjectSpace.define_finalizer(value, proc {|id| @cache.delete(@index.delete(id))})
+          ObjectSpace.define_finalizer(value, finalizer_proc)
         end
         value
       end
@@ -100,6 +100,12 @@ module RDF; module Util
         @cache.delete(key)
         @index.delete(id) if id
       end
+
+      private
+
+      def finalizer_proc
+        proc { |id| @cache.delete(@index.delete(id)) }
+      end
     end # ObjectSpaceCache
 
     ##

data/lib/rdf/util/logger.rb

@@ -181,10 +181,10 @@ module RDF; module Util
     end
 
     ##
-    # @overload log_depth(options, &block)
+    # @overload log_depth(depth: 1, **options, &block)
     #   Increase depth around a method invocation
+    #   @param [Integer] :depth Additional recursion depth
     #   @param [Hash{Symbol}] options (@options || {})
-    #   @option options [Integer] :depth Additional recursion depth
     #   @option options [Logger, #<<] :logger
     #   @yield
     #     Yields with no arguments
@@ -194,8 +194,8 @@ module RDF; module Util
     # @overload log_depth
     #   # Return the current log depth
     #   @return [Integer]
-    def log_depth(**options, &block)
-      self.logger(**options).log_depth(&block)
+    def log_depth(depth: 1, **options, &block)
+      self.logger(**options).log_depth(depth: depth, &block)
     end
 
   private
@@ -244,7 +244,7 @@ module RDF; module Util
       end
 
       ##
-      # @overload log_depth(options, &block)
+      # @overload log_depth(depth: 1, **options, &block)
       #   Increase depth around a method invocation
       #   @param [Integer] depth (1) recursion depth
       #   @param [Hash{Symbol}] options (@options || {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.10
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2023-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.