factory_girl 2.3.2 → 2.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.3.2)
+    factory_girl (2.4.0)
       activesupport
 
 GEM

data/README.md

@@ -1,16 +1,16 @@
-# factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl?branch=master)
+# factory_girl [![Build Status](https://secure.travis-ci.org/thoughtbot/factory_girl.png)](http://travis-ci.org/thoughtbot/factory_girl?branch=master) [![Dependency Status](https://gemnasium.com/thoughtbot/factory_girl.png)](https://gemnasium.com/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.
 
 If you want to use factory_girl with Rails 3, see
-[factory_girl_rails](http://github.com/thoughtbot/factory_girl_rails).
+[factory_girl_rails](https://github.com/thoughtbot/factory_girl_rails).
 
 Documentation
 -------------
 
-You should find the documentation for your version of factory_girl on [Rubygems](http://rubygems.org/gems/factory_girl).
+You should find the documentation for your version of factory_girl on [Rubygems](https://rubygems.org/gems/factory_girl).
 
-See {file:GETTING_STARTED.md} for information on defining and using factories.
+See [GETTING_STARTED](https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md) for information on defining and using factories.
 
 Install
 --------
@@ -28,15 +28,15 @@ and run `bundle install` from your shell.
 More Information
 ----------------
 
-* [Rubygems](http://rubygems.org/gems/factory_girl)
+* [Rubygems](https://rubygems.org/gems/factory_girl)
 * [Mailing list](http://groups.google.com/group/factory_girl)
-* [Issues](http://github.com/thoughtbot/factory_girl/issues)
-* [GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS](http://giantrobots.thoughtbot.com)
+* [Issues](https://github.com/thoughtbot/factory_girl/issues)
+* [GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS](http://robots.thoughtbot.com/)
 
 Contributing
 ------------
 
-Please see the [contribution guidelines](http://github.com/thoughtbot/factory_girl/blob/master/CONTRIBUTION_GUIDELINES.md).
+Please see the [contribution guidelines](https://github.com/thoughtbot/factory_girl/blob/master/CONTRIBUTION_GUIDELINES.md).
 
 Credits
 -------

data/features/factory_girl_steps.feature

@@ -215,3 +215,7 @@ Feature: Use step definitions generated by factories
     And the post "Tagged post" should not have the following tags:
       | name  |
       | funky |
+
+  Scenario: step definitions work correctly with ORMs that have simple `columns`
+    Given a simple column exists
+    Then there should be 1 SimpleColumn

data/features/support/factories.rb

@@ -58,6 +58,21 @@ end
 class NonActiveRecord
 end
 
+class SimpleColumn
+  def self.columns
+    [:name]
+  end
+
+  def save!
+    @@count ||= 0
+    @@count += 1
+  end
+
+  def self.count
+    @@count
+  end
+end
+
 FactoryGirl.define do
   # To make sure the step defs work with an email
   sequence :email do |n|
@@ -90,6 +105,10 @@ FactoryGirl.define do
   # This is here to ensure that factory step definitions don't raise for a non-AR factory
   factory :non_active_record do
   end
+
+  # This is here to make FG work with ORMs that have `columns => [:name, :admin, :etc]` on the class (Neo4j)
+  factory :simple_column do
+  end
 end
 
 require 'factory_girl/step_definitions'

data/gemfiles/2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.2)
+    factory_girl (2.4.0)
       activesupport
 
 GEM

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.2)
+    factory_girl (2.4.0)
       activesupport
 
 GEM

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.2)
+    factory_girl (2.4.0)
       activesupport
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.2)
+    factory_girl (2.4.0)
       activesupport
 
 GEM

data/gemfiles/3.2.gemfile

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

data/gemfiles/3.2.gemfile.lock

@@ -0,0 +1,90 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.4.0)
+      activesupport
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+      builder (~> 3.0.0)
+    activerecord (3.2.0.rc2)
+      activemodel (= 3.2.0.rc2)
+      activesupport (= 3.2.0.rc2)
+      arel (~> 3.0.0.rc1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.0.rc2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
+      bundler
+      rake
+    arel (3.0.0)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.2)
+      rack (~> 1.0)
+    bluecloth (2.2.0)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (3.0.0)
+    childprocess (0.2.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.6)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.18)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gherkin (2.4.21)
+      json (>= 1.4.6)
+    i18n (0.6.0)
+    json (1.6.4)
+    mocha (0.9.8)
+      rake
+    multi_json (1.0.4)
+    rack (1.4.0)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdiscount (1.6.8)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.7)
+    timecop (0.3.5)
+    tzinfo (0.3.31)
+    yard (0.7.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.0.rc2)
+  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

@@ -3,7 +3,11 @@ require "active_support/core_ext/module/delegation"
 require 'factory_girl/proxy'
 require 'factory_girl/registry'
 require 'factory_girl/null_factory'
+require 'factory_girl/null_object'
 require 'factory_girl/factory'
+require 'factory_girl/attribute_assigner'
+require 'factory_girl/evaluator'
+require 'factory_girl/evaluator_class_definer'
 require 'factory_girl/attribute'
 require 'factory_girl/callback'
 require 'factory_girl/declaration_list'

data/lib/factory_girl/attribute.rb

@@ -14,15 +14,7 @@ module FactoryGirl
       ensure_non_attribute_writer!
     end
 
-    def add_to(proxy)
-      if @ignored
-        proxy.set_ignored(self, to_proc(proxy))
-      else
-        proxy.set(self, to_proc(proxy))
-      end
-    end
-
-    def to_proc(proxy)
+    def to_proc
       lambda { }
     end
 

data/lib/factory_girl/attribute/association.rb

@@ -9,10 +9,10 @@ module FactoryGirl
         @overrides = overrides
       end
 
-      def to_proc(proxy)
+      def to_proc
         factory   = @factory
         overrides = @overrides
-        lambda { proxy.association(factory, overrides) }
+        lambda { association(factory, overrides) }
       end
 
       def association?

data/lib/factory_girl/attribute/dynamic.rb

@@ -6,11 +6,11 @@ module FactoryGirl
         @block = block
       end
 
-      def to_proc(proxy)
+      def to_proc
         block = @block
 
         lambda {
-          value = block.arity == 1 ? block.call(proxy) : proxy.instance_exec(&block)
+          value = block.arity == 1 ? block.call(self) : instance_exec(&block)
           raise SequenceAbuseError if FactoryGirl::Sequence === value
           value
         }

data/lib/factory_girl/attribute/sequence.rb

@@ -7,7 +7,7 @@ module FactoryGirl
         @sequence = sequence
       end
 
-      def to_proc(proxy)
+      def to_proc
         sequence = @sequence
         lambda { FactoryGirl.generate(sequence) }
       end

data/lib/factory_girl/attribute/static.rb

@@ -6,7 +6,7 @@ module FactoryGirl
         @value = value
       end
 
-      def to_proc(proxy)
+      def to_proc
         value = @value
         lambda { value }
       end

data/lib/factory_girl/attribute_assigner.rb

@@ -0,0 +1,73 @@
+module FactoryGirl
+  class AttributeAssigner
+    def initialize(build_class, evaluator)
+      @build_class              = build_class
+      @evaluator                = evaluator
+      @attribute_list           = evaluator.class.attribute_list
+      @attribute_names_assigned = []
+    end
+
+    def object
+      @evaluator.instance = build_class_instance
+      build_class_instance.tap do |instance|
+        attributes_to_set_on_instance.each do |attribute|
+          instance.send("#{attribute}=", get(attribute))
+          @attribute_names_assigned << attribute
+        end
+      end
+    end
+
+    def hash
+      @evaluator.instance = NullObject.new
+
+      attributes_to_set_on_hash.inject({}) do |result, attribute|
+        result[attribute] = get(attribute)
+        result
+      end
+    end
+
+    private
+
+    def build_class_instance
+      @build_class_instance ||= @build_class.new
+    end
+
+    def get(attribute_name)
+      @evaluator.send(attribute_name)
+    end
+
+    def attributes_to_set_on_instance
+      attribute_names_to_assign - @attribute_names_assigned
+    end
+
+    def attributes_to_set_on_hash
+      attribute_names_to_assign - association_names
+    end
+
+    def attribute_names_to_assign
+      non_ignored_attribute_names + override_names - ignored_attribute_names - alias_names_to_ignore
+    end
+
+    def non_ignored_attribute_names
+      @attribute_list.reject(&:ignored).map(&:name)
+    end
+
+    def ignored_attribute_names
+      @attribute_list.select(&:ignored).map(&:name)
+    end
+
+    def association_names
+      @attribute_list.associations.map(&:name)
+    end
+
+    def override_names
+      @evaluator.__overrides.keys
+    end
+
+    def alias_names_to_ignore
+      @attribute_list.reject(&:ignored).map do |attribute|
+        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override }
+      end.flatten.compact
+    end
+  end
+end

data/lib/factory_girl/attribute_list.rb

@@ -18,13 +18,12 @@ module FactoryGirl
       @attributes.each(&block)
     end
 
-    def apply_attributes(attributes_to_apply)
-      attributes_to_apply.each do |attribute|
-        new_attribute = find_attribute(attribute.name) || attribute
-        delete_attribute(attribute.name)
+    def associations
+      @attributes.select(&:association?)
+    end
 
-        add_attribute new_attribute
-      end
+    def apply_attributes(attributes_to_apply)
+      attributes_to_apply.each {|attribute| add_attribute(attribute) }
     end
 
     private
@@ -47,17 +46,9 @@ module FactoryGirl
     end
 
     def attribute_defined?(attribute_name)
-      !!find_attribute(attribute_name)
-    end
-
-    def find_attribute(attribute_name)
-      @attributes.detect do |attribute|
+      @attributes.any? do |attribute|
         attribute.name == attribute_name
       end
     end
-
-    def delete_attribute(attribute_name)
-      @attributes.delete_if {|attrib| attrib.name == attribute_name }
-    end
   end
 end

data/lib/factory_girl/callback.rb

@@ -10,10 +10,10 @@ module FactoryGirl
       check_name
     end
 
-    def run(instance, proxy)
+    def run(instance, evaluator)
       case block.arity
       when 1 then block.call(instance)
-      when 2 then block.call(instance, proxy)
+      when 2 then block.call(instance, evaluator)
       else block.call
       end
     end

data/lib/factory_girl/evaluator.rb

@@ -0,0 +1,57 @@
+require "active_support/core_ext/class/attribute"
+
+module FactoryGirl
+  class Evaluator
+    class_attribute :callbacks, :attribute_lists
+
+    def self.attribute_list
+      AttributeList.new.tap do |list|
+        attribute_lists.each do |attribute_list|
+          list.apply_attributes attribute_list.to_a
+        end
+      end
+    end
+    undef_method(:id) if method_defined?(:id)
+
+    def initialize(build_strategy, overrides = {})
+      @build_strategy    = build_strategy
+      @overrides         = overrides
+      @cached_attributes = overrides
+
+      @build_strategy.add_observer(CallbackRunner.new(self.class.callbacks, self))
+    end
+
+    delegate :association, :to => :@build_strategy
+
+    def instance=(object_instance)
+      @instance = object_instance
+    end
+
+    def method_missing(method_name, *args, &block)
+      if @cached_attributes.key?(method_name)
+        @cached_attributes[method_name]
+      else
+        @instance.send(method_name, *args, &block)
+      end
+    end
+
+    def __overrides
+      @overrides
+    end
+
+    private
+
+    class CallbackRunner
+      def initialize(callbacks, evaluator)
+        @callbacks = callbacks
+        @evaluator = evaluator
+      end
+
+      def update(name, result_instance)
+        @callbacks.select {|callback| callback.name == name }.each do |callback|
+          callback.run(result_instance, @evaluator)
+        end
+      end
+    end
+  end
+end