pluck_each 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e38a2e5de6b397dab4950becd1de9a80b703dd4e
-  data.tar.gz: 0f3798ecff31d3f35ece1f6ecedcea9ce657a233
+SHA256:
+  metadata.gz: 1251afdb2cfb174e19fb429dc792037908275e3de39125de5704a8783b19d3c5
+  data.tar.gz: fa3759bccd4eac1e27508cc95f5f18c0a0c8106bad171ac7fe2e99ecce280864
 SHA512:
-  metadata.gz: 4cfd3aff95b389605210a1721da6361de08ef10ed15f70e269be0f846f48811afa7f4791fa559bdc13def4da414a0545e61a64fb2b1b118c144971740d9f753f
-  data.tar.gz: d3009c05a01c391bda8294158abab7fe8d45ad432fefa64304cd99a50f4c0f11d675d68d9c9ad3b050709a4e955eb7fca651bb8f1f6948ff9220d87d0a11178b
+  metadata.gz: 2ef9e0c7e2fd32ffbd2eadf5f0dd678a7f81777f683f0d18223680dbc9ca8f51272e219df1730cceadaff7e214c5b36b20b6ce8fda764f885707780969c3f814
+  data.tar.gz: 0ba161fd79eba6c7542affaa794e26013055cd781cd13990806725280e665e88f5920f61cc18134638e0a8a6bced183a4a080114829a7af724006339fe8ea851

data/lib/pluck_each/version.rb

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

data/lib/pluck_each.rb

@@ -8,6 +8,8 @@ end
 module ActiveRecord
   module Batches
 
+    IS_RAILS_6_1_PLUS = ::Gem::Version.new(::ActiveRecord.version) >= ::Gem::Version.new("6.1.0")
+
     def pluck_each(*args)
       pluck_in_batches(*args) do |values|
         values.each { |value| yield value }
@@ -20,25 +22,35 @@ module ActiveRecord
 
       # Ensure the primary key is selected so we can use it as an offset
       id_in_columns_requested = string_column_names.include?(primary_key)
+      id_only_field_requested = id_in_columns_requested && string_column_names.size == 1
       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
 
-      relation = relation.reorder(batch_order).limit(batch_size)
+      if IS_RAILS_6_1_PLUS
+        relation = relation.reorder(batch_order(:asc)).limit(batch_size)
+      else
+        relation = relation.reorder(batch_order).limit(batch_size)
+      end
+
       batch_relation = relation
 
       loop do
         batch = batch_relation.pluck(*string_column_names)
         break if batch.empty?
 
-        primary_key_offset = batch.last.at(id_position_in_response)
+        primary_key_offset = batch.last
 
-        unless id_in_columns_requested
-          batch.collect! do |record|
-            record.delete_at(id_position_in_response)
-            record
+        if !id_only_field_requested
+          primary_key_offset = primary_key_offset.at(id_position_in_response)
+
+          unless id_in_columns_requested
+            batch.collect! do |record|
+              record.delete_at(id_position_in_response)
+              record
+            end
           end
         end
 
@@ -47,7 +59,10 @@ module ActiveRecord
         yield batch
 
         break if batch.size < batch_size
-        batch_relation = relation.where(arel_attribute(primary_key).gt(primary_key_offset))
+
+        # Rails 5 introduced "arel_attribute" but keeps support for "table" so using
+        # "table" as the basis for this for now
+        batch_relation = relation.where(table[primary_key].gt(primary_key_offset))
       end
     end
   end

data/pluck_each.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", "> 3.2.0"
   spec.add_dependency "activesupport", "> 3.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "mocha"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

data/spec/pluck_each_spec.rb

@@ -12,22 +12,48 @@ describe PluckEach do
 
   describe 'API' do
     it 'adds pluck_each to Arel relation nodes' do
-      User.all.must_respond_to :pluck_each
+      _(User.all).must_respond_to :pluck_each
     end
 
     it 'adds pluck_in_batches to Arel relation nodes' do
-      User.all.must_respond_to :pluck_in_batches
+      _(User.all).must_respond_to :pluck_in_batches
     end
   end
 
   describe 'pluck_each' do
     before do
       User.delete_all
+      Product.delete_all
+
       User.create(:first_name => '1', :last_name => '1')
       User.create(:first_name => '2', :last_name => '2')
       User.create(:first_name => '3', :last_name => '3')
       User.create(:first_name => '4', :last_name => '4')
       User.create(:first_name => '5', :last_name => '5')
+      Product.create(:name => "1", :value => 1, :user_id => User.first.id)
+      Product.create(:name => "2", :value => 2, :user_id => User.first.id)
+      Product.create(:name => "3", :value => 3, :user_id => User.first.id)
+    end
+
+    it 'plucks :id from scope on association' do
+      values = []
+      user = User.first
+      user.products.pluck_each(:name) do |name|
+        values << name
+      end
+
+      values.sort!
+      _(values).must_equal ["1", "2", "3"]
+    end
+
+    it 'plucks :id when only field requested' do
+      values = []
+      User.all.pluck_each(:id) do |id|
+        values << id
+      end
+
+      values.sort!
+      _(values).must_equal User.all.pluck(:id).sort
     end
 
     it 'plucks only the fields requested' do
@@ -37,7 +63,7 @@ describe PluckEach do
       end
 
       values.sort!
-      values.must_equal ['1', '2', '3', '4', '5']
+      _(values).must_equal ['1', '2', '3', '4', '5']
     end
 
     it 'allows batch_size in options to determine batch size' do
@@ -48,9 +74,9 @@ describe PluckEach do
         count += 1
       end
 
-      count.must_equal(5)
+      _(count).must_equal(5)
       values.sort!
-      values.must_equal ['1', '2', '3', '4', '5']
+      _(values).must_equal ['1', '2', '3', '4', '5']
     end
   end
 
@@ -71,7 +97,7 @@ describe PluckEach do
       end
 
       batch_sizes.sort!
-      batch_sizes.must_equal [1, 2, 2]
+      _(batch_sizes).must_equal [1, 2, 2]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_each
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: " pluck_each and plucK_in_batches ... should behave like find_each and
   find_in_batches "
 email:
@@ -130,7 +130,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: pluck_each and plucK_in_batches ... should behave like find_each and find_in_batches
 test_files: