sparql 3.1.0 → 3.1.6

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #      (filter (exists (bgp (triple ?s ?p ex:o)))
     #      (bgp (triple ?s ?p ?o))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-filter-exists
+    # @see https://www.w3.org/TR/sparql11-query/#func-filter-exists
     class Exists < Operator::Unary
       include Evaluatable
 

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
     #           (triple ?s :q ?w)
     #         ))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#evaluation
+    # @see https://www.w3.org/TR/sparql11-query/#evaluation
     class Exprlist < Operator
       include Evaluatable
 
@@ -40,16 +40,6 @@ module SPARQL; module Algebra
         res = operands.all? {|op| boolean(op.evaluate(bindings, depth: options[:depth].to_i + 1, **options)).true? }
         RDF::Literal(res) # FIXME: error handling
       end
-
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # Exprlist
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     #       (extend ((?z (+ ?o 10)))
     #         (bgp (triple ?s <http://example/p> ?o)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#evaluation
+    # @see https://www.w3.org/TR/sparql11-query/#evaluation
     class Extend < Operator::Binary
       include Query
       
@@ -38,7 +38,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see http://www.w3.org/TR/sparql11-query/#evaluation
+      # @see https://www.w3.org/TR/sparql11-query/#evaluation
       def execute(queryable, **options, &block)
         debug(options) {"Extend"}
         @solutions = operand(1).execute(queryable, depth: options[:depth].to_i + 1, **options)
@@ -50,6 +50,7 @@ module SPARQL; module Algebra
                                             depth: options[:depth].to_i + 1,
                                             **options)
               debug(options) {"===> + #{var} => #{val.inspect}"}
+              val = val.dup.bind(solution) if val.is_a?(RDF::Query::Pattern)
               solution.bindings[var.to_sym] = val
             rescue TypeError => e
               # Evaluates to error, ignore
@@ -72,16 +73,6 @@ module SPARQL; module Algebra
         end
         super
       end
-
-      ##
-      # Returns an optimized version of this query.
-      #
-      # Return optimized query
-      #
-      # @return FIXME
-      def optimize
-        operands = operands.map(&:optimize)
-      end
     end # Filter
   end # Operator
 end; end # SPARQL::Algebra

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,8 +34,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
-      # @see    http://www.w3.org/TR/sparql11-query/#ebv
+      # @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)
@@ -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
+      # @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, 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

@@ -17,7 +17,7 @@ module SPARQL; module Algebra
     #               (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,7 +37,7 @@ module SPARQL; module Algebra
       # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlGroupAggregate
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlGroupAggregate
       def execute(queryable, **options, &block)
         debug(options) {"Group"}
         exprlist = operands.first
@@ -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

@@ -13,7 +13,7 @@ module SPARQL; module Algebra
     #            (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
 

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
       
@@ -40,16 +40,6 @@ module SPARQL; module Algebra
         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
 
@@ -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] :solutions
+      # @param  [RDF::Query::Solutions] solutions
       #   Solution to map to patterns for this operation
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
@@ -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, solutions: nil, **options)
         # Only binds the first solution
         solution = solutions.is_a?(RDF::Query::Solutions) ? solutions.first : solutions
@@ -45,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,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) {"InsertData #{op.to_sxp}"}

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
 

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

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

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

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

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

@@ -0,0 +1,30 @@
+module SPARQL; module Algebra
+  class Operator
+    ##
+    # The SPARQL `isTRIPLE` operator.
+    #
+    # Returns true if term is an RDF-star triple. Returns false otherwise.
+    #
+    # @see https://w3c.github.io/rdf-star/rdf-star-cg-spec.html#istriple
+    class IsTriple < Operator::Unary
+      include Evaluatable
+
+      NAME = :isTRIPLE
+
+      ##
+      # Returns `true` if the operand is an `RDF::Statement`, `false` otherwise.
+      #
+      # @param  [RDF::Term] term
+      #   an RDF term
+      # @return [RDF::Literal::Boolean] `true` or `false`
+      # @raise  [TypeError] if the operand is not an RDF term
+      def apply(term)
+        case term
+          when RDF::Statement  then RDF::Literal::TRUE
+          when RDF::Term then RDF::Literal::FALSE
+          else raise TypeError, "expected an RDF::Term, but got #{term.inspect}"
+        end
+      end
+    end # IsTriple
+  end # Operator
+end; end # SPARQL::Algebra