ar-octopus 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 962dc9c9117e08008c637c759626480b47566338
-  data.tar.gz: 8661fb69b2f9fd24df265827eabbc5ee4aa623ce
+  metadata.gz: 10312fc71268bf4330c9a6c49038d5b1b3dab35a
+  data.tar.gz: 3aaf8fd301f7a018b9df3fbc247b3080f624ed52
 SHA512:
-  metadata.gz: f6091ea4584d2c031076b6ea0f4fc06abd9a10c2ed4d88762711d4854c8524c5172bab6081e50bc2a73c8ccf67dc68aeba8d91cdf179cfdc9aa7b77dbff37924
-  data.tar.gz: 96109ec7506bed3e1cd898e2efb1174006d18ca35ee538dbf5e1912fc3d4465188dd7110884ffaff17c2c9fefe126c726e415201e8423e2e957e1dbbaf7bd378
+  metadata.gz: 79dd6e2fedf56d5bb00ecf8afef6f0749fd842c8b7c9f1bb4735a059a6706d373623e49b43c1f47606808a4c6b90e40b5640f29053d0ee4f7de25a043ff175a2
+  data.tar.gz: 0400e3053af09d3b591a4992967787fb4957a48148b0a8fa3b290b8b8f7201519f72361a45acd49f366323b821463a1039059b186baf5ac38653b26649ebd87c

data/lib/octopus/relation_proxy.rb

@@ -26,9 +26,18 @@ module Octopus
     end + [:each, :map, :index_by]
     # `find { ... }` etc. should run_on_shard, `find(id)` should be sent to relation
     ENUM_WITH_BLOCK_METHODS = [:find, :select, :none?, :any?, :one?, :many?, :sum]
+    BATCH_METHODS = [:find_each, :find_in_batches, :in_batches]
 
     def method_missing(method, *args, &block)
-      if ENUM_METHODS.include?(method) || block && ENUM_WITH_BLOCK_METHODS.include?(method)
+      if !block && BATCH_METHODS.include?(method)
+        ::Enumerator.new do |yielder|
+          run_on_shard do
+            @ar_relation.public_send(method, *args) do |batch_item|
+              yielder << batch_item
+            end
+          end
+        end
+      elsif ENUM_METHODS.include?(method) || block && ENUM_WITH_BLOCK_METHODS.include?(method)
         run_on_shard { @ar_relation.to_a }.public_send(method, *args, &block)
       elsif block
         @ar_relation.public_send(method, *args, &block)

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/octopus/model_spec.rb

@@ -522,7 +522,7 @@ describe Octopus::Model do
         @user3 = User.using(:brazil).create!(:name => 'User3')
       end
 
-      it "#find_each should work" do
+      it "#find_each should work with a block" do
         result_array = []
 
         User.using(:brazil).where("name is not NULL").find_each do |user|
@@ -532,7 +532,27 @@ describe Octopus::Model do
         expect(result_array).to eq([@user1, @user2, @user3])
       end
 
-      it "#find_in_batches, should work" do
+      it "#find_each should work as an enumerator" do
+        result_array = []
+
+        User.using(:brazil).where("name is not NULL").find_each.each do |user|
+          result_array << user
+        end
+
+        expect(result_array).to eq([@user1, @user2, @user3])
+      end
+
+      it "#find_each should work as a lazy enumerator" do
+        result_array = []
+
+        User.using(:brazil).where("name is not NULL").find_each.lazy.each do |user|
+          result_array << user
+        end
+
+        expect(result_array).to eq([@user1, @user2, @user3])
+      end
+
+      it "#find_in_batches should work with a block" do
         result_array = []
 
         User.using(:brazil).where("name is not NULL").find_in_batches(batch_size: 1) do |user|
@@ -541,6 +561,26 @@ describe Octopus::Model do
 
         expect(result_array).to eq([[@user1], [@user2], [@user3]])
       end
+
+      it "#find_in_batches should work as an enumerator" do
+        result_array = []
+
+        User.using(:brazil).where("name is not NULL").find_in_batches(batch_size: 1).each do |user|
+          result_array << user
+        end
+
+        expect(result_array).to eq([[@user1], [@user2], [@user3]])
+      end
+
+      it "#find_in_batches should work as a lazy enumerator" do
+        result_array = []
+
+        User.using(:brazil).where("name is not NULL").find_in_batches(batch_size: 1).lazy.each do |user|
+          result_array << user
+        end
+
+        expect(result_array).to eq([[@user1], [@user2], [@user3]])
+      end
     end
 
     describe 'deleting a record' do

data/spec/octopus/relation_proxy_spec.rb

@@ -58,10 +58,18 @@ describe Octopus::RelationProxy do
       end
     end
 
-    it "can deliver methods in ActiveRecord::Batches correctly" do
+    it "can deliver methods in ActiveRecord::Batches correctly when given a block" do
       expect { @relation.find_each(&:inspect) }.not_to raise_error
     end
 
+    it "can deliver methods in ActiveRecord::Batches correctly as an enumerator" do
+      expect { @relation.find_each.each(&:inspect) }.not_to raise_error
+    end
+
+    it "can deliver methods in ActiveRecord::Batches correctly as a lazy enumerator" do
+      expect { @relation.find_each.lazy.each(&:inspect) }.not_to raise_error
+    end
+
     context 'under Rails 4' do
       it 'is an Octopus::RelationProxy' do
         expect{@relation.ar_relation}.not_to raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Thiago Pradi