model_iterator 1.0.3 → 1.0.4

data/lib/model_iterator.rb

@@ -1,6 +1,6 @@
 # Iterates over large models, storing state in Redis.
 class ModelIterator
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 
   class MaxIterations < StandardError
     attr_reader :iterator
@@ -104,14 +104,13 @@ class ModelIterator
     @max = @options[:max].to_i
     @joins = @options[:joins]
     @clause =  "#{@id_clause} #{op} ?"
-    if @options[:conditions]
-      conditions = Array(@options[:conditions])
-      @clause += " AND (#{conditions.first})"
-      @clause_args = conditions[1..-1]
-    elsif !args.empty?
-      @clause += " AND (#{args.shift})"
-      @clause_args = args
+
+    if !(conditions = Array(@options[:conditions] || args)).empty?
+      @clause += " AND (#{conditions.shift})"
     end
+
+    @clause_args = conditions
+
     @current_id = @options[:start_id]
     @limit = @options[:limit] || 100
     @job = @prefix = @key = nil

data/model_iterator.gemspec

@@ -12,7 +12,7 @@ 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.3'
+  s.version           = '1.0.4'
   s.date              = '2013-05-01'
   s.rubyforge_project = 'model_iterator'
 

data/test/iterate_test.rb

@@ -32,7 +32,7 @@ class IterateTest < ModelIterator::TestCase
     assert_equal 3, iter.current_id
   end
 
-  def test_loops_through_all_sets
+  def test_loops_through_all_sets_with_null_redis
     names = []
     redis = ModelIterator::NullRedis.new
     iter = ModelIterator.new Model, :redis => redis, :limit => 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_iterator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2632868807396715918
+      hash: 1098997578076474898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: