factory_girl 1.1.5 → 1.2.0

data/README.rdoc

@@ -0,0 +1,228 @@
+= factory_girl
+
+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 inheritence.
+
+== Download
+
+Github: http://github.com/thoughtbot/factory_girl/tree/master
+
+Gem:
+  gem install thoughtbot-factory_girl --source http://gems.github.com
+
+Note: if you install factory_girl using the gem from Github, you'll need this
+in your environment.rb if you want to use Rails 2.1+'s dependency manager:
+
+  config.gem "thoughtbot-factory_girl",
+             :lib    => "factory_girl",
+             :source => "http://gems.github.com"
+
+== Defining factories
+
+Each factory has a name and a set of attributes. The name is used to guess the class of the object by default, but it's possible to excplicitly specify it:
+
+  # This will guess the User class
+  Factory.define :user do |u|
+    u.first_name 'John'
+    u.last_name  'Doe'
+    u.admin false
+  end
+
+  # This will use the User class (Admin would have been guessed)
+  Factory.define :admin, :class => User do |u|
+    u.first_name 'Admin'
+    u.last_name  'User'
+    u.admin true
+  end
+
+  # The same, but using a string instead of class constant
+  Factory.define :admin, :class => 'user' do |u|
+    u.first_name 'Admin'
+    u.last_name  'User'
+    u.admin true
+  end
+
+It is highly recommended that you have one factory for each class that provides the simplest set of attributes necessary to create an instance of that class. If you're creating ActiveRecord objects, that means that you should only provide attributes that are required through validations and that do not have defaults. Other factories can be created through inheritence to cover common scenarios for each class.
+
+Factories can either be defined anywhere, but will automatically be loaded if they are defined in files at the following locations:
+
+  test/factories.rb
+  spec/factories.rb
+  test/factories/*.rb
+  spec/factories/*.rb
+
+== Using factories
+
+factory_girl supports several different build strategies: build, create, attributes_for and stub:
+
+  # Returns a User instance that's not saved
+  user = Factory.build(:user)
+
+  # Returns a saved User instance
+  user = Factory.create(:user)
+
+  # Returns a hash of attributes that can be used to build a User instance:
+  attrs = Factory.attributes_for(:user)
+
+  # Returns an object with all defined attributes stubbed out:
+  stub = Factory.stub(:user)
+
+You can use the Factory method as a shortcut for the default build strategy:
+
+  # Same as Factory.create :user:
+  user = Factory(:user)
+
+The default strategy can be overriden:
+
+  # Now same as Factory.build(:user)
+  Factory.define :user, :default_strategy => :build do |u|
+    ...
+  end
+
+  user = Factory(:user)
+
+No matter which startegy is used, it's possible to override the defined attributes by passing a hash:
+
+  # Build a User instance and override the first_name property
+  user = Factory.build(:user, :first_name => 'Joe')
+  user.first_name
+  # => "Joe"
+
+== Lazy Attributes
+
+Most factory attributes can be added using static values that are evaluated when the factory is defined, but some attributes (such as associations and other attributes that must be dynamically generated) will need values assigned each time an instance is generated. These "lazy" attributes can be added by passing a block instead of a parameter:
+
+  Factory.define :user do |u|
+    # ...
+    u.activation_code { User.generate_activation_code }
+  end
+
+== Dependent Attributes
+
+Attributes can be based on the values of other attributes using the proxy that is yieled to lazy attribute blocks:
+
+  Factory.define :user do |u|
+    u.first_name 'Joe'
+    u.last_name  'Blow'
+    u.email {|a| "#{a.first_name}.#{a.last_name}@example.com".downcase }
+  end
+
+  Factory(:user, :last_name => 'Doe').email
+  # => "joe.doe@example.com"
+
+== Associations
+
+Associated instances can be generated by using the association method when
+defining a lazy attribute:
+
+  Factory.define :post do |p|
+    # ...
+    p.author {|author| author.association(:user, :last_name => 'Writely') }
+  end
+
+The behavior of the association method varies depending on the build strategy used for the parent object.
+
+  # Builds and saves a User and a Post
+  post = Factory(:post)
+  post.new_record?       # => false
+  post.author.new_record # => false
+
+  # Builds and saves a User, and then builds but does not save a 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:
+  Factory.define :post do |p|
+    p.author {|a| a.association(:user) }
+  end
+
+  Factory.define :post do |p|
+    p.association :author, :factory => :user
+  end
+
+If the factory name is the same as the association name, the factory name can
+be left out.
+
+== Inheritance
+
+You can easily create multiple factories for the same class without repeating common attributes by using inheritence:
+
+  Factory.define :post do |p|
+    # the 'title' attribute is required for all posts
+    p.title 'A title'
+  end
+
+  Factory.define :approved_post, :parent => :post do |p|
+    p.approved true
+    # the 'approver' association is required for an approved post
+    p.association :approver, :factory => :user
+  end
+
+== Sequences
+
+Unique values in a specific format (for example, e-mail addresses) can be
+generated using sequences. Sequences are defined by calling Factory.sequence,
+and values in a sequence are generated by calling Factory.next:
+
+  # Defines a new sequence
+  Factory.sequence :email do |n|
+    "person#{n}@example.com"
+  end
+
+  Factory.next :email
+  # => "person1@example.com"
+
+  Factory.next :email
+  # => "person2@example.com"
+
+Sequences can be used in lazy attributes:
+
+  Factory.define :user do |f|
+    f.email { Factory.next(:email) }
+  end
+
+And it's also possible to define an in-line sequence that is only used in
+a particular factory:
+
+  Factory.define :user do |f|
+    f.sequence :email {|n| "person#{n}@example.com" }
+  end
+
+== Alternate Syntaxes
+
+Users' tastes for syntax vary dramatically, but most users are looking for a common feature set. Because of this, factory_girl supports "syntax layers" which provide alternate interfaces. See Factory::Syntax for information about the various layers available.
+
+== More Information
+
+Our blog: http://giantrobots.thoughtbot.com
+
+factory_girl rdoc: http://dev.thoughtbot.com/factory_girl
+
+Mailing list: http://groups.google.com/group/factory_girl
+
+factory_girl tickets: http://thoughtbot.lighthouseapp.com/projects/14354-factory_girl
+
+== Contributing
+
+Please read the contribution guidelines before submitting patches or pull requests.
+
+== Author
+
+factory_girl was written by Joe Ferris with contributions from several authors, including:
+* Alex Sharp
+* Eugene Bolshakov
+* Jon Yurek
+* Josh Nichols
+* Josh Owens
+
+The syntax layers are derived from software written by the following authors:
+* Pete Yandell
+* Rick Bradley
+* Yossef Mendelssohn
+
+Thanks to all members of thoughtbot for inspiration, ideas, and funding.
+
+Copyright 2008-2009 Joe Ferris and thoughtbot[http://www.thoughtbot.com], inc.

data/Rakefile

@@ -12,6 +12,7 @@ task :default => :test
 desc 'Test the factory_girl plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
@@ -27,8 +28,9 @@ desc 'Generate documentation for the factory_girl plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Factory Girl'
-  rdoc.options << '--line-numbers' << '--inline-source' << "--main" << "README.textile"
-  rdoc.rdoc_files.include('README.textile')
+  rdoc.options << '--line-numbers' << '--inline-source' << "--main" << "README.rdoc"
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('CONTRIBUTION_GUIDELINES.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -39,7 +41,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{factory_girl}
-  s.version     = "1.1.5"
+  s.version     = "1.2.0"
   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
@@ -51,8 +53,8 @@ spec = Gem::Specification.new do |s|
   s.test_files   = Dir[*['test/**/*_test.rb']]
 
   s.has_rdoc         = true
-  s.extra_rdoc_files = ["README.textile"]
-  s.rdoc_options = ['--line-numbers', '--inline-source', "--main", "README.textile"]
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.rdoc_options = ['--line-numbers', '--inline-source', "--main", "README.rdoc"]
 
   s.authors = ["Joe Ferris"]
   s.email   = %q{jferris@thoughtbot.com}

data/lib/factory_girl.rb

@@ -1,19 +1,26 @@
 require 'active_support'
+require 'factory_girl/proxy'
+require 'factory_girl/proxy/build'
+require 'factory_girl/proxy/create'
+require 'factory_girl/proxy/attributes_for'
+require 'factory_girl/proxy/stub'
 require 'factory_girl/factory'
-require 'factory_girl/attribute_proxy'
 require 'factory_girl/attribute'
+require 'factory_girl/attribute/static'
+require 'factory_girl/attribute/dynamic'
+require 'factory_girl/attribute/association'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
 
-# Shortcut for Factory.create.
+# Shortcut for Factory.default_strategy.
 #
 # Example:
 #   Factory(:user, :name => 'Joe')
 def Factory (name, attrs = {})
-  Factory.create(name, attrs)
+  Factory.default_strategy(name, attrs)
 end
 
-if defined? Rails
+if defined? Rails.configuration
   Rails.configuration.after_initialize do
     Factory.definition_file_paths = [
       File.join(RAILS_ROOT, 'test', 'factories'),

data/lib/factory_girl/aliases.rb

@@ -8,19 +8,30 @@ class Factory
     [/(.*)/, '\1_id']
   ]
 
-  # Defines a new alias for attributes
+  # Defines a new alias for attributes.
   #
   # Arguments:
-  #   pattern: (Regexp)
-  #     A pattern that will be matched against attributes when looking for
-  #     aliases. Contents captured in the pattern can be used in the alias.
-  #   replace: (String)
-  #     The alias that results from the matched pattern. Captured strings can
-  #     be insert like String#sub.
+  # * pattern: +Regexp+
+  #   A pattern that will be matched against attributes when looking for
+  #   aliases. Contents captured in the pattern can be used in the alias.
+  # * replace: +String+
+  #   The alias that results from the matched pattern. Captured strings can
+  #   be substituded like with +String#sub+.
   #
   # Example:
   #   
   #   Factory.alias /(.*)_confirmation/, '\1'
+  #
+  # factory_girl starts with aliases for foreign keys, so that a :user
+  # association can be overridden by a :user_id parameter:
+  #
+  #   Factory.define :post do |p|
+  #     p.association :user
+  #   end
+  #
+  #   # The user association will not be built in this example. The user_id
+  #   # will be used instead.
+  #   Factory(:post, :user_id => 1)
   def self.alias (pattern, replace)
     self.aliases << [pattern, replace]
   end

data/lib/factory_girl/attribute.rb

@@ -1,5 +1,9 @@
 class Factory
 
+  # Raised when defining an invalid attribute:
+  # * Defining an attribute which has a name ending in "="
+  # * Defining an attribute with both a static and lazy value
+  # * Defining an attribute twice in the same factory
   class AttributeDefinitionError < RuntimeError
   end
   
@@ -7,32 +11,18 @@ class Factory
 
     attr_reader :name
 
-    def initialize (name, static_value, lazy_block)
-      name = name.to_sym
+    def initialize(name)
+      @name = name.to_sym
 
-      if name.to_s =~ /=$/
+      if @name.to_s =~ /=$/
         raise AttributeDefinitionError, 
-          "factory_girl uses 'f.#{name.to_s.chop} value' syntax " +
-          "rather than 'f.#{name} = value'" 
+          "factory_girl uses 'f.#{@name.to_s.chop} value' syntax " +
+          "rather than 'f.#{@name} = value'" 
       end
-
-      unless static_value.nil? || lazy_block.nil?
-        raise AttributeDefinitionError, "Both value and block given"
-      end
-
-      @name         = name
-      @static_value = static_value
-      @lazy_block   = lazy_block
     end
 
-    def value (proxy)
-      if @lazy_block.nil?
-        @static_value
-      else
-        @lazy_block.call(proxy)
-      end
+    def add_to(proxy)
     end
-
   end
 
 end

data/lib/factory_girl/attribute/association.rb

@@ -0,0 +1,18 @@
+class Factory
+  class Attribute #:nodoc:
+
+    class Association < Attribute  #:nodoc:
+
+      def initialize(name, factory, overrides)
+        super(name)
+        @factory   = factory
+        @overrides = overrides
+      end
+
+      def add_to(proxy)
+        proxy.associate(name, @factory, @overrides)
+      end
+    end
+
+  end
+end

data/lib/factory_girl/attribute/dynamic.rb

@@ -0,0 +1,17 @@
+class Factory
+  class Attribute #:nodoc:
+
+    class Dynamic < Attribute  #:nodoc:
+
+      def initialize(name, block)
+        super(name)
+        @block = block
+      end
+
+      def add_to(proxy)
+        proxy.set(name, @block.call(proxy))
+      end
+    end
+
+  end
+end

data/lib/factory_girl/attribute/static.rb

@@ -0,0 +1,17 @@
+class Factory
+  class Attribute #:nodoc:
+
+    class Static < Attribute  #:nodoc:
+
+      def initialize(name, value)
+        super(name)
+        @value = value
+      end
+
+      def add_to(proxy)
+        proxy.set(name, @value)
+      end
+    end
+
+  end
+end

data/lib/factory_girl/factory.rb

@@ -1,4 +1,8 @@
 class Factory
+
+  # Raised when a factory is defined that attempts to instantiate itself.
+  class AssociationDefinitionError < RuntimeError
+  end
   
   class << self
     attr_accessor :factories #:nodoc:
@@ -13,37 +17,66 @@ class Factory
   self.factories = {}
   self.definition_file_paths = %w(factories test/factories spec/factories)
 
-  attr_reader :factory_name
+  attr_reader :factory_name #:nodoc:
+  attr_reader :attributes #:nodoc:
 
   # Defines a new factory that can be used by the build strategies (create and
   # build) to build new objects.
   #
   # Arguments:
-  #   name: (Symbol)
-  #     A unique name used to identify this factory.
-  #   options: (Hash)
-  #     class: the class that will be used when generating instances for this
-  #            factory. If not specified, the class will be guessed from the 
-  #            factory name.
+  # * name: +Symbol+ or +String+
+  #   A unique name used to identify this factory.
+  # * options: +Hash+
+  #
+  # Options:
+  # * class: +Symbol+, +Class+, or +String+
+  #   The class that will be used when generating instances for this factory. If not specified, the class will be guessed from the factory name.
+  # * parent: +Symbol+
+  #   The parent factory. If specified, the attributes from the parent
+  #   factory will be copied to the current one with an ability to override
+  #   them.
+  # * default_strategy: +Symbol+
+  #   The strategy that will be used by the Factory shortcut method.
+  #   Defaults to :create.
   #
-  # Yields:
-  #    The newly created factory (Factory)
+  # Yields: +Factory+
+  # The newly created factory.
   def self.define (name, options = {})
     instance = Factory.new(name, options)
     yield(instance)
+    if parent = options.delete(:parent)
+      instance.inherit_from(Factory.factory_by_name(parent))
+    end    
     self.factories[instance.factory_name] = instance
   end
+  
+  def class_name #:nodoc:
+    @options[:class] || factory_name
+  end
 
   def build_class #:nodoc:
-    @build_class ||= class_for(@options[:class] || factory_name)
+    @build_class ||= class_for(class_name)
+  end
+  
+  def default_strategy #:nodoc:
+    @options[:default_strategy] || :create
   end
 
   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
+    parent.attributes.each do |attribute|
+      unless attribute_defined?(attribute.name)
+        @attributes << attribute.clone
+      end
+    end
+  end
 
   # Adds an attribute that should be assigned on generated instances for this
   # factory.
@@ -53,18 +86,26 @@ class Factory
   # instance is generated. Lazy attribute blocks will not be called if that
   # attribute is overriden for a specific instance.
   #
-  # When defining lazy attributes, an instance of Factory::AttributeProxy will
+  # When defining lazy attributes, an instance of Factory::Proxy will
   # be yielded, allowing associations to be built using the correct build
   # strategy.
   #
   # Arguments:
-  #   name: (Symbol)
-  #     The name of this attribute. This will be assigned using :"#{name}=" for
-  #     generated instances.
-  #   value: (Object)
-  #     If no block is given, this value will be used for this attribute.
+  # * name: +Symbol+ or +String+
+  #   The name of this attribute. This will be assigned using :"#{name}=" for
+  #   generated instances.
+  # * value: +Object+
+  #   If no block is given, this value will be used for this attribute.
   def add_attribute (name, value = nil, &block)
-    attribute = Attribute.new(name, value, block)
+    if block_given?
+      if value
+        raise AttributeDefinitionError, "Both value and block given"
+      else
+        attribute = Attribute::Dynamic.new(name, block)
+      end
+    else
+      attribute = Attribute::Static.new(name, value)
+    end
 
     if attribute_defined?(attribute.name)
       raise AttributeDefinitionError, "Attribute already defined: #{name}"
@@ -104,128 +145,160 @@ class Factory
   #   end
   #
   # Arguments:
-  #   name: (Symbol)
-  #     The name of this attribute.
-  #   options: (Hash)
-  #     factory: (Symbol)
-  #       The name of the factory to use when building the associated instance.
-  #       If no name is given, the name of the attribute is assumed to be the
-  #       name of the factory. For example, a "user" association will by
-  #       default use the "user" factory.
+  # * name: +Symbol+
+  #   The name of this attribute.
+  # * options: +Hash+
+  #
+  # Options:
+  # * factory: +Symbol+ or +String+
+  #    The name of the factory to use when building the associated instance.
+  #    If no name is given, the name of the attribute is assumed to be the
+  #    name of the factory. For example, a "user" association will by
+  #    default use the "user" factory.
   def association (name, options = {})
-    name    = name.to_sym
-    options = symbolize_keys(options)
-    association_factory = options[:factory] || name
-
-    add_attribute(name) {|a| a.association(association_factory) }
+    factory_name = options.delete(:factory) || name
+    if factory_name_for(factory_name) == self.factory_name
+      raise AssociationDefinitionError, "Self-referencing association '#{name}' in factory '#{self.factory_name}'"
+    end
+    @attributes << Attribute::Association.new(name, factory_name, options)
   end
 
-  def attributes_for (attrs = {}) #:nodoc:
-    build_attributes_hash(attrs, :attributes_for)
+  # Adds an attribute that will have unique values generated by a sequence with
+  # a specified format.
+  #
+  # The result of:
+  #   Factory.define :user do |f|
+  #    f.sequence(:email) { |n| "person#{n}@example.com" }
+  #   end
+  #
+  # Is equal to:
+  #   Factory.sequence(:email) { |n| "person#{n}@example.com" }
+  #
+  #   Factory.define :user do |f|
+  #    f.email { Factory.next(:email) }
+  #   end
+  #
+  # Except that no globally available sequence will be defined.
+  def sequence (name, &block)
+    s = Sequence.new(&block)
+    add_attribute(name) { s.next }
   end
-
-  def build (attrs = {}) #:nodoc:
-    build_instance(attrs, :build)
+  
+  # Generates and returns a Hash of attributes from this factory. Attributes
+  # can be individually overridden by passing in a Hash of attribute => value
+  # pairs.
+  #
+  # Arguments:
+  # * name: +Symbol+ or +String+
+  #   The name of the factory that should be used.
+  # * overrides: +Hash+
+  #   Attributes to overwrite for this set.
+  #
+  # Returns: +Hash+
+  # A set of attributes that can be used to build an instance of the class
+  # this factory generates. 
+  def self.attributes_for (name, overrides = {})
+    factory_by_name(name).run(Proxy::AttributesFor, overrides)
   end
 
-  def create (attrs = {}) #:nodoc:
-    instance = build_instance(attrs, :create)
-    instance.save!
-    instance
+  # Generates and returns an instance from this factory. Attributes can be
+  # individually overridden by passing in a Hash of attribute => value pairs.
+  #
+  # Arguments:
+  # * name: +Symbol+ or +String+
+  #   The name of the factory that should be used.
+  # * overrides: +Hash+
+  #   Attributes to overwrite for this instance.
+  #
+  # Returns: +Object+
+  # An instance of the class this factory generates, with generated attributes
+  # assigned.
+  def self.build (name, overrides = {})
+    factory_by_name(name).run(Proxy::Build, overrides)
   end
 
-  class << self
-
-    # Generates and returns a Hash of attributes from this factory. Attributes
-    # can be individually overridden by passing in a Hash of attribute => value
-    # pairs.
-    #
-    # Arguments:
-    #   attrs: (Hash)
-    #     Attributes to overwrite for this set.
-    #
-    # Returns:
-    #   A set of attributes that can be used to build an instance of the class
-    #   this factory generates. (Hash)
-    def attributes_for (name, attrs = {})
-      factory_by_name(name).attributes_for(attrs)
-    end
-
-    # Generates and returns an instance from this factory. Attributes can be
-    # individually overridden by passing in a Hash of attribute => value pairs.
-    #
-    # Arguments:
-    #   attrs: (Hash)
-    #     See attributes_for
-    #
-    # Returns:
-    #   An instance of the class this factory generates, with generated
-    #   attributes assigned.
-    def build (name, attrs = {})
-      factory_by_name(name).build(attrs)
-    end
-
-    # Generates, saves, and returns an instance from this factory. Attributes can
-    # be individually overridden by passing in a Hash of attribute => value
-    # pairs.
-    #
-    # If the instance is not valid, an ActiveRecord::Invalid exception will be
-    # raised.
-    #
-    # Arguments:
-    #   attrs: (Hash)
-    #     See attributes_for
-    #
-    # Returns:
-    #   A saved instance of the class this factory generates, with generated
-    #   attributes assigned.
-    def create (name, attrs = {})
-      factory_by_name(name).create(attrs)
-    end
+  # Generates, saves, and returns an instance from this factory. Attributes can
+  # be individually overridden by passing in a Hash of attribute => value
+  # pairs.
+  #
+  # Instances are saved using the +save!+ method, so ActiveRecord models will
+  # raise ActiveRecord::RecordInvalid exceptions for invalid attribute sets.
+  #
+  # Arguments:
+  # * name: +Symbol+ or +String+
+  #   The name of the factory that should be used.
+  # * overrides: +Hash+
+  #   Attributes to overwrite for this instance.
+  #
+  # Returns: +Object+
+  # A saved instance of the class this factory generates, with generated
+  # attributes assigned.
+  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.
+  #
+  # Arguments:
+  # * name: +Symbol+ or +String+
+  #   The name of the factory that should be used.
+  # * overrides: +Hash+
+  #   Attributes to overwrite for this instance.
+  #
+  # Returns: +Object+
+  # An object with generated attributes stubbed out.
+  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.
+  #
+  # Arguments:
+  # * name: +Symbol+ or +String+
+  #   The name of the factory that should be used.
+  # * overrides: +Hash+
+  #   Attributes to overwrite for this instance.
+  #
+  # Returns: +Object+
+  # The result of the default strategy.
+  def self.default_strategy (name, overrides = {})  
+    self.send(factory_by_name(name).default_strategy, name, overrides)
+  end
 
-    def find_definitions #:nodoc:
-      definition_file_paths.each do |path|
-        require("#{path}.rb") if File.exists?("#{path}.rb")
+  def self.find_definitions #:nodoc:
+    definition_file_paths.each do |path|
+      require("#{path}.rb") if File.exists?("#{path}.rb")
 
-        if File.directory? path
-          Dir[File.join(path, '*.rb')].each do |file|
-            require file
-          end
+      if File.directory? path
+        Dir[File.join(path, '*.rb')].each do |file|
+          require file
         end
       end
     end
-
-    private
-
-    def factory_by_name (name)
-      factories[name.to_sym] or raise ArgumentError.new("No such factory: #{name.to_s}")
-    end
-
   end
 
-  private
-
-  def build_attributes_hash (values, strategy)
-    values = symbolize_keys(values)
-    passed_keys = values.keys.collect {|key| Factory.aliases_for(key) }.flatten
+  def run (proxy_class, overrides) #:nodoc:
+    proxy = proxy_class.new(build_class)
+    overrides = symbolize_keys(overrides)
+    overrides.each {|attr, val| proxy.set(attr, val) }
+    passed_keys = overrides.keys.collect {|k| Factory.aliases_for(k) }.flatten
     @attributes.each do |attribute|
       unless passed_keys.include?(attribute.name)
-        proxy = AttributeProxy.new(self, attribute.name, strategy, values)
-        values[attribute.name] = attribute.value(proxy)
+        attribute.add_to(proxy)
       end
     end
-    values
+    proxy.result
   end
 
-  def build_instance (override, strategy)
-    instance = build_class.new
-    attrs = build_attributes_hash(override, strategy)
-    attrs.each do |attr, value|
-      instance.send(:"#{attr}=", value)
-    end
-    instance
-  end
+  private
 
+  def self.factory_by_name (name)
+    factories[name.to_sym] or raise ArgumentError.new("No such factory: #{name.to_s}")
+  end
+  
   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))
@@ -247,10 +320,17 @@ class Factory
   end
 
   def assert_valid_options(options)
-    invalid_keys = options.keys - [:class] 
+    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}"
+    end
   end
 
   # Based on ActiveSupport's underscore inflector