sparql 1.0.7 → 1.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eabf23290e66c519d04a3903fb9c10cab87236c5
+  data.tar.gz: ccf93905bff11c897f0fb00b01113095c527aa9e
+SHA512:
+  metadata.gz: de063e0c1d091dcb541f43d00942db7636c1e931f1504337cb9b0c8648085e30856bfbb332b08cfc392aece68c62595c1f6bd2924be9f715bc1fb2574b3b75a6
+  data.tar.gz: d03282b7ed8ae2edadbd9050d8101a9195df45844baa4cf126fefefef38c0b5089a07a67f75902e6a54d3a8404a86358ab13445a161f0b9fdc7fd0ad10aa9ac1

data/AUTHORS

@@ -1,3 +1,2 @@
 * Gregg Kellogg <gregg@greggkellogg.net>
 * Arto Bendiken <arto.bendiken@gmail.com>
-* Pius Uzamere <pius@alum.mit.edu>

data/CREDITS

@@ -0,0 +1 @@
+* Pius Uzamere <pius@alum.mit.edu>

data/README.md

@@ -51,6 +51,26 @@ The SPARQL gem now implements the following [SPARQL 1.1][] operations:
 * Support for all [functions](http://www.w3.org/TR/sparql11-query/#SparqlOps).
 * Support for [BIND](http://www.w3.org/TR/sparql11-query/#bind)
 
+### SPARQL Extension Functions
+Extension functions may be defined, which will be invoked during query evaluation. For example:
+
+    # Register a function using the IRI <http://rubygems.org/gems/sparql#crypt>
+    crypt_iri = RDF::URI("http://rubygems.org/gems/sparql#crypt")
+    SPARQL::Algebra::Expression.register_extension(crypt_iri) do |literal|
+      raise TypeError, "argument must be a literal" unless literal.literal?
+      RDF::Literal(literal.to_s.crypt)
+    end
+
+Then, use the function in a query:
+
+    PREFIX rsp: <http://rubygems.org/gems/sparql#>
+    PREFIX schema: <http://schema.org/>
+    SELECT ?crypted
+    {
+      [ schema:email ?email]
+      BIND(rsp:crypt(?email) AS ?crypted)
+    }
+
 ### Middleware
 
 `Rack::SPARQL` is a superset of [Rack::LinkedData][] to allow content negotiated results

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/sparql/algebra/expression.rb

@@ -125,6 +125,69 @@ module SPARQL; module Algebra
       operator.new(*operands)
     end
 
+    ##
+    # Register an extension function.
+    #
+    # Extension functions take zero or more arguments of type `RDF::Term`
+    # and return an argument of type `RDF::Term`, or raise `TypeError`.
+    #
+    # Functions are identified using the `uri` parameter and specified using a block.
+    #
+    # Arguments are evaluated, and the block is called with argument values (if a variable was unbound, an error will have been generated).
+    # 
+    # It is possible to get unevaluated arguments but care must be taken not to violate the rules of function evaluation.
+    # 
+    # Normally, block should be a pure evaluation based on it's arguments. It should not access a graph nor return different values for the same arguments (to allow expression optimization). Blocks can't bind a variables.
+    #
+    # @example registering a function definition applying the Ruby `crypt` method to its unary argument.
+    #   SPARQL::Algebra::Expression.register_extension(RDF::URI("http://example/crypt") do |literal|
+    #     raise TypeError, "argument must be a literal" unless literal.literal?
+    #     RDF::Literal(literal.to_s.crypt("salt"))
+    #   end
+    #
+    # @param [RDF::URI] uri
+    # @yield *args
+    # @yieldparam [Array<RDF::Term>] *args
+    # @yieldreturn [RDF::Term]
+    # @param [Proc] function
+    # @return [void]
+    # @raise [TypeError] if `uri` is not an RDF::URI or no block is given
+    def self.register_extension(uri, &block)
+      raise TypeError, "uri must be an IRI" unless uri.is_a?(RDF::URI)
+      raise TypeError, "must pass a block" unless block_given?
+      self.extensions[uri] = block
+    end
+
+    ##
+    # Registered extensions
+    #
+    # @return [Hash{RDF::URI => Proc}]
+    def self.extensions
+      @extensions ||= {}
+    end
+
+    ##
+    # Invoke an extension function.
+    #
+    # Applies a registered extension function, if registered.
+    # Otherwise, if it is an XSD Constructor function, apply
+    # that.
+    #
+    # @param [RDF::URI] function
+    # @param [Array<RDF::Term>] *args
+    # @return [RDF::Term]
+    # @see http://www.w3.org/TR/sparql11-query/#extensionFunctions
+    # @see http://www.w3.org/TR/sparql11-query/#FunctionMapping
+    def self.extension(function, *args)
+      if function.to_s.start_with?(RDF::XSD.to_s)
+        self.cast(function, args.first)
+      elsif extension_function = self.extensions[function]
+        extension_function.call(*args)
+      else
+        raise TypeError, "Extension function #{function} not recognized"
+      end
+    end
+
     ##
     # Casts operand as the specified datatype
     #
@@ -134,8 +197,8 @@ module SPARQL; module Algebra
     # @param [RDF::Term] value
     #   Value, which should be a typed literal, where the type must be that specified
     # @raise [TypeError] if datatype is not a URI or value cannot be cast to datatype
-    # @return [Boolean]
-    # @see http://www.w3.org/TR/rdf-sparql-query/#FunctionMapping
+    # @return [RDF::Term]
+    # @see http://www.w3.org/TR/sparql11-query/#FunctionMapping
     def self.cast(datatype, value)
       case datatype
       when RDF::XSD.dateTime
@@ -149,8 +212,10 @@ module SPARQL; module Algebra
         end
       when RDF::XSD.float, RDF::XSD.double
         case value
-        when RDF::Literal::Numeric, RDF::Literal::Boolean
-          RDF::Literal.new(value, :datatype => datatype)
+        when RDF::Literal::Boolean
+          RDF::Literal.new(value.object ? 1 : 0, :datatype => datatype)
+        when RDF::Literal::Numeric
+          RDF::Literal.new(value.to_f, :datatype => datatype)
         when RDF::Literal::DateTime, RDF::Literal::Date, RDF::Literal::Time, RDF::URI, RDF::Node
           raise TypeError, "Value #{value.inspect} cannot be cast as #{datatype}"
         else
@@ -161,7 +226,7 @@ module SPARQL; module Algebra
         when RDF::Literal::Boolean
           value
         when RDF::Literal::Numeric
-          RDF::Literal::Boolean.new(value.value != 0)
+          RDF::Literal::Boolean.new(value.object != 0)
         when RDF::Literal::DateTime, RDF::Literal::Date, RDF::Literal::Time, RDF::URI, RDF::Node
           raise TypeError, "Value #{value.inspect} cannot be cast as #{datatype}"
         else
@@ -169,7 +234,9 @@ module SPARQL; module Algebra
         end
       when RDF::XSD.decimal, RDF::XSD.integer
         case value
-        when RDF::Literal::Integer, RDF::Literal::Decimal, RDF::Literal::Boolean
+        when RDF::Literal::Boolean
+          RDF::Literal.new(value.object ? 1 : 0, :datatype => datatype)
+        when RDF::Literal::Integer, RDF::Literal::Decimal
           RDF::Literal.new(value, :datatype => datatype)
         when RDF::Literal::DateTime, RDF::Literal::Date, RDF::Literal::Time, RDF::URI, RDF::Node
           raise TypeError, "Value #{value.inspect} cannot be cast as #{datatype}"
@@ -179,7 +246,7 @@ module SPARQL; module Algebra
       when RDF::XSD.string
          RDF::Literal.new(value, :datatype => datatype)
       else
-        raise TypeError, "Expected datatype (#{datatype}) to be an XSD type"
+        raise TypeError, "Expected datatype (#{datatype}) to be a recognized XPath function"
       end
     rescue
       raise TypeError, $!.message

data/lib/sparql/algebra/extensions.rb

@@ -42,7 +42,21 @@ class Array
   # @return [RDF::Term]
   def evaluate(bindings)
     dt, val = self.map {|o| o.evaluate(bindings)}
-    SPARQL::Algebra::Expression.cast(*self.map {|o| o.evaluate(bindings)})
+    SPARQL::Algebra::Expression.extension(*self.map {|o| o.evaluate(bindings)})
+  end
+
+  ##
+  # If `#execute` is invoked, it implies that a non-implemented Algebra operator
+  # is being invoked
+  #
+  # @param  [RDF::Queryable] queryable
+  #   the graph or repository to query
+  # @param  [Hash{Symbol => Object}] options
+  # @raise [NotImplementedError]
+  #   If an attempt is made to perform an unsupported operation
+  # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
+  def execute(queryable, options = {})
+    raise NotImplementedError, "SPARQL::Algebra '#{first}' operator not implemented"
   end
 end
 

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

@@ -4,11 +4,11 @@ module SPARQL; module Algebra
     # A SPARQL `concat` operator.
     #
     # @example
-    #   (concat ?a ?b)
+    #   (concat ?a ?b ...)
     #
     # @see http://www.w3.org/TR/sparql11-query/#func-concat
     # @see http://www.w3.org/TR/xpath-functions/#func-concat
-    class Concat < Operator::Binary
+    class Concat < Operator
       include Evaluatable
 
       NAME = :concat
@@ -24,24 +24,23 @@ module SPARQL; module Algebra
       #     concat("foo"@en, "bar")                      #=> "foobar"
       #     concat("foo"@en, "bar"^^xsd:string)          #=> "foobar"
       #
-      # @param  [RDF::Literal] left
-      #   a literal
-      # @param  [RDF::Literal] right
-      #   a literal
-      # @return [RDF::Literal] 
-      # @raise  [TypeError] if either operand is not a literal
-      def apply(left, right)
-        case
-        when !left.literal? || !right.literal?
-          raise TypeError, "expected two plain literal operands, but got #{left.inspect} and #{right.inspect}"
-        when ![left.datatype, right.datatype].compact.all? {|dt| dt == RDF::XSD.string}
-          raise TypeError, "expected two plain literal operands, but got #{left.inspect} and #{right.inspect}"
-        when left.datatype == RDF::XSD.string && right.datatype == RDF::XSD.string
-          RDF::Literal.new("#{left}#{right}", :datatype => RDF::XSD.string)
-        when left.has_language? && left.language == right.language
-          RDF::Literal.new("#{left}#{right}", :language => left.language)
-        else
-          RDF::Literal.new("#{left}#{right}")
+      # @param  [RDF::Query::Solution, #[]] bindings
+      # @return [RDF::Term]
+      # @raise  [TypeError] if any operand is not a literal
+      def evaluate(bindings = {})
+        ops = operands.map {|op| op.evaluate(bindings)}
+
+        raise TypeError, "expected all plain literal operands" unless ops.all? {|op| op.literal? && op.plain?}
+
+        ops.inject do |memo, op|
+          case
+          when memo.datatype == RDF::XSD.string && op.datatype == RDF::XSD.string
+            RDF::Literal.new("#{memo}#{op}", :datatype => RDF::XSD.string)
+          when memo.has_language? && memo.language == op.language
+            RDF::Literal.new("#{memo}#{op}", :language => memo.language)
+          else
+            RDF::Literal.new("#{memo}#{op}")
+          end
         end
       end
     end # Concat

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

@@ -31,7 +31,8 @@ module SPARQL; module Algebra
       # @raise  [TypeError] if the operand is not a simple literal
       def apply(literal)
         raise TypeError, "expected an simple literal, but got #{literal.inspect}" unless literal.literal? && literal.simple?
-        Operator.base_uri.join(literal.to_s)
+        base = Operator.base_uri || RDF::URI("")
+        base.join(literal.to_s)
       end
 
       Operator::URI = IRI

data/lib/sparql/algebra/query.rb

@@ -85,6 +85,11 @@ module SPARQL; module Algebra
       !failed?
     end
 
+    # Determine if this is an empty query, having no operands
+    def empty?
+      self.operands.empty?
+    end
+
     ##
     # Enumerates over each matching query solution.
     #

data/lib/sparql/extensions.rb

@@ -99,6 +99,14 @@ module RDF::Queryable
   end
 end
 
+class RDF::Query
+  # Determine if this is an empty query, having no patterns
+  def empty?
+    self.patterns.empty?
+  end
+end
+
+
 ##
 # Extensions for `RDF::Query::Solutions`.
 class RDF::Query::Solutions

data/lib/sparql/grammar/parser11.rb

@@ -232,7 +232,7 @@ module SPARQL::Grammar
         add_prod_datum(:PrefixDecl, prefix_op)
       end
     end
-    
+
     # [7]  	SelectQuery	  ::=  	SelectClause DatasetClause* WhereClause SolutionModifier
     production(:SelectQuery) do |input, data, callback|
       query = merge_modifiers(data)
@@ -356,59 +356,9 @@ module SPARQL::Grammar
     # [54]  	GroupGraphPatternSub	  ::=  	TriplesBlock?
     #                                             ( GraphPatternNotTriples '.'? TriplesBlock? )*
     production(:GroupGraphPatternSub) do |input, data, callback|
-      query_list = data[:query_list]
-      debug("GroupGraphPatternSub") {"ql #{query_list.to_a.inspect}"}
-      debug("GroupGraphPatternSub") {"q #{data[:query] ? data[:query].first.inspect : 'nil'}"}
-            
-      if query_list
-        lhs = data[:query].to_a.first
-
-        # Bind terminates the TriplesBlock?
-        if data[:extend]
-          lhs ||= SPARQL::Algebra::Operator::BGP.new
-          # query should be nil
-          lhs = SPARQL::Algebra::Operator::Extend.new(data.delete(:extend), lhs)
-        end
-
-        while !query_list.empty?
-          rhs = query_list.shift
-          # Make the right-hand-side a Join with only a single operand, if it's not already and Operator
-          rhs = SPARQL::Algebra::Expression.for(:join, :placeholder, rhs) unless rhs.is_a?(SPARQL::Algebra::Operator)
-          debug("GroupGraphPatternSub") {"<= q: #{rhs.inspect}"}
-          debug("GroupGraphPatternSub") {"<= lhs: #{lhs ? lhs.inspect : 'nil'}"}
-          lhs ||= SPARQL::Algebra::Operator::BGP.new if rhs.is_a?(SPARQL::Algebra::Operator::LeftJoin)
-          if lhs
-            if rhs.operand(0) == :placeholder
-              rhs.operands[0] = lhs
-            else
-              rhs = SPARQL::Algebra::Operator::Join.new(lhs, rhs)
-            end
-          end
-          lhs = rhs
-          lhs = lhs.operand(1) if lhs.operand(0) == :placeholder
-          debug("GroupGraphPatternSub(itr)") {"=> lhs: #{lhs.inspect}"}
-        end
-        # Trivial simplification for :join or :union of one query
-        case lhs
-        when SPARQL::Algebra::Operator::Join, SPARQL::Algebra::Operator::Union
-          if lhs.operand(0) == :placeholder
-            lhs = lhs.operand(1)
-            debug("GroupGraphPatternSub(simplify)") {"=> lhs: #{lhs.inspect}"}
-          end
-        end
-        res = lhs
-      elsif data[:query]
-        res = data[:query].first
-      end
-
-      debug("GroupGraphPatternSub(pre-extend)") {"res: #{res.inspect}"}
-
-      if data[:extend]
-        res ||= SPARQL::Algebra::Operator::BGP.new
-        # query should be nil
-        res = SPARQL::Algebra::Operator::Extend.new(data[:extend], res)
-      end
+      debug("GroupGraphPatternSub") {"q #{data[:query].inspect}"}
 
+      res = data[:query].first
       debug("GroupGraphPatternSub(pre-filter)") {"res: #{res.inspect}"}
 
       if data[:filter]
@@ -420,29 +370,17 @@ module SPARQL::Grammar
       add_prod_datum(:query, res)
     end
 
-    # _GroupGraphPatternSub_2 ::= ( GraphPatternNotTriples '.'? TriplesBlock? )
-    # Create a stack of GroupQuerys having a single graph element and resolve in GroupGraphPattern
-    production(:_GroupGraphPatternSub_2) do |input, data, callback|
-      lhs = data[:query_list]
-      [data[:query]].flatten.compact.each do |rhs|
-        rhs = SPARQL::Algebra::Expression.for(:join, :placeholder, rhs) if rhs.is_a?(RDF::Query)
-        add_prod_data(:query_list, rhs)
-      end
-      add_prod_datum(:query_list, lhs)
-      add_prod_datum(:extend, data[:extend])
-      add_prod_datum(:filter, data[:filter])
-    end
-
-    # _GroupGraphPatternSub_3
-
     # [55]  	TriplesBlock	  ::=  	TriplesSameSubjectPath
     #                               ( '.' TriplesBlock? )?
     production(:TriplesBlock) do |input, data, callback|
       query = SPARQL::Algebra::Operator::BGP.new
       data[:pattern].to_a.each {|p| query << p}
-        
+
       # Append triples from ('.' TriplesBlock? )?
       data[:query].to_a.each {|q| query += q}
+      if (lhs = (input.delete(:query) || []).first) && !lhs.empty?
+        query = SPARQL::Algebra::Expression.for(:join, lhs, query)
+      end
       add_prod_datum(:query, query)
     end
 
@@ -452,28 +390,44 @@ module SPARQL::Grammar
     #                                       | GraphGraphPattern
     #                                       | ServiceGraphPattern
     #                                       | Filter | Bind
+    start_production(:GraphPatternNotTriples) do |input, data, callback|
+      # Modifies previous graph
+      data[:input_query] = input.delete(:query) || [SPARQL::Algebra::Operator::BGP.new]
+    end
     production(:GraphPatternNotTriples) do |input, data, callback|
-      add_prod_datum(:extend, data[:extend])
+      lhs = data[:input_query].first
+
+      # Filter trickls up to GroupGraphPatternSub
       add_prod_datum(:filter, data[:filter])
 
-      if data[:query]
-        res = data[:query].to_a.first
-        add_prod_data(:query, res)
+      if data[:extend] && lhs.is_a?(SPARQL::Algebra::Operator::Extend)
+        # Coalesce extensions
+        lhs = lhs.dup
+        lhs.operands.first.concat(data[:extend])
+        add_prod_datum(:query, lhs)
+      elsif data[:extend]
+        add_prod_datum(:query, SPARQL::Algebra::Expression.for(:extend, data[:extend], lhs))
+      elsif data[:leftjoin]
+        add_prod_datum(:query, SPARQL::Algebra::Expression.for(:leftjoin, lhs, *data[:leftjoin]))
+      elsif data[:query] && !lhs.empty?
+        add_prod_datum(:query, SPARQL::Algebra::Expression.for(:join, lhs, *data[:query]))
+      elsif data[:query]
+        add_prod_datum(:query, data[:query])
+      else
+        add_prod_datum(:query, lhs)
       end
     end
 
     # [57]  	OptionalGraphPattern	  ::=  	'OPTIONAL' GroupGraphPattern
     production(:OptionalGraphPattern) do |input, data, callback|
-      if data[:query]
-        expr = nil
-        query = data[:query].first
-        if query.is_a?(SPARQL::Algebra::Operator::Filter)
-          # Change to expression on left-join with query element
-          expr, query = query.operands
-          add_prod_data(:query, SPARQL::Algebra::Expression.for(:leftjoin, :placeholder, query, expr))
-        else
-          add_prod_data(:query, SPARQL::Algebra::Expression.for(:leftjoin, :placeholder, query))
-        end
+      expr = nil
+      query = data[:query] ? data[:query].first : SPARQL::Algebra::Operator::BGP.new
+      if query.is_a?(SPARQL::Algebra::Operator::Filter)
+        # Change to expression on left-join with query element
+        expr, query = query.operands
+        add_prod_data(:leftjoin, query, expr)
+      elsif !query.empty?
+        add_prod_data(:leftjoin, query)
       end
     end
 
@@ -786,9 +740,9 @@ module SPARQL::Grammar
       accumulate_operator_expressions(:MultiplicativeExpression, :_Mul_Div, data)
     end
 
-    # [118]  	UnaryExpression	  ::=  	  '!' PrimaryExpression 
-    #                                 |	'+' PrimaryExpression 
-    #                                 |	'-' PrimaryExpression 
+    # [118]  	UnaryExpression	  ::=  	  '!' PrimaryExpression
+    #                                 |	'+' PrimaryExpression
+    #                                 |	'-' PrimaryExpression
     #                                 |	PrimaryExpression
     production(:UnaryExpression) do |input, data, callback|
       case data[:UnaryExpression]
@@ -830,60 +784,60 @@ module SPARQL::Grammar
     end
 
     # [121] BuiltInCall             ::= Aggregate
-    #                                 | 'STR' '(' Expression ')' 
-    #                                 | 'LANG' '(' Expression ')' 
-    #                                 | 'LANGMATCHES' '(' Expression ',' Expression ')' 
-    #                                 | 'DATATYPE' '(' Expression ')' 
-    #                                 | 'BOUND' '(' Var ')' 
-    #                                 | 'IRI' '(' Expression ')' 
-    #                                 | 'URI' '(' Expression ')' 
-    #                                 | 'BNODE' ( '(' Expression ')' | NIL ) 
-    #                                 | 'RAND' NIL 
-    #                                 | 'ABS' '(' Expression ')' 
-    #                                 | 'CEIL' '(' Expression ')' 
-    #                                 | 'FLOOR' '(' Expression ')' 
-    #                                 | 'ROUND' '(' Expression ')' 
-    #                                 | 'CONCAT' ExpressionList 
-    #                                 | SubstringExpression 
-    #                                 | 'STRLEN' '(' Expression ')' 
-    #                                 | StrReplaceExpression 
-    #                                 | 'UCASE' '(' Expression ')' 
-    #                                 | 'LCASE' '(' Expression ')' 
-    #                                 | 'ENCODE_FOR_URI' '(' Expression ')' 
-    #                                 | 'CONTAINS' '(' Expression ',' Expression ')' 
-    #                                 | 'STRSTARTS' '(' Expression ',' Expression ')' 
-    #                                 | 'STRENDS' '(' Expression ',' Expression ')' 
-    #                                 | 'STRBEFORE' '(' Expression ',' Expression ')' 
-    #                                 | 'STRAFTER' '(' Expression ',' Expression ')' 
-    #                                 | 'YEAR' '(' Expression ')' 
-    #                                 | 'MONTH' '(' Expression ')' 
-    #                                 | 'DAY' '(' Expression ')' 
-    #                                 | 'HOURS' '(' Expression ')' 
-    #                                 | 'MINUTES' '(' Expression ')' 
-    #                                 | 'SECONDS' '(' Expression ')' 
-    #                                 | 'TIMEZONE' '(' Expression ')' 
-    #                                 | 'TZ' '(' Expression ')' 
-    #                                 | 'NOW' NIL 
+    #                                 | 'STR' '(' Expression ')'
+    #                                 | 'LANG' '(' Expression ')'
+    #                                 | 'LANGMATCHES' '(' Expression ',' Expression ')'
+    #                                 | 'DATATYPE' '(' Expression ')'
+    #                                 | 'BOUND' '(' Var ')'
+    #                                 | 'IRI' '(' Expression ')'
+    #                                 | 'URI' '(' Expression ')'
+    #                                 | 'BNODE' ( '(' Expression ')' | NIL )
+    #                                 | 'RAND' NIL
+    #                                 | 'ABS' '(' Expression ')'
+    #                                 | 'CEIL' '(' Expression ')'
+    #                                 | 'FLOOR' '(' Expression ')'
+    #                                 | 'ROUND' '(' Expression ')'
+    #                                 | 'CONCAT' ExpressionList
+    #                                 | SubstringExpression
+    #                                 | 'STRLEN' '(' Expression ')'
+    #                                 | StrReplaceExpression
+    #                                 | 'UCASE' '(' Expression ')'
+    #                                 | 'LCASE' '(' Expression ')'
+    #                                 | 'ENCODE_FOR_URI' '(' Expression ')'
+    #                                 | 'CONTAINS' '(' Expression ',' Expression ')'
+    #                                 | 'STRSTARTS' '(' Expression ',' Expression ')'
+    #                                 | 'STRENDS' '(' Expression ',' Expression ')'
+    #                                 | 'STRBEFORE' '(' Expression ',' Expression ')'
+    #                                 | 'STRAFTER' '(' Expression ',' Expression ')'
+    #                                 | 'YEAR' '(' Expression ')'
+    #                                 | 'MONTH' '(' Expression ')'
+    #                                 | 'DAY' '(' Expression ')'
+    #                                 | 'HOURS' '(' Expression ')'
+    #                                 | 'MINUTES' '(' Expression ')'
+    #                                 | 'SECONDS' '(' Expression ')'
+    #                                 | 'TIMEZONE' '(' Expression ')'
+    #                                 | 'TZ' '(' Expression ')'
+    #                                 | 'NOW' NIL
     #                                 | 'UUID' NIL
     #                                 | 'STRUUID' NIL
-    #                                 | 'MD5' '(' Expression ')' 
-    #                                 | 'SHA1' '(' Expression ')' 
-    #                                 | 'SHA224' '(' Expression ')' 
-    #                                 | 'SHA256' '(' Expression ')' 
-    #                                 | 'SHA384' '(' Expression ')' 
-    #                                 | 'SHA512' '(' Expression ')' 
-    #                                 | 'COALESCE' ExpressionList 
-    #                                 | 'IF' '(' Expression ',' Expression ',' Expression ')' 
-    #                                 | 'STRLANG' '(' Expression ',' Expression ')' 
-    #                                 | 'STRDT' '(' Expression ',' Expression ')' 
-    #                                 | 'sameTerm' '(' Expression ',' Expression ')' 
-    #                                 | 'isIRI' '(' Expression ')' 
-    #                                 | 'isURI' '(' Expression ')' 
-    #                                 | 'isBLANK' '(' Expression ')' 
-    #                                 | 'isLITERAL' '(' Expression ')' 
-    #                                 | 'isNUMERIC' '(' Expression ')' 
-    #                                 | RegexExpression 
-    #                                 | ExistsFunc 
+    #                                 | 'MD5' '(' Expression ')'
+    #                                 | 'SHA1' '(' Expression ')'
+    #                                 | 'SHA224' '(' Expression ')'
+    #                                 | 'SHA256' '(' Expression ')'
+    #                                 | 'SHA384' '(' Expression ')'
+    #                                 | 'SHA512' '(' Expression ')'
+    #                                 | 'COALESCE' ExpressionList
+    #                                 | 'IF' '(' Expression ',' Expression ',' Expression ')'
+    #                                 | 'STRLANG' '(' Expression ',' Expression ')'
+    #                                 | 'STRDT' '(' Expression ',' Expression ')'
+    #                                 | 'sameTerm' '(' Expression ',' Expression ')'
+    #                                 | 'isIRI' '(' Expression ')'
+    #                                 | 'isURI' '(' Expression ')'
+    #                                 | 'isBLANK' '(' Expression ')'
+    #                                 | 'isLITERAL' '(' Expression ')'
+    #                                 | 'isNUMERIC' '(' Expression ')'
+    #                                 | RegexExpression
+    #                                 | ExistsFunc
     #                                 | NotExistsFunc
     production(:BuiltInCall) do |input, data, callback|
       if builtin = data.keys.detect {|k| BUILTINS.include?(k)}
@@ -933,12 +887,12 @@ module SPARQL::Grammar
       add_prod_datum(:notexists, data[:query])
     end
 
-    # [127] Aggregate               ::= 'COUNT' '(' 'DISTINCT'? ( '*' | Expression ) ')' 
-    #                                 | 'SUM' '(' 'DISTINCT'? Expression ')' 
-    #                                 | 'MIN' '(' 'DISTINCT'? Expression ')' 
-    #                                 | 'MAX' '(' 'DISTINCT'? Expression ')' 
-    #                                 | 'AVG' '(' 'DISTINCT'? Expression ')' 
-    #                                 | 'SAMPLE' '(' 'DISTINCT'? Expression ')' 
+    # [127] Aggregate               ::= 'COUNT' '(' 'DISTINCT'? ( '*' | Expression ) ')'
+    #                                 | 'SUM' '(' 'DISTINCT'? Expression ')'
+    #                                 | 'MIN' '(' 'DISTINCT'? Expression ')'
+    #                                 | 'MAX' '(' 'DISTINCT'? Expression ')'
+    #                                 | 'AVG' '(' 'DISTINCT'? Expression ')'
+    #                                 | 'SAMPLE' '(' 'DISTINCT'? Expression ')'
     #                                 | 'GROUP_CONCAT' '(' 'DISTINCT'? Expression
     #                                   ( ';' 'SEPARATOR' '=' String )? ')'
     production(:Aggregate) do |input, data, callback|
@@ -965,7 +919,7 @@ module SPARQL::Grammar
     production(:RDFLiteral) do |input, data, callback|
       if data[:string]
         lit = data.dup
-        str = lit.delete(:string).last 
+        str = lit.delete(:string).last
         lit[:datatype] = lit.delete(:iri).last if lit[:iri]
         lit[:language] = lit.delete(:language).last.downcase if lit[:language]
         add_prod_datum(:literal, RDF::Literal.new(str, lit)) if str
@@ -1002,7 +956,7 @@ module SPARQL::Grammar
     ##
     # Initializes a new parser instance.
     #
-    # @param  [String, #to_s]          input
+    # @param  [String, IO, StringIO, #to_s]          input
     # @param  [Hash{Symbol => Object}] options
     # @option options [Hash]     :prefixes     (Hash.new)
     #   the prefix mappings to use (for acessing intermediate parser productions)
@@ -1020,9 +974,15 @@ module SPARQL::Grammar
     #   Show progress of parser productions
     # @option options [Boolean] :debug
     #   Detailed debug output
+    # @yield  [parser] `self`
+    # @yieldparam  [SPARQL::Grammar::Parser] parser
+    # @yieldreturn [void] ignored
     # @return [SPARQL::Grammar::Parser]
-    def initialize(input = nil, options = {})
-      @input = input.to_s.dup
+    def initialize(input = nil, options = {}, &block)
+      @input = case input
+      when IO, StringIO then input.read
+      else input.to_s.dup
+      end
       @input.force_encoding(Encoding::UTF_8)
       @options = {:anon_base => "b0", :validate => false}.merge(options)
       @options[:debug] ||= case
@@ -1053,12 +1013,12 @@ module SPARQL::Grammar
     rescue Error
       false
     end
-    
+
     # @return [String]
     def to_sxp_bin
       @result
     end
-    
+
     def to_s
       @result.to_sxp
     end
@@ -1237,7 +1197,7 @@ module SPARQL::Grammar
     # @return [RDF::Query::Variable]
     def variable(id, distinguished = true)
       id = nil if id.to_s.empty?
-      
+
       if id
         @vars[id] ||= begin
           v = RDF::Query::Variable.new(id)
@@ -1281,7 +1241,7 @@ module SPARQL::Grammar
       iri.lexical = "#{prefix}:#{suffix}" unless resolve_iris?
       iri
     end
-    
+
     # Create a literal
     def literal(value, options = {})
       options = options.dup
@@ -1300,7 +1260,7 @@ module SPARQL::Grammar
     def expand_collection(data)
       # Add any triples generated from deeper productions
       add_prod_datum(:pattern, data[:pattern])
-      
+
       # Create list items for each element in data[:GraphNode]
       first = data[:Collection]
       list = data[:GraphNode].to_a.flatten.compact
@@ -1312,7 +1272,7 @@ module SPARQL::Grammar
         add_pattern(:Collection, :subject => first, :predicate => RDF["rest"], :object => rest)
         first = rest
       end
-      
+
       if last
         add_pattern(:Collection, :subject => first, :predicate => RDF["first"], :object => last)
       end
@@ -1343,11 +1303,11 @@ module SPARQL::Grammar
     # Flatten a Data in form of :filter => [op+ bgp?], without a query into filter and query creating exprlist, if necessary
     # @return [Array[:expr, query]]
     def flatten_filter(data)
-      query = data.pop if data.last.respond_to?(:execute)
+      query = data.pop if data.last.is_a?(SPARQL::Algebra::Query)
       expr = data.length > 1 ? SPARQL::Algebra::Operator::Exprlist.new(*data) : data.first
       [expr, query]
     end
-    
+
     # Merge query modifiers, datasets, and projections
     #
     # This includes tranforming aggregates if also used with a GROUP BY
@@ -1364,7 +1324,7 @@ module SPARQL::Grammar
         query = SPARQL::Algebra::Expression[:group, data[:group].first, query]
       end
 
-      if data[:extend]
+      if data[:extend] # FIXME: needed?
         # extension variables must not appear in projected variables.
         # Add them to the projection otherwise
         data[:extend].each do |(var, expr)|
@@ -1382,9 +1342,9 @@ module SPARQL::Grammar
       query = SPARQL::Algebra::Expression[data[:DISTINCT_REDUCED].first, query] if data[:DISTINCT_REDUCED]
 
       query = SPARQL::Algebra::Expression[:slice, data[:slice][0], data[:slice][1], query] if data[:slice]
-      
+
       query = SPARQL::Algebra::Expression[:dataset, data[:dataset], query] if data[:dataset]
-      
+
       query
     end
 

metadata

@@ -1,310 +1,271 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.0.8
 platform: ruby
 authors:
 - Gregg Kellogg
 - Arto Bendiken
-- Pius Uzamere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sparql-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: spira
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -312,7 +273,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -320,21 +280,21 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
-description: ! "\n    Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL
-  Algebra processing\n    and includes SPARQL Client for accessing remote repositories."
+description: |2-
+
+      Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL Algebra processing
+      and includes SPARQL Client for accessing remote repositories.
 email: public-rdf-ruby@w3.org
 executables:
 - sparql
@@ -459,27 +419,26 @@ files:
 homepage: http://github.com/ruby-rdf/sparql
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SPARQL library for Ruby.
 test_files: []
 has_rdoc: false