rdf 3.1.13 → 3.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a8a5a69a203cf83628099c927675bbc4abe122bd8568bb69fa06bae0cbcb94b
-  data.tar.gz: eba5377c635a6b05c25cd2b88107521c494d557dbfde6c0de5dbe52646ee1401
+  metadata.gz: 8747674533ca06af62b3ee536ea4342be3c8bedc8831b1a1838e244d927263cb
+  data.tar.gz: fbc0593916678f9f696d4c461b29df01549da5af7d436b700d66735f5350054d
 SHA512:
-  metadata.gz: 51af08617cb541333344b88a968c2d5699439baa7a4263154f7ccbdce06b635491b1cb93b9fb0e4dbca8711d9b71926ff22b60ab92f3f0cad9e205f86d1a3177
-  data.tar.gz: 8abc461f8937d46d3e75634764bc8bbaaf6f54ba07e39fa94c1400b62a59f20436ffd07c50a428aea7c2a01e292acbedb8f94bd5d07560e2523a00fef19174d1
+  metadata.gz: fb56f5b72af92421afb2216ca5d1dec10907860a2f1ad069e4d69e37ee3126219dfb0c60fab256c1088424b9a8dcc42f6637e98b1c52258cc88163b394e06fc5
+  data.tar.gz: dcd897b9313decf48df3a89d4e8885ac74da1b966d194c28faa56a2edff2f4b123d093322655985ae1c0c059c6e8e49be9f18bbc9b1ef9c87634394d9090064b

data/VERSION

@@ -1 +1 @@
-3.1.13
+3.1.15

data/lib/rdf/model/literal.rb

@@ -308,6 +308,37 @@ module RDF
     end
     alias_method :===, :==
 
+    ##
+    # Compares `self` to `other` for sorting purposes (with type check).
+    #
+    # @param  [Object]  other
+    # @return [Integer] `-1`, `0`, or `1`
+    def <=>(other)
+      case other
+      when Literal
+        case
+        when self.eql?(other)
+          0
+        when self.language? && other.language?
+          # Literals with languages can compare if languages are identical
+          self.to_s <=> other.to_s
+        when self.simple? && other.simple?
+          self.to_s <=> other.to_s
+        when !self.valid?
+          type_error("#{self.inspect} is invalid") || 0
+        when !other.valid?
+          type_error("#{other.inspect} is invalid") || 0
+        when self.comperable_datatype2?(other)
+          self.object <=> other.object
+        else
+          type_error("#{self.inspect} and #{other.inspect} are not comperable") || 0
+        end
+      when String
+        self.simple? && self.value <=> other
+      else 1
+      end
+    end
+
     ##
     # Returns `true` if this is a plain literal. A plain literal
     # may have a language, but may not have a datatype. For
@@ -399,6 +430,32 @@ module RDF
       end
     end
 
+    ##
+    # Returns `true` if the literal has a datatype and the comparison should
+    # return false instead of raise a type error.
+    #
+    # Used for <=> operator.
+    #
+    # This behavior is intuited from SPARQL data-r2/expr-equal/eq-2-2
+    # @return [Boolean]
+    def comperable_datatype2?(other)
+      case self
+      when RDF::Literal::Numeric, RDF::Literal::Boolean
+        case other
+        when RDF::Literal::Numeric, RDF::Literal::Boolean
+          true
+        else
+          self.plain? || other.plain? ||
+          self.language? || other.language? ||
+          self.datatype == other.datatype
+        end
+      else
+        self.plain? || other.plain? ||
+        self.language? || other.language? ||
+        self.datatype == other.datatype
+      end
+    end
+
     ##
     # Converts this literal into its canonical lexical representation.
     #

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

@@ -11,6 +11,9 @@ module RDF; class Literal
     # @return [Integer] `-1`, `0`, or `1`
     # @since  0.3.0
     def <=>(other)
+      # If lexically invalid, use regular literal testing
+      return super unless self.valid? && (!other.respond_to?(:valid?) || other.valid?)
+
       case other
         when ::Numeric
           to_d <=> other
@@ -30,11 +33,10 @@ module RDF; class Literal
     # @since  0.3.0
     def ==(other)
       # If lexically invalid, use regular literal testing
-      return super unless self.valid?
+      return super unless self.valid? && (!other.respond_to?(:valid?) || other.valid?)
 
       case other
       when Literal::Numeric
-        return super unless other.valid?
         (cmp = (self <=> other)) ? cmp.zero? : false
       when RDF::URI, RDF::Node
         # Interpreting SPARQL data-r2/expr-equal/eq-2-2, numeric can't be compared with other types

data/lib/rdf/model/statement.rb

@@ -301,7 +301,7 @@ module RDF
     # @see RDF::Literal#==
     # @see RDF::Query::Variable#==
     def eql?(other)
-      other.is_a?(Statement) && self == other && (self.graph_name || false) == (other.graph_name || false)
+      other.is_a?(Statement) && self.to_a.eql?(other.to_a) && (self.graph_name || false) == (other.graph_name || false)
     end
 
     ##

data/lib/rdf/query/pattern.rb

@@ -59,6 +59,12 @@ module RDF; class Query
       super
     end
 
+    ##
+    # Create a new pattern from the quads, recursivly dupping sub-patterns.
+    def dup
+      self.class.from(self.to_quad.map {|t| t.is_a?(RDF::Query::Pattern) ? t.dup : t})
+    end
+
     ##
     # Any additional options for this pattern.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.1.13
+  version: 3.1.15
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.