factory_girl 2.0.3 → 2.0.4

data/GETTING_STARTED.md

@@ -259,6 +259,78 @@ Without a block, the value will increment itself, starting at its initial value:
       sequence(:position)
     end
 
+Traits
+------
+
+Traits allow you to group attributes together and then apply them
+to any factory.
+
+    factory :user, :aliases => [:author]
+
+    factory :story do
+      title "My awesome story"
+      author
+
+      trait :published do
+        published true
+      end
+
+      trait :unpublished do
+        published false
+      end
+
+      trait :week_long_publishing do
+        start_at { 1.week.ago }
+        end_at   { Time.now }
+      end
+
+      trait :month_long_publishing do
+        start_at { 1.month.ago }
+        end_at   { Time.now }
+      end
+
+      factory :week_long_published_story,    :traits => [:published, :week_long_publishing]
+      factory :month_long_published_story,   :traits => [:published, :month_long_publishing]
+      factory :week_long_unpublished_story,  :traits => [:unpublished, :week_long_publishing]
+      factory :month_long_unpublished_story, :traits => [:unpublished, :month_long_publishing]
+    end
+
+Traits can be used as attributes:
+
+    factory :week_long_published_story_with_title, :parent => :story do
+      published
+      week_long_publishing
+      title { "Publishing that was started at {start_at}" }
+    end
+
+Traits that define the same attributes won't raise AttributeDefinitionErrors;
+the trait that defines the attribute latest gets precedence.
+
+    factory :user do
+      name "Friendly User"
+      login { name }
+
+      trait :male do
+        name   "John Doe"
+        gender "Male"
+        login { "#{name} (M)" }
+      end
+
+      trait :female do
+        name   "Jane Doe"
+        gender "Female"
+        login { "#{name} (F)" }
+      end
+
+      trait :admin do
+        admin true
+        login { "admin-#{name}" }
+      end
+
+      factory :male_admin,   :traits => [:male, :admin]   # login will be "admin-John Doe"
+      factory :female_admin, :traits => [:admin, :female] # login will be "Jane Doe (F)"
+    end
+
 Callbacks
 ---------
 

data/Gemfile

@@ -4,6 +4,7 @@ gem "rake"
 gem "rspec", "~> 2.0"
 gem "rcov"
 gem "activerecord", :require => false
+gem "activesupport", :require => false
 gem "rr"
 gem "sqlite3-ruby", :require => false
 gem "appraisal", "~> 0.3.5"

data/Gemfile.lock

@@ -58,6 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
+  activesupport
   appraisal (~> 0.3.5)
   bluecloth
   cucumber (~> 1.0.0)

data/README.md

@@ -1,4 +1,4 @@
-# factory_girl [![Build Status](http://travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl)
+# factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/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 inheritance.
 

data/lib/factory_girl.rb

@@ -12,7 +12,10 @@ require 'factory_girl/attribute/association'
 require 'factory_girl/attribute/callback'
 require 'factory_girl/attribute/sequence'
 require 'factory_girl/attribute/implicit'
+require 'factory_girl/attribute/trait'
 require 'factory_girl/sequence'
+require 'factory_girl/attribute_list'
+require 'factory_girl/trait'
 require 'factory_girl/aliases'
 require 'factory_girl/definition_proxy'
 require 'factory_girl/syntax/methods'
@@ -50,4 +53,16 @@ module FactoryGirl
   def self.sequence_by_name(name)
     sequences.find(name)
   end
+
+  def self.traits
+    @traits ||= Registry.new
+  end
+
+  def self.register_trait(trait)
+    traits.add(trait)
+  end
+
+  def self.trait_by_name(name)
+    traits.find(name)
+  end
 end

data/lib/factory_girl/attribute.rb

@@ -34,6 +34,10 @@ module FactoryGirl
       1
     end
 
+    def aliases_for?(attr)
+      FactoryGirl.aliases_for(attr).include?(name)
+    end
+
     def <=>(another)
       return nil unless another.is_a? Attribute
       self.priority <=> another.priority

data/lib/factory_girl/attribute/implicit.rb

@@ -2,8 +2,9 @@ module FactoryGirl
   class Attribute
 
     class Implicit < Attribute
-      def initialize(name)
+      def initialize(name, factory = nil)
         super(name)
+        @factory = factory
       end
 
       def add_to(proxy)
@@ -27,8 +28,10 @@ module FactoryGirl
       def resolve_name
         if FactoryGirl.factories.registered?(name)
           Attribute::Association.new(name, name, {})
-        else
+        elsif FactoryGirl.sequences.registered?(name)
           Attribute::Sequence.new(name, name)
+        else
+          Attribute::Trait.new(name, @factory)
         end
       end
     end

data/lib/factory_girl/attribute/trait.rb

@@ -0,0 +1,22 @@
+module FactoryGirl
+  class Attribute #:nodoc:
+
+    class Trait < Attribute #:nodoc:
+      def initialize(name, factory)
+        super(name)
+        @factory = factory
+      end
+
+      def add_to(proxy)
+        trait.attributes.each { |attr| attr.add_to(proxy) }
+      end
+
+      private
+
+      def trait
+        (@factory || FactoryGirl).trait_by_name(name)
+      end
+    end
+
+  end
+end

data/lib/factory_girl/attribute_list.rb

@@ -0,0 +1,59 @@
+module FactoryGirl
+  class AttributeList
+    include Enumerable
+
+    def initialize
+      @attributes = []
+    end
+
+    def define_attribute(attribute)
+      if attribute_defined?(attribute.name)
+        raise AttributeDefinitionError, "Attribute already defined: #{attribute.name}"
+      end
+
+      @attributes << attribute
+    end
+
+    def add_callback(name, &block)
+      unless valid_callback_names.include?(name.to_sym)
+        raise InvalidCallbackNameError, "#{name} is not a valid callback name. Valid callback names are #{valid_callback_names.inspect}"
+      end
+
+      @attributes << Attribute::Callback.new(name.to_sym, block)
+    end
+
+    def each(&block)
+      @attributes.each(&block)
+    end
+
+    def attribute_defined?(attribute_name)
+      !@attributes.detect do |attribute|
+        attribute.name == attribute_name &&
+          !attribute.is_a?(FactoryGirl::Attribute::Callback)
+      end.nil?
+    end
+
+    def apply_attributes(attributes_to_apply)
+      new_attributes = []
+
+      attributes_to_apply.each do |attribute|
+        if attribute_defined?(attribute.name)
+          @attributes.delete_if do |attrib|
+            new_attributes << attrib.clone if attrib.name == attribute.name
+          end
+        else
+          new_attributes << attribute.clone
+        end
+      end
+
+      @attributes.unshift *new_attributes
+      @attributes = @attributes.partition {|attr| attr.priority.zero? }.flatten
+    end
+
+    private
+
+    def valid_callback_names
+      [:after_build, :after_create, :after_stub]
+    end
+  end
+end

data/lib/factory_girl/definition_proxy.rb

@@ -78,7 +78,7 @@ module FactoryGirl
     # are equivalent.
     def method_missing(name, *args, &block)
       if args.empty? && block.nil?
-        @factory.define_attribute(Attribute::Implicit.new(name))
+        @factory.define_attribute(Attribute::Implicit.new(name, @factory))
       elsif args.first.is_a?(Hash) && args.first.has_key?(:factory)
         association(name, *args)
       else
@@ -154,5 +154,9 @@ module FactoryGirl
     def factory(name, options = {}, &block)
       @child_factories << [name, options, block]
     end
+
+    def trait(name, &block)
+      @factory.define_trait(Trait.new(name, &block))
+    end
   end
 end

data/lib/factory_girl/factory.rb

@@ -13,7 +13,7 @@ module FactoryGirl
 
   class Factory
     attr_reader :name #:nodoc:
-    attr_reader :attributes #:nodoc:
+    attr_reader :traits #:nodoc:
 
     def factory_name
       puts "WARNING: factory.factory_name is deprecated. Use factory.name instead."
@@ -34,55 +34,62 @@ module FactoryGirl
 
     def initialize(name, options = {}) #:nodoc:
       assert_valid_options(options)
-      @name       = factory_name_for(name)
-      @options    = options
-      @attributes = []
+      @name           = factory_name_for(name)
+      @parent         = options[:parent]
+      @options        = options
+      @attribute_list = AttributeList.new
+      @traits         = []
     end
 
     def inherit_from(parent) #:nodoc:
       @options[:class]            ||= parent.class_name
       @options[:default_strategy] ||= parent.default_strategy
 
-      new_attributes = []
-      parent.attributes.each do |attribute|
-        unless attribute_defined?(attribute.name)
-          new_attributes << attribute.clone
-        end
+      apply_attributes(parent.attributes)
+    end
+
+    def apply_traits(traits) #:nodoc:
+      traits.reverse.map { |name| trait_by_name(name) }.each do |trait|
+        apply_attributes(trait.attributes)
       end
+    end
 
-      @attributes += new_attributes
-      @attributes.sort!
+    def apply_attributes(attributes_to_apply)
+      @attribute_list.apply_attributes(attributes_to_apply)
     end
 
     def define_attribute(attribute)
-      name = attribute.name
-      # TODO: move these checks into Attribute
-      if attribute_defined?(name)
-        raise AttributeDefinitionError, "Attribute already defined: #{name}"
-      end
       if attribute.respond_to?(:factory) && attribute.factory == self.name
-        raise AssociationDefinitionError, "Self-referencing association '#{name}' in factory '#{self.name}'"
+        raise AssociationDefinitionError, "Self-referencing association '#{attribute.name}' in factory '#{self.name}'"
       end
-      @attributes << attribute
+
+      @attribute_list.define_attribute(attribute)
+    end
+
+    def define_trait(trait)
+      @traits << trait
     end
 
     def add_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)
+      @attribute_list.add_callback(name, &block)
+    end
+
+    def attributes
+      @attribute_list.to_a
     end
 
     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| FactoryGirl.aliases_for(k) }.flatten
-      @attributes.each do |attribute|
-        unless passed_keys.include?(attribute.name)
+      @attribute_list.each do |attribute|
+        factory_overrides = overrides.select { |attr, val| attribute.aliases_for?(attr) }
+        if factory_overrides.empty?
           attribute.add_to(proxy)
+        else
+          factory_overrides.each { |attr, val| proxy.set(attr, val) }
         end
       end
+      overrides.each { |attr, val| proxy.set(attr, val) }
       proxy.result(@to_create_block)
     end
 
@@ -94,6 +101,16 @@ module FactoryGirl
       attributes.select {|attribute| attribute.association? }
     end
 
+    def trait_by_name(name)
+      if existing_attribute = trait_for(name)
+        existing_attribute
+      elsif @parent
+        FactoryGirl.factory_by_name(@parent).trait_by_name(name)
+      else
+        FactoryGirl.trait_by_name(name)
+      end
+    end
+
     # Names for this factory, including aliases.
     #
     # Example:
@@ -148,12 +165,8 @@ module FactoryGirl
       end
     end
 
-    def attribute_defined? (name)
-      !@attributes.detect {|attr| attr.name == name && !attr.is_a?(Attribute::Callback) }.nil?
-    end
-
     def assert_valid_options(options)
-      invalid_keys = options.keys - [:class, :parent, :default_strategy, :aliases]
+      invalid_keys = options.keys - [:class, :parent, :default_strategy, :aliases, :traits]
       unless invalid_keys == []
         raise ArgumentError, "Unknown arguments: #{invalid_keys.inspect}"
       end
@@ -194,5 +207,8 @@ module FactoryGirl
       end
     end
 
+    def trait_for(name)
+      traits.detect {|trait| trait.name == name }
+    end
   end
 end

data/lib/factory_girl/syntax/default.rb

@@ -16,6 +16,11 @@ module FactoryGirl
           factory = Factory.new(name, options)
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           proxy.instance_eval(&block) if block_given?
+
+          if traits = options.delete(:traits)
+            factory.apply_traits(traits)
+          end
+
           if parent = options.delete(:parent)
             factory.inherit_from(FactoryGirl.factory_by_name(parent))
           end
@@ -29,6 +34,10 @@ module FactoryGirl
         def sequence(name, start_value = 1, &block)
           FactoryGirl.register_sequence(Sequence.new(name, start_value, &block))
         end
+
+        def trait(name, &block)
+          FactoryGirl.register_trait(Trait.new(name, &block))
+        end
       end
     end
   end

data/lib/factory_girl/trait.rb

@@ -0,0 +1,29 @@
+module FactoryGirl
+  class Trait
+    attr_reader :name
+
+    def initialize(name, &block) #:nodoc:
+      @name = name
+      @attribute_list = AttributeList.new
+
+      proxy = FactoryGirl::DefinitionProxy.new(self)
+      proxy.instance_eval(&block) if block_given?
+    end
+
+    def define_attribute(attribute)
+      @attribute_list.define_attribute(attribute)
+    end
+
+    def add_callback(name, &block)
+      @attribute_list.add_callback(name, &block)
+    end
+
+    def attributes
+      @attribute_list.to_a
+    end
+
+    def names
+      [@name]
+    end
+  end
+end

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end
 

data/spec/acceptance/attributes_ordered_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'acceptance/acceptance_helper'
+
+describe "a generated attributes hash where order matters" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('ParentModel', :static           => :integer,
+                                :evaluates_first  => :integer,
+                                :evaluates_second => :integer,
+                                :evaluates_third  => :integer)
+
+    FactoryGirl.define do
+      factory :parent_model do
+        evaluates_first  { static }
+        evaluates_second { evaluates_first }
+        evaluates_third  { evaluates_second }
+
+        factory :child_model do
+          static 1
+        end
+      end
+    end
+  end
+
+  subject { FactoryGirl.build(:child_model) }
+
+  it "assigns attributes in the order they're defined with preference to static attributes" do
+    subject[:evaluates_first].should  == 1
+    subject[:evaluates_second].should == 1
+    subject[:evaluates_third].should  == 1
+  end
+end

data/spec/acceptance/overrides_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'acceptance/acceptance_helper'
+require 'active_support/ordered_hash'
+
+describe "attribute overrides" do
+  before do
+    define_model('User', :admin    => :boolean)
+    define_model('Post', :title    => :string,
+                         :secure   => :boolean,
+                         :user_id  => :integer) do
+      belongs_to :user
+
+      def secure=(value)
+        return unless user && user.admin?
+        write_attribute(:secure, value)
+      end
+    end
+
+    FactoryGirl.define do
+      factory :user do
+        factory :admin do
+          admin true
+        end
+      end
+
+      factory :post do
+        user
+        title "default title"
+      end
+    end
+  end
+
+  let(:admin) { FactoryGirl.create(:admin) }
+
+  let(:post_attributes) do
+    attributes = ActiveSupport::OrderedHash.new
+    attributes[:secure] = false
+    attributes
+  end
+
+  let(:non_admin_post_attributes) do
+    post_attributes[:user] = FactoryGirl.create(:user)
+    post_attributes
+  end
+
+  let(:admin_post_attributes) do
+    post_attributes[:user] = admin
+    post_attributes
+  end
+
+  context "with an admin posting" do
+    subject      { FactoryGirl.create(:post, admin_post_attributes) }
+    its(:secure) { should == false }
+  end
+
+  context "with a non-admin posting" do
+    subject      { FactoryGirl.create(:post, non_admin_post_attributes) }
+    its(:secure) { should be_nil }
+  end
+
+  context "with no user posting" do
+    subject      { FactoryGirl.create(:post, post_attributes) }
+    its(:secure) { should be_nil }
+  end
+end

data/spec/acceptance/parent_spec.rb

@@ -3,16 +3,18 @@ require 'acceptance/acceptance_helper'
 
 describe "an instance generated by a factory that inherits from another factory" do
   before do
-    define_model("User", :name => :string, :admin => :boolean, :email => :string)
+    define_model("User", :name => :string, :admin => :boolean, :email => :string, :upper_email => :string, :login => :string)
 
     FactoryGirl.define do
       factory :user do
         name  "John"
         email { "#{name.downcase}@example.com" }
+        login { email }
 
         factory :admin do
           name "admin"
           admin true
+          upper_email { email.upcase }
         end
 
         factory :guest do
@@ -29,11 +31,12 @@ describe "an instance generated by a factory that inherits from another factory"
   end
 
   describe "the child class redefining parent's static method used by a dynamic method" do
-    subject     { FactoryGirl.create(:admin) }
-    it          { should be_kind_of(User) }
-    it          { should be_admin }
-    its(:name)  { should == "admin" }
-    its(:email) { should == "admin@example.com" }
+    subject           { FactoryGirl.create(:admin) }
+    it                { should be_kind_of(User) }
+    it                { should be_admin }
+    its(:name)        { should == "admin" }
+    its(:email)       { should == "admin@example.com" }
+    its(:upper_email) { should == "ADMIN@EXAMPLE.COM"}
   end
 
   describe "the child class redefining parent's dynamic method" do
@@ -41,6 +44,7 @@ describe "an instance generated by a factory that inherits from another factory"
     it          { should_not be_admin }
     its(:name)  { should == "John" }
     its(:email) { should eql "John-guest@example.com" }
+    its(:login) { should == "John-guest@example.com" }
   end
 end
 

data/spec/acceptance/traits_spec.rb

@@ -0,0 +1,171 @@
+require "spec_helper"
+require "acceptance/acceptance_helper"
+
+describe "an instance generated by a factory with multiple traits" do
+  before do
+    define_model("User",
+                 :name          => :string,
+                 :admin         => :boolean,
+                 :gender        => :string,
+                 :email         => :string,
+                 :date_of_birth => :date,
+                 :great         => :string)
+
+    FactoryGirl.define do
+      factory :user_without_admin_scoping, :class => User do
+        admin_trait
+      end
+
+      factory :user do
+        name "John"
+
+        trait :great do
+          great "GREAT!!!"
+        end
+
+        trait :admin do
+          admin true
+        end
+
+        trait :admin_trait do
+          admin true
+        end
+
+        trait :male do
+          name   "Joe"
+          gender "Male"
+        end
+
+        trait :female do
+          name   "Jane"
+          gender "Female"
+        end
+
+        factory :great_user do
+          great
+        end
+
+        factory :admin, :traits => [:admin]
+
+        factory :male_user do
+          male
+
+          factory :child_male_user do
+            date_of_birth { Date.parse("1/1/2000") }
+          end
+        end
+
+        factory :female, :traits => [:female] do
+          trait :admin do
+            admin true
+            name "Judy"
+          end
+
+          factory :female_admin_judy, :traits => [:admin]
+        end
+
+        factory :female_admin,            :traits => [:female, :admin]
+        factory :female_after_male_admin, :traits => [:male, :female, :admin]
+        factory :male_after_female_admin, :traits => [:female, :male, :admin]
+      end
+
+      trait :email do
+        email { "#{name}@example.com" }
+      end
+
+      factory :user_with_email, :class => User, :traits => [:email] do
+        name "Bill"
+      end
+    end
+  end
+
+  context "the parent class" do
+    subject      { FactoryGirl.create(:user) }
+    its(:name)   { should == "John" }
+    its(:gender) { should be_nil }
+    it           { should_not be_admin }
+  end
+
+  context "the child class with one trait" do
+    subject      { FactoryGirl.create(:admin) }
+    its(:name)   { should == "John" }
+    its(:gender) { should be_nil }
+    it           { should be_admin }
+  end
+
+  context "the other child class with one trait" do
+    subject      { FactoryGirl.create(:female) }
+    its(:name)   { should == "Jane" }
+    its(:gender) { should == "Female" }
+    it           { should_not be_admin }
+  end
+
+  context "the child with multiple traits" do
+    subject      { FactoryGirl.create(:female_admin) }
+    its(:name)   { should == "Jane" }
+    its(:gender) { should == "Female" }
+    it           { should be_admin }
+  end
+
+  context "the child with multiple traits and overridden attributes" do
+    subject      { FactoryGirl.create(:female_admin, :name => "Jill", :gender => nil) }
+    its(:name)   { should == "Jill" }
+    its(:gender) { should be_nil }
+    it           { should be_admin }
+  end
+
+  context "the child with multiple traits who override the same attribute" do
+    context "when the male assigns name after female" do
+      subject      { FactoryGirl.create(:male_after_female_admin) }
+      its(:name)   { should == "Joe" }
+      its(:gender) { should == "Male" }
+      it           { should be_admin }
+    end
+
+    context "when the female assigns name after male" do
+      subject      { FactoryGirl.create(:female_after_male_admin) }
+      its(:name)   { should == "Jane" }
+      its(:gender) { should == "Female" }
+      it           { should be_admin }
+    end
+  end
+
+  context "child class with scoped trait and inherited trait" do
+    subject      { FactoryGirl.create(:female_admin_judy) }
+    its(:name)   { should == "Judy" }
+    its(:gender) { should == "Female" }
+    it           { should be_admin }
+  end
+
+  context "factory using global trait" do
+    subject     { FactoryGirl.create(:user_with_email) }
+    its(:name)  { should == "Bill" }
+    its(:email) { should == "Bill@example.com"}
+  end
+
+  context "factory created with alternate syntax for specifying trait" do
+    subject      { FactoryGirl.create(:male_user) }
+    its(:gender) { should == "Male" }
+  end
+
+  context "factory created with alternate syntax where trait name and attribute are the same" do
+    subject     { FactoryGirl.create(:great_user) }
+    its(:great) { should == "GREAT!!!" }
+  end
+
+  context "factory created with alternate syntax where trait name and attribute are the same and attribute is overridden" do
+    subject     { FactoryGirl.create(:great_user, :great => "SORT OF!!!") }
+    its(:great) { should == "SORT OF!!!" }
+  end
+
+  context "child factory created where trait attributes are inherited" do
+    subject             { FactoryGirl.create(:child_male_user) }
+    its(:gender)        { should == "Male" }
+    its(:date_of_birth) { should == Date.parse("1/1/2000") }
+  end
+
+  context "factory outside of scope" do
+    subject     { FactoryGirl.create(:user_without_admin_scoping) }
+    it { expect { subject }.to raise_error(ArgumentError, "Not registered: admin_trait") }
+  end
+end

data/spec/factory_girl/attribute_list_spec.rb

@@ -0,0 +1,111 @@
+require "spec_helper"
+
+describe FactoryGirl::AttributeList, "#define_attribute" do
+  let(:static_attribute)  { FactoryGirl::Attribute::Static.new(:full_name, "value") }
+  let(:dynamic_attribute) { FactoryGirl::Attribute::Dynamic.new(:email, lambda {|u| "#{u.full_name}@example.com" }) }
+
+  it "maintains a list of attributes" do
+    subject.define_attribute(static_attribute)
+    subject.to_a.should == [static_attribute]
+
+    subject.define_attribute(dynamic_attribute)
+    subject.to_a.should == [static_attribute, dynamic_attribute]
+  end
+
+  it "raises if an attribute has already been defined" do
+    expect {
+      2.times { subject.define_attribute(static_attribute) }
+    }.to raise_error(FactoryGirl::AttributeDefinitionError, "Attribute already defined: full_name")
+  end
+end
+
+describe FactoryGirl::AttributeList, "#attribute_defined?" do
+  let(:static_attribute)                    { FactoryGirl::Attribute::Static.new(:full_name, "value") }
+  let(:callback_attribute)                  { FactoryGirl::Attribute::Callback.new(:after_create, lambda { }) }
+  let(:static_attribute_named_after_create) { FactoryGirl::Attribute::Static.new(:after_create, "funky!") }
+
+  it "knows if an attribute has been defined" do
+    subject.attribute_defined?(static_attribute.name).should == false
+
+    subject.define_attribute(static_attribute)
+
+    subject.attribute_defined?(static_attribute.name).should == true
+    subject.attribute_defined?(:undefined_attribute).should == false
+  end
+
+  it "doesn't reference callbacks" do
+    subject.define_attribute(callback_attribute)
+
+    subject.attribute_defined?(:after_create).should == false
+
+    subject.define_attribute(static_attribute_named_after_create)
+    subject.attribute_defined?(:after_create).should == true
+  end
+end
+
+describe FactoryGirl::AttributeList, "#add_callback" do
+  let(:proxy_class) { mock("klass") }
+  let(:proxy) { FactoryGirl::Proxy.new(proxy_class) }
+  let(:valid_callback_names) { [:after_create, :after_build, :after_stub] }
+  let(:invalid_callback_names) { [:before_create, :before_build, :bogus] }
+
+
+  it "allows for defining adding a callback" do
+    subject.add_callback(:after_create) { "Called after_create" }
+
+    subject.first.name.should == :after_create
+
+    subject.first.add_to(proxy)
+    proxy.callbacks[:after_create].first.call.should == "Called after_create"
+  end
+
+  it "allows valid callback names to be assigned" do
+    valid_callback_names.each do |callback_name|
+      expect do
+        subject.add_callback(callback_name) { "great name!" }
+      end.to_not raise_error(FactoryGirl::InvalidCallbackNameError)
+    end
+  end
+
+  it "raises if an invalid callback name is assigned" do
+    invalid_callback_names.each do |callback_name|
+      expect do
+        subject.add_callback(callback_name) { "great name!" }
+      end.to raise_error(FactoryGirl::InvalidCallbackNameError, "#{callback_name} is not a valid callback name. Valid callback names are [:after_build, :after_create, :after_stub]")
+    end
+  end
+end
+
+describe FactoryGirl::AttributeList, "#apply_attributes" do
+  let(:full_name_attribute) { FactoryGirl::Attribute::Static.new(:full_name, "John Adams") }
+  let(:city_attribute)      { FactoryGirl::Attribute::Static.new(:city, "Boston") }
+  let(:email_attribute)     { FactoryGirl::Attribute::Dynamic.new(:email, lambda {|model| "#{model.full_name}@example.com" }) }
+  let(:login_attribute)     { FactoryGirl::Attribute::Dynamic.new(:login, lambda {|model| "username-#{model.full_name}" }) }
+
+  it "prepends applied attributes" do
+    subject.define_attribute(full_name_attribute)
+    subject.apply_attributes([city_attribute])
+    subject.to_a.should == [city_attribute, full_name_attribute]
+  end
+
+  it "moves non-static attributes to the end of the list" do
+    subject.define_attribute(full_name_attribute)
+    subject.apply_attributes([city_attribute, email_attribute])
+    subject.to_a.should == [city_attribute, full_name_attribute, email_attribute]
+  end
+
+  it "maintains order of non-static attributes" do
+    subject.define_attribute(full_name_attribute)
+    subject.define_attribute(login_attribute)
+    subject.apply_attributes([city_attribute, email_attribute])
+    subject.to_a.should == [city_attribute, full_name_attribute, email_attribute, login_attribute]
+  end
+
+  it "overwrites attributes that are already defined" do
+    subject.define_attribute(full_name_attribute)
+    attribute_with_same_name = FactoryGirl::Attribute::Static.new(:full_name, "Benjamin Franklin")
+
+    subject.apply_attributes([attribute_with_same_name])
+    subject.to_a.should == [attribute_with_same_name]
+  end
+end

data/spec/factory_girl/definition_proxy_spec.rb

@@ -130,7 +130,7 @@ describe FactoryGirl::DefinitionProxy do
     name = :user
     attr = 'attribute'
     stub(attr).name { name }
-    mock(FactoryGirl::Attribute::Implicit).new(name) { attr }
+    mock(FactoryGirl::Attribute::Implicit).new(name, factory) { attr }
     subject.send(name)
     factory.attributes.should include(attr)
   end

data/spec/factory_girl/factory_spec.rb

@@ -25,24 +25,6 @@ describe FactoryGirl::Factory do
     @factory.default_strategy.should == :create
   end
 
-  it "should not allow the same attribute to be added twice" do
-    lambda {
-      2.times { @factory.define_attribute FactoryGirl::Attribute::Static.new(:name, 'value') }
-    }.should raise_error(FactoryGirl::AttributeDefinitionError)
-  end
-
-  it "should add a callback attribute when defining a callback" do
-    mock(FactoryGirl::Attribute::Callback).new(:after_create, is_a(Proc)) { 'after_create callback' }
-    @factory.add_callback(:after_create) {}
-    @factory.attributes.should include('after_create callback')
-  end
-
-  it "should raise an InvalidCallbackNameError when defining a callback with an invalid name" do
-    lambda{
-      @factory.add_callback(:invalid_callback_name) {}
-    }.should raise_error(FactoryGirl::InvalidCallbackNameError)
-  end
-
   describe "after adding an attribute" do
     before do
       @attribute = "attribute"

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ RSpec.configure do |config|
   config.after do
     FactoryGirl.factories.clear
     FactoryGirl.sequences.clear
+    FactoryGirl.traits.clear
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-05 00:00:00.000000000 -04:00
+date: 2011-08-12 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152633400 !ruby/object:Gem::Requirement
+  requirement: &2152563020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152633400
+  version_requirements: *2152563020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152632980 !ruby/object:Gem::Requirement
+  requirement: &2152562560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152632980
+  version_requirements: *2152562560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152632560 !ruby/object:Gem::Requirement
+  requirement: &2152562040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152632560
+  version_requirements: *2152562040
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152632040 !ruby/object:Gem::Requirement
+  requirement: &2152561440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.5
   type: :development
   prerelease: false
-  version_requirements: *2152632040
+  version_requirements: *2152561440
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152631500 !ruby/object:Gem::Requirement
+  requirement: &2152560840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 3.0.0.beta3
   type: :development
   prerelease: false
-  version_requirements: *2152631500
+  version_requirements: *2152560840
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152631080 !ruby/object:Gem::Requirement
+  requirement: &2152560400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152631080
+  version_requirements: *2152560400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152630620 !ruby/object:Gem::Requirement
+  requirement: &2152530400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152630620
+  version_requirements: *2152530400
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152621520 !ruby/object:Gem::Requirement
+  requirement: &2152529980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152621520
+  version_requirements: *2152529980
 description: ! "factory_girl provides a framework and DSL for defining and\n                       using
   factories - less error-prone, more explicit, and\n                       all-around
   easier to work with than fixtures."
@@ -124,7 +124,9 @@ files:
 - lib/factory_girl/attribute/implicit.rb
 - lib/factory_girl/attribute/sequence.rb
 - lib/factory_girl/attribute/static.rb
+- lib/factory_girl/attribute/trait.rb
 - lib/factory_girl/attribute.rb
+- lib/factory_girl/attribute_list.rb
 - lib/factory_girl/definition_proxy.rb
 - lib/factory_girl/deprecated.rb
 - lib/factory_girl/factory.rb
@@ -146,11 +148,13 @@ files:
 - lib/factory_girl/syntax/sham.rb
 - lib/factory_girl/syntax/vintage.rb
 - lib/factory_girl/syntax.rb
+- lib/factory_girl/trait.rb
 - lib/factory_girl/version.rb
 - lib/factory_girl.rb
 - spec/acceptance/acceptance_helper.rb
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attributes_for_spec.rb
+- spec/acceptance/attributes_ordered_spec.rb
 - spec/acceptance/build_list_spec.rb
 - spec/acceptance/build_spec.rb
 - spec/acceptance/build_stubbed_spec.rb
@@ -160,6 +164,7 @@ files:
 - spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
+- spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
@@ -167,6 +172,7 @@ files:
 - spec/acceptance/syntax/make_spec.rb
 - spec/acceptance/syntax/sham_spec.rb
 - spec/acceptance/syntax/vintage_spec.rb
+- spec/acceptance/traits_spec.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
@@ -174,6 +180,7 @@ files:
 - spec/factory_girl/attribute/implicit_spec.rb
 - spec/factory_girl/attribute/sequence_spec.rb
 - spec/factory_girl/attribute/static_spec.rb
+- spec/factory_girl/attribute_list_spec.rb
 - spec/factory_girl/attribute_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
 - spec/factory_girl/deprecated_spec.rb
@@ -224,6 +231,7 @@ summary: factory_girl provides a framework and DSL for defining and using model
 test_files:
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attributes_for_spec.rb
+- spec/acceptance/attributes_ordered_spec.rb
 - spec/acceptance/build_list_spec.rb
 - spec/acceptance/build_spec.rb
 - spec/acceptance/build_stubbed_spec.rb
@@ -233,6 +241,7 @@ test_files:
 - spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
+- spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
@@ -240,6 +249,7 @@ test_files:
 - spec/acceptance/syntax/make_spec.rb
 - spec/acceptance/syntax/sham_spec.rb
 - spec/acceptance/syntax/vintage_spec.rb
+- spec/acceptance/traits_spec.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
@@ -247,6 +257,7 @@ test_files:
 - spec/factory_girl/attribute/implicit_spec.rb
 - spec/factory_girl/attribute/sequence_spec.rb
 - spec/factory_girl/attribute/static_spec.rb
+- spec/factory_girl/attribute_list_spec.rb
 - spec/factory_girl/attribute_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
 - spec/factory_girl/deprecated_spec.rb