sparql 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3862bae6ddfbe07b6e3645ad068976f47922a45
-  data.tar.gz: df1367b8faec7c1ee4827c236c28c64ee2711bf6
+  metadata.gz: 9ed52de8b3772ffc718813e0a7c9445fd37d27ec
+  data.tar.gz: b7aa4ec3157690796c0e12fc74bcf9328c740c2a
 SHA512:
-  metadata.gz: 32aa953994369f6ff1a00abdd151033c887b496a53b706870918a1c9f883be3abca7a7386ebdc9bbb725b30b0e77196cc521d600a97101dbd7e1af251c0103ef
-  data.tar.gz: c3a7762a66b864afb9409312e5cb4d9d55c6d76b71e418384716c5f94542cd310de1f3d801333d160a9c97969a90bab63d77c02d19e160bee74a667dc4416290
+  metadata.gz: 007315130ab3bc5f734e47c96d74f501460feb5e22229106b16c32dad35f24c59e35a47654fff1cc9f88610a8628bb43a33773cd812503800d954e52f3a3e1da
+  data.tar.gz: 697a8dde03ef5b117820d585f7e30d58c9f1e17eb8baa139f77d4f7260d6417dd6673e0d1e1bea181d2dd60f66ce8bc176dd7575d6caa056faeff03d103ed2ce

data/CREDITS

@@ -1 +1,2 @@
 * Pius Uzamere <pius@alum.mit.edu>
+* Tuan-Nhi Le <tuan-nhi.le@michivi.com>

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/sparql/algebra/extensions.rb

@@ -1,5 +1,15 @@
 require 'json'
 
+##
+# Extensions for Ruby's `NilClass` class.
+class NilClass
+
+  def evaluate(bindings, options = {})
+    self
+  end
+
+end
+
 ##
 # Extensions for Ruby's `Object` class.
 class Object

data/lib/sparql/algebra/operator.rb

@@ -289,6 +289,8 @@ module SPARQL; module Algebra
             operand
           when TrueClass, FalseClass, Numeric, String, DateTime, Date, Time
             RDF::Literal(operand)
+          when NilClass
+            nil
           else raise TypeError, "invalid SPARQL::Algebra::Operator operand: #{operand.inspect}"
         end
       end

data/lib/sparql/algebra/operator/asc.rb

@@ -16,7 +16,7 @@ module SPARQL; module Algebra
       NAME = :asc
 
       ##
-      # Returns the evaluation of it's operand. Default comparison is in
+      # Returns the evaluation of its operand. Default comparison is in
       # ascending order. Ordering is applied in {Order}.
       #
       # @param  [RDF::Query::Solution] bindings

data/lib/sparql/algebra/operator/compare.rb

@@ -52,7 +52,8 @@ module SPARQL; module Algebra
           when right.simple? && left.datatype == RDF::XSD.string && right.value == left.value
             RDF::Literal(-1)
 
-          else raise TypeError, "unable to compare #{left.inspect} and #{right.inspect}"
+          else
+            left <=> right
           end
           
         when left.is_a?(RDF::URI) && right.is_a?(RDF::URI)
@@ -65,13 +66,22 @@ module SPARQL; module Algebra
           RDF::Literal(0)
         
         # SPARQL also fixes an order between some kinds of RDF terms that would not otherwise be ordered:
-        # 2. Blank nodes
+
+        when left.nil? && !right.nil?
+          RDF::Literal(-1)
+        when right.nil?
+          RDF::Literal(1)
+
         when left.is_a?(RDF::Node) && right.is_a?(RDF::Term)
           RDF::Literal(-1)
         when right.is_a?(RDF::Node) && left.is_a?(RDF::Term)
           RDF::Literal(1)
 
-        # 3. IRIs
+        when left.is_a?(RDF::Node) && right.is_a?(RDF::URI)
+          RDF::Literal(-1)
+        when right.is_a?(RDF::Node) && left.is_a?(RDF::URI)
+          RDF::Literal(1)
+
         when left.is_a?(RDF::URI) && right.is_a?(RDF::Term)
           RDF::Literal(-1)
         when right.is_a?(RDF::URI) && left.is_a?(RDF::Term)

data/lib/sparql/algebra/operator/order.rb

@@ -32,26 +32,20 @@ module SPARQL; module Algebra
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
       def execute(queryable, options = {}, &block)
+
         debug(options) {"Order"}
         @solutions = queryable.query(operands.last, options.merge(:depth => options[:depth].to_i + 1)).order do |a, b|
-          operand(0).inject(false) do |memo, op|
+          operand(0).inject(0) do |memo, op|
             debug(options) {"(order) #{op.inspect}"}
-            memo ||= begin
+            memo = begin
               a_eval = op.evaluate(a, options.merge(:queryable => queryable, :depth => options[:depth].to_i + 1)) rescue nil
               b_eval = op.evaluate(b, options.merge(:queryable => queryable, :depth => options[:depth].to_i + 1)) rescue nil
-              comp = if a_eval.nil?
-                RDF::Literal(-1)
-              elsif b_eval.nil?
-                RDF::Literal(1)
-              elsif op.is_a?(RDF::Query::Variable)
-                a_eval <=> b_eval
-              else
-                Operator::Compare.evaluate(a_eval, b_eval)
-              end
+              comp = Operator::Compare.evaluate(a_eval, b_eval).to_i
               comp = -comp if op.is_a?(Operator::Desc)
-              comp == 0 ? false : comp
-            end
-          end || 0  # They compare equivalently if there are no matches
+              comp
+            end if memo == 0
+            memo
+          end
         end
         @solutions.each(&block) if block_given?
         @solutions

data/lib/sparql/algebra/operator/project.rb

@@ -1,7 +1,7 @@
 module SPARQL; module Algebra
   class Operator
     ##
-    # The SPARQL GraphPattern `order` operator.
+    # The SPARQL GraphPattern `project` operator.
     #
     # @example
     #   (select (?v)

data/lib/sparql/algebra/operator/table.rb

@@ -36,7 +36,7 @@ module SPARQL; module Algebra
         operands[1..-1].each do |row|
           next unless row.is_a?(Array)
           bindings = row[1..-1].inject({}) do |memo, (var, value)|
-            memo[var.to_sym] = value
+            memo[var.to_sym] = value unless value == :undef
             memo
           end
           @solutions << RDF::Query::Solution.new(bindings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf