sparql 3.0.0 → 3.1.3

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

@@ -15,7 +15,7 @@ module SPARQL; module Algebra
     #             (bgp (triple ?s :p ?o))
     #             (bgp (triple ?s :q ?x))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-coalesce
+    # @see https://www.w3.org/TR/sparql11-query/#func-coalesce
     class Coalesce < Operator
       include Evaluatable
 
@@ -41,25 +41,15 @@ module SPARQL; module Algebra
       #   options passed from query
       # @return [RDF::Term]
       # @raise  [TypeError] if none of the operands succeeds
-      def evaluate(bindings, options = {})
+      def evaluate(bindings, **options)
         operands.each do |op|
           begin
-            return op.evaluate(bindings, options.merge(depth: options[:depth].to_i + 1))
+            return op.evaluate(bindings, depth: options[:depth].to_i + 1, **options)
           rescue
           end
         end
         raise TypeError, "None of the operands evaluated"
       end
-
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # Coalesce
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -6,8 +6,8 @@ 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 https://www.w3.org/TR/sparql11-query/#OperatorMapping
+    # @see https://www.w3.org/TR/xpath-functions/#func-compare
     class Compare < Operator::Binary
       include Evaluatable
 
@@ -33,14 +33,14 @@ module SPARQL; module Algebra
       # @raise  [TypeError] if either operand is not a literal
       def apply(left, right)
         case
-        # @see http://www.w3.org/TR/sparql11-query/#OperatorMapping
-        # @see http://www.w3.org/TR/sparql11-query/#modOrderBy
+        # @see https://www.w3.org/TR/sparql11-query/#OperatorMapping
+        # @see https://www.w3.org/TR/sparql11-query/#modOrderBy
         when left.is_a?(RDF::Literal) && right.is_a?(RDF::Literal)
           case
-          # @see http://www.w3.org/TR/xpath-functions/#string-compare
-          # @see http://www.w3.org/TR/xpath-functions/#comp.numeric
-          # @see http://www.w3.org/TR/xpath-functions/#op.boolean
-          # @see http://www.w3.org/TR/xpath-functions/#comp.duration.datetime
+          # @see https://www.w3.org/TR/xpath-functions/#string-compare
+          # @see https://www.w3.org/TR/xpath-functions/#comp.numeric
+          # @see https://www.w3.org/TR/xpath-functions/#op.boolean
+          # @see https://www.w3.org/TR/xpath-functions/#comp.duration.datetime
           when (left.simple? && right.simple?) ||
                (left.is_a?(RDF::Literal::Numeric) && right.is_a?(RDF::Literal::Numeric)) ||
                (left.datatype == right.datatype && left.language == right.language)

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

@@ -8,8 +8,8 @@ module SPARQL; module Algebra
     # @example
     #   (concat ?a ?b ...)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-concat
-    # @see http://www.w3.org/TR/xpath-functions/#func-concat
+    # @see https://www.w3.org/TR/sparql11-query/#func-concat
+    # @see https://www.w3.org/TR/xpath-functions/#func-concat
     class Concat < Operator
       include Evaluatable
 
@@ -32,8 +32,8 @@ module SPARQL; module Algebra
       #   options passed from query
       # @return [RDF::Term]
       # @raise  [TypeError] if any operand is not a literal
-      def evaluate(bindings, options = {})
-        ops = operands.map {|op| op.evaluate(bindings, options.merge(depth: options[:depth].to_i + 1))}
+      def evaluate(bindings, **options)
+        ops = operands.map {|op| op.evaluate(bindings, depth: options[:depth].to_i + 1, **options)}
 
         raise TypeError, "expected all plain literal operands" unless ops.all? {|op| op.literal? && op.plain?}
 

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

@@ -12,7 +12,7 @@ module SPARQL; module Algebra
     #       (project (?s ?p ?o)
     #         (bgp (triple ?s ?p ?o)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#construct
+    # @see https://www.w3.org/TR/sparql11-query/#construct
     class Construct < Operator::Binary
       include Query
       
@@ -34,14 +34,14 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Queryable]
       #   A Queryable with constructed triples
-      # @see    http://www.w3.org/TR/sparql11-query/#construct
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#construct
+      def execute(queryable, **options, &block)
         debug(options) {"Construct #{operands.first}, #{options.inspect}"}
         graph = RDF::Graph.new
         patterns = operands.first
         query = operands.last
 
-        queryable.query(query, options.merge(depth: options[:depth].to_i + 1)).each do |solution|
+        queryable.query(query, depth: options[:depth].to_i + 1, **options).each do |solution|
           debug(options) {"(construct apply) #{solution.inspect} to BGP"}
           
           # Create a mapping from BNodes within the pattern list to newly constructed BNodes
@@ -74,16 +74,6 @@ module SPARQL; module Algebra
         graph.each(&block) if block_given?
         graph
       end
-      
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
 
       # Query results statements (e.g., CONSTRUCT, DESCRIBE, CREATE)
       # @return [Boolean]

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

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

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

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

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

@@ -6,11 +6,11 @@ module SPARQL; module Algebra
     # @example
     #    (prefix ((: <http://www.example.org>))
     #      (project (?C)
-    #        (extend ((?C ?.0))
-    #          (group () ((?.0 (count ?O)))
+    #        (extend ((?C ??.0))
+    #          (group () ((??.0 (count ?O)))
     #            (bgp (triple ?S ?P ?O))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggCount
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggCount
     class Count < Operator
       include Aggregate
 

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     # @example
     #   (create silent <graph>)
     #
-    # @see http://www.w3.org/TR/sparql11-update/#create
+    # @see https://www.w3.org/TR/sparql11-update/#create
     class Create < Operator
       include SPARQL::Algebra::Update
 
@@ -30,8 +30,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) {"Create"}
         silent = operands.first == :silent
         operands.shift if silent

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

@@ -102,7 +102,7 @@ module SPARQL; module Algebra
     #         (graph ?g (bgp (triple ?s ?p ?o))))))
     #
     # @example Dataset with multiple named graphs
-    # @see http://www.w3.org/TR/sparql11-query/#specifyingDataset
+    # @see https://www.w3.org/TR/sparql11-query/#specifyingDataset
     class Dataset < Binary
       include Query
 
@@ -125,8 +125,8 @@ 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 = {}, &base)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      def execute(queryable, **options, &base)
         debug(options) {"Dataset"}
         default_datasets = []
         named_datasets = []
@@ -144,7 +144,7 @@ module SPARQL; module Algebra
           load_opts = {debug: options.fetch(:debug, nil), graph_name: uri, base_uri: uri}
           unless queryable.has_graph?(uri)
             debug(options) {"=> load #{uri}"}
-            queryable.load(uri.to_s, load_opts)
+            queryable.load(uri.to_s, **load_opts)
           end
         end
         debug(options) {
@@ -156,18 +156,7 @@ module SPARQL; module Algebra
         aggregate = RDF::AggregateRepo.new(queryable)
         named_datasets.each {|name| aggregate.named(name) if queryable.has_graph?(name)}
         aggregate.default(*default_datasets.select {|name| queryable.has_graph?(name)})
-        aggregate.query(operands.last, options.merge(depth: options[:depth].to_i + 1), &base)
-      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
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands.last.optimize
+        aggregate.query(operands.last, depth: options[:depth].to_i + 1, **options, &base)
       end
     end # Dataset
   end # Operator

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     #       (filter (= (datatype (xsd:double ?v)) xsd:double)
     #         (bgp (triple ?s :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-datatype
+    # @see https://www.w3.org/TR/sparql11-query/#func-datatype
     class Datatype < Operator::Unary
       include Evaluatable
 

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

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

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (delete ((triple ?s ?p ?o))))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#delete
+    # @see https://www.w3.org/TR/sparql11-update/#delete
     class Delete < Operator::Unary
       include SPARQL::Algebra::Update
 
@@ -20,8 +20,8 @@ module SPARQL; module Algebra
       #
       # @param  [RDF::Queryable] queryable
       #   the graph or repository to write
-      # @param  [RDF::Query::Solution] solution
-      #   Solution to map to patterns for this operation
+      # @param  [RDF::Query::Solutions] solutions
+      #   Solutions to map to patterns for this operation
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
       # @option options [Boolean] debug
@@ -30,9 +30,11 @@ 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)
         debug(options) {"Delete: #{solution} against #{operands.to_sse}"}
+        # Only binds the first solution
+        solution = solutions.is_a?(RDF::Query::Solutions) ? solutions.first : solutions
         # Operands are an array of patterns and Queries (when named).
         # Create a new query made up all patterns
         patterns = operand.inject([]) do |memo, op|

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (deleteData ((triple :a foaf:knows :c)))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#deleteData
+    # @see https://www.w3.org/TR/sparql11-update/#deleteData
     class DeleteData < 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) {"DeleteData #{op.to_sxp}"}
           queryable.delete(op)

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (deleteWhere ((triple :a foaf:knows ?b))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#deleteWhere
+    # @see https://www.w3.org/TR/sparql11-update/#deleteWhere
     class DeleteWhere < 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)
         # Operands are an array of patterns and Queries (when named).
         # Create a new query made up all patterns
         patterns = operand.inject([]) do |memo, op|
@@ -40,9 +40,9 @@ module SPARQL; module Algebra
           end
           memo
         end
-        query = RDF::Query.new(*patterns, {}) # FIXME: added hash argument needed until Statement#to_hash removed.
+        query = RDF::Query.new(*patterns, **{}) # FIXME: added hash argument needed until Statement#to_hash removed.
         debug(options) {"DeleteWhere query #{query.to_sse}"}
-        query.execute(queryable, options.merge(depth: options[:depth].to_i + 1)) do |solution|
+        query.execute(queryable, depth: options[:depth].to_i + 1, **options) do |solution|
           debug(options) {"DeleteWhere solution #{solution.to_sse}"}
           query.each_statement do |pattern|
             pattern = pattern.dup.bind(solution)

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (order ((desc ?name))
     #         (bgp (triple ?x foaf:name ?name)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#modOrderBy
+    # @see https://www.w3.org/TR/sparql11-query/#modOrderBy
     class Desc < Operator::Asc
       NAME = :desc
     end # Desc

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #     (describe (?x)
     #       (bgp (triple ?x exOrg:employeeId "1234"))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#describe
+    # @see https://www.w3.org/TR/sparql11-query/#describe
     class Describe < Operator::Binary
       include Query
       
@@ -39,8 +39,8 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Graph]
       #   containing the constructed triples
-      # @see    http://www.w3.org/TR/sparql11-query/#describe
-      def execute(queryable, options = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#describe
+      def execute(queryable, **options, &block)
         debug(options) {"Describe #{operands.first}, #{options.inspect}"}
 
         # Describe any constand URIs
@@ -60,16 +60,6 @@ module SPARQL; module Algebra
         # Return Concise Bounded Description
         queryable.concise_bounded_description(*to_describe.uniq, &block)
       end
-      
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
 
       # Query results statements (e.g., CONSTRUCT, DESCRIBE, CREATE)
       # @return [Boolean]

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (project (?v)
     #         (bgp (triple ?x ?p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlDistinct
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlDistinct
     class Distinct < Operator::Unary
       include Query
       
@@ -30,22 +30,12 @@ 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)).distinct
+      # @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).distinct
         @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 # Distinct
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (/ 4 2)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-divide
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-divide
     class Divide < Operator::Binary
       include Evaluatable