rdf 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd1a596fac04633e2c78342c0d8ec7b6e8b6763160627987df59f9011863ac3
-  data.tar.gz: cd0b61a753cafe097b3c77de95dc457968661545db2a27482cd68d19facfd068
+  metadata.gz: 58dcc9836c4302cad4bb46a86596235794a664d508cc002ce298b6c964265ba9
+  data.tar.gz: 941a3daf3a379acf33fe09688ea9cabefd25eb88dc80a7b31d05ac380b2cb2f9
 SHA512:
-  metadata.gz: 7a1f7d6d0fd7ee8b70c6ccdcf31468b856008f2f3c7d19203ef8b3fd0a5bf86db6a63b876492b78ce521675d88563f59ce58cda96e5f6ca38b547d14d5ca7e7a
-  data.tar.gz: 6b3fe1371aca25a13f44aabdfc94bc9d9914c076ad760056dc57f0b89bf3bfa06aaad5c53cf2ea0ea5f0da164e23e7033f73c2d0e503674e7b7f818c16cac1a0
+  metadata.gz: f384a93b62b93d574c3dae02e8285f77a3ea6fa26c60eb30aa387e7213343e763a00d9a58f33d0caf4acc5f68a4b27e55361beb792127486059e8afeb333053e
+  data.tar.gz: ed8a19309a2b2f042a3f10df60465b56bd5ea9ace1a305cbe595bab507a7606eae99438fe3ce1edbcd653f513bd015aaf19d5e7203c5903278e275dc591e9d15

data/VERSION

@@ -1 +1 @@
-3.2.5
+3.2.6

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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 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-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header