factory_girl 3.6.2 → 4.0.0.rc1

data/GETTING_STARTED.md

@@ -7,13 +7,13 @@ Update Your Gemfile
 If you're using Rails, you'll need to change the required version of `factory_girl_rails`:
 
 ```ruby
-gem "factory_girl_rails", "~> 3.0"
+gem "factory_girl_rails", "~> 4.0"
 ```
 
 If you're *not* using Rails, you'll just have to change the required version of `factory_girl`:
 
 ```ruby
-gem "factory_girl", "~> 3.0"
+gem "factory_girl", "~> 4.0"
 ```
 
 JRuby users: FactoryGirl works with JRuby starting with 1.6.7.2 (latest stable, as per July 2012).
@@ -875,14 +875,41 @@ FactoryGirl.define do
 end
 ```
 
-When using `initialize_with`, attributes accessed from the `initialize_with`
-block are assigned a second time to the instance. Duplicate assignment can be
-disabled by configuring FactoryGirl as such:
+When using `initialize_with`, attributes accessed from within the `initialize_with`
+block are assigned *only* in the constructor; this equates to roughly the
+following code:
 
-    FactoryGirl.duplicate_attribute_assignment_from_initialize_with = false
+```ruby
+FactoryGirl.define do
+  factory :user do
+    initialize_with { new(name) }
+
+    name { 'value' }
+  end
+end
+
+FactoryGirl.build(:user)
+# runs
+User.new('value')
+```
+
+This prevents duplicate assignment; in versions of FactoryGirl before 4.0, it
+would run this:
 
-This would allow for attributes declared as ignored to not be ignored, since
-it won't assign them for a second time.
+```ruby
+FactoryGirl.define do
+  factory :user do
+    initialize_with { new(name) }
+
+    name { 'value' }
+  end
+end
+
+FactoryGirl.build(:user)
+# runs
+user = User.new('value')
+user.name = 'value'
+```
 
 Custom Strategies
 -----------------
@@ -1042,38 +1069,3 @@ config.after(:suite) do
   puts @factory_girl_results
 end
 ```
-
-Cucumber Integration
---------------------
-
-factory\_girl ships with step definitions that make calling factories from Cucumber easier. To use them, add the following to features/support/env.rb:
-
-```ruby
-require "factory_girl/step_definitions"
-```
-
-Note: These step definitions are _deprecated_. Read why here:
-http://robots.thoughtbot.com/post/25650434584/writing-better-cucumber-scenarios-or-why-were
-
-Alternate Syntaxes
-------------------
-
-Users' tastes for syntax vary dramatically, but most users are looking for a
-common feature set. Because of this factory\_girl supports "syntax layers" which
-provide alternate interfaces. See Factory::Syntax for information about the
-various layers available. For example, the Machinist-style syntax is popular:
-
-```ruby
-require "factory_girl/syntax/blueprint"
-require "factory_girl/syntax/make"
-require "factory_girl/syntax/sham"
-
-Sham.email {|n| "#{n}@example.com" }
-
-User.blueprint do
-  name  { "Billy Bob" }
-  email { Sham.email  }
-end
-
-User.make(name: "Johnny")
-```

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (3.6.2)
+    factory_girl (4.0.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM

data/README.md

@@ -62,12 +62,6 @@ factory_girl was written by Joe Ferris with contributions from several authors,
 * Josh Clayton
 * Thomas Walpole
 
-The syntax layers are derived from software written by the following authors:
-
-* Pete Yandell
-* Rick Bradley
-* Yossef Mendelssohn
-
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
 factory_girl is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)

data/features/step_definitions/database_steps.rb

@@ -1,42 +1,9 @@
-Then /^I should find the following for the last (.*):$/ do |model, table|
-  model_class = model.camelize.constantize
-  last_instance = model_class.last or raise "No #{model.pluralize} exist"
+Then /^I should find the following for the last category:$/ do |table|
   table.hashes.first.each do |key, value|
-    last_instance.attributes[key].to_s.should == value
+    Category.last.attributes[key].to_s.should == value
   end
 end
 
-Then /^there should be (\d+) (.*)$/ do |count, model|
-  model_class = model.singularize.camelize.constantize
-  model_class.count.should == count.to_i
-end
-
-Then /^the post "([^"]*)" should (not )?have the following tags?:$/ do |post_title, negate, table|
-  post = Post.find_by_title!(post_title)
-
-  table.hashes.each do |row|
-    tag = Tag.find_by_name(row[:name])
-
-    if negate
-      post.tags.should_not include(tag)
-    else
-      post.tags.should include(tag)
-    end
-  end
-end
-
-Transform /^table:(?:.*,)?tags(?:,.*)?$/ do |table|
-  table.map_column!("tags") do |tags|
-    tags.split(',').map {|tag| Tag.find_by_name! tag.strip }
-  end
-  table
-end
-
 Before do
-  Post.delete_all
-  Tag.delete_all
-  User.delete_all
   Category.delete_all
-  CategoryGroup.delete_all
 end
-

data/features/step_definitions/factory_girl_steps.rb

@@ -27,13 +27,6 @@ When /^I create a "([^"]*)" instance from FactoryGirl$/ do |factory_name|
   FactoryGirl.create(factory_name)
 end
 
-Given /^these super users exist:$/ do |table|
-  headers = table.headers + ["admin"]
-  rows    = table.rows.map { |row| row + [true] }
-  new_table = Cucumber::Ast::Table.new([headers] + rows)
-  step %{the following person exists:}, new_table
-end
-
 When /^I find definitions$/ do
   FactoryGirl.find_definitions
 end

data/features/support/factories.rb

@@ -5,135 +5,12 @@ ActiveRecord::Base.establish_connection(
 
 class CreateSchema < ActiveRecord::Migration
   def self.up
-    create_table :posts, :force => true do |t|
-      t.integer :author_id
-      t.integer :category_id
-      t.string  :title
-      t.string  :body
-    end
-
-    create_table :category_groups, :force => true do |t|
-      t.string :name
-    end
-
     create_table :categories, :force => true do |t|
-      t.integer :category_group_id
-      t.string :name
-    end
-
-    create_table :tags, :force => true do |t|
-      t.integer :post_id
       t.string :name
     end
-
-    create_table :users, :force => true do |t|
-      t.string  :name
-      t.boolean :admin, :default => false, :null => false
-    end
   end
 end
 
 CreateSchema.suppress_messages { CreateSchema.migrate(:up) }
 
-class User < ActiveRecord::Base
-end
-
-class CategoryGroup < ActiveRecord::Base
-end
-
-class Category < ActiveRecord::Base
-  belongs_to :category_group
-end
-
-class Post < ActiveRecord::Base
-  belongs_to :author, :class_name => 'User'
-  belongs_to :category
-  has_many :tags
-end
-
-class Tag < ActiveRecord::Base
-  belongs_to :post
-end
-
-class NonActiveRecord
-end
-
-class SimpleColumn
-  def self.columns
-    [:name]
-  end
-
-  def save!
-    @@count ||= 0
-    @@count += 1
-  end
-
-  def self.count
-    @@count
-  end
-end
-
-class NamedAttributeModel
-  def self.attribute_names
-    %w(title)
-  end
-
-  attr_accessor :title
-
-  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|
-    "email#{n}@example.com"
-  end
-
-  factory :user, :aliases => [:person] do
-    factory :admin_user do
-      admin true
-    end
-  end
-
-  factory :category do
-    name "programming"
-    category_group
-  end
-
-  factory :category_group do
-    name "tecnhology"
-  end
-
-  factory :post do
-    association :author, :factory => :user
-    category
-  end
-
-  factory :titled_post, :parent => :post do
-    title 'A Post with a Title'
-  end
-
-  factory :tag do
-    post
-  end
-  # 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
-
-  factory :named_attribute_model do
-  end
-end
-
-require 'factory_girl/step_definitions'
-
+class Category < ActiveRecord::Base; end

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.6.2)
+    factory_girl (4.0.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.6.2)
+    factory_girl (4.0.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.6.2)
+    factory_girl (4.0.0.rc1)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/factory_girl.rb

@@ -1,5 +1,6 @@
 require 'set'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/deprecation'
 require 'active_support/notifications'
 
 require 'factory_girl/definition_hierarchy'
@@ -41,7 +42,6 @@ require 'factory_girl/decorator/attribute_hash'
 require 'factory_girl/decorator/class_key_hash'
 require 'factory_girl/decorator/disallows_duplicates_registry'
 require 'factory_girl/decorator/invocation_tracker'
-require 'factory_girl/decorator/invocation_ignorer'
 require 'factory_girl/decorator/new_constructor'
 require 'factory_girl/version'
 

data/lib/factory_girl/attribute_assigner.rb

@@ -35,29 +35,17 @@ module FactoryGirl
     end
 
     def decorated_evaluator
-      invocation_decorator.new(
+      Decorator::InvocationTracker.new(
         Decorator::NewConstructor.new(@evaluator, @build_class)
       )
     end
 
-    def invocation_decorator
-      if FactoryGirl.duplicate_attribute_assignment_from_initialize_with
-        Decorator::InvocationIgnorer
-      else
-        Decorator::InvocationTracker
-      end
-    end
-
     def methods_invoked_on_evaluator
       method_tracking_evaluator.__invoked_methods__
     end
 
     def build_class_instance
-      @build_class_instance ||= method_tracking_evaluator.instance_exec(&@instance_builder).tap do
-        if @instance_builder != FactoryGirl.constructor && FactoryGirl.duplicate_attribute_assignment_from_initialize_with
-          ActiveSupport::Deprecation.warn 'Accessing attributes from initialize_with when duplicate assignment is enabled is deprecated; use FactoryGirl.duplicate_attribute_assignment_from_initialize_with = false.', caller
-        end
-      end
+      @build_class_instance ||= method_tracking_evaluator.instance_exec(&@instance_builder)
     end
 
     def build_hash

data/lib/factory_girl/configuration.rb

@@ -3,8 +3,6 @@ module FactoryGirl
   class Configuration
     attr_reader :factories, :sequences, :traits, :strategies, :callback_names
 
-    attr_accessor :duplicate_attribute_assignment_from_initialize_with
-
     def initialize
       @factories      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Factory'))
       @sequences      = Decorator::DisallowsDuplicatesRegistry.new(Registry.new('Sequence'))
@@ -13,8 +11,6 @@ module FactoryGirl
       @callback_names = Set.new
       @definition     = Definition.new
 
-      @duplicate_attribute_assignment_from_initialize_with = true
-
       to_create {|instance| instance.save! }
       initialize_with { new }
     end
@@ -24,5 +20,13 @@ module FactoryGirl
     def initialize_with(&block)
       @definition.define_constructor(&block)
     end
+
+    def duplicate_attribute_assignment_from_initialize_with
+      false
+    end
+
+    def duplicate_attribute_assignment_from_initialize_with=(value)
+      ActiveSupport::Deprecation.warn 'Assignment of duplicate_attribute_assignment_from_initialize_with is unnecessary as this is now default behavior in FactoryGirl 4.0; this line can be removed', caller
+    end
   end
 end

data/lib/factory_girl/definition_proxy.rb

@@ -85,10 +85,6 @@ module FactoryGirl
         @definition.declare_attribute(Declaration::Implicit.new(name, @definition, @ignore))
       elsif args.first.respond_to?(:has_key?) && args.first.has_key?(:factory)
         association(name, *args)
-      elsif FactoryGirl.callback_names.include?(name)
-        callback_when, callback_name = name.to_s.split('_', 2)
-        ActiveSupport::Deprecation.warn "Calling #{name} is deprecated; use the syntax #{callback_when}(:#{callback_name}) {}", caller
-        @definition.add_callback(Callback.new(name, block))
       else
         add_attribute(name, *args, &block)
       end