factory_girl_rails 1.7.0 → 2.0.0.rc

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    factory_girl_rails (1.7.0)
-      factory_girl (~> 2.6.0)
+    factory_girl_rails (2.0.0.rc)
+      factory_girl (~> 3.0.0.rc)
       railties (>= 3.0.0)
 
 GEM
@@ -56,8 +56,8 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (2.6.0)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0.rc1)
+      activesupport (>= 3.0.0)
     ffi (1.0.9)
     gherkin (2.4.1)
       json (>= 1.4.6)

data/factory_girl_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
-  s.version     = '1.7.0'
+  s.version     = '2.0.0.rc'
   s.authors     = ["Joe Ferris"]
   s.email       = %q{jferris@thoughtbot.com}
   s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
-  s.add_runtime_dependency('factory_girl', '~> 2.6.0')
+  s.add_runtime_dependency('factory_girl', '~> 3.0.0.rc')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 2.6.0')

data/features/generators.feature

@@ -10,4 +10,8 @@ Feature:
     And I add "factory_girl_rails" from this project as a dependency
     When I successfully run `bundle install`
     And I successfully run `bundle exec rails generate model User name:string --fixture-replacement=factory_girl`
-    Then the output should contain "test/factories/users.rb"
+    And I successfully run `bundle exec rails generate model Namespaced::User name:string --fixture-replacement=factory_girl`
+    Then the output should contain "test/factories/users.rb"
+    And the output should contain "test/factories/namespaced_users.rb"
+    And the file "test/factories/users.rb" should contain "factory :user do"
+    And the file "test/factories/namespaced_users.rb" should contain "factory :namespaced_user, :class => 'Namespaced::User' do"

data/lib/generators/factory_girl.rb

@@ -6,6 +6,10 @@ module FactoryGirl
       def self.source_root
         @_factory_girl_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'factory_girl', generator_name, 'templates'))
       end
+
+      def explicit_class_option
+        ", :class => '#{class_name}'" unless class_name == singular_table_name.camelize
+      end
     end
   end
-end
+end

data/lib/generators/factory_girl/model/templates/fixtures.rb

@@ -1,7 +1,7 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do
-  factory :<%= singular_name %> do
+  factory :<%= singular_table_name %><%= explicit_class_option %> do
 <% for attribute in attributes -%>
     <%= attribute.name %> <%= attribute.default.inspect %>
 <% end -%>

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl_rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
-  prerelease: 
+  version: 2.0.0.rc
+  prerelease: 6
 platform: ruby
 authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70348318218200 !ruby/object:Gem::Requirement
+  requirement: &70129470142100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348318218200
+  version_requirements: *70129470142100
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70348318216400 !ruby/object:Gem::Requirement
+  requirement: &70129470141600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *70348318216400
+  version_requirements: *70129470141600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348318215220 !ruby/object:Gem::Requirement
+  requirement: &70129470141220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348318215220
+  version_requirements: *70129470141220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348318214060 !ruby/object:Gem::Requirement
+  requirement: &70129470140680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70348318214060
+  version_requirements: *70129470140680
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70348318212780 !ruby/object:Gem::Requirement
+  requirement: &70129470140180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70348318212780
+  version_requirements: *70129470140180
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70348318212100 !ruby/object:Gem::Requirement
+  requirement: &70129470139800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348318212100
+  version_requirements: *70129470139800
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70348318210300 !ruby/object:Gem::Requirement
+  requirement: &70129470139260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,7 +87,7 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70348318210300
+  version_requirements: *70129470139260
 description: ! "factory_girl_rails provides integration between\n    factory_girl
   and rails 3 (currently just automatic factory definition\n    loading)"
 email: jferris@thoughtbot.com
@@ -129,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16