rubberband 0.0.9 → 0.0.10

data/lib/elasticsearch/client/hits.rb

@@ -52,7 +52,7 @@ module ElasticSearch
         @total_entries = response["hits"]["total"]
         @_shards = response["_shards"]
         @facets = response["facets"]
-        @scroll_id = response["_scrollId"]
+        @scroll_id = response["_scroll_id"] || response["_scrollId"]
         populate(@options[:ids_only])
       end
 

data/lib/elasticsearch/client/index.rb

@@ -82,9 +82,18 @@ module ElasticSearch
       end
 
       #ids_only Return ids instead of hits
-      def scroll(scroll_id, options={})
-        response = execute(:scroll, scroll_id)
-        Hits.new(response, { :ids_only => options[:ids_only] }).freeze
+      #pass a block to execute the block for each batch of hits
+      def scroll(scroll_id, options={}, &block)
+        begin
+          search_options = options.reject { |k, v| [:page, :per_page, :ids_only, :limit, :offset].include?(k) }
+          response = execute(:scroll, scroll_id, options)
+          hits = Hits.new(response, { :ids_only => options[:ids_only] }).freeze
+          if block_given? && !hits.empty?
+            yield hits 
+            scroll_id = hits.scroll_id
+          end
+        end until !block_given? || hits.empty?
+        hits
       end 
 
       #df	 The default field to use when no field prefix is defined within the query.

data/lib/elasticsearch/transport/base_protocol.rb

@@ -46,8 +46,9 @@ module ElasticSearch
         results # {"hits"=>{"hits"=>[{"_id", "_type", "_source", "_index", "_score"}], "total"}, "_shards"=>{"failed", "total", "successful"}}
       end
 
-      def scroll(scroll_id)
-        response = request(:get, {:op => "_search/scroll"}, {:scroll_id => scroll_id })
+      def scroll(scroll_id, options={})
+        # patron cannot submit get requests with content, so we pass the scroll_id in the parameters
+        response = request(:get, {:op => "_search/scroll"}, options.merge(:scroll_id => scroll_id))
         handle_error(response) unless response.status == 200
         results = encoder.decode(response.body)
         # unescape ids

data/lib/elasticsearch/version.rb

@@ -2,7 +2,7 @@ module ElasticSearch
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 8
+    PATCH = 10
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/rubberband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubberband}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grantr"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-03-25}
   s.description = %q{An ElasticSearch client with ThriftClient-like failover handling.}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grantr/rubberband}
   s.licenses = ["Apache v2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{An ElasticSearch client.}
   s.test_files = [
     "spec/admin_spec.rb",
@@ -75,7 +75,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,187 +1,147 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubberband
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+version: !ruby/object:Gem::Version
+  version: 0.0.10
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - grantr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-03-25 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: patron
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10610880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10610880
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &10609760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10609760
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &10608320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10608320
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &10598620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10598620
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &10585740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10585740
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &10582680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10582680
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &10579800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10579800
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &10578640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 11
+      - !ruby/object:Gem::Version
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10578640
+- !ruby/object:Gem::Dependency
   name: patron
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &10577460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10577460
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &10576200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10576200
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &10574660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *10574660
 description: An ElasticSearch client with ThriftClient-like failover handling.
 email: grantr@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - TODO
-files: 
+files:
 - .autotest
 - .rspec
 - CONTRIBUTORS
@@ -225,38 +185,34 @@ files:
 - vendor/elasticsearch/elasticsearch.thrift
 has_rdoc: true
 homepage: http://github.com/grantr/rubberband
-licenses: 
+licenses:
 - Apache v2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2113882144738525775
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3653460652269889711
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An ElasticSearch client.
-test_files: 
+test_files:
 - spec/admin_spec.rb
 - spec/bulk_spec.rb
 - spec/hits_spec.rb