sparql 3.2.1 → 3.2.3

data/lib/sparql/algebra/operator.rb

@@ -55,12 +55,14 @@ module SPARQL; module Algebra
     autoload :Timezone,           'sparql/algebra/operator/timezone'
     autoload :TZ,                 'sparql/algebra/operator/tz'
     autoload :Year,               'sparql/algebra/operator/year'
+    autoload :Triple,             'sparql/algebra/operator/triple'
     autoload :IsTriple,           'sparql/algebra/operator/is_triple'
     autoload :Subject,            'sparql/algebra/operator/subject'
     autoload :Predicate,          'sparql/algebra/operator/predicate'
     autoload :Object,             'sparql/algebra/operator/object'
 
     # Binary operators
+    autoload :Adjust,             'sparql/algebra/operator/adjust'
     autoload :And,                'sparql/algebra/operator/and'
     autoload :Compare,            'sparql/algebra/operator/compare'
     autoload :Concat,             'sparql/algebra/operator/concat'
@@ -95,7 +97,9 @@ module SPARQL; module Algebra
     autoload :NotOneOf,           'sparql/algebra/operator/notoneof'
     autoload :PathOpt,            'sparql/algebra/operator/path_opt'
     autoload :PathPlus,           'sparql/algebra/operator/path_plus'
+    autoload :PathRange,          'sparql/algebra/operator/path_range'
     autoload :PathStar,           'sparql/algebra/operator/path_star'
+    autoload :PathZero,            'sparql/algebra/operator/path_zero'
     autoload :Path,               'sparql/algebra/operator/path'
     autoload :Reverse,            'sparql/algebra/operator/reverse'
     autoload :Seq,                'sparql/algebra/operator/seq'
@@ -173,6 +177,7 @@ module SPARQL; module Algebra
         when :>               then GreaterThan
         when :>=              then GreaterThanOrEqual
         when :abs             then Abs
+        when :adjust          then Adjust
         when :alt             then Alt
         when :and, :'&&'      then And
         when :avg             then Avg
@@ -215,9 +220,11 @@ module SPARQL; module Algebra
         when :now             then Now
         when :or, :'||'       then Or
         when :path            then Path
+        when :path0           then PathZero
         when :path?           then PathOpt
-        when :"path*"         then PathStar
         when :"path+"         then PathPlus
+        when :"path*"         then PathStar
+        when :pathrange       then PathRange
         when :plus            then Plus
         when :rand            then Rand
         when :regex           then Regex
@@ -302,7 +309,9 @@ module SPARQL; module Algebra
 
         # RDF-star
         when :istriple        then IsTriple
-        when :triple          then RDF::Query::Pattern
+        when :triple          then Triple
+        when :qtriple         then RDF::Query::Pattern
+        when :quad            then RDF::Query::Pattern
         when :subject         then Subject
         when :predicate       then Predicate
         when :object          then Object
@@ -340,7 +349,7 @@ module SPARQL; module Algebra
     # @param [String] content
     # @param [Operator] datasets ([])
     # @param [Operator] distinct (false)
-    # @param [Hash{Symbol => Operator}] extensions
+    # @param [Hash{String => Operator}] extensions
     #   Variable bindings
     # @param [Array<Operator>] filter_ops ([])
     #   Filter Operations
@@ -383,10 +392,9 @@ module SPARQL; module Algebra
         str << "REDUCED " if reduced
 
         str << project.map do |p|
-          if expr = extensions.delete(p)
-            v = expr.to_sparql(as_statement: true, **options)
-            v = "<< #{v} >>" if expr.is_a?(RDF::Statement)
-            pp = p.to_sparql(**options)
+          if expr = extensions.delete(p.to_s)
+            v = expr.to_sparql(**options)
+            pp = RDF::Query::Variable.new(p).to_sparql(**options)
             # Replace projected variables with their extension, if any
             '(' + v + ' AS ' + pp + ')'
           else
@@ -402,9 +410,9 @@ module SPARQL; module Algebra
 
       # Bind
       extensions.each do |as, expression|
-        v = expression.to_sparql(as_statement: true, **options)
-        v = "<< #{v} >>" if expression.is_a?(RDF::Statement)
-        content << "\nBIND (" << v << " AS " << as.to_sparql(**options) << ") ."
+        v = expression.to_sparql(**options)
+        pp = RDF::Query::Variable.new(as).to_sparql(**options)
+        content << "\nBIND (" << v << " AS " << pp << ") ."
       end
 
       # Filter
@@ -793,6 +801,15 @@ module SPARQL; module Algebra
       operands.each {|op| op.validate! if op.respond_to?(:validate!)}
       self
     end
+
+    ##
+    # The variables used in this query.
+    #
+    # @return [Hash{Symbol => RDF::Query::Variable}]
+    def variables
+      operands.inject({}) {|hash, o| o.respond_to?(:variables) ? hash.merge(o.variables) : hash}
+    end
+
   protected
 
     ##

data/lib/sparql/algebra/query.rb

@@ -16,13 +16,13 @@ module SPARQL; module Algebra
       @operands.unshift(query)
       self
     end
-    
+
     ##
     # The variables used in this query.
     #
     # @return [Hash{Symbol => RDF::Query::Variable}]
     def variables
-      operands.inject({}) {|hash, o| o.executable? ? hash.merge(o.variables) : hash}
+      operands.inject({}) {|hash, o| o.respond_to?(:variables) ? hash.merge(o.variables) : hash}
     end
 
     ##
@@ -38,7 +38,9 @@ module SPARQL; module Algebra
     #   the graph or repository to query
     # @param  [Hash{Symbol => Object}] options
     #   any additional keyword options
-    # @option options [Boolean] debug
+    # @option options  [RDF::Query::Solution] :bindings
+    #   a query solution containing zero or more variable bindings
+    # @option options [Boolean] :debug
     #   Query execution debugging
     # @option options [RDF::Term, RDF::Query::Variable] :graph_name
     # @yield  [solution]

data/lib/sparql/algebra.rb

@@ -233,7 +233,7 @@ module SPARQL
   # scarcity.
   # 
   # [memoization]:      http://en.wikipedia.org/wiki/Memoization
-  # [RDF::Util::Cache]: http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Util/Cache
+  # [RDF::Util::Cache]: https://ruby-rdf.github.io/rdf/RDF/Util/Cache
   # 
   # ## Documentation
   # 
@@ -246,12 +246,15 @@ module SPARQL
   #   * {SPARQL::Algebra::Operator}
   #     * {SPARQL::Algebra::Operator::Abs}
   #     * {SPARQL::Algebra::Operator::Add}
+  #     * {SPARQL::Algebra::Operator::Adjust}
+  #     * {SPARQL::Algebra::Operator::Alt}
   #     * {SPARQL::Algebra::Operator::And}
   #     * {SPARQL::Algebra::Operator::Asc}
   #     * {SPARQL::Algebra::Operator::Ask}
   #     * {SPARQL::Algebra::Operator::Avg}
   #     * {SPARQL::Algebra::Operator::Base}
   #     * {SPARQL::Algebra::Operator::BGP}
+  #     * {SPARQL::Algebra::Operator::Bnode}
   #     * {SPARQL::Algebra::Operator::Bound}
   #     * {SPARQL::Algebra::Operator::Ceil}
   #     * {SPARQL::Algebra::Operator::Clear}
@@ -266,9 +269,9 @@ module SPARQL
   #     * {SPARQL::Algebra::Operator::Dataset}
   #     * {SPARQL::Algebra::Operator::Datatype}
   #     * {SPARQL::Algebra::Operator::Day}
-  #     * {SPARQL::Algebra::Operator::Delete}
   #     * {SPARQL::Algebra::Operator::DeleteData}
   #     * {SPARQL::Algebra::Operator::DeleteWhere}
+  #     * {SPARQL::Algebra::Operator::Delete}
   #     * {SPARQL::Algebra::Operator::Desc}
   #     * {SPARQL::Algebra::Operator::Describe}
   #     * {SPARQL::Algebra::Operator::Distinct}
@@ -276,6 +279,7 @@ module SPARQL
   #     * {SPARQL::Algebra::Operator::Drop}
   #     * {SPARQL::Algebra::Operator::EncodeForURI}
   #     * {SPARQL::Algebra::Operator::Equal}
+  #     * {SPARQL::Algebra::Operator::Exists}
   #     * {SPARQL::Algebra::Operator::Exprlist}
   #     * {SPARQL::Algebra::Operator::Extend}
   #     * {SPARQL::Algebra::Operator::Filter}
@@ -296,9 +300,11 @@ module SPARQL
   #     * {SPARQL::Algebra::Operator::IsIRI}
   #     * {SPARQL::Algebra::Operator::IsLiteral}
   #     * {SPARQL::Algebra::Operator::IsNumeric}
+  #     * {SPARQL::Algebra::Operator::IsTriple}
   #     * {SPARQL::Algebra::Operator::Join}
   #     * {SPARQL::Algebra::Operator::Lang}
   #     * {SPARQL::Algebra::Operator::LangMatches}
+  #     * {SPARQL::Algebra::Operator::LCase}
   #     * {SPARQL::Algebra::Operator::LeftJoin}
   #     * {SPARQL::Algebra::Operator::LessThan}
   #     * {SPARQL::Algebra::Operator::LessThanOrEqual}
@@ -316,20 +322,32 @@ module SPARQL
   #     * {SPARQL::Algebra::Operator::NotEqual}
   #     * {SPARQL::Algebra::Operator::NotExists}
   #     * {SPARQL::Algebra::Operator::NotIn}
+  #     * {SPARQL::Algebra::Operator::NotOneOf}
   #     * {SPARQL::Algebra::Operator::Now}
+  #     * {SPARQL::Algebra::Operator::Object}
   #     * {SPARQL::Algebra::Operator::Or}
   #     * {SPARQL::Algebra::Operator::Order}
+  #     * {SPARQL::Algebra::Operator::Path}
+  #     * {SPARQL::Algebra::Operator::PathOpt}
+  #     * {SPARQL::Algebra::Operator::PathPlus}
+  #     * {SPARQL::Algebra::Operator::PathRange}
+  #     * {SPARQL::Algebra::Operator::PathStar}
+  #     * {SPARQL::Algebra::Operator::PathZero}
   #     * {SPARQL::Algebra::Operator::Plus}
+  #     * {SPARQL::Algebra::Operator::Predicate}
   #     * {SPARQL::Algebra::Operator::Prefix}
   #     * {SPARQL::Algebra::Operator::Project}
   #     * {SPARQL::Algebra::Operator::Rand}
   #     * {SPARQL::Algebra::Operator::Reduced}
   #     * {SPARQL::Algebra::Operator::Regex}
   #     * {SPARQL::Algebra::Operator::Replace}
+  #     * {SPARQL::Algebra::Operator::Reverse}
   #     * {SPARQL::Algebra::Operator::Round}
   #     * {SPARQL::Algebra::Operator::SameTerm}
   #     * {SPARQL::Algebra::Operator::Sample}
   #     * {SPARQL::Algebra::Operator::Seconds}
+  #     * {SPARQL::Algebra::Operator::Seq}
+  #     * {SPARQL::Algebra::Operator::Sequence}
   #     * {SPARQL::Algebra::Operator::SHA1}
   #     * {SPARQL::Algebra::Operator::SHA256}
   #     * {SPARQL::Algebra::Operator::SHA384}
@@ -349,6 +367,7 @@ module SPARQL
   #     * {SPARQL::Algebra::Operator::Sum}
   #     * {SPARQL::Algebra::Operator::Table}
   #     * {SPARQL::Algebra::Operator::Timezone}
+  #     * {SPARQL::Algebra::Operator::Triple}
   #     * {SPARQL::Algebra::Operator::TZ}
   #     * {SPARQL::Algebra::Operator::Ucase}
   #     * {SPARQL::Algebra::Operator::Union}
@@ -436,7 +455,7 @@ module SPARQL
     #
     # @param  [Symbol, #to_sym] name
     # @return [Variable]
-    # @see    http://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Query/Variable
+    # @see    https://ruby-rdf.github.io/rdf/RDF/Query/Variable
     def Variable(name)
       Variable.new(name)
     end