rdf 3.2.5 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd1a596fac04633e2c78342c0d8ec7b6e8b6763160627987df59f9011863ac3
-  data.tar.gz: cd0b61a753cafe097b3c77de95dc457968661545db2a27482cd68d19facfd068
+  metadata.gz: 9a11f72b598d08137366e7d9d0796dc7a0f6bf822484c6809a9e7905270b0b06
+  data.tar.gz: 67a7699bef7b127a327ba1dd3b5d53c7155325da9d8520ccf91fe51f4688cca3
 SHA512:
-  metadata.gz: 7a1f7d6d0fd7ee8b70c6ccdcf31468b856008f2f3c7d19203ef8b3fd0a5bf86db6a63b876492b78ce521675d88563f59ce58cda96e5f6ca38b547d14d5ca7e7a
-  data.tar.gz: 6b3fe1371aca25a13f44aabdfc94bc9d9914c076ad760056dc57f0b89bf3bfa06aaad5c53cf2ea0ea5f0da164e23e7033f73c2d0e503674e7b7f818c16cac1a0
+  metadata.gz: 46f34b3fd322934aa324b3977714d7a456a4fef2d9aa28c340c484abf2b593ffe3b753b1d4a82e4aa9837321c5232d1d6fce1f46f114bad37dd3f4bf3e6a0b85
+  data.tar.gz: 2f07ef6e2c199240232d7185153b0b9fa41dc885bbc0fed2b616fa061440ccb6439eb993ab463f81e6535b946d4e8301d2b6a76fb397c3d5b9ee048fa58654e0

data/VERSION

@@ -1 +1 @@
-3.2.5
+3.2.8

data/lib/rdf/cli.rb

@@ -572,7 +572,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 +594,7 @@ 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
+            options.merge(format: format)[opt].to_s != val.to_s
           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/temporal.rb

@@ -128,7 +128,7 @@ module RDF; class Literal
     #
     # @return [String]
     def to_s
-      @string || (@object.strftime(self.class.const_get(:FORMAT)).sub('.000', '') + self.tz)
+      @string ||= (@object.strftime(self.class.const_get(:FORMAT)).sub('.000', '') + self.tz)
     end
 
     ##
@@ -146,18 +146,18 @@ module RDF; class Literal
     #
     #   Otherwise, the timezone is set based on the difference between the current timezone offset (if any) and `zone`.
     #
-    #   @param [String] zone (nil) In the form of {ZONE_GRAMMAR}.
+    #   @param [DayTimeDuration, String] zone (nil) In the form of {ZONE_GRAMMAR}.
     #   @return [Temporal] `self`
     #   @raise [RangeError] if `zone < -14*60` or `zone > 14*60`
     # @see https://www.w3.org/TR/xpath-functions/#func-adjust-dateTime-to-timezone
     def adjust_to_timezone!(*args)
       zone = args.empty? ? '+00:00' : args.first
-      if zone.nil?
+      if zone.to_s.empty?
         # Remove timezone component
         @object = self.class.new(@object.strftime(self.class.const_get(:FORMAT))).object
         @zone = nil
       else
-        md = zone.match(ZONE_GRAMMAR)
+        md = zone.to_s.match(ZONE_GRAMMAR)
         raise ArgumentError,
               "expected #{zone.inspect} to be a xsd:dayTimeDuration or +/-HH:MM" unless md
 

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

@@ -39,7 +39,10 @@ module RDF; class Literal
           end
           # Normalize 24:00:00 to 00:00:00
           hr, mi, se = tm.split(':')
-          hr = "%.2i" % (hr.to_i % 24) if hr.to_i > 23
+          if hr.to_i > 23
+            hr = "%.2i" % (hr.to_i % 24)
+            @string = nil
+          end
           value = "#{hr}:#{mi}:#{se}"
           # Normalize to 1972-12-31 dateTime base
           ::DateTime.parse("1972-12-31T#{hr}:#{mi}:#{se}#{@zone}")

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

@@ -317,13 +317,12 @@ class RDF::Query
     def hash
       @bindings.hash
     end
-    
+
     ##
     # Equivalence of solution
     def eql?(other)
       other.is_a?(Solution) && @bindings.eql?(other.bindings)
     end
-    alias_method :==, :eql?
 
     ##
     # Equals of solution

data/lib/rdf/query/solutions.rb

@@ -77,6 +77,15 @@ module RDF; class Query
       end
     end
 
+    ##
+    # Sets variable names used in these solutions. If not set, the default is determined by the variables used in each solution.
+    #
+    # @param [Array<Symbol, RDF::Query::Variable>] vars
+    # @return [Array<Symbol>]
+    def variable_names=(vars)
+      @variable_names = vars.map(&:to_sym)
+    end
+
     ##
     # @overload variable?
     #   Returns `false`.
@@ -294,5 +303,17 @@ module RDF; class Query
       self
     end
     alias_method :limit!, :limit
+
+    ##
+    # Equivalence of solution
+    def eql?(other)
+      super && (!other.respond_to?(:variable_names) || variable_names.eql?(other.variable_names))
+    end
+
+    ##
+    # Equals of solution
+    def ==(other)
+      super && (!other.respond_to?(:variable_names) || variable_names.eql?(other.variable_names))
+    end
   end # Solutions
 end; end # RDF::Query

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.5
+  version: 3.2.8
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header