sparql 3.0.1 → 3.1.4

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (filter (= ?v 2)
     #         (bgp (triple ?s <http://example/p> ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#evaluation
+    # @see https://www.w3.org/TR/sparql11-query/#evaluation
     class Filter < Operator::Binary
       include Query
       
@@ -34,15 +34,15 @@ 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.w3.org/TR/sparql11-query/#ebv
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      # @see    https://www.w3.org/TR/sparql11-query/#ebv
+      def execute(queryable, **options, &block)
         debug(options) {"Filter #{operands.first.to_sxp}"}
         opts = options.merge(queryable: queryable, depth: options[:depth].to_i + 1)
         @solutions = RDF::Query::Solutions()
-        queryable.query(operands.last, options.merge(depth: options[:depth].to_i + 1)) do |solution|
+        queryable.query(operands.last, depth: options[:depth].to_i + 1, **options) do |solution|
           begin
-            pass = boolean(operands.first.evaluate(solution, opts)).true?
+            pass = boolean(operands.first.evaluate(solution, **opts)).true?
             debug(options) {"(filter) #{pass.inspect} #{solution.to_h.inspect}"}
             @solutions << solution if pass
           rescue
@@ -69,16 +69,6 @@ module SPARQL; module Algebra
         end
         self
       end
-
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # Filter
   end # Operator
 end; end # SPARQL::Algebra

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

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

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

@@ -15,7 +15,7 @@ module SPARQL; module Algebra
     #     (graph :g
     #       ((triple :s :p :o))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Graph < Operator::Binary
       include Query
       
@@ -36,7 +36,7 @@ module SPARQL; module Algebra
       #   @param [Array<RDF::Query::Pattern>] patterns
       #     Quads
       # @return [RDF::Query]
-      def self.new(name, patterns, &block)
+      def self.new(name, patterns, options = {}, &block)
         case patterns
         when RDF::Query
           # Record that the argument as a (bgp) for re-serialization back to SSE
@@ -63,26 +63,15 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      def execute(queryable, **options, &block)
         debug(options) {"Graph #{operands.first}"}
         graph_name, query = operands.first, operands.last
-        @solutions = queryable.query(query, options.merge(graph_name: graph_name), &block)
+        @solutions = queryable.query(query, graph_name: graph_name, **options, &block)
       end
-      
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
-      
+
       ##
       # Don't do any more rewriting
-      # FIXME: if ooperator is JOIN, and rewritten sub-operators are queries, can do simple merge of sub-graphs
       # @return [SPARQL::Algebra::Expression] `self`
       def rewrite(&block)
         self

data/lib/sparql/algebra/operator/greater_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-greater-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-boolean-greater-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-dateTime-greater-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-greater-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-boolean-greater-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-dateTime-greater-than
     class GreaterThan < Compare
       NAME = :>
 

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

@@ -7,11 +7,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-greater-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-boolean-greater-than
-    # @see http://www.w3.org/TR/xpath-functions/#func-dateTime-greater-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-greater-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-boolean-greater-than
+    # @see https://www.w3.org/TR/xpath-functions/#func-dateTime-greater-than
     class GreaterThanOrEqual < Compare
       NAME = :>=
 

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

@@ -11,13 +11,13 @@ module SPARQL; module Algebra
     # @example
     #     (prefix ((: <http://example/>))
     #       (project (?w ?S)
-    #         (extend ((?S ?.0))
-    #           (group (?w) ((?.0 (sample ?v)))
+    #         (extend ((?S ??.0))
+    #           (group (?w) ((??.0 (sample ?v)))
     #             (leftjoin
     #               (bgp (triple ?s :p ?v))
     #               (bgp (triple ?s :q ?w)))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Group < Operator
       include Query
       
@@ -37,13 +37,13 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlGroupAggregate
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlGroupAggregate
+      def execute(queryable, **options, &block)
         debug(options) {"Group"}
         exprlist = operands.first
         query = operands.last
         aggregates = operands.length == 3 ? operand(1) : []
-        solutions = queryable.query(query, options.merge(depth: options[:depth].to_i + 1))
+        solutions = queryable.query(query, depth: options[:depth].to_i + 1, **options)
 
         groups = solutions.group_by do |solution|
           # Evaluate each exprlist operand to get groups where each key is a new solution
@@ -54,14 +54,14 @@ module SPARQL; module Algebra
               if operand.is_a?(Array)
                 # Form is [variable, expression]
                 soln[operand.first] = operand.last.evaluate(solution,
-                                                            options.merge(
-                                                             queryable: queryable,
-                                                             depth: options[:depth].to_i + 1))
+                                                            queryable: queryable,
+                                                            depth: options[:depth].to_i + 1,
+                                                            **options)
               else
                 # Form is variable
-                soln[operand] = operand.evaluate(solution, options.merge(
-                                                            queryable: queryable,
-                                                            depth: options[:depth].to_i + 1))
+                soln[operand] = operand.evaluate(solution, queryable: queryable,
+                                                           depth: options[:depth].to_i + 1,
+                                                           **options)
               end
             rescue TypeError
               # Ignore expression
@@ -76,7 +76,7 @@ module SPARQL; module Algebra
         @solutions = RDF::Query::Solutions(groups.map do |group_soln, solns|
           aggregates.each do |(var, aggregate)|
             begin
-              group_soln[var] = aggregate.aggregate(solns, options)
+              group_soln[var] = aggregate.aggregate(solns, **options)
             rescue TypeError
               # Ignored in output
             end
@@ -84,8 +84,18 @@ module SPARQL; module Algebra
           group_soln
         end)
 
-        # Make sure that's at least an empty solution
-        @solutions << RDF::Query::Solution.new if @solutions.empty?
+        # If there exprlist is empty, make sure that's at least an empty solution
+        if @solutions.empty? && exprlist.empty?
+          soln = RDF::Query::Solution.new
+          aggregates.each do |(var, aggregate)|
+            begin
+              soln[var] = aggregate.aggregate([], **options)
+            rescue TypeError
+              # Ignored in output
+            end
+          end
+          @solutions << soln
+        end
 
         debug(options) {"=>(solutions) #{@solutions.inspect}"}
         @solutions.each(&block) if block_given?
@@ -112,16 +122,6 @@ module SPARQL; module Algebra
         end
         super
       end
-
-      ##
-      # Returns an optimized version of this query.
-      #
-      # TODO
-      #
-      # @return [Group] `self`
-      def optimize
-        self
-      end
     end # Group
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -9,11 +9,11 @@ module SPARQL; module Algebra
     #    (prefix ((: <http://www.example.org/>))
     #      (filter (|| (= ?g "1 22") (= ?g "22 1"))
     #        (project (?g)
-    #          (extend ((?g ?.0))
-    #            (group () ((?.0 (group_concat ?o)))
-    #              (bgp (triple ??0 :p1 ?o)))))))
+    #          (extend ((?g ??.0))
+    #            (group () ((??.0 (group_concat ?o)))
+    #              (bgp (triple ??.0 :p1 ?o)))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggGroupConcat
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggGroupConcat
     class GroupConcat < Operator
       include Aggregate
 
@@ -29,12 +29,12 @@ module SPARQL; module Algebra
       # @return [RDF::Term]
       # @raise [TypeError]
       # @abstract
-      def aggregate(solutions = [], options = {})
+      def aggregate(solutions = [], **options)
         operands.shift if distinct = (operands.first == :distinct)
         sep = operands.length == 2 ? operand(0).last : RDF::Literal(' ')
         args_enum = solutions.map do |solution|
           begin
-            operands.last.evaluate(solution, options.merge(depth: options[:depth].to_i + 1))
+            operands.last.evaluate(solution, depth: options[:depth].to_i + 1, **options)
           rescue TypeError
             # Ignore errors
             nil

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)
@@ -43,7 +45,7 @@ module SPARQL; module Algebra
         end
         patterns.each do |pattern|
           pattern = pattern.dup.bind(solution)
-          debug(options) {"Insert statement #{statement.to_sse}"}
+          debug(options) {"Insert pattern #{pattern.to_sse}"}
           # Only insert bound or constant patterns
           queryable.insert(RDF::Statement.from(pattern)) if pattern.bound? || pattern.constant?
         end

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