elastic_record 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d254216fe907d0c00ffb1c00aeb7ef1fcd1c034
-  data.tar.gz: 99b0c21ca7295348e69a666d6a3981cb49b497c1
+  metadata.gz: 01876488cf87aafffd46c830a6712dd84f56c83d
+  data.tar.gz: 7db2399fa5d44bf81a3c157cd23c95d60b040c19
 SHA512:
-  metadata.gz: f4728a0563f5fddc5a127d164ae816d3e8c7d037d4490b43a3744d8e0bf3174e08ac040340406cc201095728b1e82f02c45431b24191c9e810469fe69a37961b
-  data.tar.gz: 7b007f7549f9159f3d6deedca8c25f2f8e7edf31e70b85f3eeae3fb75bf79513e1769c5019c4e0d17ffcad493d8991947b4ab926a9014c31c839789148e2eac6
+  metadata.gz: 4f8a6c431823345a68a2da9d2d6c6099f5449a240068c60aa1f3f6ccbd8d2d74bb95ef3ed2f4c6c4882c0a65c537b298adc0b42b7ecc979b04b82e6cf708181e
+  data.tar.gz: 032af52b81c1e79b7957934aa1812f809ef8109f18c418d95fd42dcfa70e99472dd28825b62020714d00aad35cc5f5945f95c7923e300d5e982db8c68c7298cc

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '1.2.2'
+  s.version = '1.2.3'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/relation/batches.rb

@@ -1,5 +1,28 @@
 module ElasticRecord
   class Relation
+    class ScanSearch
+      attr_reader :scroll_id
+
+      def initialize(model, scroll_id, options = {})
+        @model     = model
+        @scroll_id = scroll_id
+        @options   = options
+      end
+
+      def request_more_ids
+        json = @model.elastic_index.scroll(@scroll_id, keep_alive)
+        json['hits']['hits'].map { |hit| hit['_id'] }
+      end
+
+      def keep_alive
+        @options[:keep_alive] || (raise "Must provide a :keep_alive option")
+      end
+
+      def requested_batch_size
+        @options[:batch_size]
+      end
+    end
+
     module Batches
       def find_each(options = {})
         find_in_batches(options) do |records|
@@ -14,24 +37,10 @@ module ElasticRecord
       end
 
       def find_ids_in_batches(options = {}, &block)
-        options.assert_valid_keys(:batch_size, :keep_alive)
-
-        scroll_keep_alive = options[:keep_alive] || ElasticRecord::Config.scroll_keep_alive
-        size = options[:batch_size] || 100
-
-        options = {
-          scroll: scroll_keep_alive,
-          size: size,
-          search_type: 'scan'
-        }.update(options)
+        scan_search = create_scan_search(options)
 
-        search_result = klass.elastic_index.search(as_elastic, options)
-        scroll_id = search_result['_scroll_id']
-        hit_count = 0
-
-        while (hit_ids = get_scroll_hit_ids(scroll_id, scroll_keep_alive)).any?
-          hit_count += hit_ids.size
-          hit_ids.each_slice(size, &block)
+        while (hit_ids = scan_search.request_more_ids).any?
+          hit_ids.each_slice(scan_search.requested_batch_size, &block)
         end
       end
 
@@ -41,12 +50,15 @@ module ElasticRecord
         end
       end
 
-      private
+      def create_scan_search(options = {})
+        options[:batch_size] ||= 100
+        options[:keep_alive] ||= ElasticRecord::Config.scroll_keep_alive
 
-        def get_scroll_hit_ids(scroll_id, scroll_keep_alive)
-          json = klass.elastic_index.scroll(scroll_id, scroll_keep_alive)
-          json['hits']['hits'].map { |hit| hit['_id'] }
-        end
+        search_options = {search_type: 'scan', size: options[:batch_size], scroll: options[:keep_alive]}
+        json = klass.elastic_index.search(as_elastic, search_options)
+
+        ElasticRecord::Relation::ScanSearch.new(klass, json['_scroll_id'], options)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic