model_iterator 1.0.2 → 1.0.3

data/lib/model_iterator.rb

@@ -1,6 +1,6 @@
 # Iterates over large models, storing state in Redis.
 class ModelIterator
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 
   class MaxIterations < StandardError
     attr_reader :iterator
@@ -144,7 +144,7 @@ class ModelIterator
     each_set do |records|
       records.each do |record|
         block.call(record)
-        @current_id = record.send(@id_field)
+        update_current_id(record)
       end
     end
     cleanup
@@ -220,6 +220,33 @@ class ModelIterator
     opt[:joins] = @joins if @joins
     opt
   end
-end
 
+  # Updates the current ID for the given record.
+  #
+  # record - A single record from the iteration.
+  #
+  # Returns nothing.
+  def update_current_id(record)
+    @current_id = record.send(@id_field)
+  end
+
+  # Pass this to ModelIterator if you don't want to store state anywhere.
+  class NullRedis
+    @instance = new
+
+    def self.new
+      @instance
+    end
+
+    def get(key)
+      0
+    end
+
+    def set(key, value)
+    end
+
+    def del(key)
+    end
+  end
+end
 

data/model_iterator.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'model_iterator'
-  s.version           = '1.0.2'
-  s.date              = '2013-03-19'
+  s.version           = '1.0.3'
+  s.date              = '2013-05-01'
   s.rubyforge_project = 'model_iterator'
 
   ## Make sure your summary is short. The description may be as long

data/test/iterate_test.rb

@@ -8,7 +8,8 @@ class IterateTest < ModelIterator::TestCase
 
   def test_loops_through_all_records
     names = []
-    iter = ModelIterator.new Model, :redis => RedisClient.new, :limit => 1
+    redis = RedisClient.new
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1
     iter.each do |m|
       names << m.name
     end
@@ -16,6 +17,36 @@ class IterateTest < ModelIterator::TestCase
     assert_equal %w(a b c), names
   end
 
+  def test_loops_through_all_sets
+    names = []
+    redis = RedisClient.new
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1
+    iter.each_set do |records|
+      names << records.map(&:name)
+      iter.update_current_id(records.last)
+    end
+
+    assert_equal [%w(a), %w(b), %w(c)], names
+
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1
+    assert_equal 3, iter.current_id
+  end
+
+  def test_loops_through_all_sets
+    names = []
+    redis = ModelIterator::NullRedis.new
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1
+    iter.each_set do |records|
+      names << records.map(&:name)
+      iter.update_current_id(records.last)
+    end
+
+    assert_equal [%w(a), %w(b), %w(c)], names
+
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1
+    assert_equal 0, iter.current_id
+  end
+
   def test_loops_through_filtered_records
     names = []
     iter = ModelIterator.new Model, 'name != ?', 'a',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_iterator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1002102300965983738
+      hash: 2632868807396715918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: