factory_girl 2.5.0 → 2.5.1

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+before_install:
+  - gem update --system
 script: "bundle exec rake spec:unit spec:acceptance features"
 gemfile:
   - gemfiles/2.1.gemfile

data/Changelog

@@ -1,3 +1,12 @@
+2.5.1 (February 3, 2012)
+  Fix attribute evaluation when the attribute isn't defined in the factory but
+    is a private method on Object
+  Update rubygems on Travis before running tests
+  Fix spec name
+  Update GETTING_STARTED with correct usage of build_stubbed
+  Update README with more info on initialize_with
+  Honor :parent on factory over block nesting
+
 2.5.0 (January 20, 2012)
   Revert 'Deprecate build_stubbed and attributes_for'
   Implement initialize_with to allow overriding object instantiation

data/GETTING_STARTED.md

@@ -487,7 +487,7 @@ factory\_girl makes available three callbacks for injecting some code:
 
 * after_build  - called after a factory is built   (via FactoryGirl.build)
 * after_create - called after a factory is saved   (via FactoryGirl.create)
-* after_stub   - called after a factory is stubbed (via FactoryGirl.stub)
+* after_stub   - called after a factory is stubbed (via FactoryGirl.build_stubbed)
 
 Examples:
 
@@ -593,10 +593,10 @@ twenty_year_olds = FactoryGirl.build_list(:user, 25, :date_of_birth => 20.years.
 Custom Construction
 -------------------
 
-Instantiating objects can be overridden in the case where you'd rather not
-call `new` on your build class or you have some other factory method that
-you'd prefer to use. Using custom construction also allows for your objects to
-be instantiated with any number of arguments.
+If you want to use factory_girl to construct an object where some attributes
+are passed to `initialize` or if you want to do something other than simply
+calling `new` on your build class, you can override the default behavior by
+defining `to_initialize` on your factory. Example:
 
 ```ruby
 # user.rb
@@ -626,6 +626,19 @@ FactoryGirl.build(:user).name # Bob Hope
 Notice that I ignored the `name` attribute. If you don't want attributes
 reassigned after your object has been instantiated, you'll want to `ignore` them.
 
+Although factory_girl is written to work with ActiveRecord out of the box, it
+can also work with any Ruby class. For maximum compatibiltiy with ActiveRecord,
+the default initializer builds all instances by calling new on your build class
+without any arguments. It then calls attribute writer methods to assign all the
+attribute values. While that works fine for ActiveRecord, it actually doesn't
+work for almost any other Ruby class.
+
+You can override the initializer in order to:
+
+* Build non-ActiveRecord objects that require arguments to `initialize`
+* Use a method other than `new` to instantiate the instance
+* Do crazy things like decorate the instance after it's built
+
 Cucumber Integration
 --------------------
 

data/Gemfile.lock

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

data/gemfiles/2.1.gemfile.lock

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

data/gemfiles/2.3.gemfile.lock

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

data/gemfiles/3.0.gemfile.lock

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

data/gemfiles/3.1.gemfile.lock

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

data/gemfiles/3.2.gemfile.lock

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

data/lib/factory_girl/evaluator.rb

@@ -11,13 +11,21 @@ module FactoryGirl
         end
       end
     end
-    undef_method(:id) if method_defined?(:id)
+
+    private_instance_methods.each do |method|
+      undef_method(method) unless method =~ /^__|initialize/
+    end
 
     def initialize(build_strategy, overrides = {})
       @build_strategy    = build_strategy
       @overrides         = overrides
       @cached_attributes = overrides
 
+      singleton = class << self; self end
+      @overrides.each do |name, value|
+        singleton.send :define_method, name, lambda { value }
+      end
+
       @build_strategy.add_observer(CallbackRunner.new(self.class.callbacks, self))
     end
 

data/lib/factory_girl/syntax/default.rb

@@ -24,7 +24,8 @@ module FactoryGirl
           FactoryGirl.register_factory(factory)
 
           proxy.child_factories.each do |(child_name, child_options, child_block)|
-            factory(child_name, child_options.merge(:parent => name), &child_block)
+            parent_factory = child_options.delete(:parent) || name
+            factory(child_name, child_options.merge(:parent => parent_factory), &child_block)
           end
         end
 

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end
 

data/spec/acceptance/attribute_existing_on_object_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+
+describe "declaring attributes on a Factory that are private methods on Object" do
+  before do
+    define_model("Website", :system => :boolean, :link => :string, :sleep => :integer)
+
+    FactoryGirl.define do
+      factory :website do
+        system false
+        link   "http://example.com"
+        sleep  15
+      end
+    end
+  end
+
+  subject { FactoryGirl.build(:website, :sleep => -5) }
+
+  its(:system) { should == false }
+  its(:link)   { should == "http://example.com" }
+  its(:sleep)  { should == -5 }
+end
+
+describe "assigning overrides that are also private methods on object" do
+  before do
+    define_model("Website",  :format => :string, :y => :integer, :more_format => :string, :some_funky_method => :string)
+
+    Object.class_eval do
+      private
+      def some_funky_method(args)
+      end
+    end
+
+    FactoryGirl.define do
+      factory :website do
+        more_format { "format: #{format}" }
+      end
+    end
+  end
+
+  after do
+    Object.send(:undef_method, :some_funky_method)
+  end
+
+  subject { FactoryGirl.build(:website, :format => "Great", :y => 12345, :some_funky_method => "foobar!") }
+  its(:format)            { should == "Great" }
+  its(:y)                 { should == 12345 }
+  its(:more_format)       { should == "format: Great" }
+  its(:some_funky_method) { should == "foobar!" }
+end
+
+describe "accessing methods from the instance within a dynamic attribute that is also a private method on object" do
+  before do
+    define_model("Website", :more_format => :string) do
+      def format
+        "This is an awesome format"
+      end
+    end
+
+    FactoryGirl.define do
+      factory :website do
+        more_format { "format: #{format}" }
+      end
+    end
+  end
+
+  subject           { FactoryGirl.build(:website) }
+  its(:more_format) { should == "format: This is an awesome format" }
+end

data/spec/acceptance/parent_spec.rb

@@ -65,3 +65,26 @@ describe "an instance generated by a factory that inherits from another factory"
   end
 end
 
+describe "nested factories with different parents" do
+  before do
+    define_model("User", :name => :string)
+
+    FactoryGirl.define do
+      factory :user do
+        name  "Basic User"
+
+        factory :male_user do
+          name "John Doe"
+        end
+
+        factory :uppercase_male_user, :parent => :male_user do
+          after_build {|user| user.name = user.name.upcase }
+        end
+      end
+    end
+  end
+
+  it "honors :parent over the factory block nesting" do
+    FactoryGirl.build(:uppercase_male_user).name.should == "JOHN DOE"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70146233062280 !ruby/object:Gem::Requirement
+  requirement: &70093884307140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146233062280
+  version_requirements: *70093884307140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70146233061680 !ruby/object:Gem::Requirement
+  requirement: &70093884306400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70146233061680
+  version_requirements: *70093884306400
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70146233061160 !ruby/object:Gem::Requirement
+  requirement: &70093884305300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70146233061160
+  version_requirements: *70093884305300
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70146233060780 !ruby/object:Gem::Requirement
+  requirement: &70093884304160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233060780
+  version_requirements: *70093884304160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70146233060320 !ruby/object:Gem::Requirement
+  requirement: &70093884302020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233060320
+  version_requirements: *70093884302020
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70146233059900 !ruby/object:Gem::Requirement
+  requirement: &70093884285960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233059900
+  version_requirements: *70093884285960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70146233059460 !ruby/object:Gem::Requirement
+  requirement: &70093884291240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233059460
+  version_requirements: *70093884291240
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70146233059040 !ruby/object:Gem::Requirement
+  requirement: &70093884290600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233059040
+  version_requirements: *70093884290600
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70146233058540 !ruby/object:Gem::Requirement
+  requirement: &70093884288880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *70146233058540
+  version_requirements: *70093884288880
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70146233058120 !ruby/object:Gem::Requirement
+  requirement: &70093884288420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233058120
+  version_requirements: *70093884288420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70146233057620 !ruby/object:Gem::Requirement
+  requirement: &70093884287780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233057620
+  version_requirements: *70093884287780
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70146233057180 !ruby/object:Gem::Requirement
+  requirement: &70093884286820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146233057180
+  version_requirements: *70093884286820
 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."
@@ -229,7 +229,7 @@ files:
 - gemfiles/3.2.gemfile.lock
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
-- spec/acceptance/attribute_existing_on_object.rb
+- spec/acceptance/attribute_existing_on_object_spec.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/attributes_from_instance_spec.rb
 - spec/acceptance/attributes_ordered_spec.rb
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance
@@ -336,7 +336,7 @@ test_files:
 - gemfiles/3.2.gemfile.lock
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
-- spec/acceptance/attribute_existing_on_object.rb
+- spec/acceptance/attribute_existing_on_object_spec.rb
 - spec/acceptance/attributes_for_spec.rb
 - spec/acceptance/attributes_from_instance_spec.rb
 - spec/acceptance/attributes_ordered_spec.rb

data/spec/acceptance/attribute_existing_on_object.rb

@@ -1,21 +0,0 @@
-require "spec_helper"
-
-describe "declaring attributes on a Factory that are private methods on Object" do
-  before do
-    define_model("Website", :system => :boolean, :link => :string, :sleep => :integer)
-
-    FactoryGirl.define do
-      factory :website do
-        system false
-        link   "http://example.com"
-        sleep  15
-      end
-    end
-  end
-
-  subject { FactoryGirl.build(:website, :sleep => -5) }
-
-  its(:system) { should == false }
-  its(:link)   { should == "http://example.com" }
-  its(:sleep)  { should == -5 }
-end