sparql 3.2.0 → 3.2.4

data/lib/sparql/algebra/extensions.rb

@@ -70,28 +70,12 @@ class Array
   # Returns a partial SPARQL grammar for this array.
   #
   # @param [String] delimiter (" ")
+  #   If the first element is an IRI, treat it as an extension function
   # @return [String]
-  def to_sparql(delimiter: " ", **options)
+  def to_sparql(delimiter: " ",  **options)
     map {|e| e.to_sparql(**options)}.join(delimiter)
   end
 
-  ##
-  # Evaluates the array using the given variable `bindings`.
-  #
-  # In this case, the Array has two elements, the first of which is
-  # an XSD datatype, and the second is the expression to be evaluated.
-  # The result is cast as a literal of the appropriate type
-  #
-  # @param  [RDF::Query::Solution] bindings
-  #   a query solution containing zero or more variable bindings
-  # @param [Hash{Symbol => Object}] options ({})
-  #   options passed from query
-  # @return [RDF::Term]
-  # @see SPARQL::Algebra::Expression.evaluate
-  def evaluate(bindings, **options)
-    SPARQL::Algebra::Expression.extension(*self.map {|o| o.evaluate(bindings, **options)})
-  end
-
   ##
   # If `#execute` is invoked, it implies that a non-implemented Algebra operator
   # is being invoked
@@ -140,6 +124,14 @@ class Array
   end
   def constant?; !(variable?); end
 
+  ##
+  # The variables used in this array.
+  #
+  # @return [Hash{Symbol => RDF::Query::Variable}]
+  def variables
+    self.inject({}) {|hash, o| o.respond_to?(:variables) ? hash.merge(o.variables) : hash}
+  end
+
   ##
   # Does this contain any nodes?
   #
@@ -302,7 +294,6 @@ module RDF::Term
   end
 end # RDF::Term
 
-
 # Override RDF::Queryable to execute against SPARQL::Algebra::Query elements as well as RDF::Query and RDF::Pattern
 module RDF::Queryable
   alias_method :query_without_sparql, :query
@@ -364,7 +355,7 @@ class RDF::Statement
   # Transform Statement Pattern into an SXP
   # @return [Array]
   def to_sxp_bin
-    [ (has_graph? ? :quad : :triple),
+    [ (has_graph? ? :quad : (quoted? ? :qtriple : :triple)),
       (:inferred if inferred?),
       subject,
       predicate,
@@ -387,18 +378,10 @@ class RDF::Statement
   #
   # Returns a partial SPARQL grammar for this term.
   #
-  # @param [Boolean] as_statement (false) serialize as < ... >, otherwise TRIPLE(...)
   # @return [String]
-  def to_sparql(as_statement: false, **options)
-    return "TRIPLE(#{to_triple.to_sparql(as_statement: true, **options)})" unless as_statement
-
-    to_triple.map do |term|
-      if term.is_a?(::RDF::Statement)
-        "<<" + term.to_sparql(**options) + ">>"
-      else
-        term.to_sparql(**options)
-      end
-    end.join(" ") + " ."
+  def to_sparql(**options)
+    str = to_triple.map {|term| term.to_sparql(**options)}.join(" ")
+    quoted? ? ('<<' + str + '>>') : str
   end
 
   ##
@@ -448,15 +431,36 @@ class RDF::Query
 
   ##
   #
-  # Returns a partial SPARQL grammar for this term.
+  # Returns a partial SPARQL grammar for this query.
   #
   # @param [Boolean] top_level (true)
   #   Treat this as a top-level, generating SELECT ... WHERE {}
+  # @param [Array<Operator>] filter_ops ([])
+  #   Filter Operations
   # @return [String]
-  def to_sparql(top_level: true, **options)
-    str = @patterns.map { |e| e.to_sparql(as_statement: true, top_level: false, **options) }.join("\n")
+  def to_sparql(top_level: true, filter_ops: [], **options)
+    str = @patterns.map do |e|
+      e.to_sparql(top_level: false, **options) + " . \n"
+    end.join("")
     str = "GRAPH #{graph_name.to_sparql(**options)} {\n#{str}\n}\n" if graph_name
-    top_level ? SPARQL::Algebra::Operator.to_sparql(str, **options) : str
+    if top_level
+      SPARQL::Algebra::Operator.to_sparql(str, filter_ops: filter_ops, **options)
+    else
+      # Filters
+      filter_ops.each do |op|
+        str << "\nFILTER (#{op.to_sparql(**options)}) ."
+      end
+
+      # Extensons
+      extensions = options.fetch(:extensions, [])
+      extensions.each do |as, expression|
+        v = expression.to_sparql(**options)
+        pp = RDF::Query::Variable.new(as).to_sparql(**options)
+        str << "\nBIND (" << v << " AS " << pp << ") ."
+      end
+      str = "{#{str}}" unless filter_ops.empty? && extensions.empty?
+      str
+    end
   end
 
   ##

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

@@ -5,7 +5,7 @@ module SPARQL; module Algebra
     #
     # [121] BuiltInCall ::= ... | 'ABS' '(' Expression ')'
     #
-    # @example SPARQL Query
+    # @example SPARQL Grammar
     #   PREFIX : <http://example.org/>
     #   SELECT * WHERE {
     #     ?s :num ?num

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

@@ -0,0 +1,69 @@
+module SPARQL; module Algebra
+  class Operator
+    ##
+    # The SPARQL `adjust` operator.
+    #
+    # [121] BuiltInCall ::= ... | 'ADJUST' '(' Expression ',' Expression ')'
+    #
+    # @example SPARQL Grammar
+    #   PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+    #   SELECT ?id (ADJUST(?d, ?tz) AS ?adjusted) WHERE {
+    #     VALUES (?id ?tz ?d) {
+    #       (1 "-PT10H"^^xsd:dayTimeDuration "2002-03-07"^^xsd:date)
+    #     }
+    #   }
+    #
+    # @example SSE
+    #   (prefix ((xsd: <http://www.w3.org/2001/XMLSchema#>))
+    #    (project (?id ?adjusted)
+    #     (extend ((?adjusted (adjust ?d ?tz)))
+    #      (table (vars ?id ?tz ?d)
+    #       (row
+    #        (?id 1)
+    #        (?tz "-PT10H"^^xsd:dayTimeDuration)
+    #        (?d "2002-03-07"^^xsd:date))))))
+    #
+    # @see https://www.w3.org/TR/sparql11-query/#func-abs
+    # @see https://www.w3.org/TR/xpath-functions/#func-abs
+    class Adjust < Operator::Binary
+      include Evaluatable
+
+      NAME = [:adjust]
+
+      ##
+      # Returns the first operand adjusted by the dayTimeDuration of the second operand
+      # 
+      # @param  [RDF::Literal::Temporal] operand
+      #   the operand
+      # @param  [RDF::Literal, String] duration
+      #   the dayTimeDuration or an empty string.
+      # @return [RDF::Literal] literal of same type
+      # @raise  [TypeError] if the operand is not a numeric value
+      def apply(operand, duration, **options)
+        case operand
+        when RDF::Literal::Temporal
+          case duration
+          when RDF::Literal::DayTimeDuration
+            operand.adjust_to_timezone(duration)
+          when RDF::Literal
+            raise TypeError, "expected second operand to be an empty literal, but got #{duration.inspect}" unless duration.to_s.empty?
+            operand.adjust_to_timezone(nil)
+          else
+            raise TypeError, "expected second operand to be an RDF::Literal::DayTimeDuration, but got #{duration.inspect}"
+          end
+        else
+          raise TypeError, "expected first operand to be an RDF::Literal::Temporal, but got #{operand.inspect}"
+        end
+      end
+
+      ##
+      #
+      # Returns a partial SPARQL grammar for this operator.
+      #
+      # @return [String]
+      def to_sparql(**options)
+        "ADJUST(#{operands.to_sparql(delimiter: ', ', **options)})"
+      end
+    end # Abs
+  end # Operator
+end; end # SPARQL::Algebra

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

@@ -79,7 +79,7 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "#{operands.first.to_sparql(**options)}|#{operands.last.to_sparql(**options)}"
+        "(#{operands.first.to_sparql(**options)}|#{operands.last.to_sparql(**options)})"
       end
     end # Alt
   end # Operator

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

@@ -54,7 +54,9 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "AVG(#{operands.to_sparql(**options)})"
+        distinct = operands.first == :distinct
+        args = distinct ? operands[1..-1] : operands
+        "AVG(#{'DISTINCT ' if distinct}#{args.to_sparql(**options)})"
       end
     end # Avg
   end # Operator

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

@@ -7,12 +7,20 @@ module SPARQL; module Algebra
     #
     # @example SPARQL Grammar
     #   PREFIX : <http://example/>
-    #   SELECT * { :s :p :o }
+    #   SELECT * { ?s ?p ?o }
     #
     # @example SSE
     #   (prefix ((: <http://example/>))
     #     (bgp (triple ?s ?p ?o)))
     #
+    # @example SPARQL Grammar (sparql-star)
+    #   PREFIX : <http://example.com/ns#>
+    #   SELECT * {<< :a :b :c >> :p1 :o1.}
+    #
+    # @example SSE (sparql-star)
+    #   (prefix ((: <http://example.com/ns#>))
+    #    (bgp (triple (qtriple :a :b :c) :p1 :o1)))
+    #
     # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class BGP < Operator
       NAME = [:bgp]

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

@@ -8,12 +8,18 @@ module SPARQL; module Algebra
     #
     # [32]  Clear                   ::= 'CLEAR' 'SILENT'? GraphRefAll
     #
-    # @example SPARQL Grammar
+    # @example SPARQL Grammar (SILENT DEFAULT)
     #   CLEAR SILENT DEFAULT
     #
-    # @example SSE
+    # @example SSE (SILENT DEFAULT)
     #   (update (clear silent default))
     #
+    # @example SPARQL Grammar (IRI)
+    #   CLEAR GRAPH <http://example.com/>
+    #
+    # @example SSE (IRI)
+    #   (update (clear <http://example.com/>))
+    #
     # @see https://www.w3.org/TR/sparql11-update/#clear
     class Clear < Operator
       include SPARQL::Algebra::Update
@@ -70,7 +76,11 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "CLEAR " + operands.to_sparql(**options)
+        silent = operands.first == :silent
+        str = "CLEAR "
+        str << "SILENT " if operands.first == :silent
+        str << "GRAPH " if operands.last.is_a?(RDF::URI)
+        str << operands.last.to_sparql(**options)
       end
     end # Clear
   end # Operator

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

@@ -99,7 +99,7 @@ module SPARQL; module Algebra
       # @return [String]
       def to_sparql(**options)
         str = "CONSTRUCT {\n" +
-        operands[0].map { |e| e.to_sparql(as_statement: true, top_level: false, **options) }.join("\n") +
+        operands[0].map { |e| e.to_sparql(top_level: false, **options) }.join(". \n") +
         "\n}\n"
 
         str << operands[1].to_sparql(top_level: true, project: nil, **options)

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

@@ -11,11 +11,39 @@ module SPARQL; module Algebra
     #   WHERE { ?S ?P ?O }
     #
     # @example SSE
-    #    (prefix ((: <http://www.example.org>))
-    #      (project (?C)
-    #        (extend ((?C ??.0))
-    #          (group () ((??.0 (count ?O)))
-    #            (bgp (triple ?S ?P ?O))))))
+    #   (prefix ((: <http://www.example.org/>))
+    #     (project (?C)
+    #       (extend ((?C ??.0))
+    #         (group () ((??.0 (count ?O)))
+    #           (bgp (triple ?S ?P ?O))))))
+    #
+    # @example SPARQL Grammar (count(*))
+    #   PREFIX : <http://www.example.org>
+    #   
+    #   SELECT (COUNT(*) AS ?C)
+    #   WHERE { ?S ?P ?O }
+    #
+    # @example SSE (count(*))
+    #   (prefix
+    #    ((: <http://www.example.org>))
+    #    (project (?C)
+    #     (extend ((?C ??.0))
+    #      (group () ((??.0 (count)))
+    #       (bgp (triple ?S ?P ?O))))))
+    #
+    # @example SPARQL Grammar (count(distinct *))
+    #   PREFIX : <http://www.example.org>
+    #   
+    #   SELECT (COUNT(DISTINCT *) AS ?C)
+    #   WHERE { ?S ?P ?O }
+    #
+    # @example SSE (count(distinct *))
+    #   (prefix
+    #    ((: <http://www.example.org>))
+    #    (project (?C)
+    #     (extend ((?C ??.0))
+    #      (group () ((??.0 (count distinct)))
+    #       (bgp (triple ?S ?P ?O))))))
     #
     # @see https://www.w3.org/TR/sparql11-query/#defn_aggCount
     class Count < Operator
@@ -39,7 +67,9 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "COUNT(#{operands.to_sparql(**options)})"
+        distinct = operands.first == :distinct
+        args = distinct ? operands[1..-1] : operands
+        "COUNT(#{'DISTINCT ' if distinct}#{args.empty? ? '*' : args.to_sparql(**options)})"
       end
     end # Count
   end # Operator

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

@@ -55,10 +55,11 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        *args, last = operands.dup
-        args += [:GRAPH, last]
-
-        "CREATE " + args.to_sparql(**options)
+        silent = operands.first == :silent
+        str = "CREATE "
+        str << "SILENT " if operands.first == :silent
+        str << "GRAPH " if operands.last.is_a?(RDF::URI)
+        str << operands.last.to_sparql(**options)
       end
     end # Create
   end # Operator

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

@@ -73,7 +73,7 @@ module SPARQL; module Algebra
     # @example Dataset with two default data sources
     #
     #     (prefix ((: <http://example/>))
-    #       (dataset (<data-g1.ttl> <data-g1.ttl)
+    #       (dataset (<data-g1.ttl> <data-g2.ttl)
     #         (bgp (triple ?s ?p ?o))))
     #
     #     is effectively re-written to the following:
@@ -101,7 +101,21 @@ module SPARQL; module Algebra
     #       (filter ((= ?g <data-g1.ttl>) || (= ?g <data-g2.ttl>))
     #         (graph ?g (bgp (triple ?s ?p ?o))))))
     #
-    # @example Dataset with multiple named graphs
+    #
+    # @example SPARQL Grammar
+    #   BASE     <http://example.org/>
+    #   PREFIX : <http://example.com/>
+    #   
+    #   SELECT * 
+    #   FROM <data-g1.ttl>
+    #   { ?s ?p ?o }
+    #
+    # @example SSE
+    #   (base <http://example.org/>
+    #    (prefix ((: <http://example.com/>))
+    #     (dataset (<data-g1.ttl>)
+    #      (bgp (triple ?s ?p ?o)))))
+    #
     # @see https://www.w3.org/TR/sparql11-query/#specifyingDataset
     class Dataset < Binary
       include Query
@@ -115,6 +129,11 @@ module SPARQL; module Algebra
       #
       # Datasets are specified in operand(1), which is an array of default or named graph URIs.
       #
+      # If `options` contains any of the Protocol attributes, the dataset is constructed on creation, and these operations should be ignored:
+      #
+      # * `default-graph-uri`
+      # * `named-graph-uri`
+      #
       # @param  [RDF::Queryable] queryable
       #   the graph or repository to query
       # @param  [Hash{Symbol => Object}] options
@@ -128,6 +147,11 @@ module SPARQL; module Algebra
       # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, **options, &base)
         debug(options) {"Dataset"}
+        if %i(default-graph-uri named-graph-uri).any? {|k| options.key?(k)} 
+          debug("=> Skip constructing merge repo due to options", options)
+          return queryable.query(operands.last, depth: options[:depth].to_i + 1, **options, &base)
+        end
+ 
         default_datasets = []
         named_datasets = []
         operand(0).each do |uri|
@@ -163,17 +187,11 @@ module SPARQL; module Algebra
       #
       # Returns a partial SPARQL grammar for this operator.
       #
+      # Extracts datasets
+      #
       # @return [String]
       def to_sparql(**options)
-        operands[0].each_with_object('') do |graph, str|
-          str << if graph.is_a?(Array)
-            "FROM #{graph[0].upcase} #{graph[1].to_sparql(**options)}\n"
-          else
-            "FROM #{graph.to_sparql(**options)}\n"
-          end
-        end.tap do |str|
-          str << operands[1].to_sparql(**options)
-        end
+        operands.last.to_sparql(datasets: operands.first, **options)
       end
     end # Dataset
   end # Operator

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

@@ -29,10 +29,10 @@ module SPARQL; module Algebra
       #
       # @param  [RDF::Literal] operand
       #   the operand
-      # @return [RDF::Literal]
+      # @return [RDF::Literal::Temporal]
       # @raise  [TypeError] if the operand is not a simple literal
       def apply(operand, **options)
-        raise TypeError, "expected an RDF::Literal::DateTime, but got #{operand.inspect}" unless operand.is_a?(RDF::Literal::DateTime)
+        raise TypeError, "expected an RDF::Literal::Temporal, but got #{operand.inspect}" unless operand.is_a?(RDF::Literal::Temporal)
         RDF::Literal(operand.object.day)
       end
 

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

@@ -75,7 +75,9 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "DELETE {\n" + operands.first.to_sparql(as_statement: true, **options) + "\n}"
+        "DELETE {\n" +
+          operands.first.to_sparql(delimiter: " .\n", **options) +
+          "\n}"
       end
     end # Delete
   end # Operator

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

@@ -54,7 +54,7 @@ module SPARQL; module Algebra
       # @return [String]
       def to_sparql(**options)
         "DELETE DATA {\n" +
-          operands.first.to_sparql(as_statement: true, top_level: false, delimiter: "\n", **options) +
+          operands.first.to_sparql(top_level: false, delimiter: ". \n", **options) +
           "\n}"
       end
     end # DeleteData

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

@@ -71,7 +71,7 @@ module SPARQL; module Algebra
       # @return [String]
       def to_sparql(**options)
         "DELETE WHERE {\n" +
-          operands.first.to_sparql(as_statement: true, top_level: false, delimiter: "\n", **options) +
+          operands.first.to_sparql(top_level: false, delimiter: ". \n", **options) +
           "\n}"
       end
     end # DeleteWhere

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

@@ -12,8 +12,8 @@ module SPARQL; module Algebra
     #   WHERE { ?x ?p ?v }
     #
     # @example SSE
-    #   (prefix ((xsd: <http://www.w3.org/2001/XMLSchema#>)
-    #            (: <http://example/>))
+    #   (prefix ((: <http://example.org/>)
+    #            (xsd: <http://www.w3.org/2001/XMLSchema#>))
     #     (distinct
     #       (project (?v)
     #         (bgp (triple ?x ?p ?v)))))

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

@@ -60,7 +60,7 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "#{operands.first.to_sparql(**options)} / #{operands.last.to_sparql(**options)}"
+        "(#{operands.first.to_sparql(**options)} / #{operands.last.to_sparql(**options)})"
       end
     end # Divide
   end # Operator

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

@@ -10,12 +10,18 @@ module SPARQL; module Algebra
     #
     # [33]  Drop                    ::= 'DROP' 'SILENT'? GraphRefAll
     #
-    # @example SPARQL Grammar
-    #   DROP DEFAULT
+    # @example SPARQL Grammar (SILENT DEFAULT)
+    #   DROP SILENT DEFAULT
     #
-    # @example SSE
+    # @example SSE (SILENT DEFAULT)
     #   (update
-    #    (drop default))
+    #    (drop silent default))
+    #
+    # @example SPARQL Grammar (IRI)
+    #   DROP GRAPH <http://example.com/>
+    #
+    # @example SSE (IRI)
+    #   (update (drop <http://example.com/>))
     #
     # @see https://www.w3.org/TR/sparql11-update/#drop
     class Drop < Operator
@@ -40,7 +46,6 @@ module SPARQL; module Algebra
       def execute(queryable, **options)
         debug(options) {"Drop"}
         silent = operands.first == :silent
-        silent = operands.first == :silent
         operands.shift if silent
 
         raise ArgumentError, "drop expected operand to be 'default', 'named', 'all', or an IRI" unless operands.length == 1
@@ -74,7 +79,11 @@ module SPARQL; module Algebra
       #
       # @return [String]
       def to_sparql(**options)
-        "DROP " + operands.to_sparql(**options)
+        silent = operands.first == :silent
+        str = "DROP "
+        str << "SILENT " if operands.first == :silent
+        str << "GRAPH " if operands.last.is_a?(RDF::URI)
+        str << operands.last.to_sparql(**options)
       end
     end # Drop
   end # Operator

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

@@ -9,15 +9,13 @@ module SPARQL; module Algebra
     #
     # @example SPARQL Grammar
     #   PREFIX : <http://example.org/>
-    #   PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     #   SELECT ?s ?str (ENCODE_FOR_URI(?str) AS ?encoded) WHERE {
     #     ?s :str ?str
     #   }
     #
     # @example SSE
-    #   (prefix
-    #    ((: <http://example.org/>))
-    #    (project (?str ?encoded)
+    #   (prefix ((: <http://example.org/>))
+    #    (project (?s ?str ?encoded)
     #     (extend ((?encoded (encode_for_uri ?str)))
     #      (bgp (triple ?s :str ?str)))))
     #

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

@@ -8,6 +8,8 @@ module SPARQL; module Algebra
     # [72]  ExpressionList ::= NIL | '(' Expression ( ',' Expression )* ')'
     #
     # @example SPARQL Grammar
+    #   PREFIX : <http://example.org/>
+    #
     #   SELECT ?v ?w
     #   { 
     #     FILTER (?v = 2)
@@ -17,7 +19,7 @@ module SPARQL; module Algebra
     #   }
     #
     # @example SSE
-    #   (prefix ((: <http://example/>))
+    #   (prefix ((: <http://example.org/>))
     #     (project (?v ?w)
     #       (filter (exprlist (= ?v 2) (= ?w 3))
     #         (bgp