sparql 3.0.1 → 3.1.4

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?}

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

@@ -11,8 +11,8 @@ module SPARQL; module Algebra
     #          (filter (|| (= ?type ex:Reptile) (= ?type ex:Insect))
     #            (bgp (triple ?animal <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type))))))
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-unary-minus
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-unary-minus
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Minus < Operator::Binary
       include Query
 
@@ -33,18 +33,18 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
-      # @see    http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#negation
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
+      # @see    https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#negation
+      def execute(queryable, **options, &block)
         # Let Ω1 and Ω2 be multisets of solution mappings. We define:
         # 
         # Minus(Ω1, Ω2) = { μ | μ in Ω1 . ∀ μ' in Ω2, either μ and μ' are not compatible or dom(μ) and dom(μ') are disjoint }
         # 
         # card[Minus(Ω1, Ω2)](μ) = card[Ω1](μ)
         debug(options) {"Minus"}
-        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) {"(minus 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) {"(minus right) #{right.inspect}"}
         @solutions = left.minus(right)
         @solutions.each(&block) if block_given?
@@ -52,16 +52,17 @@ 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:
       #   Replace join(Z, A) by A
       #   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/minutes.rb

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

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

@@ -33,17 +33,17 @@ 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) {"Modify"}
         query = operands.shift
 
-        queryable.query(query, options.merge(depth: options[:depth].to_i + 1)) do |solution|
+        queryable.query(query, depth: options[:depth].to_i + 1, **options) do |solution|
           debug(options) {"(solution)=>#{solution.inspect}"}
 
           # Execute each operand with queryable and solution
           operands.each do |op|
-            op.execute(queryable, solution, options.merge(depth: options[:depth].to_i + 1))
+            op.execute(queryable, solutions: solution, depth: options[:depth].to_i + 1, **options)
           end
         end
         queryable

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

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

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (move silent <iri> to default)
     #
-    # @see http://www.w3.org/TR/sparql11-update/#move
+    # @see https://www.w3.org/TR/sparql11-update/#move
     class Move < 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) {"Move"}
         silent = operands.first == :silent
         operands.shift if silent

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

@@ -7,7 +7,7 @@ module SPARQL; module Algebra
     #   (* ?x ?y)
     #   (multiply ?x ?y)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-multiply
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-multiply
     class Multiply < Operator::Binary
       include Evaluatable
 

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

@@ -7,7 +7,7 @@ module SPARQL; module Algebra
     #   (- ?x)
     #   (negate ?x)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-unary-minus
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-unary-minus
     class Negate < Operator::Unary
       include Evaluatable
 

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

@@ -7,7 +7,7 @@ module SPARQL; module Algebra
     #   (! ?x)
     #   (not ?x)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-not
+    # @see https://www.w3.org/TR/xpath-functions/#func-not
     class Not < Operator::Unary
       include Evaluatable