ar-find-in-batches-with-order 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a925a70757e5aba077a829c8390721aafb758e6
-  data.tar.gz: 6662ce7e8fb81f22f807be5e5b3c7fbd42759258
+  metadata.gz: 84f11eb8cbb3debcff137e68266fa7668bb938ae
+  data.tar.gz: ee5ee55a31b708b9117c39a65cd076da33693a20
 SHA512:
-  metadata.gz: 4ba8c62855896049ebf287bf1b5435e40bf11570561360e20ce1bd5af543c216a7ae817b31a7d67339ebd21b1c496922887a8b381183510e2df7b72d7b5a3d2a
-  data.tar.gz: 68704bce9b02c094c168ae4320fc575f7091056c0f462d8061bdae449e7921d8a444250caf9cd6f876bd4acc3439579075623536b2f70bda7289431c44bb8d3e
+  metadata.gz: 3a0e60008eb6e22060fee13095de11a85a0493ef5966caf5e0ced6f85493c132bd5398443b801efbb40e198557f300474ef2c072ab397e14b55061ba4c3f5247
+  data.tar.gz: a295e13733faae2843fb10b8dbdadea74f506793c6fe4436af7d432f9e560a60cbe468e6ad84672a594c9867ce44784085bb63a8399a73231db656b70d7be2b9

data/README.md

@@ -2,7 +2,7 @@
 
 Allows you to use find_each and find_each_in_batches with custom ordering.
 
-This is useful if your domain knowledge allows youo to make assumptions about the order of your records. In the vanilla find_each/find_each_in_batches implementation, Rails disables custom ordering to ensure consistency in case ordering changes between batchings.
+This is useful if your domain knowledge allows you to make assumptions about the order of your records. In the vanilla find_each/find_each_in_batches implementation, Rails disables custom ordering to ensure consistency in case ordering changes between batchings.
 
 However, in many cases you know that this would never happen. For example, in acitivity feeds, you might want to batch-find activitites sorted by newest items. You know that new items cannot disrupt the ordering once batching started.
 

data/lib/ar-find-in-batches-with-order.rb

@@ -12,26 +12,27 @@ module ActiveRecord
       batch_size = options.delete(:batch_size) || 1000
 
       # try to deduct the property_key, but safer to specificy directly
-      property_key = options.delete(:property_key) || arel.orders.first.try(:value).try(:name)
+      property_key = options.delete(:property_key) || arel.orders.first.try(:value).try(:name) || arel.orders.first.try(:split,' ').try(:first)
+      sanitized_key = ActiveRecord::Base.connection.quote_column_name(property_key)
       relation = relation.limit(batch_size)
 
       # in strictmode, we return records with same values as the last record of the last batch
       strict_mode = options.delete(:strict_mode) || true
 
 
-      records = start ? (direction == :desc ? relation.where(table[property_key].lteq(start)).to_a : relation.where(table[property_key].gteq(start)).to_a)  : relation.to_a
+      records = start ? (direction == :desc ? relation.where("#{sanitized_key} <= ?", start).to_a : relation.where("#{sanitized_key} >= ?", start).to_a)  : relation.to_a
 
-       while records.any?
+      while records.any?
         records_size = records.size
-  
+
         yield records
 
 
         break if records_size < batch_size
-        
+
         start = records.last.try(property_key)
 
-        records = strict_mode ? (direction == :desc ? relation.where(table[property_key].lteq(start)).to_a : relation.where(table[property_key].gteq(start)).to_a) : (direction == :desc ? relation.where(table[property_key].lt(start)).to_a : relation.where(table[property_key].gt(start)).to_a)
+        records = strict_mode ? (direction == :desc ? relation.where("#{sanitized_key} <= ?", start).to_a : relation.where("#{sanitized_key} >= ?", start).to_a) : (direction == :desc ? relation.where("#{sanitized_key} < ?", start).to_a : relation.where("#{sanitized_key} > ?", start).to_a)
       end
     end
 
@@ -40,10 +41,10 @@ module ActiveRecord
       last_record = nil
       find_in_batches_with_order(options) do |records|
 
-        records.each do |record| 
+        records.each do |record|
           # we need to find the last record of the previous batch
           next if last_record and (record != last_record)
-          if last_record 
+          if last_record
             last_record = nil
             next
           end
@@ -59,4 +60,4 @@ module ActiveRecord
   class Relation
     include FindInBatchesWithOrder
   end
-end
+end

data/lib/ar-find-in-batches-with-order/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module FindInBatchesWithOrder
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-find-in-batches-with-order
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nam Chu Hoai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,8 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Allow find_in_batches with custom order property
 test_files: []
+has_rdoc: