sparql 3.0.0 → 3.1.3

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

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

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

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

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #         (order (?v)
     #           (bgp (triple ??0 :num ?v))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Slice < Operator::Ternary
       include Query
       
@@ -42,26 +42,16 @@ 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)
         offset = operands[0] == :_ ? 0 : operands[0].to_i
         limit = operands[1] == :_ ? -1 : operands[1].to_i
-        @solutions = operands.last. execute(queryable, options.merge(depth: options[:depth].to_i + 1))
+        @solutions = operands.last. execute(queryable, depth: options[:depth].to_i + 1, **options)
         @solutions.offset(operands[0]) unless operands[0] == :_
         @solutions.limit(operands[1]) unless operands[1] == :_
         @solutions.each(&block) if block_given?
         @solutions
       end
-      
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # Slice
   end # Operator
 end; end # SPARQL::Algebra

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

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

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

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

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

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

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #         (filter (langMatches (lang ?str) "en")
     #           (bgp (triple ?s :str ?str))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-strdt
+    # @see https://www.w3.org/TR/sparql11-query/#func-strdt
     class StrDT < Operator::Binary
       include Evaluatable
 
@@ -23,7 +23,7 @@ module SPARQL; module Algebra
       # @param  [RDF::URI] datatypeIRI
       #   datatype
       # @return [RDF::Literal] a datatyped literal
-      # @see http://www.w3.org/TR/sparql11-query/#func-strdt
+      # @see https://www.w3.org/TR/sparql11-query/#func-strdt
       def apply(value, datatypeIRI)
         raise TypeError, "Literal #{value.inspect} is not simple" unless value.simple?
         RDF::Literal.new(value.to_s, datatype: datatypeIRI)

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

@@ -6,8 +6,8 @@ module SPARQL; module Algebra
     # @example
     #   (strends ?x ?y)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-strends
-    # @see http://www.w3.org/TR/xpath-functions/#func-ends-with
+    # @see https://www.w3.org/TR/sparql11-query/#func-strends
+    # @see https://wwww.w3.org/TR/xpath-functions/#func-ends-with
     class StrEnds < Operator::Binary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #           (filter (langMatches (lang ?str) "en")
     #             (bgp (triple ?s :str ?str))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-strlang
+    # @see https://www.w3.org/TR/sparql11-query/#func-strlang
     class StrLang < Operator::Binary
       include Evaluatable
 
@@ -24,7 +24,7 @@ module SPARQL; module Algebra
       # @param  [RDF::Literal] langTag
       #   datatype
       # @return [RDF::Literal] a datatyped literal
-      # @see http://www.w3.org/TR/sparql11-query/#func-strlang
+      # @see https://www.w3.org/TR/sparql11-query/#func-strlang
       def apply(value, langTag)
         raise TypeError, "Literal #{value.inspect} is not simple" unless value.simple?
         RDF::Literal.new(value.to_s, language: langTag.to_s)

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

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

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

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

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
     #             (extend ((?uuid (struuid)))
     #               (bgp))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-struuid
+    # @see https://www.w3.org/TR/sparql11-query/#func-struuid
     class StrUUID < Operator::Nullary
       include Evaluatable
 

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

@@ -6,8 +6,8 @@ module SPARQL; module Algebra
     # @example
     #   (substr ?x ?y)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-substr
-    # @see http://www.w3.org/TR/xpath-functions/#func-substring
+    # @see https://www.w3.org/TR/sparql11-query/#func-substr
+    # @see https://www.w3.org/TR/xpath-functions/#func-substring
     class SubStr < Operator::Ternary
       include Evaluatable
 
@@ -22,7 +22,7 @@ module SPARQL; module Algebra
       # @param  [Hash{Symbol => Object}] options
       #   any additional options (see {Operator#initialize})
       # @raise  [TypeError] if any operand is invalid
-      def initialize(source, startingLoc, length = RDF::Literal(""), options = {})
+      def initialize(source, startingLoc, length = RDF::Literal(""), **options)
         super
       end
 
@@ -71,7 +71,7 @@ module SPARQL; module Algebra
       # Remove the optional argument.
       #
       # @return [Array] `self`
-      # @see    http://openjena.org/wiki/SSE
+      # @see    https://openjena.org/wiki/SSE
       def to_sxp_bin
         [NAME] + operands.reject {|o| o.to_s == ""}
       end

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

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

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

@@ -6,12 +6,12 @@ module SPARQL; module Algebra
     # @example
     #    (prefix ((: <http://www.example.org/>))
     #      (project (?sum)
-    #        (extend ((?sum ?.0))
-    #          (group () ((?.0 (sum ?o)))
+    #        (extend ((?sum ??.0))
+    #          (group () ((??.0 (sum ?o)))
     #            (bgp (triple ?s :dec ?o))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggSum
-    class Sum < Operator::Unary
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggSum
+    class Sum < Operator
       include Aggregate
 
       NAME = :sum
@@ -23,6 +23,8 @@ module SPARQL; module Algebra
       #   enum of evaluated operand
       # @return [RDF::Literal::Numeric] The sum 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?
           RDF::Literal(0)
         elsif enum.flatten.all? {|n| n.is_a?(RDF::Literal::Numeric)}

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

@@ -11,7 +11,9 @@ module SPARQL; module Algebra
     #      (row (?title "SPARQL Tutorial"))
     #      (row (?book :book2)))
     #
-    # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data
+    # @example empty table
+    #     (table unit)
+    # @see https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data
     class Table < Operator
       include Query
       
@@ -30,10 +32,10 @@ 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)
         @solutions = RDF::Query::Solutions()
-        operands[1..-1].each do |row|
+        Array(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 unless value == :undef

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

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

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

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

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

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

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (graph ?g
     #         (bgp (triple ?s ?p ?o)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Union < Operator::Binary
       include Query
       
@@ -30,11 +30,11 @@ 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) {"Union"}
         @solutions = RDF::Query::Solutions(operands.inject([]) do |memo, op|
-          solns = op.execute(queryable, options.merge(depth: options[:depth].to_i + 1))
+          solns = op.execute(queryable, depth: options[:depth].to_i + 1, **options)
           debug(options) {"=> (op) #{solns.inspect}"}
           memo + solns
         end)
@@ -45,7 +45,7 @@ module SPARQL; module Algebra
 
       # The same blank node label cannot be used in two different basic graph patterns in the same query
       def validate!
-        left_nodes, right_nodes = operand(0).ndvars, operand(1).ndvars
+        left_nodes, right_nodes = operand(0).ndvars.map(&:name), operand(1).ndvars.map(&:name)
 
         unless (left_nodes.compact & right_nodes.compact).empty?
           raise ArgumentError,
@@ -55,13 +55,14 @@ module SPARQL; module Algebra
       end
 
       ##
-      # Returns an optimized version of this query.
+      # Optimizes this query.
       #
       # Optimize operands and remove any which are empty.
       #
-      # @return [Union, 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/update.rb

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (bgp (triple ?s ?p ?o))
     #       (insert ((triple ?s ?p "q")))))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#graphUpdate
+    # @see https://www.w3.org/TR/sparql11-update/#graphUpdate
     class Update < Operator
       include SPARQL::Algebra::Update
       
@@ -30,12 +30,12 @@ module SPARQL; module Algebra
       #   If an attempt is made to perform an unsupported operation
       # @raise [IOError]
       #   If `queryable` is immutable
-      # @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) {"Update"}
         raise IOError, "queryable is not mutable" unless queryable.mutable?
         operands.each do |op|
-          op.execute(queryable, options.merge(depth: options[:depth].to_i + 1))
+          op.execute(queryable, depth: options[:depth].to_i + 1, **options)
         end
         queryable
       end

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (using (:g1) (bgp (triple ?s ?p ?o)))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#add
+    # @see https://www.w3.org/TR/sparql11-update/#add
     class Using < Operator
       include SPARQL::Algebra::Query
 
@@ -30,10 +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, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-update/
+      def execute(queryable, **options, &block)
         debug(options) {"Using"}
-        Dataset.new(*operands).execute(queryable, options.merge(depth: options[:depth].to_i + 1), &block)
+        Dataset.new(*operands).execute(queryable, depth: options[:depth].to_i + 1, **options, &block)
       end
     end # Using
   end # Operator

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
     #             (extend ((?uuid (uuid)))
     #               (bgp))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-uuid
+    # @see https://www.w3.org/TR/sparql11-query/#func-uuid
     class UUID < Operator::Nullary
       include Evaluatable
 

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     #     (bgp (triple ?s ?p ?o))
     #     (insert ((triple ?s ?p "z"))))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#deleteInsert
+    # @see https://www.w3.org/TR/sparql11-update/#deleteInsert
     class With < Operator
       include SPARQL::Algebra::Update
 
@@ -32,8 +32,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) {"With: #{operand.to_sse}"}
         # Bound variable
         name = operands.shift
@@ -42,7 +42,7 @@ module SPARQL; module Algebra
           debug(options) {"=> default data source #{name}"}
           load_opts = {debug: options.fetch(:debug, nil), base_uri: name}
           debug(options) {"=> load #{name}"}
-          queryable.load(name.to_s, load_opts)
+          queryable.load(name.to_s, **load_opts)
         end
 
         # Set name for RDF::Graph descendants having no graph_name to the name variable
@@ -58,12 +58,12 @@ module SPARQL; module Algebra
         query = operands.shift
 
         # Restrict query portion to this graph
-        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
       end