mongo_batch 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9343db89a622725ac3532e5e7b16ff128b5d04b2
-  data.tar.gz: 5a2a6233dbc88941e86f53659020a8d4d1d4d516
+  metadata.gz: 31cf19268cb6591963d37fee0f1c2f5f2d9f5ba5
+  data.tar.gz: d84b84401e4e0778d308d2d6c71f12715e926591
 SHA512:
-  metadata.gz: 7fc6a20a065fe187c8980584c50dcaed5597b7ffae396c6c3d091249e7fe5ee6a38f7537005a8b0044c247f25477c996f9cc0f5b4543f70873c75d08c1d66b63
-  data.tar.gz: 17ed373f8e1f0cf2cddf265e3604df9ea42c207da69169346c2eefed1e30781a7140278271a0585e04360c6acb7e1cef7d5173a4228676056ce55118bcc84de1
+  metadata.gz: ddac9a08616da8097c1a9573af2137d2a2b2d3c4a4715f68d7a94c7475a9dd7ab55c5c54bb52892461f73b0bd2699dd46b8a2232fc1ac01152eb884e68a924c4
+  data.tar.gz: 99c711457dae4a1a8368d7d500e691e51b5ef15038e9669e58c9081d58f5cdd2129c5bbdba105d7b3f2706c3b9727e3e68e6a29cb04967808a5ff6bff1f96b71

data/README.md

@@ -2,8 +2,7 @@
 
 A Ruby library to run Mongoid queries on large collections in batches.
 
-**Supported Ruby versions:** 2.1, 2.2
-
+**Supported Ruby versions:** 2.1, 2.2  
 **Supported Mongoid versions:** 4.0, 5.0
 
 ## Installation

data/lib/mongo_batch.rb

@@ -15,16 +15,24 @@ module MongoBatch
         processed_so_far = offset
 
         offset.step(by: batch_size, to: to - batch_size).each do |offset|
-          yielder << query.order_by(order_by).limit(batch_size).skip(offset)
+          yielder << with_order.limit(batch_size).skip(offset)
           processed_so_far += batch_size
         end
 
         if processed_so_far < to
           last_limit = to - processed_so_far
-          yielder << query.order(order_by).limit(last_limit).skip(processed_so_far)
+          yielder << with_order.limit(last_limit).skip(processed_so_far)
         end
       end
     end
+
+    def with_order
+      options.sort ? query : query.order_by(order_by)
+    end
+
+    def options
+      query.criteria.options
+    end
   end
 
   def self.in_batches(query, options = {})

data/spec/mongo_batch_spec.rb

@@ -8,6 +8,7 @@ describe MongoBatch do
     extend MongoBatch
 
     field :body, type: String
+    field :index, type: Integer
   end
 
   describe '#find_in_batches' do
@@ -85,6 +86,16 @@ describe MongoBatch do
       expect(ids).to eq(posts.map(&:id).reverse)
     end
 
+    it 'does not enforce an order if one is already applied' do
+      posts = 1.upto(10).map { |n| FactoryGirl.create(:post, index: n) }
+
+      posts_in_batches = described_class
+                         .in_batches(Post.desc(:index), batch_size: 5)
+                         .map(&:to_a)
+
+      expect(posts_in_batches).to eq([posts[5..9].reverse, posts[0..4].reverse])
+    end
+
     it 'preserves any scopes previously applied' do
       posts = FactoryGirl.create_list(:post, 5, body: 'Hello world!')
       FactoryGirl.create_list(:post, 1)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mongo_batch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Oliver Martell
+- Matthew MacLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library to batch Mongo queries