sparql 3.0.2 → 3.1.5

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

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

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #         (filter (langMatches (lang ?str) "en")
     #           (bgp (triple ?s :str ?str))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-strdt
+    # @see https://www.w3.org/TR/sparql11-query/#func-strdt
     class StrDT < Operator::Binary
       include Evaluatable
 
@@ -23,7 +23,7 @@ module SPARQL; module Algebra
       # @param  [RDF::URI] datatypeIRI
       #   datatype
       # @return [RDF::Literal] a datatyped literal
-      # @see http://www.w3.org/TR/sparql11-query/#func-strdt
+      # @see https://www.w3.org/TR/sparql11-query/#func-strdt
       def apply(value, datatypeIRI)
         raise TypeError, "Literal #{value.inspect} is not simple" unless value.simple?
         RDF::Literal.new(value.to_s, datatype: datatypeIRI)

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

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

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #           (filter (langMatches (lang ?str) "en")
     #             (bgp (triple ?s :str ?str))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-strlang
+    # @see https://www.w3.org/TR/sparql11-query/#func-strlang
     class StrLang < Operator::Binary
       include Evaluatable
 
@@ -24,7 +24,7 @@ module SPARQL; module Algebra
       # @param  [RDF::Literal] langTag
       #   datatype
       # @return [RDF::Literal] a datatyped literal
-      # @see http://www.w3.org/TR/sparql11-query/#func-strlang
+      # @see https://www.w3.org/TR/sparql11-query/#func-strlang
       def apply(value, langTag)
         raise TypeError, "Literal #{value.inspect} is not simple" unless value.simple?
         RDF::Literal.new(value.to_s, language: langTag.to_s)

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

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

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

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

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
     #             (extend ((?uuid (struuid)))
     #               (bgp))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-struuid
+    # @see https://www.w3.org/TR/sparql11-query/#func-struuid
     class StrUUID < Operator::Nullary
       include Evaluatable
 

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

@@ -6,8 +6,8 @@ module SPARQL; module Algebra
     # @example
     #   (substr ?x ?y)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-substr
-    # @see http://www.w3.org/TR/xpath-functions/#func-substring
+    # @see https://www.w3.org/TR/sparql11-query/#func-substr
+    # @see https://www.w3.org/TR/xpath-functions/#func-substring
     class SubStr < Operator::Ternary
       include Evaluatable
 
@@ -22,7 +22,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(source, startingLoc, length = RDF::Literal(""), options = {})
+      def initialize(source, startingLoc, length = RDF::Literal(""), **options)
         super
       end
 
@@ -71,7 +71,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/subtract.rb

@@ -5,7 +5,7 @@ module SPARQL; module Algebra
     #   (- ?x ?y)
     #   (subtract ?x ?y)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-subtract
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-subtract
     class Subtract < Operator::Binary
       include Evaluatable
 

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

@@ -6,12 +6,12 @@ module SPARQL; module Algebra
     # @example
     #    (prefix ((: <http://www.example.org/>))
     #      (project (?sum)
-    #        (extend ((?sum ?.0))
-    #          (group () ((?.0 (sum ?o)))
+    #        (extend ((?sum ??.0))
+    #          (group () ((??.0 (sum ?o)))
     #            (bgp (triple ?s :dec ?o))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggSum
-    class Sum < Operator::Unary
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggSum
+    class Sum < Operator
       include Aggregate
 
       NAME = :sum
@@ -23,6 +23,8 @@ module SPARQL; module Algebra
       #   enum of evaluated operand
       # @return [RDF::Literal::Numeric] The sum of the terms
       def apply(enum)
+        # FIXME: we don't actually do anything with distinct
+        operands.shift if distinct = (operands.first == :distinct)
         if enum.empty?
           RDF::Literal(0)
         elsif enum.flatten.all? {|n| n.is_a?(RDF::Literal::Numeric)}

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

@@ -13,7 +13,7 @@ module SPARQL; module Algebra
     #
     # @example empty table
     #     (table unit)
-    # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data
+    # @see https://www.w3.org/TR/2013/REC-sparql11-query-20130321/#inline-data
     class Table < Operator
       include Query
       
@@ -32,8 +32,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 = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      def execute(queryable, **options, &block)
         @solutions = RDF::Query::Solutions()
         Array(operands[1..-1]).each do |row|
           next unless row.is_a?(Array)

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

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

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

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

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

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

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (graph ?g
     #         (bgp (triple ?s ?p ?o)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Union < Operator::Binary
       include Query
       
@@ -30,11 +30,11 @@ 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) {"Union"}
         @solutions = RDF::Query::Solutions(operands.inject([]) do |memo, op|
-          solns = op.execute(queryable, options.merge(depth: options[:depth].to_i + 1))
+          solns = op.execute(queryable, depth: options[:depth].to_i + 1, **options)
           debug(options) {"=> (op) #{solns.inspect}"}
           memo + solns
         end)
@@ -55,13 +55,14 @@ module SPARQL; module Algebra
       end
 
       ##
-      # Returns an optimized version of this query.
+      # Optimizes this query.
       #
       # Optimize operands and remove any which are empty.
       #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        ops = operands.map {|o| o.optimize }.select {|o| o.respond_to?(:empty?) && !o.empty?}
+      # @return [self]
+      # @see SPARQL::Algebra::Expression#optimize!
+      def optimize!(**options)
+        ops = operands.map {|o| o.optimize(**options) }.select {|o| o.respond_to?(:empty?) && !o.empty?}
         @operands = ops
         self
       end

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (bgp (triple ?s ?p ?o))
     #       (insert ((triple ?s ?p "q")))))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#graphUpdate
+    # @see https://www.w3.org/TR/sparql11-update/#graphUpdate
     class Update < Operator
       include SPARQL::Algebra::Update
       
@@ -30,12 +30,12 @@ module SPARQL; module Algebra
       #   If an attempt is made to perform an unsupported operation
       # @raise [IOError]
       #   If `queryable` is immutable
-      # @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) {"Update"}
         raise IOError, "queryable is not mutable" unless queryable.mutable?
         operands.each do |op|
-          op.execute(queryable, options.merge(depth: options[:depth].to_i + 1))
+          op.execute(queryable, depth: options[:depth].to_i + 1, **options)
         end
         queryable
       end

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     # @example
     #   (using (:g1) (bgp (triple ?s ?p ?o)))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#add
+    # @see https://www.w3.org/TR/sparql11-update/#add
     class Using < Operator
       include SPARQL::Algebra::Query
 
@@ -30,10 +30,10 @@ 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 = {}, &block)
+      # @see    https://www.w3.org/TR/sparql11-update/
+      def execute(queryable, **options, &block)
         debug(options) {"Using"}
-        Dataset.new(*operands).execute(queryable, options.merge(depth: options[:depth].to_i + 1), &block)
+        Dataset.new(*operands).execute(queryable, depth: options[:depth].to_i + 1, **options, &block)
       end
     end # Using
   end # Operator

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

@@ -14,7 +14,7 @@ module SPARQL; module Algebra
     #             (extend ((?uuid (uuid)))
     #               (bgp))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-uuid
+    # @see https://www.w3.org/TR/sparql11-query/#func-uuid
     class UUID < Operator::Nullary
       include Evaluatable
 

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

@@ -11,7 +11,7 @@ module SPARQL; module Algebra
     #     (bgp (triple ?s ?p ?o))
     #     (insert ((triple ?s ?p "z"))))
     #
-    # @see http://www.w3.org/TR/sparql11-update/#deleteInsert
+    # @see https://www.w3.org/TR/sparql11-update/#deleteInsert
     class With < Operator
       include SPARQL::Algebra::Update
 
@@ -32,17 +32,17 @@ 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) {"With: #{operand.to_sse}"}
         # Bound variable
         name = operands.shift
 
         unless queryable.has_graph?(name)
           debug(options) {"=> default data source #{name}"}
-          load_opts = {debug: options.fetch(:debug, nil), base_uri: name}
+          load_opts = {logger: options.fetch(:logger, false), base_uri: name}
           debug(options) {"=> load #{name}"}
-          queryable.load(name.to_s, load_opts)
+          queryable.load(name.to_s, **load_opts)
         end
 
         # Set name for RDF::Graph descendants having no graph_name to the name variable
@@ -58,12 +58,12 @@ module SPARQL; module Algebra
         query = operands.shift
 
         # Restrict query portion to this graph
-        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|
           debug(options) {"(solution)=>#{solution.inspect}"}
 
           # Execute each operand with queryable and solution
           operands.each do |op|
-            op.execute(queryable, solution, options.merge(depth: options[:depth].to_i + 1))
+            op.execute(queryable, solutions: solution, depth: options[:depth].to_i + 1, **options)
           end
         end
       end

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

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

data/lib/sparql/algebra/query.rb

@@ -49,8 +49,8 @@ module SPARQL; module Algebra
     #   Note, results may be used with {SPARQL.serialize_results} to obtain appropriate output encoding.
     # @raise [NotImplementedError]
     #   If an attempt is made to perform an unsupported operation
-    # @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)
       raise NotImplementedError, "#{self.class}#execute(#{queryable})"
     end
 

data/lib/sparql/algebra/update.rb

@@ -38,8 +38,8 @@ module SPARQL; module Algebra
     #   Returns the dataset.
     # @raise [NotImplementedError]
     #   If an attempt is made to perform an unsupported operation
-    # @see    http://www.w3.org/TR/sparql11-update/
-    def execute(queryable, options = {}, &block)
+    # @see    https://www.w3.org/TR/sparql11-update/
+    def execute(queryable, **options, &block)
       raise NotImplementedError, "#{self.class}#execute(#{queryable})"
     end
 

data/lib/sparql/algebra/version.rb

@@ -1,6 +1,6 @@
 module SPARQL; module Algebra
   module VERSION
-    VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..", "VERSION")
+    VERSION_FILE = File.expand_path("../../../../VERSION", __FILE__)
     MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')

data/lib/sparql/extensions.rb

@@ -25,11 +25,7 @@ module RDF::Queryable
   #
   # Used to implement the SPARQL `DESCRIBE` operator.
   #
-  # @overload concise_bounded_description(*terms, &block)
-  #   @param [Array<RDF::Term>] terms
-  #     List of terms to include in the results.
-  #
-  # @overload concise_bounded_description(*terms, options, &block)
+  # @overload concise_bounded_description(*terms, **options, &block)
   #   @param [Array<RDF::Term>] terms
   #     List of terms to include in the results.
   #   @param [Hash{Symbol => Object}] options
@@ -43,22 +39,20 @@ module RDF::Queryable
   # @yieldreturn [void] ignored
   # @return [RDF::Graph]
   #
-  # @see http://www.w3.org/Submission/CBD/
-  def concise_bounded_description(*terms, &block)
-    options = terms.last.is_a?(Hash) ? terms.pop.dup : {}
-
+  # @see https://www.w3.org/Submission/CBD/
+  def concise_bounded_description(*terms, **options, &block)
     graph = options[:graph] || RDF::Graph.new
 
     if options[:non_subjects]
       query_terms = terms.dup
 
       # Find terms not in self as a subject and recurse with their subjects
-      terms.reject {|term| self.first(subject: term)}.each do |term|
-        self.query(predicate: term) do |statement|
+      terms.reject {|term| self.first({subject: term})}.each do |term|
+        self.query({predicate: term}) do |statement|
           query_terms << statement.subject
         end
 
-        self.query(object: term) do |statement|
+        self.query({object: term}) do |statement|
           query_terms << statement.subject
         end
       end
@@ -67,9 +61,9 @@ module RDF::Queryable
     end
 
     # Don't consider term if already in graph
-    terms.reject {|term| graph.first(subject: term)}.each do |term|
+    terms.reject {|term| graph.first({subject: term})}.each do |term|
       # Find statements from queryiable with term as a subject
-      self.query(subject: term) do |statement|
+      self.query({subject: term}) do |statement|
         yield(statement) if block_given?
         graph << statement
         
@@ -81,16 +75,16 @@ module RDF::Queryable
             RDF.predicate => statement.predicate,
             RDF.object => statement.object,
           }
-        }).execute(self).each do |solution|
+        }, **{}).execute(self).each do |solution|
           # Recurse to include this subject
           recurse_opts = options.merge(non_subjects: false, graph: graph)
-          self.concise_bounded_description(solution[:s], recurse_opts, &block)
+          self.concise_bounded_description(solution[:s], **recurse_opts, &block)
         end
 
         # Recurse if object is a BNode and it is not already in subjects
         if statement.object.node?
           recurse_opts = options.merge(non_subjects: false, graph: graph)
-          self.concise_bounded_description(statement.object, recurse_opts, &block)
+          self.concise_bounded_description(statement.object, **recurse_opts, &block)
         end
       end
     end