pluck_each 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53f3851ce03e4a77c7900b6d2f7577e62803a12
-  data.tar.gz: 35a28d803fcf5f219d3927f80140804b86e56b34
+  metadata.gz: e38a2e5de6b397dab4950becd1de9a80b703dd4e
+  data.tar.gz: 0f3798ecff31d3f35ece1f6ecedcea9ce657a233
 SHA512:
-  metadata.gz: 5dc272f28fd7ae2019dce19e1c01ca473e9fa3c17044ed9a9c893a92fbf112052129f865819603d9f8ecf7c72518c194724dba64867790a1ce61b527c82e6653
-  data.tar.gz: 1fb026a0c2c70bc0e38e05e9e3ea9f3539c81436d8474ae2ffb931824012ee61095c34f841337acd9e1d41f270a9df4d67a485b1443013fbd3d412b780249498
+  metadata.gz: 4cfd3aff95b389605210a1721da6361de08ef10ed15f70e269be0f846f48811afa7f4791fa559bdc13def4da414a0545e61a64fb2b1b118c144971740d9f753f
+  data.tar.gz: d3009c05a01c391bda8294158abab7fe8d45ad432fefa64304cd99a50f4c0f11d675d68d9c9ad3b050709a4e955eb7fca651bb8f1f6948ff9220d87d0a11178b

data/lib/pluck_each/version.rb

@@ -1,3 +1,3 @@
 module PluckEach
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/pluck_each.rb

@@ -14,32 +14,41 @@ module ActiveRecord
       end
     end
 
-    def pluck_in_batches(*args)
-      options = args.extract_options!
+    def pluck_in_batches(*column_names)
+      options = column_names.extract_options!
+      string_column_names = column_names.map(&:to_s)
+
+      # Ensure the primary key is selected so we can use it as an offset
+      id_in_columns_requested = string_column_names.include?(primary_key)
+      string_column_names.unshift(primary_key) unless id_in_columns_requested
+      id_position_in_response = string_column_names.index(primary_key)
+
       relation = self
       batch_size = options[:batch_size] || 1000
-      offset = 0
 
-      relation = relation.reorder(pluck_batch_order).offset(offset).limit(batch_size)
-      records = relation.pluck(*args)
+      relation = relation.reorder(batch_order).limit(batch_size)
+      batch_relation = relation
 
-      while records.any?
-        records_size = records.size
-        offset += records_size
-        break if records_size <= 0
+      loop do
+        batch = batch_relation.pluck(*string_column_names)
+        break if batch.empty?
 
-        yield records
+        primary_key_offset = batch.last.at(id_position_in_response)
 
-        break if records_size < batch_size
-        records = relation.offset(offset).limit(batch_size).pluck(*args)
-      end
-    end
+        unless id_in_columns_requested
+          batch.collect! do |record|
+            record.delete_at(id_position_in_response)
+            record
+          end
+        end
 
-    private
+        batch.flatten! if column_names.size == 1
 
-    def pluck_batch_order
-      "#{quoted_table_name}.#{quoted_primary_key} ASC"
-    end
+        yield batch
 
+        break if batch.size < batch_size
+        batch_relation = relation.where(arel_attribute(primary_key).gt(primary_key_offset))
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_each
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: pluck_each and plucK_in_batches ... should behave like find_each and find_in_batches