Change syntax for ignoring attributes to use block syntax instead of

calling ignore on individual declarations.

Old syntax:

    factory :user do
      rockstar(true).ignore
      four { 2 + 2 }.ignore

      name { "John Doe#{" - Rockstar" if rockstar}" }
    end

New syntax:

    factory :user do
      ignore do
        rockstar true
        four     { 2 + 2 }
      end

      name { "John Doe#{" - Rockstar" if rockstar}" }
    end

GETTING_STARTED.md

@@ -159,8 +159,10 @@ Transient Attributes
 There may be times where your code can be DRYed up by passing in transient attributes to factories.
 
     factory :user do
-      rockstar(true).ignore
-      upcased { false }.ignore
+      ignore do
+        rockstar true
+        upcased { false }
+      end
 
       name  { "John Doe#{" - Rockstar" if rockstar}" }
       email { "#{name.downcase}@example.com" }

lib/factory_girl/attribute.rb

@@ -12,16 +12,12 @@ class Attribute #:nodoc:
 
     attr_reader :name, :ignored
 
-    def initialize(name)
+    def initialize(name, ignored)
       @name = name.to_sym
-      @ignored = false
+      @ignored = ignored
       ensure_non_attribute_writer!
     end
 
-    def ignore
-      @ignored = true
-    end
-
     def add_to(proxy)
     end
 

lib/factory_girl/attribute/association.rb

@@ -4,7 +4,7 @@ class Association < Attribute  #:nodoc:
       attr_reader :factory
 
       def initialize(name, factory, overrides)
-        super(name)
+        super(name, false)
         @factory   = factory
         @overrides = overrides
       end

lib/factory_girl/attribute/dynamic.rb

@@ -1,8 +1,8 @@
 module FactoryGirl
   class Attribute #:nodoc:
     class Dynamic < Attribute  #:nodoc:
-      def initialize(name, block)
-        super(name)
+      def initialize(name, ignored, block)
+        super(name, ignored)
         @block = block
       end
 
@@ -11,7 +11,12 @@ def add_to(proxy)
         if FactoryGirl::Sequence === value
           raise SequenceAbuseError
         end
-        proxy.set(name, value, @ignored)
+
+        if @ignored
+          proxy.set_ignored(name, value)
+        else
+          proxy.set(name, value)
+        end
       end
     end
   end

lib/factory_girl/attribute/sequence.rb

@@ -2,13 +2,18 @@ module FactoryGirl
   class Attribute
 
     class Sequence < Attribute
-      def initialize(name, sequence)
-        super(name)
+      def initialize(name, sequence, ignored)
+        super(name, ignored)
         @sequence = sequence
       end
 
       def add_to(proxy)
-        proxy.set(name, FactoryGirl.generate(@sequence))
+        value = FactoryGirl.generate(@sequence)
+        if @ignored
+          proxy.set_ignored(name, value)
+        else
+          proxy.set(name, value)
+        end
       end
     end
 

lib/factory_girl/attribute/static.rb

@@ -5,13 +5,17 @@ class Static < Attribute  #:nodoc:
 
       attr_reader :value
 
-      def initialize(name, value)
-        super(name)
+      def initialize(name, value, ignored)
+        super(name, ignored)
         @value = value
       end
 
       def add_to(proxy)
-        proxy.set(name, @value, @ignored)
+        if @ignored
+          proxy.set_ignored(name, @value)
+        else
+          proxy.set(name, @value)
+        end
       end
 
       def priority

lib/factory_girl/declaration.rb

@@ -2,18 +2,18 @@ module FactoryGirl
   class Declaration
     attr_reader :name
 
-    def initialize(name)
-      @name = name
+    def initialize(name, ignored = false)
+      @name    = name
+      @ignored = ignored
     end
 
     def ignore
+      $stderr.puts "DEPRECATION WARNING: Use ignore block syntax instead of calling #ignore"
       @ignored = true
     end
 
     def to_attributes
-      build.tap do |attributes|
-        attributes.each(&:ignore) if @ignored
-      end
+      build
     end
   end
 end

lib/factory_girl/declaration/association.rb

@@ -2,7 +2,7 @@ module FactoryGirl
   class Declaration
     class Association < Declaration
       def initialize(name, options)
-        super(name)
+        super(name, false)
         @options = options
       end
 

lib/factory_girl/declaration/dynamic.rb

@@ -1,15 +1,15 @@
 module FactoryGirl
   class Declaration
     class Dynamic < Declaration
-      def initialize(name, block)
-        super(name)
+      def initialize(name, ignored = false, block)
+        super(name, ignored)
         @block = block
       end
 
       private
 
       def build
-        [Attribute::Dynamic.new(name, @block)]
+        [Attribute::Dynamic.new(name, @ignored, @block)]
       end
     end
   end

lib/factory_girl/declaration/implicit.rb

@@ -1,8 +1,8 @@
 module FactoryGirl
   class Declaration
     class Implicit < Declaration
-      def initialize(name, factory = nil)
-        super(name)
+      def initialize(name, factory = nil, ignored = false)
+        super(name, ignored)
         @factory = factory
       end
 
@@ -12,7 +12,7 @@ def build
         if FactoryGirl.factories.registered?(name)
           [Attribute::Association.new(name, name, {})]
         elsif FactoryGirl.sequences.registered?(name)
-          [Attribute::Sequence.new(name, name)]
+          [Attribute::Sequence.new(name, name, @ignored)]
         else
           trait_root = @factory || FactoryGirl
           trait_root.trait_by_name(name).attributes.to_a

lib/factory_girl/declaration/static.rb

@@ -1,15 +1,15 @@
 module FactoryGirl
   class Declaration
     class Static < Declaration
-      def initialize(name, value)
-        super(name)
+      def initialize(name, value, ignored = false)
+        super(name, ignored)
         @value = value
       end
 
       private
 
       def build
-        [Attribute::Static.new(name, @value)]
+        [Attribute::Static.new(name, @value, @ignored)]
       end
     end
   end

lib/factory_girl/definition_proxy.rb

@@ -8,8 +8,9 @@ class DefinitionProxy
 
     attr_reader :child_factories
 
-    def initialize(factory)
-      @factory = factory
+    def initialize(factory, ignore = false)
+      @factory         = factory
+      @ignore          = ignore
       @child_factories = []
     end
 
@@ -36,16 +37,21 @@ def add_attribute(name, value = nil, &block)
         if value
           raise AttributeDefinitionError, "Both value and block given"
         else
-          declaration = Declaration::Dynamic.new(name, block)
+          declaration = Declaration::Dynamic.new(name, @ignore, block)
         end
       else
-        declaration = FactoryGirl::Declaration::Static.new(name, value)
+        declaration = FactoryGirl::Declaration::Static.new(name, value, @ignore)
       end
 
       @factory.declare_attribute(declaration)
       declaration
     end
 
+    def ignore(&block)
+      proxy = DefinitionProxy.new(@factory, true)
+      proxy.instance_eval(&block)
+    end
+
     # Calls add_attribute using the missing method name as the name of the
     # attribute, so that:
     #
@@ -79,7 +85,7 @@ def add_attribute(name, value = nil, &block)
     # are equivalent.
     def method_missing(name, *args, &block)
       if args.empty? && block.nil?
-        @factory.declare_attribute(Declaration::Implicit.new(name, @factory))
+        @factory.declare_attribute(Declaration::Implicit.new(name, @factory, @ignore))
       elsif args.first.is_a?(Hash) && args.first.has_key?(:factory)
         association(name, *args)
       else

lib/factory_girl/factory.rb

@@ -60,7 +60,15 @@ def run(proxy_class, overrides) #:nodoc:
         if factory_overrides.empty?
           attribute.add_to(proxy)
         else
-          factory_overrides.each { |attr, val| proxy.set(attr, val, attribute.ignored); overrides.delete(attr) }
+          factory_overrides.each do |attr, val|
+            if attribute.ignored
+              proxy.set_ignored(attr, val)
+            else
+              proxy.set(attr, val)
+            end
+
+            overrides.delete(attr)
+          end
         end
       end
       overrides.each { |attr, val| proxy.set(attr, val) }

lib/factory_girl/proxy.rb

@@ -5,12 +5,17 @@ class Proxy #:nodoc:
 
     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)

lib/factory_girl/proxy/attributes_for.rb

@@ -11,12 +11,8 @@ def get(attribute)
         @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)

lib/factory_girl/proxy/build.rb

@@ -4,7 +4,6 @@ class Build < Proxy #:nodoc:
       def initialize(klass)
         super(klass)
         @instance = klass.new
-        @ignored_attributes = {}
       end
 
       def get(attribute)
@@ -15,12 +14,8 @@ def get(attribute)
         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)

lib/factory_girl/proxy/stub.rb

@@ -55,12 +55,8 @@ def get(attribute)
         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)

spec/acceptance/transient_attributes_spec.rb

@@ -8,9 +8,11 @@
       sequence(:name) {|n| "John #{n}" }
 
       factory :user do
-        four  { 2 + 2 }.ignore
-        rockstar(true).ignore
-        upcased(false).ignore
+        ignore do
+          four     { 2 + 2 }
+          rockstar true
+          upcased  false
+        end
 
         name  { "#{FactoryGirl.generate(:name)}#{" - Rockstar" if rockstar}" }
         email { "#{name.downcase}#{four}@example.com" }
@@ -66,3 +68,43 @@
     end
   end
 end
+
+describe "deprecated way of ignoring attributes" do
+  before do
+    define_model("User", :name => :string)
+
+    FactoryGirl.define do
+      factory :user do
+        rockstar(false).ignore
+
+        name { "John Doe#{" Rockstar" if rockstar}" }
+      end
+    end
+  end
+
+  it "assigns attributes correctly" do
+    FactoryGirl.build(:user, :rockstar => true).name.should == "John Doe Rockstar"
+    FactoryGirl.build(:user).name.should == "John Doe"
+  end
+end
+
+describe "transient sequences" do
+  before do
+    define_model("User", :name => :string)
+
+    FactoryGirl.define do
+      factory :user do
+        ignore do
+          sequence(:counter)
+        end
+
+        name { "John Doe #{counter}" }
+      end
+    end
+  end
+
+  it "increments sequences correctly" do
+    FactoryGirl.build(:user).name.should == "John Doe 1"
+    FactoryGirl.build(:user).name.should == "John Doe 2"
+  end
+end