factory_data_preloader 0.5.2 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 1.0.0.beta0 / 2010-12-21
+
+* Added Gemfile and updated gemspec to list all dependencies
+* Require all libraries needed (YAML and singleton)
+* Updated tests to work with latest shoulda
+
+== 1.0.0.beta0 / 2010-12-20
+
+* Updating to Rails 3 compat
+
 == 0.5.2 / 2009-07-09
 
 * Improved backtrace output.

data/README.rdoc

@@ -18,17 +18,15 @@ and re-use it in each test when rails rolls back the transaction.
 
 == Download
 
-Github: http://github.com/myronmarston/factory_data_preloader/tree/master
+Github: http://github.com/myronmarston/factory_data_preloader
 
 Gem:
-  gem install myronmarston-factory_data_preloader --source http://gems.github.com
+  gem install factory_data_preloader --source http://gemcutter.org
   
 == Usage
 
 Load the gem using Rails' 2.1+ gem support, in either config/environment.rb, or config/environments/test.rb:
-  config.gem 'myronmarston-factory_data_preloader', 
-    :lib => 'factory_data_preloader', 
-    :source => 'http://gems.github.com'
+  config.gem 'factory_data_preloader', :source => 'http://gemcutter.org'
 
 Define your preloaded data.  FactoryData will automatically require test/factory_data.rb or test/factory_data/*.rb.
 Define your data in these files like this:
@@ -91,7 +89,7 @@ at the start of each test run.  If you want finer grain control over which prelo
 
 == Notes, etc.
 
-* This gem has been tested with Rails 2.2.2 and Rails 2.3.2.
+* This gem has been tested with Rails 2.2.2, 2.3.2, 2.3.3 and 2.3.4.
 * You can create the data using any fixture replacement you want.  In this contrived example, I just used ActiveRecord's
   built in methods for simplicity's sake.
 * FactoryData#preload does not actually preload the data.  It simply defines the data that will be automatically preloaded

data/VERSION.yml

@@ -1,4 +1,5 @@
---- 
-:major: 0
-:minor: 5
-:patch: 2
+---
+:major: 1
+:minor: 0
+:patch: 0
+:build: 'beta0'

data/lib/factory_data_preloader.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'rubygems'
+require 'singleton'
 
 if ENV['RAILS_VERSION']
   puts "loading Rails version #{ENV['RAILS_VERSION']}"
@@ -18,14 +19,5 @@ require 'factory_data_preloader/preloaded_data_hash'
 require 'factory_data_preloader/factory_data'
 require 'factory_data_preloader/rails_core_ext'
 
-if defined? Rails.configuration
-  Rails.configuration.after_initialize do
-    FactoryData.definition_file_paths = [
-      File.join(RAILS_ROOT, 'test', 'factory_data'),
-      File.join(RAILS_ROOT, 'spec', 'factory_data')
-    ]
-    FactoryData.find_definitions
-  end
-else
-  FactoryData.find_definitions
-end
+require 'factory_data_preloader/railtie' if defined?(Rails)
+

data/lib/factory_data_preloader/rails_core_ext.rb

@@ -1,5 +1,5 @@
 # TODO: add tests for this.  I've manually tested this in a Rails 2.2 and 2.3 app, but haven't found a way to add
-# a test for this to our test suite.  It's difficult to test this since it just modifies what happens before the 
+# a test for this to our test suite.  It's difficult to test this since it just modifies what happens before the
 # tests are run.
 
 # Between Rails 2.2 and 2.3, the fixture loading code was moved from
@@ -13,7 +13,7 @@ patch_module.class_eval do
     FactoryData.preload_data!
     val
   end
-    
+
   def teardown_fixtures_with_preloaded_factory_data
     FactoryData.reset_cache!
     teardown_fixtures_without_preloaded_factory_data
@@ -23,13 +23,17 @@ patch_module.class_eval do
   alias_method_chain :teardown_fixtures, :preloaded_factory_data
 end
 
-class Fixtures
-  def delete_existing_fixtures_with_preloaded_factory_data
-    delete_existing_fixtures_without_preloaded_factory_data
-    FactoryData.delete_preload_data!
+# Fixtures#delete_existing_fixtures was removed in Rails 3.1
+# see: https://github.com/rails/rails/commit/f9ea47736e270152c264bb5f8fdbfaa1d04fe82f
+if ActiveRecord::Fixtures.instance_methods(false).include?(:delete_existing_fixtures)
+  class Fixtures
+    def delete_existing_fixtures_with_preloaded_factory_data
+      delete_existing_fixtures_without_preloaded_factory_data
+      FactoryData.delete_preload_data!
+    end
+
+    alias_method_chain :delete_existing_fixtures, :preloaded_factory_data
   end
-  
-  alias_method_chain :delete_existing_fixtures, :preloaded_factory_data
 end
 
 class ActiveSupport::TestCase

data/lib/factory_data_preloader/railtie.rb

@@ -0,0 +1,27 @@
+module FactoryDataPreloader
+
+  if defined? Rails::Railtie
+    # Rails 3.x init
+    class Railtie < Rails::Railtie
+      config.after_initialize do
+        FactoryData.definition_file_paths = [
+          File.join(File.join(Rails.root.to_s, 'test', 'factory_data')),
+          File.join(File.join(Rails.root.to_s, 'spec', 'factory_data')),
+        ]
+
+        FactoryData.find_definitions
+      end
+    end
+  else
+    # Rails 2.x init
+    Rails.configuration.after_initialize do
+      FactoryData.definition_file_paths = [
+        File.join(RAILS_ROOT, 'test', 'factory_data'),
+        File.join(RAILS_ROOT, 'spec', 'factory_data')
+      ]
+
+      FactoryData.find_definitions
+    end
+  end
+
+end

data/test/factory_data_test.rb

@@ -7,50 +7,68 @@ class FactoryDataTest < Test::Unit::TestCase
 
   context 'Calling FactoryData.preload(:users)' do
     setup do
+      @user_count = User.count
       FactoryData.preload(:users) do |data|
         data.add(:thom) { User.create(:first_name => 'Thom', :last_name => 'York') }
       end
     end
 
-    should_not_change 'User.count'
-    should_change "FactoryData.methods.include?('users')", :from => false, :to => true
+    should "not change User.count" do
+      assert_equal(@user_count, User.count)
+    end
+
+    should "change FactoryData.methods.include?('users') to true" do
+      assert_equal(true, FactoryData.methods.include?('users'))
+    end
 
     context 'when there was a previous user record in the database' do
       setup { User.create(:first_name => 'Barack', :last_name => 'Obama') }
 
       context 'and calling FactoryData.delete_preload_data!' do
         setup { FactoryData.delete_preload_data! }
-        should_change 'User.count', :to => 0
+
+        should "change User.count to 0" do
+          assert_equal(0, User.count)
+        end
       end
     end
 
     context 'and later calling FactoryData.preload_data!' do
       setup do
+        @user_count = User.count
         @out, @err = OutputCapturer.capture do
           FactoryData.preload_data!
         end
       end
 
-      should_change 'User.count', :by => 1
+      should "change User.count by 1" do
+        assert_equal(@user_count + 1, User.count)
+      end
 
       context 'and later re-defining the preloaders' do
         setup do
+          @user_count = User.count
           FactoryData.preload(:users) do |data|
             data.add(:thom) { User.create(:first_name => 'Thom', :last_name => 'York') }
             data.add(:john) { User.create(:first_name => 'John', :last_name => 'Doe') }
           end
         end
 
-        should_change 'User.count', :by => -1
+        should "change User.count by - 1" do
+          assert_equal(@user_count - 1, User.count)
+        end
 
         context 'and preloading the re-defined preloader' do
           setup do
+            @user_count = User.count
             @out, @err = OutputCapturer.capture do
               FactoryData.preload_data!
             end
           end
 
-          should_change 'User.count', :by => 2
+          should "create 2 users" do
+            assert_equal(@user_count + 2, User.count)
+          end
         end
       end
 
@@ -76,10 +94,12 @@ class FactoryDataTest < Test::Unit::TestCase
         end
 
         context 'and later calling FactoryData.reset_cache!' do
-          setup { FactoryData.reset_cache! }
+          setup do
+            FactoryData.reset_cache!
+          end
 
           should 'reload the record from the database the next time FactoryData.users(key) is called' do
-            User.expects(:find).once.returns(@user)
+            User.expects(:find_by_id).once.returns(@user)
             FactoryData.users(:thom)
           end
         end

data/test/preloader_test.rb

@@ -20,12 +20,15 @@ class PreloaderTest < Test::Unit::TestCase
 
     context 'when preloaded' do
       setup do
+        @user_count = User.count
         @out, @err = OutputCapturer.capture do
           @preloader.preload!
         end
       end
 
-      should_change 'User.count', :by => 2
+      should 'change User.count by 2' do
+        assert_equal(@user_count + 2, User.count)
+      end
 
       should 'return the preloaded data when #get_record is called' do
         assert_equal 'York', @preloader.get_record(:thom).last_name
@@ -39,6 +42,7 @@ class PreloaderTest < Test::Unit::TestCase
 
       context 'when preloaded again' do
         setup do
+          @user_count = User.count
           @out, @err = OutputCapturer.capture do
             @preloader.preload!
           end
@@ -49,7 +53,9 @@ class PreloaderTest < Test::Unit::TestCase
           assert_equal '', @out
         end
 
-        should_not_change 'User.count'
+        should 'not change User.count' do
+          assert_equal(@user_count, User.count)
+        end
       end
 
       should 'issue a delete statement if #delete_table_data! is called' do

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'sqlite3'
 
 begin
   require 'ruby-debug'

metadata

@@ -1,92 +1,147 @@
 --- !ruby/object:Gem::Specification 
 name: factory_data_preloader
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors: 
-- Myron Marston
+  - Kyle J. Ginavan
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 -07:00
-default_executable: 
+date: 2009-07-09 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: Shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: shoulda
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.11.3
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 2.12.0
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.10
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 0.10.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: activerecord
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.0
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: activesupport
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.0
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: jeweler
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: sqlite3-ruby
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.3.2
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.4.0
+    type: :development
+    version_requirements: *id006
 description: 
-email: myron.marston@gmail.com
+email: kylejginavan@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
-- LICENSE
+  - README.rdoc
+  - LICENSE
 files: 
-- CHANGELOG.rdoc
-- README.rdoc
-- VERSION.yml
-- lib/factory_data_preloader/core_ext.rb
-- lib/factory_data_preloader/factory_data.rb
-- lib/factory_data_preloader/preloaded_data_hash.rb
-- lib/factory_data_preloader/preloader.rb
-- lib/factory_data_preloader/preloader_collection.rb
-- lib/factory_data_preloader/rails_core_ext.rb
-- lib/factory_data_preloader.rb
-- test/factory_data_test.rb
-- test/lib/models.rb
-- test/lib/schema.rb
-- test/preloaded_data_hash_test.rb
-- test/preloader_test.rb
-- test/test_helper.rb
-- LICENSE
-has_rdoc: true
-homepage: http://github.com/myronmarston/factory_data_preloader
+  - CHANGELOG.rdoc
+  - README.rdoc
+  - VERSION.yml
+  - lib/factory_data_preloader/core_ext.rb
+  - lib/factory_data_preloader/factory_data.rb
+  - lib/factory_data_preloader/preloaded_data_hash.rb
+  - lib/factory_data_preloader/preloader.rb
+  - lib/factory_data_preloader/preloader_collection.rb
+  - lib/factory_data_preloader/rails_core_ext.rb
+  - lib/factory_data_preloader/railtie.rb
+  - lib/factory_data_preloader.rb
+  - test/factory_data_test.rb
+  - test/lib/models.rb
+  - test/lib/schema.rb
+  - test/preloaded_data_hash_test.rb
+  - test/preloader_test.rb
+  - test/test_helper.rb
+  - LICENSE
+homepage: http://github.com/kylejginavan/factory_data_preloader
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --inline-source
-- --charset=UTF-8
+  - --inline-source
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library for preloading test data in rails applications.
 test_files: []