model_iterator 1.0.0 → 1.0.1

data/lib/model_iterator.rb

@@ -1,6 +1,6 @@
 # Iterates over large models, storing state in Redis.
 class ModelIterator
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
   class MaxIterations < StandardError
     attr_reader :iterator
@@ -10,6 +10,11 @@ class ModelIterator
     end
   end
 
+  class << self
+    # Gets or sets a default Redis client object for iterators.
+    attr_accessor :redis
+  end
+
   # Gets a reference to the ActiveRecord::Base class that is iterated.
   #
   # Returns a Class.
@@ -51,7 +56,7 @@ class ModelIterator
   # iterating.  This is set automatically by #each.
   attr_accessor :job
 
-  # Gets or Sets the Redis client object.
+  # Gets or sets the Redis client object.
   attr_accessor :redis
 
   # Initializes a ModelIterator instance.
@@ -89,7 +94,7 @@ class ModelIterator
     else
       {}
     end
-    @redis = @options[:redis]
+    @redis = @options[:redis] || self.class.redis
     @id_field = @options[:id_field] || klass.primary_key
     @id_clause = @options[:id_clause] || "#{klass.table_name}.#{@id_field}"
     @order = @options[:order] == :desc ? :desc : :asc

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.0'
+  s.version           = '1.0.1'
   s.date              = '2012-09-07'
   s.rubyforge_project = 'model_iterator'
 

data/test/init_test.rb

@@ -28,10 +28,15 @@ end
 
 class InitializationTestWithOptions < ModelIterator::TestCase
   def setup
-    @iter = ModelIterator.new Model, :redis => RedisClient.new,
+    ModelIterator.redis = @redis = RedisClient.new
+    @iter = ModelIterator.new Model,
       :start_id => 5, :limit => 10, :prefix => 'foo'
   end
 
+  def teardown
+    ModelIterator.redis = nil
+  end
+
   def test_sets_klass
     assert_equal Model, @iter.klass
   end
@@ -51,6 +56,10 @@ class InitializationTestWithOptions < ModelIterator::TestCase
   def test_sets_redis_prefix
     assert_equal 'foo:ModelIterator:ModelIterator::TestCase::Model', @iter.prefix
   end
+
+  def test_sets_default_redis
+    assert_equal @redis, @iter.redis
+  end
 end
 
 class InitializationTestWithCustomWhereClause < ModelIterator::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_iterator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -72,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3722461387104018248
+      hash: -4149675607368163527
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: