sparql 3.0.0 → 3.1.3

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (path+ :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_OneOrMorePath
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_OneOrMorePath
     class PathPlus < Operator::Unary
       include Query
       
@@ -25,8 +25,8 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @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)
         subject, object = options[:subject], options[:object]
         debug(options) {"Path+ #{[subject, operands, object].to_sse}"}
 
@@ -53,7 +53,7 @@ module SPARQL; module Algebra
         # Keep track of solutions
         # Recurse into query
         immediate_solutions = []
-        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|
           immediate_solutions << solution
         end
 
@@ -66,23 +66,23 @@ module SPARQL; module Algebra
           case
           when subject.variable? && object.variable?
             # Query starting with bound object as subject, but replace result with subject
-            rs = queryable.query(self, options.merge(
+            rs = queryable.query(self, **options.merge(
               subject: solution[object],
               accumulator: (cumulative_solutions + immediate_solutions),
               depth: options[:depth].to_i + 1)).map {|s| s.merge(subject.to_sym => solution[subject])}
             # Query starting with bound subject as object, but replace result with subject
-            ro = queryable.query(self, options.merge(
+            ro = queryable.query(self, **options.merge(
               object: solution[subject],
               accumulator: (cumulative_solutions + immediate_solutions),
               depth: options[:depth].to_i + 1)).map {|s| s.merge(object.to_sym => solution[object])}
             recursive_solutions += (rs + ro).uniq
           when subject.variable?
-            recursive_solutions += queryable.query(self, options.merge(
+            recursive_solutions += queryable.query(self, **options.merge(
               object: solution[subject],
               accumulator: (cumulative_solutions + immediate_solutions),
               depth: options[:depth].to_i + 1)).uniq
           when object.variable?
-            recursive_solutions += queryable.query(self, options.merge(
+            recursive_solutions += queryable.query(self, **options.merge(
               subject: solution[object],
               accumulator: (cumulative_solutions + immediate_solutions),
               depth: options[:depth].to_i + 1)).uniq

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (path* :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_ZeroOrMorePath
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_ZeroOrMorePath
     class PathStar < Operator::Unary
       include Query
       
@@ -28,14 +28,14 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @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)
         subject, object = options[:subject], options[:object]
         debug(options) {"Path* #{[subject, operands, object].to_sse}"}
 
         # (:x :p* :y) => (:x (:p+)? :y)
         query = PathOpt.new(PathPlus.new(*operands))
-        query.execute(queryable, options.merge(depth: options[:depth].to_i + 1), &block)
+        query.execute(queryable, depth: options[:depth].to_i + 1, **options, &block)
       end
     end # PathStar
   end # Operator

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

@@ -7,9 +7,9 @@ module SPARQL; module Algebra
     #   (+ ?x ?y)
     #   (plus ?x ?y)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-unary-plus
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-add
-    class Plus < Operator::Unary
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-unary-plus
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-add
+    class Plus < Operator
       include Evaluatable
 
       NAME = [:+, :plus]

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

@@ -8,7 +8,7 @@ module SPARQL; module Algebra
     #     (graph ?g
     #       (bgp (triple ?s ?p ?o))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#QSynIRI
+    # @see https://www.w3.org/TR/sparql11-query/#QSynIRI
     class Prefix < Binary
       include Query
       
@@ -29,21 +29,21 @@ 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) {"Prefix"}
-        @solutions = queryable.query(operands.last, options.merge(depth: options[:depth].to_i + 1), &block)
+        @solutions = queryable.query(operands.last, depth: options[:depth].to_i + 1, **options, &block)
       end
-      
+
       ##
       # Returns an optimized version of this query.
       #
-      # If optimize operands, and if the first two operands are both Queries, replace
-      # with the unique sum of the query elements
+      # Replace with the query with URIs having their lexical shortcut removed
       #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands.last.optimize
+      # @return [Prefix] a copy of `self`
+      # @see SPARQL::Algebra::Expression#optimize
+      def optimize(**options)
+        operands.last.optimize(**options)
       end
 
       # Combine two prefix definitions, merging their definitions

data/lib/sparql/algebra/operator/project.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/#modProjection
+    # @see https://www.w3.org/TR/sparql11-query/#modProjection
     class Project < Operator::Binary
       include Query
       
@@ -29,23 +29,13 @@ 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)
-        @solutions = queryable.query(operands.last, options.merge(depth: options[:depth].to_i + 1))
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      def execute(queryable, **options, &block)
+        @solutions = queryable.query(operands.last, depth: options[:depth].to_i + 1, **options)
         @solutions = @solutions.project(*(operands.first))
         @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 # Project
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -8,7 +8,7 @@ module SPARQL; module Algebra
     # @example
     #   (rand)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#idp2130040
+    # @see https://www.w3.org/TR/sparql11-query/#idp2130040
     class Rand < Operator::Nullary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (project (?v)
     #         (bgp (triple ?x ?p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Reduced < Operator::Unary
       include Query
       
@@ -30,23 +30,13 @@ 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 = operands.last.
-          execute(queryable, options.merge(depth: options[:depth].to_i + 1)).reduced
+          execute(queryable, depth: options[:depth].to_i + 1, **options).reduced
         @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 # Reduced
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -10,8 +10,8 @@ module SPARQL; module Algebra
     #       (filter (regex ?val "GHI")
     #         (bgp (triple ex:foo rdf:value ?val)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#funcex-regex
-    # @see http://www.w3.org/TR/xpath-functions/#func-matches
+    # @see https://www.w3.org/TR/sparql11-query/#funcex-regex
+    # @see https://www.w3.org/TR/xpath-functions/#func-matches
     class Regex < Operator::Ternary
       include Evaluatable
 
@@ -26,7 +26,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(text, pattern, flags = RDF::Literal(''), options = {})
+      def initialize(text, pattern, flags = RDF::Literal(''), **options)
         super
       end
 
@@ -43,17 +43,17 @@ module SPARQL; module Algebra
       # @raise  [TypeError] if any operand is unbound
       # @raise  [TypeError] if any operand is not a simple literal
       def apply(text, pattern, flags = RDF::Literal(''))
-        # @see http://www.w3.org/TR/xpath-functions/#regex-syntax
+        # @see https://www.w3.org/TR/xpath-functions/#regex-syntax
         raise TypeError, "expected a plain RDF::Literal, but got #{text.inspect}" unless text.is_a?(RDF::Literal) && text.plain?
         text = text.to_s
         # TODO: validate text syntax
 
-        # @see http://www.w3.org/TR/xpath-functions/#regex-syntax
+        # @see https://www.w3.org/TR/xpath-functions/#regex-syntax
         raise TypeError, "expected a plain RDF::Literal, but got #{pattern.inspect}" unless pattern.is_a?(RDF::Literal) && pattern.plain?
         pattern = pattern.to_s
         # TODO: validate pattern syntax
 
-        # @see http://www.w3.org/TR/xpath-functions/#flags
+        # @see https://www.w3.org/TR/xpath-functions/#flags
         raise TypeError, "expected a plain RDF::Literal, but got #{flags.inspect}" unless flags.is_a?(RDF::Literal) && flags.plain?
         flags = flags.to_s
         # TODO: validate flag syntax

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

@@ -10,8 +10,8 @@ module SPARQL; module Algebra
     #         (extend ((?new (replace ?str "[^a-z0-9]" "-")))
     #           (bgp (triple ?s :str ?str)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#funcex-replace
-    # @see http://www.w3.org/TR/xpath-functions/#func-replace
+    # @see https://www.w3.org/TR/sparql11-query/#funcex-replace
+    # @see https://www.w3.org/TR/xpath-functions/#func-replace
     class Replace < Operator::Quaternary
       include Evaluatable
 
@@ -27,7 +27,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(text, pattern, replacement, flags = RDF::Literal(''), options = {})
+      def initialize(text, pattern, replacement, flags = RDF::Literal(''), **options)
         super
       end
 
@@ -72,7 +72,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/reverse.rb

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (reverse :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_inverse
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_inverse
     class Reverse < Operator::Unary
       include Query
       
@@ -29,8 +29,8 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @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) {"Reverse #{operands.to_sse}"}
         subject, object = options[:subject], options[:object]
 
@@ -42,7 +42,7 @@ module SPARQL; module Algebra
         else
           operand(0)
         end
-        queryable.query(query, options.merge(
+        queryable.query(query, **options.merge(
           subject: object,
           object: subject,
           depth: options[:depth].to_i + 1

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

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

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (filter (sameTerm ?v)
     #         (bgp (triple ?x :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-sameTerm
+    # @see https://www.w3.org/TR/sparql11-query/#func-sameTerm
     class SameTerm < Operator::Binary
       include Evaluatable
 
@@ -33,12 +33,15 @@ module SPARQL; module Algebra
       ##
       # Returns an optimized version of this expression.
       #
-      # @return [SPARQL::Algebra::Expression]
-      def optimize
-        if operand(0).is_a?(Variable) && operand(0).eql?(operand(1))
+      # Return true if variable operand1 is a bound variable and equals operand2
+      #
+      # @return [SameTerm] a copy of `self`
+      # @see SPARQL::Algebra::Expression#optimize
+      def optimize(**options)
+        if operand(0).is_a?(Variable) && operand(0).bound? && operand(0).eql?(operand(1))
           RDF::Literal::TRUE
         else
-          super # @see Operator#optimize
+          super # @see Operator#optimize!
         end
       end
     end # SameTerm

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

@@ -7,11 +7,11 @@ module SPARQL; module Algebra
     #   (prefix ((: <http://www.example.org/>))
     #     (filter (|| (|| (= ?sample 1.0) (= ?sample 2.2)) (= ?sample 3.5))
     #       (project (?sample)
-    #         (extend ((?sample ?.0))
-    #           (group () ((?.0 (sample ?o)))
+    #         (extend ((?sample ??.0))
+    #           (group () ((??.0 (sample ?o)))
     #             (bgp (triple ?s :dec ?o)))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggSample
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggSample
     class Sample < Operator::Unary
       include Aggregate
 

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

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

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

@@ -28,13 +28,12 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @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)
         subject, object = options[:subject], options[:object]
         debug(options) {"Seq #{[subject, operands, object].to_sse}"}
 
-        v = RDF::Query::Variable.new
-        v.distinguished = false
+        v = RDF::Query::Variable.new(distinguished: false)
         q1 = if operand(0).is_a?(RDF::Term)
           RDF::Query.new do |q|
             q.pattern [subject, operand(0), v]
@@ -50,10 +49,10 @@ module SPARQL; module Algebra
           operand(1)
         end
 
-        left = queryable.query(q1, options.merge(object: v, depth: options[:depth].to_i + 1))
+        left = queryable.query(q1, **options.merge(object: v, depth: options[:depth].to_i + 1))
         debug(options) {"(seq)=>(left) #{left.map(&:to_h).to_sse}"}
 
-        right = queryable.query(q2, options.merge(subject: v, depth: options[:depth].to_i + 1))
+        right = queryable.query(q2, **options.merge(subject: v, depth: options[:depth].to_i + 1))
         debug(options) {"(seq)=>(right) #{right.map(&:to_h).to_sse}"}
 
         @solutions = RDF::Query::Solutions(left.map do |s1|

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

@@ -34,15 +34,15 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
-      def execute(queryable, options = {})
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      def execute(queryable, **options)
         debug(options) {"Sequence #{operands.to_sse}"}
 
-        last = queryable.query(operands.shift, options.merge(depth: options[:depth].to_i + 1))
+        last = queryable.query(operands.shift, depth: options[:depth].to_i + 1, **options)
         debug(options) {"(sequence)=>(last) #{last.map(&:to_h).to_sse}"}
 
         operands.each do |op|
-          this = queryable.query(op, options.merge(depth: options[:depth].to_i + 1))
+          this = queryable.query(op, depth: options[:depth].to_i + 1, **options)
           debug(options) {"(sequence)=>(this) #{this.map(&:to_h).to_sse}"}
 
           last = last.map do |s1|

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

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

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

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