factory_girl 2.0.0.rc1 → 2.0.0.rc2

data/GETTING_STARTED.md

@@ -1,6 +1,19 @@
 Getting Started
 ===============
 
+Update Your Gemfile
+-------------------
+
+If you're using Rails, you'll need to upgrade `factory_girl_rails` to the latest RC:
+
+    gem "factory_girl_rails", "~> 1.1.rc1"
+
+If you're *not* using Rails, you'll just have to change the required version of `factory_girl`:
+
+    gem "factory_girl", "~> 2.0.0.rc1"
+
+Once your Gemfile is updated, you'll want to update your bundle.
+
 Defining factories
 ------------------
 
@@ -77,6 +90,14 @@ If repeating "FactoryGirl" is too verbose for you, you can mix the syntax method
       include Factory::Syntax::Methods
     end
 
+This would allow you to write:
+
+    describe User, "#full_name" do
+      subject { create(:user, :first_name => "John", :last_name => "Doe") }
+
+      its(:full_name) { should == "John Doe" }
+    end
+
 Lazy Attributes
 ---------------
 
@@ -85,6 +106,33 @@ Most factory attributes can be added using static values that are evaluated when
     factory :user do
       # ...
       activation_code { User.generate_activation_code }
+      date_of_birth   { 21.years.ago }
+    end
+
+Aliases
+-------
+
+Aliases allow you to use named associations more easily.
+
+    factory :user, :aliases => [:author, :commenter] do
+      first_name    "John"
+      last_name     "Doe"
+      date_of_birth { 18.years.ago }
+    end
+
+    factory :post do
+      author
+      # instead of
+      # association :author, :factory => :user
+      title "How to read a book effectively"
+      body  "There are five steps involved."
+    end
+
+    factory :comment do
+      commenter
+      # instead of
+      # association :commenter, :factory => :user
+      body "Great article!"
     end
 
 Dependent Attributes
@@ -157,10 +205,6 @@ You can also assign the parent explicitly:
       approved true
     end
 
-    approved_post = FactoryGirl.create(:approved_post)
-    approved_post.title # => 'A title'
-    approved_post.approved # => true
-
 As mentioned above, it's good practice to define a basic factory for each class with only the attributes required to create it. Then, create more specific factories that inherit from this basic parent. Factory definitions are still code, so keep them DRY.
 
 Sequences
@@ -231,12 +275,12 @@ Examples:
       after_build { |user| generate_hashed_password(user) }
     end
 
-Note that you'll have an instance of the user in the block.  This can be useful.
+Note that you'll have an instance of the user in the block. This can be useful.
 
 You can also define multiple types of callbacks on the same factory:
 
     factory :user do
-      after_build  { |user| do_something_to(user)      }
+      after_build  { |user| do_something_to(user) }
       after_create { |user| do_something_else_to(user) }
     end
 
@@ -244,7 +288,7 @@ Factories can also define any number of the same kind of callback.  These callba
 
     factory :user do
       after_create { this_runs_first }
-      after_create { then_this       }
+      after_create { then_this }
     end
 
 Calling FactoryGirl.create will invoke both after_build and after_create callbacks.
@@ -281,4 +325,3 @@ Users' tastes for syntax vary dramatically, but most users are looking for a com
     end
 
     User.make(:name => 'Johnny')
-

data/README.md

@@ -13,13 +13,17 @@ You should find the documentation for your version of factory_girl on [Rubygems]
 
 See [GETTING_STARTED.md](http://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md) for information on defining and using factories.
 
-Download
+Install
 --------
 
-[Github](http://github.com/thoughtbot/factory_girl/tree/master) or
-
-Rubygems:
-    gem install factory_girl
+```shell
+gem install factory_girl
+```
+or add the following line to Gemfile:
+```ruby
+gem 'factory_girl'
+```
+and run `bundle install` from your shell.
 
 More Information
 ----------------

data/lib/factory_girl/definition_proxy.rb

@@ -1,7 +1,9 @@
 module FactoryGirl
   class DefinitionProxy
-    instance_methods.each do |method|
-      undef_method(method) unless method =~ /(^__|^nil\?$|^send$|^object_id$|^extend$|^instance_eval$)/
+    UNPROXIED_METHODS = %w(__send__ nil? send object_id extend instance_eval initialize block_given? raise)
+
+    (instance_methods + private_instance_methods).each do |method|
+      undef_method(method) unless UNPROXIED_METHODS.include?(method)
     end
 
     attr_reader :child_factories
@@ -56,7 +58,7 @@ module FactoryGirl
     #     add_attribute :name, 'Billy Idol'
     #   end
     #
-    # are equivilent.
+    # are equivalent.
     #
     # If no argument or block is given, factory_girl will look for a sequence
     # or association with the same name. This means that:
@@ -73,7 +75,7 @@ module FactoryGirl
     #     account
     #   end
     #
-    # are equivilent.
+    # are equivalent.
     def method_missing(name, *args, &block)
       if args.empty? && block.nil?
         @factory.define_attribute(Attribute::Implicit.new(name))

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end
 

data/spec/factory_girl/definition_proxy_spec.rb

@@ -37,6 +37,11 @@ describe FactoryGirl::DefinitionProxy do
     }.should raise_error(FactoryGirl::AttributeDefinitionError)
   end
 
+  it "should add an attribute with a built-in private method" do
+    subject.instance_eval { sleep(0.1) }
+    factory.attributes.map { |attribute| attribute.name }.should == [:sleep]
+  end
+
   describe "child factories" do
     its(:child_factories) { should == [] }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  hash: 15424087
+  hash: 15424081
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 1
-  version: 2.0.0.rc1
+  - 2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Joe Ferris
@@ -17,12 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -04:00
+date: 2011-07-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +33,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +47,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,11 +61,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +77,11 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +95,11 @@ dependencies:
         - beta
         - 3
         version: 3.0.0.beta3
-  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,11 +109,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,7 +123,6 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id007
 description: |-
   factory_girl provides a framework and DSL for defining and
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance factories.