in_batches 1.0.0 → 1.0.1

data/gemfiles/5.2.gemfile

@@ -1,10 +1,10 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.2.0'
-
-group :test do
-  gem 'simplecov'
-  gem 'sqlite3', '~> 1.3.6'
-end
-
-gemspec path: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+
+group :test do
+  gem 'simplecov'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/{atomically.gemspec → in_batches.gemspec}

@@ -1,43 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'in_batches/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'in_batches'
-  spec.version       = InBatches::VERSION
-  spec.authors       = ['khiav reoy']
-  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
-
-  spec.summary       = 'Backport in_batches from Rails 5 for Rails 3 and 4.'
-  spec.description   = 'Backport in_batches from Rails 5 for Rails 3 and 4.'
-  spec.homepage      = 'https://github.com/khiav223577/in_batches'
-  spec.license       = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.metadata    = {
-    'homepage_uri'      => 'https://github.com/khiav223577/in_batches',
-    'changelog_uri'     => 'https://github.com/khiav223577/in_batches/blob/master/CHANGELOG.md',
-    'source_code_uri'   => 'https://github.com/khiav223577/in_batches',
-    'documentation_uri' => 'http://www.rubydoc.info/gems/in_batches',
-    'bug_tracker_uri'   => 'https://github.com/khiav223577/in_batches/issues',
-  }
-
-  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-
-  spec.add_dependency 'activerecord', '>= 3'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'in_batches/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'in_batches'
+  spec.version       = InBatches::VERSION
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
+
+  spec.summary       = 'Backport in_batches from Rails 5 for Rails 3 and 4.'
+  spec.description   = 'Backport in_batches from Rails 5 for Rails 3 and 4.'
+  spec.homepage      = 'https://github.com/khiav223577/in_batches'
+  spec.license       = 'MIT'
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  # if spec.respond_to?(:metadata)
+  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  # end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
+  spec.require_paths = ['lib']
+  spec.metadata    = {
+    'homepage_uri'      => 'https://github.com/khiav223577/in_batches',
+    'changelog_uri'     => 'https://github.com/khiav223577/in_batches/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/in_batches',
+    'documentation_uri' => 'http://www.rubydoc.info/gems/in_batches',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/in_batches/issues',
+  }
+
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+
+  spec.add_dependency 'activerecord', '>= 3'
+end

data/lib/in_batches.rb

@@ -1,5 +1,10 @@
-# frozen_string_literal: true
-
-require 'in_batches/version'
-require 'active_record'
-require 'in_batches/active_record_extensions' if not defined?(ActiveRecord::Batches::BatchEnumerator)
+# frozen_string_literal: true
+
+require 'in_batches/version'
+require 'active_record'
+
+if defined?(ActiveRecord::Batches::BatchEnumerator)
+  warn "Congratulations on upgrading Rails to 5 or above. You could remove `in_batches` gem now. :)"
+else
+  require 'in_batches/active_record_extensions'
+end

data/lib/in_batches/active_record/batches.rb

@@ -1,54 +1,54 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module Batches
-    def in_batches(of: 1000, begin_at: nil, end_at: nil, load: false)
-      relation = self
-      unless block_given?
-        return BatchEnumerator.new(of: of, begin_at: begin_at, end_at: end_at, relation: self)
-      end
-
-      if logger && (arel.orders.present? || arel.taken.present?)
-        logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
-      end
-
-      relation = relation.reorder(batch_order).limit(of)
-      relation = apply_limits(relation, begin_at, end_at)
-      batch_relation = relation
-
-      loop do
-        if load
-          records = batch_relation.to_a
-          ids = batch_relation.pluck(primary_key)
-          relation_yielded = self.where(primary_key => ids).reorder(batch_order)
-          relation_yielded.load_records(records)
-        else
-          ids = batch_relation.pluck(primary_key)
-          relation_yielded = self.where(primary_key => ids).reorder(batch_order)
-        end
-
-        break if ids.empty?
-
-        primary_key_offset = ids.last
-        raise ArgumentError.new("Primary key not included in the custom select clause") unless primary_key_offset
-
-        yield relation_yielded
-
-        break if ids.length < of
-        batch_relation = relation.where(table[primary_key].gt(primary_key_offset))
-      end
-    end
-
-    private
-
-    def apply_limits(relation, begin_at, end_at)
-      relation = relation.where(table[primary_key].gteq(begin_at)) if begin_at
-      relation = relation.where(table[primary_key].lteq(end_at)) if end_at
-      relation
-    end
-
-    def batch_order
-      "#{quoted_table_name}.#{quoted_primary_key} ASC"
-    end
-  end
-end
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Batches
+    def in_batches(of: 1000, begin_at: nil, end_at: nil, load: false)
+      relation = self
+      unless block_given?
+        return BatchEnumerator.new(of: of, begin_at: begin_at, end_at: end_at, relation: self)
+      end
+
+      if logger && (arel.orders.present? || arel.taken.present?)
+        logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
+      end
+
+      relation = relation.reorder(batch_order).limit(of)
+      relation = apply_limits(relation, begin_at, end_at)
+      batch_relation = relation
+
+      loop do
+        if load
+          records = batch_relation.to_a
+          ids = batch_relation.pluck(primary_key)
+          relation_yielded = self.where(primary_key => ids).reorder(batch_order)
+          relation_yielded.load_records(records)
+        else
+          ids = batch_relation.pluck(primary_key)
+          relation_yielded = self.where(primary_key => ids).reorder(batch_order)
+        end
+
+        break if ids.empty?
+
+        primary_key_offset = ids.last
+        raise ArgumentError.new("Primary key not included in the custom select clause") unless primary_key_offset
+
+        yield relation_yielded
+
+        break if ids.length < of
+        batch_relation = relation.where(table[primary_key].gt(primary_key_offset))
+      end
+    end
+
+    private
+
+    def apply_limits(relation, begin_at, end_at)
+      relation = relation.where(table[primary_key].gteq(begin_at)) if begin_at
+      relation = relation.where(table[primary_key].lteq(end_at)) if end_at
+      relation
+    end
+
+    def batch_order
+      "#{quoted_table_name}.#{quoted_primary_key} ASC"
+    end
+  end
+end

data/lib/in_batches/active_record/relation/batch_enumerator.rb

@@ -1,67 +1,67 @@
-module ActiveRecord
-  module Batches
-    class BatchEnumerator
-      include Enumerable
-
-      def initialize(of: 1000, begin_at: nil, end_at: nil, relation:) #:nodoc:
-        @of       = of
-        @relation = relation
-        @begin_at = begin_at
-        @end_at   = end_at
-      end
-
-      # Looping through a collection of records from the database (using the
-      # +all+ method, for example) is very inefficient since it will try to
-      # instantiate all the objects at once.
-      #
-      # In that case, batch processing methods allow you to work with the
-      # records in batches, thereby greatly reducing memory consumption.
-      #
-      #   Person.in_batches.each_record do |person|
-      #     person.do_awesome_stuff
-      #   end
-      #
-      #   Person.where("age > 21").in_batches(of: 10).each_record do |person|
-      #     person.party_all_night!
-      #   end
-      #
-      # If you do not provide a block to #each_record, it will return an Enumerator
-      # for chaining with other methods:
-      #
-      #   Person.in_batches.each_record.with_index do |person, index|
-      #     person.award_trophy(index + 1)
-      #   end
-      def each_record
-        return to_enum(:each_record) unless block_given?
-
-        @relation.to_enum(:in_batches, of: @of, begin_at: @begin_at, end_at: @end_at, load: true).each do |relation|
-          relation.to_a.each { |record| yield record }
-        end
-      end
-
-      # Delegates #delete_all, #update_all, #destroy_all methods to each batch.
-      #
-      #   People.in_batches.delete_all
-      #   People.in_batches.destroy_all('age < 10')
-      #   People.in_batches.update_all('age = age + 1')
-      [:delete_all, :update_all, :destroy_all].each do |method|
-        define_method(method) do |*args, &block|
-          @relation.to_enum(:in_batches, of: @of, begin_at: @begin_at, end_at: @end_at, load: false).each do |relation|
-            relation.send(method, *args, &block)
-          end
-        end
-      end
-
-      # Yields an ActiveRecord::Relation object for each batch of records.
-      #
-      #   Person.in_batches.each do |relation|
-      #     relation.update_all(awesome: true)
-      #   end
-      def each
-        enum = @relation.to_enum(:in_batches, of: @of, begin_at: @begin_at, end_at: @end_at, load: false)
-        return enum.each { |relation| yield relation } if block_given?
-        enum
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Batches
+    class BatchEnumerator
+      include Enumerable
+
+      def initialize(of: 1000, begin_at: nil, end_at: nil, relation:) #:nodoc:
+        @of       = of
+        @relation = relation
+        @begin_at = begin_at
+        @end_at   = end_at
+      end
+
+      # Looping through a collection of records from the database (using the
+      # +all+ method, for example) is very inefficient since it will try to
+      # instantiate all the objects at once.
+      #
+      # In that case, batch processing methods allow you to work with the
+      # records in batches, thereby greatly reducing memory consumption.
+      #
+      #   Person.in_batches.each_record do |person|
+      #     person.do_awesome_stuff
+      #   end
+      #
+      #   Person.where("age > 21").in_batches(of: 10).each_record do |person|
+      #     person.party_all_night!
+      #   end
+      #
+      # If you do not provide a block to #each_record, it will return an Enumerator
+      # for chaining with other methods:
+      #
+      #   Person.in_batches.each_record.with_index do |person, index|
+      #     person.award_trophy(index + 1)
+      #   end
+      def each_record
+        return to_enum(:each_record) unless block_given?
+
+        @relation.to_enum(:in_batches, of: @of, begin_at: @begin_at, end_at: @end_at, load: true).each do |relation|
+          relation.to_a.each { |record| yield record }
+        end
+      end
+
+      # Delegates #delete_all, #update_all, #destroy_all methods to each batch.
+      #
+      #   People.in_batches.delete_all
+      #   People.in_batches.destroy_all('age < 10')
+      #   People.in_batches.update_all('age = age + 1')
+      [:delete_all, :update_all, :destroy_all].each do |method|
+        define_method(method) do |*args, &block|
+          @relation.to_enum(:in_batches, of: @of, begin_at: @begin_at, end_at: @end_at, load: false).each do |relation|
+            relation.send(method, *args, &block)
+          end
+        end
+      end
+
+      # Yields an ActiveRecord::Relation object for each batch of records.
+      #
+      #   Person.in_batches.each do |relation|
+      #     relation.update_all(awesome: true)
+      #   end
+      def each
+        enum = @relation.to_enum(:in_batches, of: @of, begin_at: @begin_at, end_at: @end_at, load: false)
+        return enum.each { |relation| yield relation } if block_given?
+        enum
+      end
+    end
+  end
+end

data/lib/in_batches/active_record_extensions.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-require 'in_batches/active_record/relation/batch_enumerator'
-require 'in_batches/active_record/batches'
-
-class ActiveRecord::Base
-  def self.in_batches(*args)
-    where('').in_batches(*args)
-  end
-end
+# frozen_string_literal: true
+
+require 'in_batches/active_record/relation/batch_enumerator'
+require 'in_batches/active_record/batches'
+
+class ActiveRecord::Base
+  def self.in_batches(*args)
+    where('').in_batches(*args)
+  end
+end

data/lib/in_batches/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-module InBatches
-  VERSION = '1.0.0'
-end
+# frozen_string_literal: true
+
+module InBatches
+  VERSION = '1.0.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_batches
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,11 +96,11 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE
 - README.md
 - Rakefile
-- atomically.gemspec
 - bin/console
 - bin/setup
 - gemfiles/3.2.gemfile
@@ -108,6 +108,7 @@ files:
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- in_batches.gemspec
 - lib/in_batches.rb
 - lib/in_batches/active_record/batches.rb
 - lib/in_batches/active_record/relation/batch_enumerator.rb
@@ -137,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Backport in_batches from Rails 5 for Rails 3 and 4.