sparql 3.1.0 → 3.1.6

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)
@@ -62,6 +62,8 @@ module SPARQL; module Algebra
         when left.is_a?(RDF::Node) && right.is_a?(RDF::Node)
           # BNode comparison is undefined.
           RDF::Literal(0)
+        when left.is_a?(RDF::Statement) && right.is_a?(RDF::Statement)
+          RDF::Literal(RDF::Literal(left.to_s).send(self.class.const_get(:NAME), RDF::Literal(right.to_s)))
         when left.nil? && right.nil?
           RDF::Literal(0)
         
@@ -77,6 +79,11 @@ module SPARQL; module Algebra
         when right.is_a?(RDF::Node) && left.is_a?(RDF::Term)
           RDF::Literal(1)
 
+        when left.is_a?(RDF::Statement) && right.is_a?(RDF::Term)
+          RDF::Literal(-1)
+        when right.is_a?(RDF::Statement) && left.is_a?(RDF::Term)
+          RDF::Literal(1)
+
         when left.is_a?(RDF::Node) && right.is_a?(RDF::URI)
           RDF::Literal(-1)
         when right.is_a?(RDF::Node) && left.is_a?(RDF::URI)

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
 

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,7 +34,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Queryable]
       #   A Queryable with constructed triples
-      # @see    http://www.w3.org/TR/sparql11-query/#construct
+      # @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
@@ -52,10 +52,11 @@ module SPARQL; module Algebra
               terms[r] = case o = pattern.send(r)
               when RDF::Node            then nodes[o] ||= RDF::Node.new
               when RDF::Query::Variable then solution[o]
+              when RDF::Query::Pattern  then RDF::Statement.from(o.dup.bind(solution))
               else                           o
               end
             end
-            
+
             statement = RDF::Statement.from(terms)
 
             # Sanity checking on statement
@@ -74,16 +75,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,7 +28,7 @@ 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/
+      # @see    https://www.w3.org/TR/sparql11-update/
       def execute(queryable, **options)
         debug(options) {"Copy"}
         silent = operands.first == :silent

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #          (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,7 +30,7 @@ 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/
+      # @see    https://www.w3.org/TR/sparql11-update/
       def execute(queryable, **options)
         debug(options) {"Create"}
         silent = operands.first == :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,7 +125,7 @@ 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    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, **options, &base)
         debug(options) {"Dataset"}
         default_datasets = []
@@ -141,7 +141,7 @@ module SPARQL; module Algebra
             debug(options) {"=> default data source #{uri}"}
             default_datasets << uri
           end
-          load_opts = {debug: options.fetch(:debug, nil), graph_name: uri, base_uri: uri}
+          load_opts = {logger: options.fetch(:logger, false), graph_name: uri, base_uri: uri}
           unless queryable.has_graph?(uri)
             debug(options) {"=> load #{uri}"}
             queryable.load(uri.to_s, **load_opts)
@@ -158,17 +158,6 @@ module SPARQL; module Algebra
         aggregate.default(*default_datasets.select {|name| queryable.has_graph?(name)})
         aggregate.query(operands.last, depth: options[:depth].to_i + 1, **options, &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
-      end
     end # Dataset
   end # Operator
 end; end # SPARQL::Algebra

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,9 @@ 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/
+      # @see    https://www.w3.org/TR/sparql11-update/
       def execute(queryable, solutions: nil, **options)
-        debug(options) {"Delete: #{solution} against #{operands.to_sse}"}
+        debug(options) {"Delete: #{solutions} 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).
@@ -47,7 +47,7 @@ module SPARQL; module Algebra
         end
         patterns.each do |pattern|
           pattern = pattern.dup.bind(solution)
-          debug(options) {"Delete statement #{statement.to_sse}"}
+          debug(options) {"Delete pattern #{pattern.to_sse}"}
           queryable.delete(RDF::Statement.from(pattern)) if pattern.bound? || pattern.constant?
         end
         queryable

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,7 +28,7 @@ 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/
+      # @see    https://www.w3.org/TR/sparql11-update/
       def execute(queryable, **options)
         operand.each do |op|
           debug(options) {"DeleteData #{op.to_sxp}"}

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,7 +28,7 @@ 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/
+      # @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
@@ -46,7 +46,7 @@ module SPARQL; module Algebra
           debug(options) {"DeleteWhere solution #{solution.to_sse}"}
           query.each_statement do |pattern|
             pattern = pattern.dup.bind(solution)
-            debug(options) {"DeleteWhere statement #{statement.to_sse}"}
+            debug(options) {"DeleteWhere pattern #{pattern.to_sse}"}
             queryable.delete(RDF::Statement.from(pattern)) if pattern.bound? || pattern.constant?
           end
         end

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,7 +39,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Graph]
       #   containing the constructed triples
-      # @see    http://www.w3.org/TR/sparql11-query/#describe
+      # @see    https://www.w3.org/TR/sparql11-query/#describe
       def execute(queryable, **options, &block)
         debug(options) {"Describe #{operands.first}, #{options.inspect}"}
 
@@ -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
+      # @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
 

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     # @example
     #   (drop default)
     #
-    # @see http://www.w3.org/TR/sparql11-update/#drop
+    # @see https://www.w3.org/TR/sparql11-update/#drop
     class Drop < Operator
       include SPARQL::Algebra::Update
 
@@ -30,7 +30,7 @@ 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/
+      # @see    https://www.w3.org/TR/sparql11-update/
       def execute(queryable, **options)
         debug(options) {"Drop"}
         silent = operands.first == :silent

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

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

data/lib/sparql/algebra/operator/equal.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/sparql11-query/#func-RDFterm-equal
+    # @see https://www.w3.org/TR/sparql11-query/#OperatorMapping
+    # @see https://www.w3.org/TR/sparql11-query/#func-RDFterm-equal
     class Equal < Compare
       NAME = :'='