factory_girl 3.2.0 → 3.3.0

data/Appraisals

@@ -1,11 +1,11 @@
 appraise "3.0" do
-  gem "activerecord", "~> 3.0"
+  gem "activerecord", "~> 3.0.0"
 end
 
 appraise "3.1" do
-  gem "activerecord", "~> 3.1"
+  gem "activerecord", "~> 3.1.0"
 end
 
 appraise "3.2" do
-  gem "activerecord", "~> 3.2"
+  gem "activerecord", "~> 3.2.0"
 end

data/GETTING_STARTED.md

@@ -207,7 +207,7 @@ factory :user do
   name  { "John Doe#{" - Rockstar" if rockstar}" }
   email { "#{name.downcase}@example.com" }
 
-  after_create do |user, evaluator|
+  after(:create) do |user, evaluator|
     user.name.upcase! if evaluator.upcased
   end
 end
@@ -299,11 +299,11 @@ FactoryGirl.define do
         posts_count 5
       end
 
-      # the after_create yields two values; the user instance itself and the
+      # the after(:create) yields two values; the user instance itself and the
       # evaluator, which stores all values from the factory, including ignored
       # attributes; `create_list`'s second argument is the number of records
       # to create and we make sure the user is associated properly to the post
-      after_create do |user, evaluator|
+      after(:create) do |user, evaluator|
         FactoryGirl.create_list(:post, evaluator.posts_count, user: user)
       end
     end
@@ -589,18 +589,19 @@ FactoryGirl.create_list(:user, 3, :admin, :male, name: "Jon Snow")
 Callbacks
 ---------
 
-factory\_girl makes available three callbacks for injecting some code:
+factory\_girl makes available four 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.build_stubbed)
+* after(:build)   - called after a factory is built   (via `FactoryGirl.build`, `FactoryGirl.create`)
+* before(:create) - called before a factory is saved  (via `FactoryGirl.create`)
+* after(:create)  - called after a factory is saved   (via `FactoryGirl.create`)
+* after(:stub)    - called after a factory is stubbed (via `FactoryGirl.build_stubbed`)
 
 Examples:
 
 ```ruby
 # Define a factory that calls the generate_hashed_password method after it is built
 factory :user do
-  after_build { |user| generate_hashed_password(user) }
+  after(:build) { |user| generate_hashed_password(user) }
 end
 ```
 
@@ -610,8 +611,8 @@ You can also define multiple types of callbacks on the same factory:
 
 ```ruby
 factory :user do
-  after_build  { |user| do_something_to(user) }
-  after_create { |user| do_something_else_to(user) }
+  after(:build)  { |user| do_something_to(user) }
+  after(:create) { |user| do_something_else_to(user) }
 end
 ```
 
@@ -619,12 +620,12 @@ Factories can also define any number of the same kind of callback.  These callba
 
 ```ruby
 factory :user do
-  after_create { this_runs_first }
-  after_create { then_this }
+  after(:create) { this_runs_first }
+  after(:create) { then_this }
 end
 ```
 
-Calling FactoryGirl.create will invoke both after\_build and after\_create callbacks.
+Calling FactoryGirl.create will invoke both `after_build` and `after_create` callbacks.
 
 Also, like standard attributes, child factories will inherit (and can also define) callbacks from their parent factory.
 
@@ -677,7 +678,7 @@ When modifying a factory, you can change any of the attributes you want (aside f
 `FactoryGirl.modify` must be called outside of a `FactoryGirl.define` block as it operates on factories differently.
 
 A caveat: you can only modify factories (not sequences or traits) and callbacks *still compound as they normally would*. So, if
-the factory you're modifying defines an `after_create` callback, you defining an `after_create` won't override it, it'll just get run after the first callback.
+the factory you're modifying defines an `after(:create)` callback, you defining an `after(:create)` won't override it, it'll just get run after the first callback.
 
 Building or Creating Multiple Records
 -------------------------------------
@@ -761,6 +762,15 @@ factory :user do
 end
 ```
 
+You can define `initialize_with` for all factories by including it in the
+`FactoryGirl.define` block:
+
+```ruby
+FactoryGirl.define do
+  initialize_with { new("Awesome first argument") }
+end
+```
+
 Custom Strategies
 -----------------
 
@@ -778,7 +788,7 @@ executes the `to_create` callback defined on the factory.
 To understand how factory\_girl uses strategies internally, it's probably
 easiest to just view the source for each of the four default strategies.
 
-Inheritance can occasionally be useful; here's an example of inheriting from
+Here's an example of composing a strategy using
 `FactoryGirl::Strategy::Create` to build a JSON representation of your model.
 
 ```ruby
@@ -810,6 +820,41 @@ FactoryGirl.json(:user)
 Finally, you can override factory\_girl's own strategies if you'd like by
 registering a new object in place of the strategies.
 
+Custom Callbacks
+----------------
+
+Custom callbacks can be defined if you're using custom strategies:
+
+```ruby
+class JsonStrategy
+  def initialize
+    @strategy = FactoryGirl.strategy_by_name(:create).new
+  end
+
+  delegate :association, to: :@strategy
+
+  def result(evaluation)
+    result = @strategy.result(evaluation)
+    evaluation.notify(:before_json, result)
+
+    result.to_json.tap do |json|
+      evaluation.notify(:after_json, json)
+      evaluation.notify(:make_json_awesome, json)
+    end
+  end
+end
+
+FactoryGirl.register_strategy(:json, JsonStrategy)
+
+FactoryGirl.define do
+  factory :user do
+    before(:json)                {|user| do_something_to(user) }
+    after(:json)                 {|user_json| do_something_to(user_json) }
+    callback(:make_json_awesome) {|user_json| do_something_to(user_json) }
+  end
+end
+```
+
 Custom Methods to Persist Objects
 ---------------------------------
 
@@ -832,6 +877,20 @@ factory :user_without_database do
 end
 ```
 
+To override `to_create` for all factories, define it within the
+`FactoryGirl.define` block:
+
+```ruby
+FactoryGirl.define do
+  to_create {|instance| instance.persist! }
+
+
+  factory :user do
+    name "John Doe"
+  end
+end
+```
+
 ActiveSupport Instrumentation
 -----------------------------
 

data/Gemfile.lock

@@ -1,42 +1,37 @@
 PATH
   remote: .
   specs:
-    factory_girl (3.2.0)
+    factory_girl (3.3.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
       rake
-    arel (2.2.1)
-    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)
-    bcrypt-ruby (3.0.1)
-    bluecloth (2.1.0)
-    bourne (1.0)
-      mocha (= 0.9.8)
+    arel (3.0.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    bluecloth (2.2.0)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.2.2)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
@@ -45,36 +40,35 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    ffi (1.0.9)
+    ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.6.0)
-    json (1.6.6)
-    mocha (0.9.8)
-      rake
-    multi_json (1.0.3)
-    rack (1.3.3)
+    json (1.7.0)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.4)
     rake (0.9.2.2)
-    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)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.29)
-    yard (0.7.2)
+    tzinfo (0.3.33)
+    yard (0.8.1)
 
 PLATFORMS
   ruby

data/NEWS

@@ -1,3 +1,15 @@
+3.3.0 (May 13, 2012)
+  Allow to_create, skip_create, and initialize_with to be defined globally
+  Allow to_create, skip_create, and initialize_with to be defined within traits
+  Fix deprecation messages for alternate syntaxes (make, generate, etc.)
+  Improve library documentation
+  Deprecate after_build, after_create, before_create, after_stub in favor of new callbacks
+  Introduce new callback syntax: after(:build) {}, after(:custom) {}, or callback(:different) {}
+    This allows for declaring any callback, usable with custom strategies
+  Add attributes_for_list and build_stubbed_list with the StrategySyntaxMethodRegistrar
+  Allow use of syntax methods (build, create, generate, etc) implicitly in callbacks
+  Internal refactoring of a handful of components
+
 3.2.0 (April 24, 2012)
   Use AS::Notifications for pub/sub to track running factories
   Call new within initialize_with implicitly on the build class

data/gemfiles/3.0.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "activerecord", "~> 3.0"
+gem "activerecord", "~> 3.0.0"
 
 gemspec :path=>"../"

data/gemfiles/3.0.gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.2.0)
+    factory_girl (3.3.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.12)
     appraisal (0.4.1)
       bundler
       rake
-    arel (3.0.2)
+    arel (2.0.10)
     aruba (0.4.11)
       childprocess (>= 0.2.3)
       cucumber (>= 1.1.1)
@@ -30,8 +29,8 @@ GEM
     bluecloth (2.2.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
-    builder (3.0.0)
-    childprocess (0.3.1)
+    builder (2.1.2)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
@@ -43,12 +42,12 @@ GEM
     ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
-    i18n (0.6.0)
-    json (1.6.6)
+    i18n (0.5.0)
+    json (1.7.0)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
+    multi_json (1.3.4)
     rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -58,23 +57,23 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.32)
-    yard (0.7.5)
+    tzinfo (0.3.33)
+    yard (0.8.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0)
+  activerecord (~> 3.0.0)
   appraisal (~> 0.4)
   aruba
   bluecloth

data/gemfiles/3.1.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "activerecord", "~> 3.1"
+gem "activerecord", "~> 3.1.0"
 
 gemspec :path=>"../"

data/gemfiles/3.1.gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.2.0)
+    factory_girl (3.3.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
       i18n (~> 0.6)
+    activerecord (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.4)
       multi_json (~> 1.0)
     appraisal (0.4.1)
       bundler
       rake
-    arel (3.0.2)
+    arel (2.2.3)
     aruba (0.4.11)
       childprocess (>= 0.2.3)
       cucumber (>= 1.1.1)
@@ -31,7 +31,7 @@ GEM
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
@@ -44,11 +44,11 @@ GEM
     gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.6.0)
-    json (1.6.6)
+    json (1.7.0)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
+    multi_json (1.3.4)
     rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -58,23 +58,23 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.32)
-    yard (0.7.5)
+    tzinfo (0.3.33)
+    yard (0.8.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.1)
+  activerecord (~> 3.1.0)
   appraisal (~> 0.4)
   aruba
   bluecloth