sparql 3.1.0 → 3.1.6

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

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

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

@@ -0,0 +1,27 @@
+module SPARQL; module Algebra
+  class Operator
+    ##
+    # The SPARQL `OBJECT` operator.
+    #
+    # If triple is an RDF-star triple, the function returns the object of this triple. Passing anything other than an RDF-star triple is an error.
+    #
+    # @see https://w3c.github.io/rdf-star/rdf-star-cg-spec.html#object
+    class Object < Operator::Unary
+      include Evaluatable
+
+      NAME = :object
+
+      ##
+      # Returns the object part of arg.
+      #
+      # @param  [RDF::Statement] operand
+      #   the operand
+      # @return [RDF::Literal]
+      # @raise  [TypeError] if the operand is not a statement
+      def apply(operand)
+        raise TypeError, "expected an RDF::Statement, but got #{operand.inspect}" unless operand.is_a?(RDF::Statement)
+        operand.object
+      end
+    end # Object
+  end # Operator
+end; end # SPARQL::Algebra

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

@@ -7,8 +7,8 @@ module SPARQL; module Algebra
     #   (|| ?x ?y)
     #   (or ?x ?y)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-logical-or
-    # @see http://www.w3.org/TR/sparql11-query/#evaluation
+    # @see https://www.w3.org/TR/sparql11-query/#func-logical-or
+    # @see https://www.w3.org/TR/sparql11-query/#evaluation
     class Or < Operator::Binary
       include Evaluatable
 
@@ -53,7 +53,7 @@ module SPARQL; module Algebra
           right = nil
         end
 
-        # From http://www.w3.org/TR/sparql11-query/#evaluation
+        # From https://www.w3.org/TR/sparql11-query/#evaluation
         # A logical-or that encounters an error on only one branch will return TRUE if the other branch is TRUE
         # and an error if the other branch is FALSE.
         case

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

@@ -9,7 +9,7 @@ module SPARQL; module Algebra
     #       (order ((asc ?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 Order < Operator::Binary
       include Query
       
@@ -30,7 +30,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, &block)
 
         debug(options) {"Order"}
@@ -50,16 +50,6 @@ module SPARQL; module Algebra
         @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 # Order
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (path :a (path+ :p) ?z)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlTranslatePathExpressions
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlTranslatePathExpressions
     class Path < Operator::Ternary
       include Query
       
@@ -25,7 +25,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, &block)
         debug(options) {"Path #{operands.to_sse}"}
         subject, path_op, object = operands

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (path? :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_ZeroOrOnePath
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_ZeroOrOnePath
     class PathOpt < Operator::Unary
       include Query
       
@@ -29,7 +29,7 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, **options, &block)
         subject, object = options[:subject], options[:object]
         debug(options) {"Path? #{[subject, operands, object].to_sse}"}

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (path+ :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_OneOrMorePath
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_OneOrMorePath
     class PathPlus < Operator::Unary
       include Query
       
@@ -25,7 +25,7 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, **options, &block)
         subject, object = options[:subject], options[:object]
         debug(options) {"Path+ #{[subject, operands, object].to_sse}"}

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

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (path* :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_ZeroOrMorePath
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_ZeroOrMorePath
     class PathStar < Operator::Unary
       include Query
       
@@ -28,7 +28,7 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @see    http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+      # @see    https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
       def execute(queryable, **options, &block)
         subject, object = options[:subject], options[:object]
         debug(options) {"Path* #{[subject, operands, object].to_sse}"}

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

@@ -7,8 +7,8 @@ module SPARQL; module Algebra
     #   (+ ?x ?y)
     #   (plus ?x ?y)
     #
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-unary-plus
-    # @see http://www.w3.org/TR/xpath-functions/#func-numeric-add
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-unary-plus
+    # @see https://www.w3.org/TR/xpath-functions/#func-numeric-add
     class Plus < Operator
       include Evaluatable
 

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

@@ -0,0 +1,27 @@
+module SPARQL; module Algebra
+  class Operator
+    ##
+    # The SPARQL `PREDICATE` operator.
+    #
+    # If triple is an RDF-star triple, the function returns the predicate of this triple. Passing anything other than an RDF-star triple is an error.
+    #
+    # @see https://w3c.github.io/rdf-star/rdf-star-cg-spec.html#predicate
+    class Predicate < Operator::Unary
+      include Evaluatable
+
+      NAME = :predicate
+
+      ##
+      # Returns the predicate part of arg.
+      #
+      # @param  [RDF::Statement] operand
+      #   the operand
+      # @return [RDF::Literal]
+      # @raise  [TypeError] if the operand is not a statement
+      def apply(operand)
+        raise TypeError, "expected an RDF::Statement, but got #{operand.inspect}" unless operand.is_a?(RDF::Statement)
+        operand.predicate
+      end
+    end # Predicate
+  end # Operator
+end; end # SPARQL::Algebra

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

@@ -8,7 +8,7 @@ module SPARQL; module Algebra
     #     (graph ?g
     #       (bgp (triple ?s ?p ?o))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#QSynIRI
+    # @see https://www.w3.org/TR/sparql11-query/#QSynIRI
     class Prefix < Binary
       include Query
       
@@ -29,21 +29,21 @@ 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) {"Prefix"}
         @solutions = queryable.query(operands.last, depth: options[:depth].to_i + 1, **options, &block)
       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
+      # Replace with the query with URIs having their lexical shortcut removed
       #
-      # @return [Union, RDF::Query] `self`
-      def optimize
-        operands.last.optimize
+      # @return [Prefix] a copy of `self`
+      # @see SPARQL::Algebra::Expression#optimize
+      def optimize(**options)
+        operands.last.optimize(**options)
       end
 
       # Combine two prefix definitions, merging their definitions

data/lib/sparql/algebra/operator/project.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/#modProjection
+    # @see https://www.w3.org/TR/sparql11-query/#modProjection
     class Project < Operator::Binary
       include Query
       
@@ -29,23 +29,13 @@ 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)
         @solutions = @solutions.project(*(operands.first))
         @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 # Project
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -8,7 +8,7 @@ module SPARQL; module Algebra
     # @example
     #   (rand)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#idp2130040
+    # @see https://www.w3.org/TR/sparql11-query/#idp2130040
     class Rand < Operator::Nullary
       include Evaluatable
 

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (project (?v)
     #         (bgp (triple ?x ?p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#sparqlAlgebra
+    # @see https://www.w3.org/TR/sparql11-query/#sparqlAlgebra
     class Reduced < Operator::Unary
       include Query
       
@@ -30,23 +30,13 @@ 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 = operands.last.
           execute(queryable, depth: options[:depth].to_i + 1, **options).reduced
         @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 # Reduced
   end # Operator
 end; end # SPARQL::Algebra

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

@@ -10,8 +10,8 @@ module SPARQL; module Algebra
     #       (filter (regex ?val "GHI")
     #         (bgp (triple ex:foo rdf:value ?val)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#funcex-regex
-    # @see http://www.w3.org/TR/xpath-functions/#func-matches
+    # @see https://www.w3.org/TR/sparql11-query/#funcex-regex
+    # @see https://www.w3.org/TR/xpath-functions/#func-matches
     class Regex < Operator::Ternary
       include Evaluatable
 
@@ -43,17 +43,17 @@ module SPARQL; module Algebra
       # @raise  [TypeError] if any operand is unbound
       # @raise  [TypeError] if any operand is not a simple literal
       def apply(text, pattern, flags = RDF::Literal(''))
-        # @see http://www.w3.org/TR/xpath-functions/#regex-syntax
+        # @see https://www.w3.org/TR/xpath-functions/#regex-syntax
         raise TypeError, "expected a plain RDF::Literal, but got #{text.inspect}" unless text.is_a?(RDF::Literal) && text.plain?
         text = text.to_s
         # TODO: validate text syntax
 
-        # @see http://www.w3.org/TR/xpath-functions/#regex-syntax
+        # @see https://www.w3.org/TR/xpath-functions/#regex-syntax
         raise TypeError, "expected a plain RDF::Literal, but got #{pattern.inspect}" unless pattern.is_a?(RDF::Literal) && pattern.plain?
         pattern = pattern.to_s
         # TODO: validate pattern syntax
 
-        # @see http://www.w3.org/TR/xpath-functions/#flags
+        # @see https://www.w3.org/TR/xpath-functions/#flags
         raise TypeError, "expected a plain RDF::Literal, but got #{flags.inspect}" unless flags.is_a?(RDF::Literal) && flags.plain?
         flags = flags.to_s
         # TODO: validate flag syntax

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

@@ -10,8 +10,8 @@ module SPARQL; module Algebra
     #         (extend ((?new (replace ?str "[^a-z0-9]" "-")))
     #           (bgp (triple ?s :str ?str)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#funcex-replace
-    # @see http://www.w3.org/TR/xpath-functions/#func-replace
+    # @see https://www.w3.org/TR/sparql11-query/#funcex-replace
+    # @see https://www.w3.org/TR/xpath-functions/#func-replace
     class Replace < Operator::Quaternary
       include Evaluatable
 
@@ -72,7 +72,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/reverse.rb

@@ -6,7 +6,7 @@ module SPARQL; module Algebra
     # @example
     #   (reverse :p)
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_evalPP_inverse
+    # @see https://www.w3.org/TR/sparql11-query/#defn_evalPP_inverse
     class Reverse < Operator::Unary
       include Query
       
@@ -29,7 +29,7 @@ module SPARQL; module Algebra
       #   each matching solution
       # @yieldparam  [RDF::Query::Solution] solution
       # @yieldreturn [void] ignored
-      # @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) {"Reverse #{operands.to_sse}"}
         subject, object = options[:subject], options[:object]

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

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

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

@@ -10,7 +10,7 @@ module SPARQL; module Algebra
     #       (filter (sameTerm ?v)
     #         (bgp (triple ?x :p ?v)))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#func-sameTerm
+    # @see https://www.w3.org/TR/sparql11-query/#func-sameTerm
     class SameTerm < Operator::Binary
       include Evaluatable
 
@@ -33,12 +33,15 @@ module SPARQL; module Algebra
       ##
       # Returns an optimized version of this expression.
       #
-      # @return [SPARQL::Algebra::Expression]
-      def optimize
-        if operand(0).is_a?(Variable) && operand(0).eql?(operand(1))
+      # Return true if variable operand1 is a bound variable and equals operand2
+      #
+      # @return [SameTerm] a copy of `self`
+      # @see SPARQL::Algebra::Expression#optimize
+      def optimize(**options)
+        if operand(0).is_a?(Variable) && operand(0).bound? && operand(0).eql?(operand(1))
           RDF::Literal::TRUE
         else
-          super # @see Operator#optimize
+          super # @see Operator#optimize!
         end
       end
     end # SameTerm

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

@@ -11,12 +11,19 @@ module SPARQL; module Algebra
     #           (group () ((??.0 (sample ?o)))
     #             (bgp (triple ?s :dec ?o)))))))
     #
-    # @see http://www.w3.org/TR/sparql11-query/#defn_aggSample
-    class Sample < Operator::Unary
+    # @see https://www.w3.org/TR/sparql11-query/#defn_aggSample
+    class Sample < Operator
       include Aggregate
 
       NAME = :sample
 
+      def initialize(*operands, **options)
+        raise ArgumentError,
+          "sample operator accepts at most one argument with an optional :distinct" if
+          (operands - %i{distinct}).length != 1
+        super
+      end
+
       ##
       # Sample is a set function which returns an arbitrary value from the multiset passed to it.
       #