sparql 1.1.1 → 1.1.2

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

@@ -23,13 +23,18 @@ module SPARQL; module Algebra
       #   the graph or repository to query
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
+      # @yield  [solution]
+      #   each matching solution
+      # @yieldparam  [RDF::Query::Solution] solution
+      # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
-      def execute(queryable, options = {})
-        @solutions = operands.last.
-          execute(queryable, options.merge(:depth => options[:depth].to_i + 1)).
-          project(*(operands.first))
+      def execute(queryable, options = {}, &block)
+        @solutions = queryable.query(operands.last, options.merge(:depth => options[:depth].to_i + 1))
+        @solutions = @solutions.project(*(operands.first))
+        @solutions.each(&block) if block_given?
+        @solutions
       end
       
       ##

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

@@ -24,13 +24,18 @@ module SPARQL; module Algebra
       #   the graph or repository to query
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
+      # @yield  [solution]
+      #   each matching solution
+      # @yieldparam  [RDF::Query::Solution] solution
+      # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
-      def execute(queryable, options = {})
+      def execute(queryable, options = {}, &block)
         @solutions = operands.last.
-          execute(queryable, options.merge(:depth => options[:depth].to_i + 1)).
-          reduced
+          execute(queryable, options.merge(:depth => options[:depth].to_i + 1)).reduced
+        @solutions.each(&block) if block_given?
+        @solutions
       end
       
       ##

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

@@ -36,13 +36,20 @@ module SPARQL; module Algebra
       #   the graph or repository to query
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
+      # @yield  [solution]
+      #   each matching solution
+      # @yieldparam  [RDF::Query::Solution] solution
+      # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
-      def execute(queryable, options = {})
+      def execute(queryable, options = {}, &block)
+        offset = operands[0] == :_ ? 0 : operands[0].to_i
+        limit = operands[1] == :_ ? -1 : operands[1].to_i
         @solutions = operands.last. execute(queryable, options.merge(:depth => options[:depth].to_i + 1))
         @solutions.offset(operands[0]) unless operands[0] == :_
         @solutions.limit(operands[1]) unless operands[1] == :_
+        @solutions.each(&block) if block_given?
         @solutions
       end
       

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

@@ -24,11 +24,15 @@ module SPARQL; module Algebra
       #   the graph or repository to query
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
+      # @yield  [solution]
+      #   each matching solution
+      # @yieldparam  [RDF::Query::Solution] solution
+      # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
-      def execute(queryable, options = {})
-        @solutions = RDF::Query::Solutions.new
+      def execute(queryable, options = {}, &block)
+        @solutions = RDF::Query::Solutions()
         operands[1..-1].each do |row|
           next unless row.is_a?(Array)
           bindings = row[1..-1].inject({}) do |memo, (var, value)|
@@ -37,6 +41,7 @@ module SPARQL; module Algebra
           end
           @solutions << RDF::Query::Solution.new(bindings)
         end
+        @solutions.each(&block) if block_given?
         @solutions
       end
     end # Table

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

@@ -24,17 +24,22 @@ module SPARQL; module Algebra
       #   the graph or repository to query
       # @param  [Hash{Symbol => Object}] options
       #   any additional keyword options
+      # @yield  [solution]
+      #   each matching solution
+      # @yieldparam  [RDF::Query::Solution] solution
+      # @yieldreturn [void] ignored
       # @return [RDF::Query::Solutions]
       #   the resulting solution sequence
       # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
-      def execute(queryable, options = {})
+      def execute(queryable, options = {}, &block)
         debug(options) {"Union"}
-        @solutions = RDF::Query::Solutions.new(operands.inject([]) do |memo, op|
+        @solutions = RDF::Query::Solutions(operands.inject([]) do |memo, op|
           solns = op.execute(queryable, options.merge(:depth => options[:depth].to_i + 1))
           debug(options) {"=> (op) #{solns.inspect}"}
           memo + solns
         end)
         debug(options) {"=> #{@solutions.inspect}"}
+        @solutions.each(&block) if block_given?
         @solutions
       end
       

data/lib/sparql/algebra/query.rb

@@ -26,7 +26,7 @@ module SPARQL; module Algebra
     end
 
     ##
-    # The solution sequence for this query.
+    # The solution sequence for this query. This is only set
     #
     # @return [RDF::Query::Solutions]
     attr_reader :solutions
@@ -40,14 +40,16 @@ module SPARQL; module Algebra
     #   any additional keyword options
     # @option options [Boolean] debug
     #   Query execution debugging
-    # @return [RDF::Query::Solutions]
-    #   the resulting solution sequence
-    # @raise [TypeError]
-    #   TypeError raised if any operands are invalid
+    # @yield  [solution]
+    #   each matching solution, statement or boolean
+    # @yieldparam  [RDF::Statement, RDF::Query::Solution, Boolean] solution
+    # @yieldreturn [void] ignored
+    # @return [RDF::Graph, Boolean, RDF::Query::Solutions::Enumerator]
+    #   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/rdf-sparql-query/#sparqlAlgebra
-    def execute(queryable, options = {})
+    def execute(queryable, options = {}, &block)
       raise NotImplementedError, "#{self.class}#execute(#{queryable})"
     end
 
@@ -90,6 +92,24 @@ module SPARQL; module Algebra
       self.operands.empty?
     end
 
+    # Query results in a boolean result (e.g., ASK)
+    # @return [Boolean]
+    def query_yields_boolean?
+      false
+    end
+
+    # Query results statements (e.g., CONSTRUCT, DESCRIBE, CREATE)
+    # @return [Boolean]
+    def query_yields_statements?
+      false
+    end
+
+    # Query results solutions (e.g., SELECT)
+    # @return [Boolean]
+    def query_yields_solutions?
+      !(query_yields_boolean? || query_yields_statements?)
+    end
+
     ##
     # Enumerates over each matching query solution.
     #

data/lib/sparql/extensions.rb

@@ -99,14 +99,6 @@ 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

@@ -1063,7 +1063,7 @@ module SPARQL::Grammar
       when IO, StringIO then input.read
       else input.to_s.dup
       end
-      @input.force_encoding(Encoding::UTF_8)
+      @input.encode!(Encoding::UTF_8)
       @options = {:anon_base => "b0", :validate => false}.merge(options)
       @options[:debug] ||= case
       when options[:progress] then 2

data/lib/sparql/results.rb

@@ -183,13 +183,12 @@ module SPARQL
   #   Similar to :content_type, but takes an ordered array of appropriate content types,
   #   and serializes using the first appropriate type, including wild-cards.
   # @return [String]
-  #   String with serialized results and #content_type
+  #   String with serialized results and `#content_type`
   # @raise [RDF::WriterError] when inappropriate formatting options are used
   def serialize_results(solutions, options = {})
     format = options[:format].to_sym if options[:format]
     content_type = options[:content_type].to_s.split(';').first
-    content_types = options[:content_types] || ['*/*']
-    format ||= SPARQL::Results::MIME_TYPES.invert[content_type] if content_type
+    content_types = Array(options[:content_types] || '*/*')
 
     if !format && !content_type
       case solutions
@@ -231,7 +230,10 @@ module SPARQL
         require 'rdf/ntriples'
       end
       fmt = RDF::Format.for(format ? format.to_sym : {:content_type => content_type})
-      fmt ||= RDF::NTriples::Format
+      unless fmt
+        fmt = RDF::Format.for(:file_extension => format.to_sym) || RDF::NTriples::Format
+        format = fmt.to_sym
+      end
       format ||= fmt.to_sym
       content_type ||= fmt.content_type.first
       results = solutions.dump(format, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -101,26 +101,26 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -169,30 +169,30 @@ dependencies:
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: SPARQL library for Ruby.