model_iterator 1.0.4 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 99afeb3b36405d067e41fd305efccf904b992ac4
+  data.tar.gz: 0c9caa876f8d4566eeca4bf0c2da655f71d4eb68
+SHA512:
+  metadata.gz: 06c0aa15153f69b15381acac1aa5235a56778fb7d3cc8e31e4226621db62ee2606561f1ea990f210f883d49f421a0cb8f1f50c5026255ea25abb1d0916ff3eb0
+  data.tar.gz: 40021312de9cb5f1bff81d28d88ad2bc8e41f320e462776ddc17bba4ca4112b9a1160700705f8d159b8467fb33b523e1e52ffb78417aa50be3aae9cdf072f8d9

data/Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :dev do
-  gem 'rake'
-  gem 'activerecord'
   gem 'sqlite3'
 end
 

data/lib/model_iterator.rb

@@ -1,6 +1,6 @@
 # Iterates over large models, storing state in Redis.
 class ModelIterator
-  VERSION = "1.0.4"
+  VERSION = "2.0.0"
 
   class MaxIterations < StandardError
     attr_reader :iterator
@@ -204,7 +204,11 @@ class ModelIterator
   # Returns an Array of ActiveRecord::Base instances if any results are
   # returned, or nil.
   def records
-    arr = @klass.all(find_options)
+    options = find_options
+    query = @klass.where(options[:conditions]).limit(options[:limit]).order(options[:order])
+    query = query.select(options[:select]) if options[:select]
+    query = query.joins(options[:joins]) if options[:joins]
+    arr = query.to_a
     arr.empty? ? nil : arr
   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.4'
-  s.date              = '2013-05-01'
+  s.version           = '2.0.0'
+  s.date              = '2016-03-31'
   s.rubyforge_project = 'model_iterator'
 
   ## Make sure your summary is short. The description may be as long
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
 
+  s.add_dependency 'activerecord', '>=4.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'
 

data/test/helper.rb

@@ -3,18 +3,32 @@ require 'test/unit'
 require 'active_record'
 require File.expand_path("../../lib/model_iterator", __FILE__)
 
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
 class ModelIterator::TestCase < Test::Unit::TestCase
   class Model < ActiveRecord::Base
-    establish_connection :adapter => 'sqlite3', :database => ':memory:'
     connection.create_table table_name do |c|
       c.column :name, :string
     end
 
+    has_one :associated_model
+
     %w(a b c).each do |s|
       create!(:name => s)
     end
   end
 
+  class AssociatedModel < ActiveRecord::Base
+    connection.create_table table_name do |c|
+      c.integer :model_id
+    end
+
+    belongs_to :model
+
+    Model.all.each do |m|
+      create!(:model => m)
+    end
+  end
+
   class RedisClient
     def initialize(hash = nil)
       @hash = hash || {}

data/test/iterate_test.rb

@@ -133,6 +133,23 @@ class IterateTest < ModelIterator::TestCase
     assert_equal %w(a b c), names
   end
 
+  def test_select_option_honored
+    names = []
+    redis = RedisClient.new
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1, :select => :id
+    iter.each do |m|
+      assert_false m.attributes.has_key?(:name)
+    end
+  end
+
+  def test_joins_can_be_used
+    redis = RedisClient.new
+    iter = ModelIterator.new Model, :redis => redis, :limit => 1, :joins => :associated_model
+    iter.each do |m|
+      assert_not_nil m.associated_model
+    end
+  end
+
   class ExpectedError < StandardError; end
 end
 

metadata

@@ -1,46 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: model_iterator
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Iterate through large ActiveRecord datasets
@@ -62,28 +71,24 @@ files:
 - test/iterate_test.rb
 homepage: http://github.com/technoweenie/model_iterator
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1098997578076474898
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: model_iterator
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 2
 summary: Iterate through large ActiveRecord datasets