pluck_each 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 12ea18fa9a2707621fb6430795c4c6047b337fec
-  data.tar.gz: 7091ef9abf6df62714e4f0f828303b482c82a765
+SHA256:
+  metadata.gz: 1251afdb2cfb174e19fb429dc792037908275e3de39125de5704a8783b19d3c5
+  data.tar.gz: fa3759bccd4eac1e27508cc95f5f18c0a0c8106bad171ac7fe2e99ecce280864
 SHA512:
-  metadata.gz: e11526748776eeb71864eb443c1cc16526b4c5e233d9488a9a207839270f8b4985a36de51942ed33cf5c6cec72ff5a236de8a28ff1eb46be6471b28032cb1514
-  data.tar.gz: 349cb861579f0c721068dc77f18113c71468f961c91dc3c887d49fc1e190874212c2879b26531a8836b18c6058caf9f0ae97e76a45660eb5982ccdc3a78c7cfd
+  metadata.gz: 2ef9e0c7e2fd32ffbd2eadf5f0dd678a7f81777f683f0d18223680dbc9ca8f51272e219df1730cceadaff7e214c5b36b20b6ce8fda764f885707780969c3f814
+  data.tar.gz: 0ba161fd79eba6c7542affaa794e26013055cd781cd13990806725280e665e88f5920f61cc18134638e0a8a6bced183a4a080114829a7af724006339fe8ea851

data/lib/pluck_each/version.rb

@@ -1,3 +1,3 @@
 module PluckEach
-  VERSION = "0.1.3"
+  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 }
@@ -27,7 +29,12 @@ module ActiveRecord
       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

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,11 +12,11 @@ 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
 
@@ -43,7 +43,7 @@ describe PluckEach do
       end
 
       values.sort!
-      values.must_equal ["1", "2", "3"]
+      _(values).must_equal ["1", "2", "3"]
     end
 
     it 'plucks :id when only field requested' do
@@ -53,7 +53,7 @@ describe PluckEach do
       end
 
       values.sort!
-      values.must_equal User.all.pluck(:id).sort
+      _(values).must_equal User.all.pluck(:id).sort
     end
 
     it 'plucks only the fields requested' do
@@ -63,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
@@ -74,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
 
@@ -97,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.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-05 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: