factory_girl_rails 4.2.0 → 4.2.1

data/Appraisals

@@ -1,5 +1,5 @@
 appraise "rails3.0" do
-  gem "rails", "3.0.18"
+  gem "rails", "3.0.20"
   gem "sqlite3", ">= 1.3.4", platforms: :mri
   gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
   gem "minitest-rails"
@@ -9,7 +9,7 @@ appraise "rails3.0" do
 end
 
 appraise "rails3.1" do
-  gem "rails", "3.1.9"
+  gem "rails", "3.1.10"
   gem "sass-rails"
   gem "coffee-rails"
   gem "uglifier"
@@ -22,7 +22,7 @@ appraise "rails3.1" do
 end
 
 appraise "rails3.2" do
-  gem "rails", "3.2.10"
+  gem "rails", "3.2.11"
   gem "sass-rails"
   gem "coffee-rails"
   gem "uglifier"

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '4.2.0'
+  s.version     = '4.2.1'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"

data/features/fixture_replacement_config.feature

@@ -17,6 +17,13 @@ Feature:
 
   Scenario: Using Factory Girl and Factory Girl Rails with RSpec should generate a factory file
     When I add "rspec-rails" as a dependency
+    And I configure the factories as:
+      """
+      config.generators do |g|
+        g.test_framework :rspec, fixture: true
+        g.fixture_replacement :factory_girl
+      end
+      """
     And I run `bundle install` with a clean environment
     Then the output should contain "rspec-rails"
     And I run `bundle exec rails generate model User name:string` with a clean environment

data/features/step_definitions/rails_steps.rb

@@ -19,6 +19,14 @@ When /^I set the FactoryGirl :suffix option to "([^"]+)"$/ do |suffix|
 
 end
 
+When /^I configure the factories as:$/ do |string|
+  append_to_file File.join('config', 'application.rb'), <<-END
+class Testapp::Application
+  #{string}
+end
+  END
+end
+
 When /^I configure the factories directory as "([^"]+)"$/ do |factory_dir|
   append_to_file File.join('config', 'application.rb'), <<-END
 class Testapp::Application

data/gemfiles/rails3.0.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.18"
+gem "rails", "3.0.20"
 gem "sqlite3", ">= 1.3.4", :platforms=>:mri
 gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
 gem "minitest-rails"

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
   specs:
-    factory_girl_rails (4.2.0)
+    factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
 
@@ -9,12 +9,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.18)
-      actionpack (= 3.0.18)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
       mail (~> 2.2.19)
-    actionpack (3.0.18)
-      activemodel (= 3.0.18)
-      activesupport (= 3.0.18)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -22,19 +22,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.18)
-      activesupport (= 3.0.18)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.18)
-      activemodel (= 3.0.18)
-      activesupport (= 3.0.18)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.18)
-      activemodel (= 3.0.18)
-      activesupport (= 3.0.18)
-    activesupport (3.0.18)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     appraisal (0.5.1)
       bundler
       rake
@@ -44,7 +44,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (2.1.2)
-    childprocess (0.3.6)
+    childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -57,10 +57,10 @@ GEM
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     i18n (0.5.0)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -80,17 +80,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.18)
-      actionmailer (= 3.0.18)
-      actionpack (= 3.0.18)
-      activerecord (= 3.0.18)
-      activeresource (= 3.0.18)
-      activesupport (= 3.0.18)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.18)
-    railties (3.0.18)
-      actionpack (= 3.0.18)
-      activesupport (= 3.0.18)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
@@ -131,7 +131,7 @@ DEPENDENCIES
   factory_girl_rails!
   jquery-rails
   minitest-rails
-  rails (= 3.0.18)
+  rails (= 3.0.20)
   rake
   rspec (~> 2.11.0)
   rspec-rails

data/gemfiles/rails3.1.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.1.9"
+gem "rails", "3.1.10"
 gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"

data/gemfiles/rails3.1.gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
   specs:
-    factory_girl_rails (4.2.0)
+    factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.9)
-      actionpack (= 3.1.9)
+    actionmailer (3.1.10)
+      actionpack (= 3.1.10)
       mail (~> 2.3.3)
-    actionpack (3.1.9)
-      activemodel (= 3.1.9)
-      activesupport (= 3.1.9)
+    actionpack (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -22,19 +22,19 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.9)
-      activesupport (= 3.1.9)
+    activemodel (3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.9)
-      activemodel (= 3.1.9)
-      activesupport (= 3.1.9)
+    activerecord (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.9)
-      activemodel (= 3.1.9)
-      activesupport (= 3.1.9)
-    activesupport (3.1.9)
+    activeresource (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
+    activesupport (3.1.10)
       multi_json (>= 1.0, < 1.3)
     appraisal (0.5.1)
       bundler
@@ -45,7 +45,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.0.4)
-    childprocess (0.3.6)
+    childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
@@ -66,11 +66,11 @@ GEM
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     hike (1.2.1)
     i18n (0.6.1)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -90,21 +90,21 @@ GEM
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.9)
-      actionmailer (= 3.1.9)
-      actionpack (= 3.1.9)
-      activerecord (= 3.1.9)
-      activeresource (= 3.1.9)
-      activesupport (= 3.1.9)
+    rails (3.1.10)
+      actionmailer (= 3.1.10)
+      actionpack (= 3.1.10)
+      activerecord (= 3.1.10)
+      activeresource (= 3.1.10)
+      activesupport (= 3.1.10)
       bundler (~> 1.0)
-      railties (= 3.1.9)
-    railties (3.1.9)
-      actionpack (= 3.1.9)
-      activesupport (= 3.1.9)
+      railties (= 3.1.10)
+    railties (3.1.10)
+      actionpack (= 3.1.10)
+      activesupport (= 3.1.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -161,7 +161,7 @@ DEPENDENCIES
   factory_girl_rails!
   jquery-rails
   minitest-rails
-  rails (= 3.1.9)
+  rails (= 3.1.10)
   rake
   rspec (~> 2.11.0)
   rspec-rails

data/gemfiles/rails3.2.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.2.10"
+gem "rails", "3.2.11"
 gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
   specs:
-    factory_girl_rails (4.2.0)
+    factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.10)
-      actionpack (= 3.2.10)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -21,18 +21,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.10)
-      activesupport (= 3.2.10)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.10)
-      activemodel (= 3.2.10)
-      activesupport (= 3.2.10)
-    activesupport (3.2.10)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.5.1)
@@ -44,7 +44,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.0.4)
-    childprocess (0.3.6)
+    childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -65,12 +65,12 @@ GEM
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -88,21 +88,21 @@ GEM
     rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.10)
-      actionmailer (= 3.2.10)
-      actionpack (= 3.2.10)
-      activerecord (= 3.2.10)
-      activeresource (= 3.2.10)
-      activesupport (= 3.2.10)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.10)
-    railties (3.2.10)
-      actionpack (= 3.2.10)
-      activesupport (= 3.2.10)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -137,7 +137,7 @@ GEM
     therubyrhino (2.0.2)
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
@@ -159,7 +159,7 @@ DEPENDENCIES
   factory_girl_rails!
   jquery-rails
   minitest-rails
-  rails (= 3.2.10)
+  rails (= 3.2.11)
   rake
   rspec (~> 2.11.0)
   rspec-rails

data/lib/factory_girl_rails/railtie.rb

@@ -9,8 +9,12 @@ module FactoryGirl
       rails_options = generators.options[:rails]
 
       if rails_options[:test_framework] == :rspec
-        if !rails_options.has_key?(:fixture_replacement)
-          generators.fixture_replacement :factory_girl, :dir => 'spec/factories'
+        factory_girl_dir = generators.options.fetch(:factory_girl, { :dir => 'spec/factories' })[:dir]
+
+        if rails_options.has_key?(:fixture_replacement)
+          generators.fixture_replacement rails_options[:fixture_replacement], :dir => factory_girl_dir
+        else
+          generators.fixture_replacement :factory_girl, :dir => factory_girl_dir
         end
       else
         generators.test_framework rails_options[:test_framework], :fixture => false, :fixture_replacement => :factory_girl
@@ -19,9 +23,9 @@ module FactoryGirl
 
     initializer "factory_girl.set_factory_paths" do
       FactoryGirl.definition_file_paths = [
-        File.join(Rails.root, 'factories'),
-        File.join(Rails.root, 'test', 'factories'),
-        File.join(Rails.root, 'spec', 'factories')
+        Rails.root.join('factories'),
+        Rails.root.join('test', 'factories'),
+        Rails.root.join('spec', 'factories')
       ]
     end
 

data/lib/generators/factory_girl/model/model_generator.rb

@@ -1,4 +1,5 @@
 require 'generators/factory_girl'
+require 'factory_girl_rails'
 
 module FactoryGirl
   module Generators

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_rails
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -194,3 +194,4 @@ test_files:
 - gemfiles/rails3.1.gemfile.lock
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
+has_rdoc: