sparql 3.0.0 → 3.1.3

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #         (extend ((?x (hours ?date)))
     #           (bgp (triple ?s :date ?date)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-hours
+    # @see https://www.w3.org/TR/sparql11-query/#func-hours
     class Hours < Operator::Unary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #           (extend ((?integer (if (= (lang ?o) "ja") true false)))
     #             (bgp (triple ?s ?p ?o))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-if
+    # @see https://www.w3.org/TR/sparql11-query/#func-if
     class If < Operator::Ternary
       include Evaluatable
       
@@ -33,23 +33,13 @@ module SPARQL; module Algebra
       #   a query solution containing zero or more variable bindings
       # @return [RDF::Term]
       # @raise [TypeError]
-      def evaluate(bindings, options = {})
-        operand(0).evaluate(bindings, options.merge(depth: options[:depth].to_i + 1)) == RDF::Literal::TRUE ?
-          operand(1).evaluate(bindings, options.merge(depth: options[:depth].to_i + 1).merge(depth: options[:depth].to_i + 1)) :
-          operand(2).evaluate(bindings, options.merge(depth: options[:depth].to_i + 1))
+      def evaluate(bindings, **options)
+        operand(0).evaluate(bindings, depth: options[:depth].to_i + 1, **options) == RDF::Literal::TRUE ?
+          operand(1).evaluate(bindings, depth: options[:depth].to_i + 1, **options) :
+          operand(2).evaluate(bindings, depth: options[:depth].to_i + 1, **options)
         rescue
           raise TypeError
       end
-      
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # If
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (ask (filter (in 2 1 2 3) (bgp)))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-in
+    # @see https://www.w3.org/TR/sparql11-query/#func-in
     class In < Operator
       include Evaluatable
 
@@ -38,12 +38,12 @@ module SPARQL; module Algebra
       #   options passed from query
       # @return [RDF::Literal::Boolean] `true` or `false`
       # @raise  [TypeError] if term is not found and any operand raises an error
-      def evaluate(bindings, options = {})
-        lhs = operands.first.evaluate(bindings, options)
+      def evaluate(bindings, **options)
+        lhs = operands.first.evaluate(bindings, **options)
         error_found = false
         found = operands[1..-1].any? do |op|
           begin
-            lhs == op.evaluate(bindings, options.merge(depth: options[:depth].to_i + 1))
+            lhs == op.evaluate(bindings, depth: options[:depth].to_i + 1, **options)
           rescue TypeError
             error_found = true
           end
@@ -54,16 +54,6 @@ module SPARQL; module Algebra
         else RDF::Literal::FALSE
         end
       end
-
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # In
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (insert ((triple ?s ?p "q")))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#insert
+    # @see https://www.w3.org/TR/sparql11-update/#insert
     class Insert < Operator::Unary
       include SPARQL::Algebra::Update
 
@@ -20,7 +20,7 @@ module SPARQL; module Algebra
       #
       # @param  [RDF::Queryable] queryable
       #   the graph or repository to write
-      # @param  [RDF::Query::Solution] solution
+      # @param  [RDF::Query::Solutions] solutions
       #   Solution to map to patterns for this operation
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
@@ -30,8 +30,10 @@ module SPARQL; module Algebra
       #   Returns queryable.
       # @raise [IOError]
       #   If `from` does not exist, unless the `silent` operator is present
-      # @see    http://www.w3.org/TR/sparql11-update/
-      def execute(queryable, solution, options = {})
+      # @see    https://www.w3.org/TR/sparql11-update/
+      def execute(queryable, solutions: nil, **options)
+        # Only binds the first solution
+        solution = solutions.is_a?(RDF::Query::Solutions) ? solutions.first : solutions
         debug(options) {"Insert"}
         patterns = operand.inject([]) do |memo, op|
           if op.respond_to?(:statements)

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (insertData ((graph <http://example.org/g1> ((triple :s :p :o)))))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#insertData
+    # @see https://www.w3.org/TR/sparql11-update/#insertData
     class InsertData < Operator::Unary
       include SPARQL::Algebra::Update
 
@@ -28,8 +28,8 @@ module SPARQL; module Algebra
       #   Returns queryable.
       # @raise [IOError]
       #   If `from` does not exist, unless the `silent` operator is present
-      # @see    http://www.w3.org/TR/sparql11-update/
-      def execute(queryable, options = {})
+      # @see    https://www.w3.org/TR/sparql11-update/
+      def execute(queryable, **options)
         operand.each do |op|
           debug(options) {"InsertData #{op.to_sxp}"}
           queryable.insert(op)

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

@@ -8,7 +8,7 @@ module SPARQL; module Algebra
     #       (extend ((?uri (uri "uri")) (?iri (iri "iri")))
     #         (bgp))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-iri
+    # @see https://www.w3.org/TR/sparql11-query/#func-iri
     class IRI < Operator::Unary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (filter (isBlank ?v)
     #         (bgp (triple ?x :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-isBlank
+    # @see https://www.w3.org/TR/sparql11-query/#func-isBlank
     class IsBlank < Operator::Unary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (filter (isIRI ?v)
     #         (bgp (triple ?x :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-isIRI
+    # @see https://www.w3.org/TR/sparql11-query/#func-isIRI
     class IsIRI < Operator::Unary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (filter (isLiteral ?v)
     #         (bgp (triple ?x :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-isLiteral
+    # @see https://www.w3.org/TR/sparql11-query/#func-isLiteral
     class IsLiteral < Operator::Unary
       include Evaluatable
 

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

@@ -12,7 +12,7 @@ module SPARQL; module Algebra
     #       (filter (isNumeric ?v)
     #         (bgp (triple ?x :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-isNumeric
+    # @see https://www.w3.org/TR/sparql11-query/#func-isNumeric
     class IsNumeric < Operator::Unary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (graph ?g
     #         (bgp (triple ?s ?q ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Join < Operator::Binary
       include Query
       
@@ -31,20 +31,20 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#merge-instance_method
-      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#compatible%3F-instance_method
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      # @see    https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#merge-instance_method
+      # @see    https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#compatible%3F-instance_method
+      def execute(queryable, **options, &block)
         # Join(Ω1, Ω2) = { merge(μ1, μ2) | μ1 in Ω1 and μ2 in Ω2, and μ1 and μ2 are compatible }
         # eval(D(G), Join(P1, P2)) = Join(eval(D(G), P1), eval(D(G), P2))
         #
         # Generate solutions independently, merge based on solution compatibility
         debug(options) {"Join #{operands.to_sse}"}
  
-        left = queryable.query(operand(0), options.merge(depth: options[:depth].to_i + 1))
+        left = queryable.query(operand(0), depth: options[:depth].to_i + 1, **options)
         debug(options) {"(join)=>(left) #{left.map(&:to_h).to_sse}"}
 
-        right = queryable.query(operand(1), options.merge(depth: options[:depth].to_i + 1))
+        right = queryable.query(operand(1), depth: options[:depth].to_i + 1, **options)
         debug(options) {"(join)=>(right) #{right.map(&:to_h).to_sse}"}
 
         @solutions = RDF::Query::Solutions(left.map do |s1|
@@ -67,7 +67,7 @@ module SPARQL; module Algebra
       end
 
       ##
-      # Returns an optimized version of this query.
+      # Optimizes this query.
       #
       # Groups of one graph pattern (not a filter) become join(Z, A) and can be replaced by A.
       # The empty graph pattern Z is the identity for join:
@@ -75,8 +75,10 @@ module SPARQL; module Algebra
       #   Replace join(A, Z) by A
       #
       # @return [Join, RDF::Query] `self`
-      def optimize
-        ops = operands.map {|o| o.optimize }.select {|o| o.respond_to?(:empty?) && !o.empty?}
+      # @return [self]
+      # @see SPARQL::Algebra::Expression#optimize!
+      def optimize!(**options)
+        ops = operands.map {|o| o.optimize(**options) }.select {|o| o.respond_to?(:empty?) && !o.empty?}
         @operands = ops
         self
       end

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

@@ -3,7 +3,7 @@ module SPARQL; module Algebra
     ##
     # The SPARQL `lang` operator.
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-lang
+    # @see https://www.w3.org/TR/sparql11-query/#func-lang
     class Lang < Operator::Unary
       include Evaluatable
 

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

@@ -8,8 +8,8 @@ module SPARQL; module Algebra
     #     (filter (langMatches (lang ?v) "en-GB")
     #       (bgp (triple :x ?p ?v))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-langMatches
-    # @see http://tools.ietf.org/html/rfc4647#section-3.3.1
+    # @see https://www.w3.org/TR/sparql11-query/#func-langMatches
+    # @see https://tools.ietf.org/html/rfc4647#section-3.3.1
     class LangMatches < Operator::Binary
       include Evaluatable
 
@@ -23,7 +23,7 @@ module SPARQL; module Algebra
       #   a simple literal containing a language tag
       # @param  [RDF::Literal] language_range
       #   a simple literal containing a language range, per
-      #   [RFC 4647 section 2.1](http://tools.ietf.org/html/rfc4647#section-2.1)
+      #   [RFC 4647 section 2.1](https://tools.ietf.org/html/rfc4647#section-2.1)
       # @return [RDF::Literal::Boolean] `true` or `false`
       # @raise  [TypeError] if either operand is unbound
       # @raise  [TypeError] if either operand is not a simple literal

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

@@ -6,8 +6,8 @@ module SPARQL; module Algebra
     # @example
     #   (lcase ?x)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-lcase
-    # @see http://www.w3.org/TR/xpath-functions/#func-lcase
+    # @see https://www.w3.org/TR/sparql11-query/#func-lcase
+    # @see https://www.w3.org/TR/xpath-functions/#func-lcase
     class LCase < Operator::Unary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (bgp (triple ?y :q ?w))
     #       (= ?v 2)))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class LeftJoin < Operator
       include Query
       
@@ -31,17 +31,17 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#merge-instance_method
-      # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#compatible%3F-instance_method
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      # @see    https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#merge-instance_method
+      # @see    https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Solution#compatible%3F-instance_method
+      def execute(queryable, **options, &block)
         filter = operand(2)
 
         debug(options) {"LeftJoin"}
-        left = queryable.query(operand(0), options.merge(depth: options[:depth].to_i + 1))
+        left = queryable.query(operand(0), depth: options[:depth].to_i + 1, **options)
         debug(options) {"=>(leftjoin left) #{left.inspect}"}
 
-        right = queryable.query(operand(1), options.merge(depth: options[:depth].to_i + 1))
+        right = queryable.query(operand(1), depth: options[:depth].to_i + 1, **options)
         debug(options) {"=>(leftjoin right) #{right.inspect}"}
 
         # LeftJoin(Ω1, Ω2, expr) =
@@ -83,14 +83,17 @@ module SPARQL; module Algebra
       end
 
       ##
-      # Returns an optimized version of this query.
+      # Optimizes this query.
       #
       # If optimize operands, and if the first two operands are both Queries, replace
       # with the unique sum of the query elements
       #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        ops = operands.map {|o| o.optimize }.select {|o| o.respond_to?(:empty?) && !o.empty?}
+      # @return [Object] a copy of `self`
+      # @see SPARQL::Algebra::Expression#optimize
+      # FIXME
+      def optimize!(**options)
+        return self
+        ops = operands.map {|o| o.optimize(**options) }.select {|o| o.respond_to?(:empty?) && !o.empty?}
         expr = ops.pop unless ops.last.executable?
         expr = nil if expr.respond_to?(:true?) && expr.true?
         
@@ -102,7 +105,7 @@ module SPARQL; module Algebra
         when 1
           expr ? Filter.new(expr, ops.first) : ops.first
         else
-          expr ? LeftJoin(ops[0], ops[1], expr) : LeftJoin(ops[0], ops[1])
+          expr ? LeftJoin.new(ops[0], ops[1], expr) : LeftJoin.new(ops[0], ops[1])
         end
       end
     end # LeftJoin

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

@@ -6,11 +6,11 @@ module SPARQL; module Algebra
     # @example
     #   (< ?x ?y)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#OperatorMapping
-    # @see http://www.w3.org/TR/xpath-functions/#func-compare
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-less-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-boolean-less-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-dateTime-less-than
+    # @see https://www.w3.org/TR/sparql11-query/#OperatorMapping
+    # @see https://www.w3.org/TR/xpath-functions/#func-compare
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-less-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-boolean-less-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-dateTime-less-than
     class LessThan < Compare
       NAME = :<
 

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

@@ -6,11 +6,11 @@ module SPARQL; module Algebra
     # @example
     #   (<= ?x ?y)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#OperatorMapping
-    # @see http://www.w3.org/TR/xpath-functions/#func-compare
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-less-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-boolean-less-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-dateTime-less-than
+    # @see https://www.w3.org/TR/sparql11-query/#OperatorMapping
+    # @see https://www.w3.org/TR/xpath-functions/#func-compare
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-less-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-boolean-less-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-dateTime-less-than
     class LessThanOrEqual < Compare
       NAME = :<=
 

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (load <remote> <g>)
     #
-    # @see http://www.w3.org/TR/sparql11-update/#load
+    # @see https://www.w3.org/TR/sparql11-update/#load
     class Load < Operator
       include SPARQL::Algebra::Update
 
@@ -28,8 +28,8 @@ module SPARQL; module Algebra
       #   Returns queryable.
       # @raise [IOError]
       #   If `from` does not exist, unless the `silent` operator is present
-      # @see    http://www.w3.org/TR/sparql11-update/
-      def execute(queryable, options = {})
+      # @see    https://www.w3.org/TR/sparql11-update/
+      def execute(queryable, **options)
         debug(options) {"Load"}
         silent = operands.first == :silent
         operands.shift if silent

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

@@ -6,12 +6,12 @@ module SPARQL; module Algebra
     # @example
     #    (prefix ((: <http://www.example.org/>))
     #      (project (?max)
-    #        (extend ((?max ?.0))
-    #          (group () ((?.0 (max ?o)))
+    #        (extend ((?max ??.0))
+    #          (group () ((??.0 (max ?o)))
     #            (bgp (triple ?s ?p ?o))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggMax
-    class Max < Operator::Unary
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggMax
+    class Max < Operator
       include Aggregate
 
       NAME = :max
@@ -25,6 +25,8 @@ module SPARQL; module Algebra
       #   enum of evaluated operand
       # @return [RDF::Literal] The maximum value of the terms
       def apply(enum)
+        # FIXME: we don't actually do anything with distinct
+        operands.shift if distinct = (operands.first == :distinct)
         if enum.empty?
           raise TypeError, "Maximum of an empty multiset"
         elsif enum.flatten.all? {|n| n.literal?}

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

@@ -13,7 +13,7 @@ module SPARQL; module Algebra
     #         (extend ((?hash (md5 ?l)))
     #           (bgp (triple :s1 :str ?l)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-md5
+    # @see https://www.w3.org/TR/sparql11-query/#func-md5
     class MD5 < Operator::Unary
       include Evaluatable
 

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

@@ -6,12 +6,12 @@ module SPARQL; module Algebra
     # @example
     #    (prefix ((: <http://www.example.org/>))
     #      (project (?max)
-    #        (extend ((?min ?.0))
-    #          (group () ((?.0 (min ?o)))
+    #        (extend ((?min ??.0))
+    #          (group () ((??.0 (min ?o)))
     #            (bgp (triple ?s ?p ?o))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggMin
-    class Min < Operator::Unary
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggMin
+    class Min < Operator
       include Aggregate
 
       NAME = :min
@@ -25,6 +25,8 @@ module SPARQL; module Algebra
       #   enum of evaluated operand
       # @return [RDF::Literal] The maximum value of the terms
       def apply(enum)
+        # FIXME: we don't actually do anything with distinct
+        operands.shift if distinct = (operands.first == :distinct)
         if enum.empty?
           raise TypeError, "Minumuim of an empty multiset"
         elsif enum.flatten.all? {|n| n.literal?}