factory_girl 2.0.5 → 2.1.0

data/gemfiles/2.3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 2.3"
+
+gemspec :path=>"../"

data/gemfiles/2.3.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
+    appraisal (0.3.8)
+      bundler
+      rake
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
+    bluecloth (2.1.0)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (3.0.0)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    json (1.5.3)
+    mocha (0.9.8)
+      rake
+    rake (0.9.2)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.5)
+    timecop (0.3.5)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3)
+  appraisal (~> 0.3.8)
+  aruba
+  bluecloth
+  bourne
+  cucumber (~> 1.0.0)
+  factory_girl!
+  mocha
+  rcov
+  rspec (~> 2.0)
+  sqlite3-ruby
+  timecop
+  yard

data/gemfiles/3.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 3.0"
+
+gemspec :path=>"../"

data/gemfiles/3.0.gemfile.lock

@@ -0,0 +1,81 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.9)
+    appraisal (0.3.8)
+      bundler
+      rake
+    arel (2.0.10)
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
+    bluecloth (2.1.0)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (2.1.2)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    i18n (0.5.0)
+    json (1.5.3)
+    mocha (0.9.8)
+      rake
+    rake (0.9.2)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.5)
+    timecop (0.3.5)
+    tzinfo (0.3.28)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0)
+  appraisal (~> 0.3.8)
+  aruba
+  bluecloth
+  bourne
+  cucumber (~> 1.0.0)
+  factory_girl!
+  mocha
+  rcov
+  rspec (~> 2.0)
+  sqlite3-ruby
+  timecop
+  yard

data/gemfiles/3.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 3.1"
+
+gemspec :path=>"../"

data/gemfiles/3.1.gemfile.lock

@@ -0,0 +1,91 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
+      bundler
+      rake
+    arel (2.2.1)
+    aruba (0.4.5)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    bluecloth (2.1.0)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (3.0.0)
+    childprocess (0.2.1)
+      ffi (~> 1.0.6)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.3)
+    ffi (1.0.9)
+    gherkin (2.4.16)
+      json (>= 1.4.6)
+    i18n (0.6.0)
+    json (1.5.4)
+    mocha (0.9.8)
+      rake
+    multi_json (1.0.3)
+    rack (1.3.2)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rdiscount (1.6.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.4)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.6)
+    timecop (0.3.5)
+    tzinfo (0.3.29)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1)
+  appraisal (~> 0.3.8)
+  aruba
+  bluecloth
+  bourne
+  cucumber (~> 1.0.0)
+  factory_girl!
+  mocha
+  rcov
+  rspec (~> 2.0)
+  sqlite3-ruby
+  timecop
+  yard

data/lib/factory_girl.rb

@@ -22,6 +22,7 @@ require 'factory_girl/syntax/methods'
 require 'factory_girl/syntax/default'
 require 'factory_girl/syntax/vintage'
 require 'factory_girl/find_definitions'
+require 'factory_girl/reload'
 require 'factory_girl/deprecated'
 require 'factory_girl/version'
 

data/lib/factory_girl/attribute.rb

@@ -42,6 +42,10 @@ module FactoryGirl
       self.priority <=> another.priority
     end
 
+    def ==(another)
+      self.object_id == another.object_id
+    end
+
     private
 
     def ensure_non_attribute_writer!

data/lib/factory_girl/attribute_list.rb

@@ -3,11 +3,12 @@ module FactoryGirl
     include Enumerable
 
     def initialize
-      @attributes = {}
+      @attributes  = {}
+      @overridable = false
     end
 
     def define_attribute(attribute)
-      if attribute_defined?(attribute.name)
+      if !overridable? && attribute_defined?(attribute.name)
         raise AttributeDefinitionError, "Attribute already defined: #{attribute.name}"
       end
 
@@ -27,30 +28,34 @@ module FactoryGirl
     end
 
     def attribute_defined?(attribute_name)
-      !@attributes.values.flatten.detect do |attribute|
-        attribute.name == attribute_name &&
-          !attribute.is_a?(FactoryGirl::Attribute::Callback)
-      end.nil?
+      !!find_attribute(attribute_name)
     end
 
     def apply_attributes(attributes_to_apply)
       new_attributes = []
 
       attributes_to_apply.each do |attribute|
-        if attribute_defined?(attribute.name)
-          @attributes.each_value do |attributes|
-            attributes.delete_if do |attrib|
-              new_attributes << attrib.clone if attrib.name == attribute.name
-            end
-          end
+        new_attribute = if !overridable? && defined_attribute = find_attribute(attribute.name)
+          defined_attribute
         else
-          new_attributes << attribute.clone
+          attribute
         end
+
+        delete_attribute(attribute.name)
+        new_attributes << new_attribute
       end
 
       prepend_attributes new_attributes
     end
 
+    def overridable
+      @overridable = true
+    end
+
+    def overridable?
+      @overridable
+    end
+
     private
 
     def valid_callback_names
@@ -58,6 +63,8 @@ module FactoryGirl
     end
 
     def add_attribute(attribute)
+      delete_attribute(attribute.name) if overridable?
+
       @attributes[attribute.priority] ||= []
       @attributes[attribute.priority] << attribute
       attribute
@@ -76,5 +83,20 @@ module FactoryGirl
         result
       end.flatten
     end
+
+    def find_attribute(attribute_name)
+      @attributes.values.flatten.detect do |attribute|
+        attribute.name == attribute_name &&
+          !attribute.is_a?(FactoryGirl::Attribute::Callback)
+      end
+    end
+
+    def delete_attribute(attribute_name)
+      if attribute_defined?(attribute_name)
+        @attributes.each_value do |attributes|
+          attributes.delete_if {|attrib| attrib.name == attribute_name }
+        end
+      end
+    end
   end
 end

data/lib/factory_girl/factory.rb

@@ -34,18 +34,37 @@ module FactoryGirl
 
     def initialize(name, options = {}) #:nodoc:
       assert_valid_options(options)
-      @name           = factory_name_for(name)
-      @parent         = options[:parent]
-      @options        = options
-      @attribute_list = AttributeList.new
-      @traits         = []
+      @name                     = factory_name_for(name)
+      @parent                   = options[:parent]
+      @options                  = options
+      @traits                   = []
+      @children                 = []
+      @attribute_list           = AttributeList.new
+      @inherited_attribute_list = AttributeList.new
+    end
+
+    def allow_overrides
+      @attribute_list.overridable
+      @inherited_attribute_list.overridable
+      self
+    end
+
+    def allow_overrides?
+      @attribute_list.overridable?
     end
 
     def inherit_from(parent) #:nodoc:
       @options[:class]            ||= parent.class_name
       @options[:default_strategy] ||= parent.default_strategy
 
-      apply_attributes(parent.attributes)
+      allow_overrides if parent.allow_overrides?
+      parent.add_child(self)
+
+      @inherited_attribute_list.apply_attributes(parent.attributes)
+    end
+
+    def add_child(factory)
+      @children << factory unless @children.include?(factory)
     end
 
     def apply_traits(traits) #:nodoc:
@@ -63,7 +82,7 @@ module FactoryGirl
         raise AssociationDefinitionError, "Self-referencing association '#{attribute.name}' in factory '#{self.name}'"
       end
 
-      @attribute_list.define_attribute(attribute)
+      @attribute_list.define_attribute(attribute).tap { update_children }
     end
 
     def define_trait(trait)
@@ -75,13 +94,17 @@ module FactoryGirl
     end
 
     def attributes
-      @attribute_list.to_a
+      AttributeList.new.tap do |list|
+        list.apply_attributes(@attribute_list)
+        list.apply_attributes(@inherited_attribute_list)
+      end.to_a
     end
 
     def run(proxy_class, overrides) #:nodoc:
       proxy = proxy_class.new(build_class)
       overrides = symbolize_keys(overrides)
-      @attribute_list.each do |attribute|
+
+      attributes.each do |attribute|
         factory_overrides = overrides.select { |attr, val| attribute.aliases_for?(attr) }
         if factory_overrides.empty?
           attribute.add_to(proxy)
@@ -146,6 +169,10 @@ module FactoryGirl
 
     private
 
+    def update_children
+      @children.each { |child| child.inherit_from(self) }
+    end
+
     def class_for (class_or_to_s)
       if class_or_to_s.respond_to?(:to_sym)
         class_name = variable_name_to_class_name(class_or_to_s)