factory_girl 2.1.2 → 2.2.0

data/lib/factory_girl/proxy.rb

@@ -5,12 +5,17 @@ module FactoryGirl
 
     def initialize(klass)
       @callbacks = {}
+      @ignored_attributes = {}
     end
 
     def get(attribute)
     end
 
-    def set(attribute, value, ignored = false)
+    def set(attribute, value)
+    end
+
+    def set_ignored(attribute, value)
+      @ignored_attributes[attribute] = value
     end
 
     def associate(name, factory, attributes)

data/lib/factory_girl/proxy/attributes_for.rb

@@ -11,12 +11,8 @@ module FactoryGirl
         @ignored_attributes[attribute] || @hash[attribute]
       end
 
-      def set(attribute, value, ignored = false)
-        if ignored
-          @ignored_attributes[attribute] = value
-        else
-          @hash[attribute] = value
-        end
+      def set(attribute, value)
+        @hash[attribute] = value
       end
 
       def result(to_create)

data/lib/factory_girl/proxy/build.rb

@@ -4,7 +4,6 @@ module FactoryGirl
       def initialize(klass)
         super(klass)
         @instance = klass.new
-        @ignored_attributes = {}
       end
 
       def get(attribute)
@@ -15,12 +14,8 @@ module FactoryGirl
         end
       end
 
-      def set(attribute, value, ignored = false)
-        if ignored
-          @ignored_attributes[attribute] = value
-        else
-          @instance.send(:"#{attribute}=", value)
-        end
+      def set(attribute, value)
+        @instance.send(:"#{attribute}=", value)
       end
 
       def associate(name, factory_name, overrides)

data/lib/factory_girl/proxy/stub.rb

@@ -55,12 +55,8 @@ module FactoryGirl
         end
       end
 
-      def set(attribute, value, ignored = false)
-        if ignored
-          @ignored_attributes[attribute] = value
-        else
-          @instance.send(:"#{attribute}=", value)
-        end
+      def set(attribute, value)
+        @instance.send(:"#{attribute}=", value)
       end
 
       def associate(name, factory_name, overrides)

data/lib/factory_girl/step_definitions.rb

@@ -95,6 +95,7 @@ end
 World(FactoryGirlStepHelpers)
 
 FactoryGirl.factories.each do |factory|
+  factory.ensure_compiled
   factory.human_names.each do |human_name|
     Given /^the following (?:#{human_name}|#{human_name.pluralize}) exists?:$/i do |table|
       table.hashes.each do |human_hash|
@@ -108,7 +109,7 @@ FactoryGirl.factories.each do |factory|
     end
 
     Given /^(\d+) #{human_name.pluralize} exist$/i do |count|
-      count.to_i.times { FactoryGirl.create(factory.name) }
+      FactoryGirl.create_list(factory.name, count.to_i)
     end
 
     if factory.build_class.respond_to?(:columns)
@@ -119,7 +120,7 @@ FactoryGirl.factories.each do |factory|
         end
 
         Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
-          count.to_i.times { FactoryGirl.create(factory.name, column.name => value) }
+          FactoryGirl.create_list(factory.name, count.to_i, column.name => value)
         end
       end
     end

data/lib/factory_girl/syntax/default.rb

@@ -21,14 +21,6 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           proxy.instance_eval(&block) if block_given?
 
-          if traits = options.delete(:traits)
-            factory.inherit_traits(traits)
-          end
-
-          if parent = options.delete(:parent)
-            factory.inherit_factory(FactoryGirl.factory_by_name(parent))
-          end
-
           FactoryGirl.register_factory(factory)
 
           proxy.child_factories.each do |(child_name, child_options, child_block)|
@@ -54,7 +46,7 @@ module FactoryGirl
           factory = FactoryGirl.factory_by_name(name).allow_overrides
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           proxy.instance_eval(&block)
-          factory.compile
+          factory.ensure_compiled
         end
       end
     end

data/lib/factory_girl/syntax/methods.rb

@@ -10,12 +10,14 @@ module FactoryGirl
       #   The name of the factory that should be used.
       # * overrides: +Hash+
       #   Attributes to overwrite for this set.
+      # * block:
+      #   Yields the hash of attributes.
       #
       # Returns: +Hash+
       # A set of attributes that can be used to build an instance of the class
       # this factory generates.
-      def attributes_for(name, overrides = {})
-        FactoryGirl.factory_by_name(name).run(Proxy::AttributesFor, overrides)
+      def attributes_for(name, overrides = {}, &block)
+        FactoryGirl.factory_by_name(name).run(Proxy::AttributesFor, overrides, &block)
       end
 
       # Generates and returns an instance from this factory. Attributes can be
@@ -26,12 +28,14 @@ module FactoryGirl
       #   The name of the factory that should be used.
       # * overrides: +Hash+
       #   Attributes to overwrite for this instance.
+      # * block:
+      #   Yields the built instance.
       #
       # Returns: +Object+
       # An instance of the class this factory generates, with generated attributes
       # assigned.
-      def build(name, overrides = {})
-        FactoryGirl.factory_by_name(name).run(Proxy::Build, overrides)
+      def build(name, overrides = {}, &block)
+        FactoryGirl.factory_by_name(name).run(Proxy::Build, overrides, &block)
       end
 
       # Generates, saves, and returns an instance from this factory. Attributes can
@@ -46,12 +50,14 @@ module FactoryGirl
       #   The name of the factory that should be used.
       # * overrides: +Hash+
       #   Attributes to overwrite for this instance.
+      # * block:
+      #   Yields the created instance.
       #
       # Returns: +Object+
       # A saved instance of the class this factory generates, with generated
       # attributes assigned.
-      def create(name, overrides = {})
-        FactoryGirl.factory_by_name(name).run(Proxy::Create, overrides)
+      def create(name, overrides = {}, &block)
+        FactoryGirl.factory_by_name(name).run(Proxy::Create, overrides, &block)
       end
 
       # Generates and returns an object with all attributes from this factory
@@ -63,11 +69,13 @@ module FactoryGirl
       #   The name of the factory that should be used.
       # * overrides: +Hash+
       #   Attributes to overwrite for this instance.
+      # * block
+      #   Yields the stubbed object.
       #
       # Returns: +Object+
       # An object with generated attributes stubbed out.
-      def build_stubbed(name, overrides = {})
-        FactoryGirl.factory_by_name(name).run(Proxy::Stub, overrides)
+      def build_stubbed(name, overrides = {}, &block)
+        FactoryGirl.factory_by_name(name).run(Proxy::Stub, overrides, &block)
       end
 
       # Builds and returns multiple instances from this factory as an array. Attributes can be

data/lib/factory_girl/syntax/vintage.rb

@@ -28,9 +28,6 @@ module FactoryGirl
           factory = FactoryGirl::Factory.new(name, options)
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           yield(proxy)
-          if parent = options.delete(:parent)
-            factory.inherit_factory(FactoryGirl.factory_by_name(parent))
-          end
           FactoryGirl.register_factory(factory)
         end
 

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end
 

data/spec/acceptance/attribute_existing_on_object.rb

@@ -0,0 +1,21 @@
+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

data/spec/acceptance/attributes_for_spec.rb

@@ -44,3 +44,20 @@ describe "a generated attributes hash" do
   end
 end
 
+describe "calling `attributes_for` with a block" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('Company', :name => :string)
+
+    FactoryGirl.define do
+      factory :company
+    end
+  end
+
+  it "passes the hash of attributes" do
+    attributes_for(:company, :name => 'thoughtbot') do |attributes|
+      attributes[:name].should eq('thoughtbot')
+    end
+  end
+end

data/spec/acceptance/build_spec.rb

@@ -60,5 +60,22 @@ describe "a built instance with :method => :build" do
     subject.user.should be_kind_of(User)
     subject.user.should be_new_record
   end
+end
+
+describe "calling `build` with a block" do
+  include FactoryGirl::Syntax::Methods
 
+  before do
+    define_model('Company', :name => :string)
+
+    FactoryGirl.define do
+      factory :company
+    end
+  end
+
+  it "passes the built instance" do
+    build(:company, :name => 'thoughtbot') do |company|
+      company.name.should eq('thoughtbot')
+    end
+  end
 end

data/spec/acceptance/build_stubbed_spec.rb

@@ -75,3 +75,21 @@ describe "a generated stub instance" do
   end
 end
 
+describe "calling `build_stubbed` with a block" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('Company', :name => :string)
+
+    FactoryGirl.define do
+      factory :company
+    end
+  end
+
+  it "passes the stub instance" do
+    build_stubbed(:company, :name => 'thoughtbot') do |company|
+      company.name.should eq('thoughtbot')
+      expect { company.save }.to raise_error(RuntimeError)
+    end
+  end
+end

data/spec/acceptance/create_spec.rb

@@ -89,3 +89,21 @@ describe "a custom create" do
     FactoryGirl.create(:user).should be_persisted
   end
 end
+
+describe "calling `create` with a block" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('Company', :name => :string)
+
+    FactoryGirl.define do
+      factory :company
+    end
+  end
+
+  it "passes the created instance" do
+    create(:company, :name => 'thoughtbot') do |company|
+      company.name.should eq('thoughtbot')
+    end
+  end
+end

data/spec/acceptance/define_child_before_parent_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe "defining a child factory before a parent" do
+  before do
+    define_model("User", :name => :string, :admin => :boolean, :email => :string, :upper_email => :string, :login => :string)
+
+    FactoryGirl.define do
+      factory :admin, :parent => :user do
+        admin true
+      end
+
+      factory :user do
+        name "awesome"
+      end
+    end
+  end
+
+  it "creates admin factories correctly" do
+    FactoryGirl.create(:admin).should be_admin
+  end
+end

data/spec/acceptance/syntax/blueprint_spec.rb

@@ -19,11 +19,11 @@ describe "a blueprint" do
       @instance = FactoryGirl.create(:user, :last_name => 'Rye')
     end
 
-    it "should use attributes from the blueprint" do
+    it "uses attributes from the blueprint" do
       @instance.first_name.should == 'Bill'
     end
 
-    it "should evaluate attribute blocks for each instance" do
+    it "evaluates attribute blocks for each instance" do
       @instance.email.should =~ /somebody\d+@example.com/
       FactoryGirl.create(:user).email.should_not == @instance.email
     end

data/spec/acceptance/syntax/generate_spec.rb

@@ -17,16 +17,16 @@ describe "a factory using generate syntax" do
     end
   end
 
-  it "should not raise an error when generating an invalid instance" do
-    lambda { User.generate(:first_name => nil) }.should_not raise_error
+  it "does not raise an error when generating an invalid instance" do
+    expect { User.generate(:first_name => nil) }.to_not raise_error
   end
 
-  it "should raise an error when forcefully generating an invalid instance" do
-    lambda { User.generate!(:first_name => nil) }.should raise_error(ActiveRecord::RecordInvalid)
+  it "raises an error when forcefully generating an invalid instance" do
+    expect { User.generate!(:first_name => nil) }.to raise_error(ActiveRecord::RecordInvalid)
   end
 
   %w(generate generate! spawn).each do |method|
-    it "should yield a generated instance when using #{method} with a block" do
+    it "yields a generated instance when using #{method} with a block" do
       saved_instance = nil
       User.send(method) {|instance| saved_instance = instance }
       saved_instance.should be_kind_of(User)
@@ -37,20 +37,20 @@ describe "a factory using generate syntax" do
         @instance = User.send(method, :last_name => 'Rye')
       end
 
-      it "should use attributes from the factory" do
+      it "uses attributes from the factory" do
         @instance.first_name.should == 'Bill'
       end
 
-      it "should use attributes passed to generate" do
+      it "uses attributes passed to generate" do
         @instance.last_name.should == 'Rye'
       end
 
       if method == 'spawn'
-        it "should not save the record" do
+        it "does not save the record" do
           @instance.should be_new_record
         end
       else
-        it "should save the record" do
+        it "does save the record" do
           @instance.should_not be_new_record
         end
       end

data/spec/acceptance/syntax/make_spec.rb

@@ -19,15 +19,15 @@ describe "a factory using make syntax" do
       @instance = User.make(:last_name => 'Rye')
     end
 
-    it "should use attributes from the factory" do
+    it "uses attributes from the factory" do
       @instance.first_name.should == 'Bill'
     end
 
-    it "should use attributes passed to make" do
+    it "uses attributes passed to make" do
       @instance.last_name.should == 'Rye'
     end
 
-    it "should build the record" do
+    it "builds the record" do
       @instance.should be_new_record
     end
   end
@@ -37,15 +37,15 @@ describe "a factory using make syntax" do
       @instance = User.make!(:last_name => 'Rye')
     end
 
-    it "should use attributes from the factory" do
+    it "uses attributes from the factory" do
       @instance.first_name.should == 'Bill'
     end
 
-    it "should use attributes passed to make" do
+    it "uses attributes passed to make" do
       @instance.last_name.should == 'Rye'
     end
 
-    it "should save the record" do
+    it "saves the record" do
       @instance.should_not be_new_record
     end
   end

data/spec/acceptance/syntax/sham_spec.rb

@@ -28,15 +28,15 @@ describe "a factory using sham syntax" do
       @instance = FactoryGirl.create(:user, :last_name => 'Rye')
     end
 
-    it "should support a sham called 'name'" do
+    it "supports a sham called 'name'" do
       @instance.first_name.should == 'Name'
     end
 
-    it "should support shams with starting values" do
+    it "supports shams with starting values" do
       @instance.username.should == 'User-FOO'
     end
 
-    it "should use the sham for the email" do
+    it "uses the sham for the email" do
       @instance.email.should =~ /somebody\d@example.com/
     end
   end