factory_girl 1.2.4 → 1.3.0

data/README.rdoc

@@ -2,17 +2,16 @@
 
 factory_girl is a fixtures replacement with a straightforward definition syntax, support for multiple build strategies (saved instances, unsaved instances, attribute hashes, and stubbed objects), and support for multiple factories for the same class (user, admin_user, and so on), including factory inheritance.
 
+If you want to use factory_girl with Rails 3, use the factory_girl_rails gem, not this one.
+
+If you want to use factory_girl with Rails versions prior to Rails 3, use version 1.2.4.
+
 == Download
 
 Github: http://github.com/thoughtbot/factory_girl/tree/master
 
 Gem:
-  gem install factory_girl --source http://gemcutter.org
-
-Note: if you install factory_girl using the gem from Gemcutter, you'll need this
-in your environment.rb if you want to use Rails 2.1+'s dependency manager:
-
-  config.gem "factory_girl", :source => "http://gemcutter.org"
+  gem install factory_girl
 
 == Defining factories
 
@@ -43,7 +42,8 @@ It is highly recommended that you have one factory for each class that provides
 
 Attempting to define multiple factories with the same name will raise an error.
 
-Factories can either be defined anywhere, but will automatically be loaded if they are defined in files at the following locations:
+Factories can be defined anywhere, but will be automatically loaded if they
+are defined in files at the following locations:
 
   test/factories.rb
   spec/factories.rb
@@ -127,14 +127,14 @@ The behavior of the association method varies depending on the build strategy us
   post.author.new_record # => false
 
   # Builds and saves a User, and then builds but does not save a Post
-  Factory.build(:post)
+  post = Factory.build(:post)
   post.new_record?       # => true
   post.author.new_record # => false
 
 Because this pattern is so common, a prettier syntax is available for defining
 associations:
 
-  # The following definitions are equivilent:
+  # The following definitions are equivalent:
   Factory.define :post do |p|
     p.author {|a| a.association(:user) }
   end
@@ -201,7 +201,7 @@ Factory_girl makes available three callbacks for injecting some code:
 
 Examples:
 
-  # Define a factory that calls the generate_hashed_password method after it is built 
+  # Define a factory that calls the generate_hashed_password method after it is built
   Factory.define :user do |u|
     u.after_build { |user| do_something_to(user) }
   end

data/Rakefile

@@ -8,12 +8,30 @@ require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 desc 'Default: run the specs and features.'
-task :default => [:spec, :features]
+task :default do
+  system("rake -s spec:unit;")
+  %w(2.1 2.3 3.0).each do |version|
+    system("RAILS_VERSION=#{version} rake -s spec:acceptance features;")
+  end
+end
+
+namespace :spec do
+  desc "Run unit specs"
+  Spec::Rake::SpecTask.new('unit') do |t|
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/factory_girl/**/*_spec.rb']
+  end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
+  desc "Run acceptance specs"
+  Spec::Rake::SpecTask.new('acceptance') do |t|
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/acceptance/**/*_spec.rb']
+  end
 end
 
+desc "Run the unit and acceptance specs"
+task :spec => ['spec:unit', 'spec:acceptance']
+
 desc 'Performs code coverage on the factory_girl plugin.'
 Rcov::RcovTask.new do |t|
   t.test_files = FileList['spec/*_spec.rb']
@@ -35,41 +53,6 @@ task :sync_docs => 'rdoc' do
   `rsync -ave ssh rdoc/ dev@dev.thoughtbot.com:/home/dev/www/dev.thoughtbot.com/factory_girl`
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name        = %q{factory_girl}
-    s.summary     = %q{factory_girl provides a framework and DSL for defining and
-                       using model instance factories.}
-    s.description = %q{factory_girl provides a framework and DSL for defining and
-                       using factories - less error-prone, more explicit, and
-                       all-around easier to work with than fixtures.}
-
-    s.files        = FileList['[A-Z]*', 'lib/**/*.rb', 'spec/**/*.rb']
-    s.require_path = 'lib'
-    s.test_files   = Dir[*['spec/**/*_spec.rb']]
-
-    s.has_rdoc         = true
-    s.extra_rdoc_files = ["README.rdoc"]
-    s.rdoc_options = ['--line-numbers', "--main", "README.rdoc"]
-
-    s.authors = ["Joe Ferris"]
-    s.email   = %q{jferris@thoughtbot.com}
-    s.homepage = "http://thoughtbot.com/projects/factory_girl"
-
-    s.add_development_dependency('rcov')
-    s.add_development_dependency('rspec')
-    s.add_development_dependency('cucumber')
-    s.add_development_dependency('activerecord')
-    s.add_development_dependency('rr')
-    s.add_development_dependency('sqlite3')
-
-    s.platform = Gem::Platform::RUBY
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
 desc "Clean files generated by rake tasks"
 task :clobber => [:clobber_rdoc, :clobber_rcov]
 

data/features/factory_girl_steps.feature

@@ -0,0 +1,125 @@
+Feature: Use step definitions generated by factories
+
+  Scenario: create a post and verify its attributes
+    Given the following post exists:
+      | Title       | Body                |
+      | a fun title | here is the content |
+    Then I should find the following for the last post:
+      | title       | body                |
+      | a fun title | here is the content |
+
+  Scenario: create a post without a table and verify its attributes
+    Given a post exists with a title of "a fun title"
+    Then I should find the following for the last post:
+      | title       |
+      | a fun title |
+
+  Scenario: flexible English when creating posts
+    Given an post exists with an title of "a fun title"
+    Then I should find the following for the last post:
+      | title       |
+      | a fun title |
+
+  Scenario: create a post with an underscore in an attribute name
+    Given a post exists with an author ID of "5"
+    Then I should find the following for the last post:
+      | author_id |
+      | 5         |
+
+  Scenario: create several posts
+    Given the following posts exist:
+      | Title | Body   |
+      | one   | first  |
+      | two   | second |
+      | three | third  |
+    Then I should find the following for the last post:
+      | title | body  |
+      | three | third |
+    And there should be 3 posts
+
+  Scenario: create a post with a new author
+    Given the following post exists:
+      | Title   | Author   |
+      | a title | ID: 123  |
+    Then I should find the following for the last post:
+      | title   | author_id |
+      | a title | 123       |
+    And I should find the following for the last user:
+      | id  |
+      | 123 |
+
+  Scenario: create a post with an existing author
+    Given the following user exists:
+      | ID  | Name |
+      | 123 | Joe  |
+    And the following post exists:
+      | Title   | Author    |
+      | a title | Name: Joe |
+    Then I should find the following for the last post:
+      | title   | author_id |
+      | a title | 123       |
+    And there should be 1 user
+
+  Scenario: create post with and without a category association
+    Given the following users exist:
+      | ID  | Name |
+      | 123 | Joe  |
+    And the following posts exist:
+      | Title                      | Author    | Category          |
+      | a title                    | Name: Joe | Name: programming |
+      | a title without a category | Name: Joe |                   |
+    Then I should find the following for the last post:
+      | title                      | category_id |
+      | a title without a category |             |
+
+  Scenario: create a user without attributes
+    Given a user exists
+    Then there should be 1 user
+
+  Scenario: create several users without attributes
+    Given 3 users exist
+    Then there should be 3 users
+
+  Scenario: create several users with one attribute
+    Given 3 users exist with a name of "John"
+    Then there should be 3 users
+    And I should find the following for the last user:
+      | name |
+      | John |
+
+  Scenario: create instances of a factory with an underscore in its name
+    Given an admin user exists with a name of "John"
+    Then I should find the following for the last user:
+      | name | admin |
+      | John | true  |
+
+  Scenario: create a several instances of a factory with an underscore in its name
+    Given 3 admin users exist
+    Then I should find the following for the last user:
+      | admin |
+      | true  |
+
+  Scenario: use true values when creating instances
+    Given the following user exists:
+      | name | admin |
+      | Bill | true  |
+    Then I should find the following for the last user:
+      | name | admin |
+      | Bill | true  |
+
+  Scenario: use false values when creating instances
+    Given the following user exists:
+      | name | admin |
+      | Mike | false |
+    Then I should find the following for the last user:
+      | name | admin |
+      | Mike | false |
+
+  Scenario: Properly pluralize words
+    Given the following categories exist:
+      | name       |
+      | Bed        |
+      | Test Drive |
+    And 2 categories exist
+    And 2 categories exist with a name of "Future"
+    Then there should be 6 categories

data/features/step_definitions/database_steps.rb

@@ -0,0 +1,18 @@
+Then /^I should find the following for the last (.*):$/ do |model, table|
+  model_class = model.camelize.constantize
+  last_instance = model_class.last or raise "No #{model.pluralize} exist"
+  table.hashes.first.each do |key, value|
+    last_instance.attributes[key].to_s.should == value
+  end
+end
+
+Then /^there should be (\d+) (.*)$/ do |count, model|
+  model_class = model.singularize.camelize.constantize
+  model_class.count.should == count.to_i
+end
+
+Before do
+  Post.delete_all
+  User.delete_all
+  Category.delete_all
+end

data/features/support/env.rb

@@ -0,0 +1,15 @@
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+
+$: << File.join(PROJECT_ROOT, 'lib')
+
+case ENV['RAILS_VERSION']
+when '2.1' then
+  gem 'activerecord',  '~>2.1.0'
+when '3.0' then
+  gem 'activerecord',  '~>3.0.0'
+else
+  gem 'activerecord',  '~>2.3.0'
+end
+
+require 'active_record'
+require 'factory_girl'

data/features/support/factories.rb

@@ -0,0 +1,62 @@
+ActiveRecord::Base.establish_connection(
+  :adapter  => 'sqlite3',
+  :database => File.join(File.dirname(__FILE__), 'test.db')
+)
+
+class CreateSchema < ActiveRecord::Migration
+  def self.up
+    create_table :posts, :force => true do |t|
+      t.integer :author_id
+      t.integer :category_id
+      t.string  :title
+      t.string  :body
+    end
+
+    create_table :categories, :force => true do |t|
+      t.string :name
+    end
+
+    create_table :users, :force => true do |t|
+      t.string  :name
+      t.boolean :admin, :default => false, :null => false
+    end
+  end
+end
+
+CreateSchema.suppress_messages { CreateSchema.migrate(:up) }
+
+class User < ActiveRecord::Base
+end
+
+class Category < ActiveRecord::Base
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :author, :class_name => 'User'
+  belongs_to :category
+end
+
+class NonActiveRecord
+end
+
+Factory.define :user do |f|
+end
+
+Factory.define :admin_user, :parent => :user do |f|
+  f.admin true
+end
+
+Factory.define :category do |f|
+  f.name "programming"
+end
+
+Factory.define :post do |f|
+  f.association :author, :factory => :user
+  f.association :category
+end
+
+# This is here to ensure that factory step definitions don't raise for a non-AR factory
+Factory.define :non_active_record do |f|
+end
+
+require 'factory_girl/step_definitions'

data/lib/factory_girl.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'factory_girl/proxy'
 require 'factory_girl/proxy/build'
 require 'factory_girl/proxy/create'
@@ -21,15 +20,6 @@ def Factory (name, attrs = {})
   Factory.default_strategy(name, attrs)
 end
 
-if defined? Rails.configuration
-  Rails.configuration.after_initialize do
-    Factory.definition_file_paths = [
-      File.join(RAILS_ROOT, 'test', 'factories'),
-      File.join(RAILS_ROOT, 'spec', 'factories')
-    ]
-    Factory.find_definitions
-  end
-else
-  Factory.find_definitions
+class Factory
+  VERSION = "1.3.0"
 end
-

data/lib/factory_girl/aliases.rb

@@ -19,7 +19,7 @@ class Factory
   #   be substituded like with +String#sub+.
   #
   # Example:
-  #   
+  #
   #   Factory.alias /(.*)_confirmation/, '\1'
   #
   # factory_girl starts with aliases for foreign keys, so that a :user

data/lib/factory_girl/attribute.rb

@@ -6,7 +6,7 @@ class Factory
   # * Defining an attribute twice in the same factory
   class AttributeDefinitionError < RuntimeError
   end
-  
+
   class Attribute #:nodoc:
 
     attr_reader :name
@@ -16,7 +16,7 @@ class Factory
 
       if @name.to_s =~ /=$/
         attribute_name = $`
-        raise AttributeDefinitionError, 
+        raise AttributeDefinitionError,
           "factory_girl uses 'f.#{attribute_name} value' syntax " +
           "rather than 'f.#{attribute_name} = value'"
       end

data/lib/factory_girl/factory.rb

@@ -1,9 +1,11 @@
 class Factory
+  undef :id   if Factory.instance_methods.include?('id')
+  undef :type if Factory.instance_methods.include?('type')
 
   # Raised when a factory is defined that attempts to instantiate itself.
   class AssociationDefinitionError < RuntimeError
   end
-  
+
   # Raised when a callback is defined that has an invalid name
   class InvalidCallbackNameError < RuntimeError
   end
@@ -11,7 +13,7 @@ class Factory
   # Raised when a factory is defined with the same name as a previously-defined factory.
   class DuplicateDefinitionError < RuntimeError
   end
-  
+
   class << self
     attr_accessor :factories #:nodoc:
 
@@ -54,13 +56,13 @@ class Factory
     yield(instance)
     if parent = options.delete(:parent)
       instance.inherit_from(Factory.factory_by_name(parent))
-    end    
-    if self.factories[instance.factory_name] 
+    end
+    if self.factories[instance.factory_name]
       raise DuplicateDefinitionError, "Factory already defined: #{name}"
     end
     self.factories[instance.factory_name] = instance
   end
-  
+
   def class_name #:nodoc:
     @options[:class] || factory_name
   end
@@ -68,7 +70,7 @@ class Factory
   def build_class #:nodoc:
     @build_class ||= class_for(class_name)
   end
-  
+
   def default_strategy #:nodoc:
     @options[:default_strategy] || :create
   end
@@ -76,12 +78,13 @@ class Factory
   def initialize (name, options = {}) #:nodoc:
     assert_valid_options(options)
     @factory_name = factory_name_for(name)
-    @options      = options      
+    @options      = options
     @attributes   = []
   end
-  
+
   def inherit_from(parent) #:nodoc:
-    @options[:class] ||= parent.class_name
+    @options[:class]            ||= parent.class_name
+    @options[:default_strategy] ||= parent.default_strategy
     parent.attributes.each do |attribute|
       unless attribute_defined?(attribute.name)
         @attributes << attribute.clone
@@ -138,7 +141,7 @@ class Factory
   #     f.add_attribute :name, 'Billy Idol'
   #   end
   #
-  # are equivilent. 
+  # are equivilent.
   def method_missing (name, *args, &block)
     add_attribute(name, *args, &block)
   end
@@ -194,26 +197,26 @@ class Factory
     s = Sequence.new(&block)
     add_attribute(name) { s.next }
   end
-  
+
   def after_build(&block)
     callback(:after_build, &block)
   end
-  
+
   def after_create(&block)
     callback(:after_create, &block)
   end
-  
+
   def after_stub(&block)
     callback(:after_stub, &block)
   end
-  
+
   def callback(name, &block)
     unless [:after_build, :after_create, :after_stub].include?(name.to_sym)
       raise InvalidCallbackNameError, "#{name} is not a valid callback name. Valid callback names are :after_build, :after_create, and :after_stub"
     end
     @attributes << Attribute::Callback.new(name.to_sym, block)
   end
-  
+
   # Generates and returns a Hash of attributes from this factory. Attributes
   # can be individually overridden by passing in a Hash of attribute => value
   # pairs.
@@ -226,7 +229,7 @@ class Factory
   #
   # Returns: +Hash+
   # A set of attributes that can be used to build an instance of the class
-  # this factory generates. 
+  # this factory generates.
   def self.attributes_for (name, overrides = {})
     factory_by_name(name).run(Proxy::AttributesFor, overrides)
   end
@@ -266,7 +269,7 @@ class Factory
   def self.create (name, overrides = {})
     factory_by_name(name).run(Proxy::Create, overrides)
   end
-  
+
   # Generates and returns an object with all attributes from this factory
   # stubbed out. Attributes can be individually overridden by passing in a Hash
   # of attribute => value pairs.
@@ -282,7 +285,7 @@ class Factory
   def self.stub (name, overrides = {})
     factory_by_name(name).run(Proxy::Stub, overrides)
   end
-  
+
   # Executes the default strategy for the given factory. This is usually create,
   # but it can be overridden for each factory.
   #
@@ -294,7 +297,7 @@ class Factory
   #
   # Returns: +Object+
   # The result of the default strategy.
-  def self.default_strategy (name, overrides = {})  
+  def self.default_strategy (name, overrides = {})
     self.send(factory_by_name(name).default_strategy, name, overrides)
   end
 
@@ -343,7 +346,10 @@ class Factory
 
   def class_for (class_or_to_s)
     if class_or_to_s.respond_to?(:to_sym)
-      Object.const_get(variable_name_to_class_name(class_or_to_s))
+      class_name = variable_name_to_class_name(class_or_to_s)
+      class_name.split('::').inject(Object) do |object, string|
+        object.const_get(string)
+      end
     else
       class_or_to_s
     end
@@ -362,13 +368,13 @@ class Factory
   end
 
   def assert_valid_options(options)
-    invalid_keys = options.keys - [:class, :parent, :default_strategy] 
+    invalid_keys = options.keys - [:class, :parent, :default_strategy]
     unless invalid_keys == []
       raise ArgumentError, "Unknown arguments: #{invalid_keys.inspect}"
     end
     assert_valid_strategy(options[:default_strategy]) if options[:default_strategy]
   end
-  
+
   def assert_valid_strategy(strategy)
     unless Factory::Proxy.const_defined? variable_name_to_class_name(strategy)
       raise ArgumentError, "Unknown strategy: #{strategy}"

data/lib/factory_girl/proxy.rb

@@ -59,7 +59,7 @@ class Factory
     #   # Builds (but doesn't save) a Post and a User
     #   Factory.build(:post)
     #
-    #   # Builds and saves a User, builds a Post, assigns the User to the 
+    #   # Builds and saves a User, builds a Post, assigns the User to the
     #   # author association, and saves the User.
     #   Factory.create(:post)
     #

data/lib/factory_girl/proxy/stub.rb

@@ -1,4 +1,4 @@
-class Factory 
+class Factory
   class Proxy
     class Stub < Proxy #:nodoc:
       @@next_id = 1000
@@ -11,6 +11,14 @@ class Factory
             id.nil?
           end
 
+          def save(*args)
+            raise "stubbed models are not allowed to access the database"
+          end
+
+          def destroy(*args)
+            raise "stubbed models are not allowed to access the database"
+          end
+
           def connection
             raise "stubbed models are not allowed to access the database"
           end

data/lib/factory_girl/sequence.rb

@@ -38,7 +38,7 @@ class Factory
   #     sequence.
   #
   # Example:
-  #   
+  #
   #   Factory.sequence(:email) {|n| "somebody_#{n}@example.com" }
   def self.sequence (name, &block)
     self.sequences[name] = Sequence.new(&block)

data/lib/factory_girl/step_definitions.rb

@@ -23,8 +23,7 @@ end
 World(FactoryGirlStepHelpers)
 
 Factory.factories.values.each do |factory|
-  # TODO: support irregular pluralizations
-  Given /^the following #{factory.human_name}s? exists?:$/ do |table|
+  Given /^the following (?:#{factory.human_name}|#{factory.human_name.pluralize}) exists?:$/ do |table|
     table.hashes.each do |human_hash|
       attributes = convert_human_hash_to_attribute_hash(human_hash, factory.associations)
       Factory.create(factory.factory_name, attributes)
@@ -35,8 +34,8 @@ Factory.factories.values.each do |factory|
     Factory(factory.factory_name)
   end
 
-  Given /^(\d+) #{factory.human_name}s exist$/ do |count|
-    count.to_i.times { Factory(factory.human_name) }
+  Given /^(\d+) #{factory.human_name.pluralize} exist$/ do |count|
+    count.to_i.times { Factory(factory.factory_name) }
   end
 
   if factory.build_class.respond_to?(:columns)
@@ -46,10 +45,9 @@ Factory.factories.values.each do |factory|
         Factory(factory.factory_name, column.name => value)
       end
 
-      Given /^(\d+) #{factory.human_name}s exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+      Given /^(\d+) #{factory.human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
         count.to_i.times { Factory(factory.factory_name, column.name => value) }
       end
     end
   end
 end
-

data/lib/factory_girl/syntax/blueprint.rb

@@ -39,4 +39,3 @@ class Factory
 end
 
 ActiveRecord::Base.send(:include, Factory::Syntax::Blueprint::ActiveRecord)
-

data/lib/factory_girl/syntax/make.rb

@@ -7,7 +7,7 @@ class Factory
     # Usage:
     #
     #   require 'factory_girl/syntax/make'
-    #   
+    #
     #   Factory.define :user do |factory|
     #     factory.name 'Billy Bob'
     #     factory.email 'billy@bob.example.com'

data/rails/init.rb

@@ -0,0 +1,2 @@
+require 'factory_girl'
+Rails.configuration.after_initialize { Factory.find_definitions }

data/spec/acceptance/acceptance_helper.rb

@@ -0,0 +1,16 @@
+case ENV['RAILS_VERSION']
+when '2.1' then
+  gem 'activerecord',  '~>2.1.0'
+when '3.0' then
+  gem 'activerecord',  '~>3.0.0'
+else
+  gem 'activerecord',  '~>2.3.0'
+end
+
+require 'active_record'
+require 'active_record/version'
+
+puts "Running specs using Rails #{ActiveRecord::VERSION::STRING}"
+
+require 'acceptance/models'
+

data/spec/{integration_spec.rb → acceptance/acceptance_spec.rb}

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
+require 'acceptance/acceptance_helper'
 
 describe "integration" do
   before do

data/spec/{models.rb → acceptance/models.rb}

@@ -14,12 +14,12 @@ class CreateSchema < ActiveRecord::Migration
     end
 
     create_table :posts, :force => true do |t|
-      t.string  :name  
+      t.string  :name
       t.integer :author_id
     end
-    
+
     create_table :business, :force => true do |t|
-      t.string  :name  
+      t.string  :name
       t.integer :owner_id
     end
   end
@@ -41,3 +41,8 @@ class Post < ActiveRecord::Base
   validates_presence_of :name, :author_id
   belongs_to :author, :class_name => 'User'
 end
+
+module Admin
+  class Settings
+  end
+end

data/spec/{factory_girl → acceptance}/syntax/blueprint_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 require 'factory_girl/syntax/blueprint'
 

data/spec/{factory_girl → acceptance}/syntax/generate_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 require 'factory_girl/syntax/generate'
 

data/spec/{factory_girl → acceptance}/syntax/make_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 require 'factory_girl/syntax/make'
 

data/spec/{factory_girl → acceptance}/syntax/sham_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 require 'factory_girl/syntax/sham'
 

data/spec/factory_girl/aliases_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory, "aliases" do
 

data/spec/factory_girl/attribute/association_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Attribute::Association do
   before do

data/spec/factory_girl/attribute/callback_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Attribute::Callback do
   before do

data/spec/factory_girl/attribute/dynamic_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Attribute::Dynamic do
   before do

data/spec/factory_girl/attribute/static_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Attribute::Static do
   before do

data/spec/factory_girl/attribute_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Attribute do
   before do

data/spec/factory_girl/factory_spec.rb

@@ -1,6 +1,15 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory do
+  include DefinesConstants
+
+  before do
+    define_constant('User')
+    define_constant('Admin', User)
+    define_constant('Business')
+    define_constant('Admin::Settings')
+  end
+
   describe "defining a factory" do
     before do
       @name    = :user
@@ -36,7 +45,7 @@ describe Factory do
     end
 
     it "should not allow a duplicate factory definition" do
-      lambda { 
+      lambda {
         2.times { Factory.define(@name) {|f| } }
       }.should raise_error(Factory::DuplicateDefinitionError)
     end
@@ -62,6 +71,36 @@ describe Factory do
       @factory.default_strategy.should == :create
     end
 
+    it "should return static attribute  when asked for a type" do
+      result = @factory.type
+      result.should be_kind_of(Array)
+      result.first.should be_kind_of(Factory::Attribute::Static)
+      result.first.name.should == :type
+    end
+
+    it "should define type as an attribute" do
+      @factory.type { "it's a type" }
+      attributes = @factory.attributes
+      attributes.should be_kind_of(Array)
+      attributes.size.should == 1
+      attributes.first.name.should == :type
+    end
+
+    it "should return static attribute when asked for the id" do
+      result = @factory.id
+      result.should be_kind_of(Array)
+      result.first.should be_kind_of(Factory::Attribute::Static)
+      result.first.name.should == :id
+    end
+
+    it "should define id as an attribute" do
+      @factory.id { "it's an id" }
+      attributes = @factory.attributes
+      attributes.should be_kind_of(Array)
+      attributes.size.should == 1
+      attributes.first.name.should == :id
+    end
+
     it "should not allow the same attribute to be added twice" do
       lambda {
         2.times { @factory.add_attribute :first_name }
@@ -368,6 +407,24 @@ describe Factory do
     end
   end
 
+  describe "a factory for namespaced class" do
+    before do
+      Factory.factories = {}
+      @name  = :settings
+      @class = Admin::Settings
+    end
+
+    it "should build namespaced class passed by string" do
+      factory = Factory.define(@name.to_s, :class => @class.name) {}
+      factory.build_class.should == @class
+    end
+
+    it "should build Admin::Settings class from Admin::Settings string" do
+      factory = Factory.define(@name.to_s, :class => 'admin/settings') {}
+      factory.build_class.should == @class
+    end
+  end
+
   describe "after defining a factory" do
     before do
       @name    = :user
@@ -497,6 +554,26 @@ describe Factory do
       factory = Factory.define(:object, :default_strategy => :stub) {}
       factory.default_strategy.should == :stub
     end
+
+    describe 'defining a child factory without setting default strategy' do
+      before do
+        @child = Factory.define(:child_object, :parent => :object) {}
+      end
+
+      it "should inherit default strategy from its parent" do
+        @child.default_strategy.should == :stub
+      end
+    end
+
+    describe 'defining a child factory with a default strategy' do
+      before do
+        @child2 = Factory.define(:child_object2, :parent => :object, :default_strategy => :build) {}
+      end
+
+      it "should not inherit default strategy from parent" do
+        @child2.default_strategy.should == :build
+      end
+    end
   end
 
   def self.in_directory_with_files(*files)
@@ -521,7 +598,7 @@ describe Factory do
 
   def require_definitions_from(file)
     simple_matcher do |given, matcher|
-      has_received = have_received.require(file)
+      has_received = have_received.method_missing(:require, file)
       result = has_received.matches?(given)
       matcher.description = "require definitions from #{file}"
       matcher.failure_message = has_received.failure_message

data/spec/factory_girl/proxy/attributes_for_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Proxy::AttributesFor do
   before do

data/spec/factory_girl/proxy/build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Proxy::Build do
   before do

data/spec/factory_girl/proxy/create_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Proxy::Create do
   before do

data/spec/factory_girl/proxy/stub_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Proxy::Stub do
   before do

data/spec/factory_girl/proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Proxy do
   before do

data/spec/factory_girl/sequence_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe Factory::Sequence do
   describe "a sequence" do

data/spec/spec_helper.rb

@@ -1,18 +1,42 @@
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-$: << File.join(File.dirname(__FILE__))
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH << File.join(File.dirname(__FILE__))
 
 require 'rubygems'
-
-require 'activerecord'
-
 require 'spec'
 require 'spec/autorun'
 require 'rr'
 
-require 'models'
-
 require 'factory_girl'
 
 Spec::Runner.configure do |config|
   config.mock_with RR::Adapters::Rspec
 end
+
+share_as :DefinesConstants do
+  before do
+    @defined_constants = []
+  end
+
+  after do
+    @defined_constants.reverse.each do |path|
+      namespace, class_name = *constant_path(path)
+      namespace.send(:remove_const, class_name)
+    end
+  end
+
+  def define_constant(path, base = Object, &block)
+    namespace, class_name = *constant_path(path)
+    klass = Class.new(base)
+    namespace.const_set(class_name, klass)
+    klass.class_eval(&block) if block_given?
+    @defined_constants << path
+    klass
+  end
+
+  def constant_path(constant_name)
+    names = constant_name.split('::')
+    class_name = names.pop
+    namespace = names.inject(Object) { |result, name| result.const_get(name) }
+    [namespace, class_name]
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Joe Ferris
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,38 +64,63 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: activerecord
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: -1848230021
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        - beta3
+        version: 3.0.0.beta3
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: rr
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: |-
   factory_girl provides a framework and DSL for defining and
                          using factories - less error-prone, more explicit, and
@@ -101,32 +133,38 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- CONTRIBUTION_GUIDELINES.rdoc
 - Changelog
+- CONTRIBUTION_GUIDELINES.rdoc
 - LICENSE
-- README.rdoc
 - Rakefile
-- VERSION
-- lib/factory_girl.rb
+- README.rdoc
 - lib/factory_girl/aliases.rb
-- lib/factory_girl/attribute.rb
 - lib/factory_girl/attribute/association.rb
 - lib/factory_girl/attribute/callback.rb
 - lib/factory_girl/attribute/dynamic.rb
 - lib/factory_girl/attribute/static.rb
+- lib/factory_girl/attribute.rb
 - lib/factory_girl/factory.rb
-- lib/factory_girl/proxy.rb
 - lib/factory_girl/proxy/attributes_for.rb
 - lib/factory_girl/proxy/build.rb
 - lib/factory_girl/proxy/create.rb
 - lib/factory_girl/proxy/stub.rb
+- lib/factory_girl/proxy.rb
 - lib/factory_girl/sequence.rb
 - lib/factory_girl/step_definitions.rb
-- lib/factory_girl/syntax.rb
 - lib/factory_girl/syntax/blueprint.rb
 - lib/factory_girl/syntax/generate.rb
 - lib/factory_girl/syntax/make.rb
 - lib/factory_girl/syntax/sham.rb
+- lib/factory_girl/syntax.rb
+- lib/factory_girl.rb
+- spec/acceptance/acceptance_helper.rb
+- spec/acceptance/acceptance_spec.rb
+- spec/acceptance/models.rb
+- spec/acceptance/syntax/blueprint_spec.rb
+- spec/acceptance/syntax/generate_spec.rb
+- spec/acceptance/syntax/make_spec.rb
+- spec/acceptance/syntax/sham_spec.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
@@ -140,13 +178,12 @@ files:
 - spec/factory_girl/proxy/stub_spec.rb
 - spec/factory_girl/proxy_spec.rb
 - spec/factory_girl/sequence_spec.rb
-- spec/factory_girl/syntax/blueprint_spec.rb
-- spec/factory_girl/syntax/generate_spec.rb
-- spec/factory_girl/syntax/make_spec.rb
-- spec/factory_girl/syntax/sham_spec.rb
-- spec/integration_spec.rb
-- spec/models.rb
 - spec/spec_helper.rb
+- features/factory_girl_steps.feature
+- features/step_definitions/database_steps.rb
+- features/support/env.rb
+- features/support/factories.rb
+- rails/init.rb
 has_rdoc: true
 homepage: http://thoughtbot.com/projects/factory_girl
 licenses: []
@@ -159,27 +196,36 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance factories.
 test_files: 
+- spec/acceptance/acceptance_spec.rb
+- spec/acceptance/syntax/blueprint_spec.rb
+- spec/acceptance/syntax/generate_spec.rb
+- spec/acceptance/syntax/make_spec.rb
+- spec/acceptance/syntax/sham_spec.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
@@ -193,8 +239,7 @@ test_files:
 - spec/factory_girl/proxy/stub_spec.rb
 - spec/factory_girl/proxy_spec.rb
 - spec/factory_girl/sequence_spec.rb
-- spec/factory_girl/syntax/blueprint_spec.rb
-- spec/factory_girl/syntax/generate_spec.rb
-- spec/factory_girl/syntax/make_spec.rb
-- spec/factory_girl/syntax/sham_spec.rb
-- spec/integration_spec.rb
+- features/factory_girl_steps.feature
+- features/step_definitions/database_steps.rb
+- features/support/env.rb
+- features/support/factories.rb

data/VERSION

@@ -1 +0,0 @@
-1.2.4