factory_girl_kibiz0r 2.0.0.beta2 → 2.0.0.beta3

data/lib/factory_girl.rb

@@ -12,7 +12,6 @@ require 'factory_girl/attribute/association'
 require 'factory_girl/attribute/callback'
 require 'factory_girl/attribute/sequence'
 require 'factory_girl/attribute/implicit'
-require 'factory_girl/attribute/list'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
 require 'factory_girl/definition_proxy'

data/lib/factory_girl/attribute/dynamic.rb

@@ -12,8 +12,7 @@ module FactoryGirl
         if FactoryGirl::Sequence === value
           raise SequenceAbuseError
         end
-        method = !ignored? ? :set : :ignore
-        proxy.send(method, name, value)
+        proxy.set(name, value)
       end
     end
 

data/lib/factory_girl/attribute/static.rb

@@ -9,8 +9,7 @@ module FactoryGirl
       end
 
       def add_to(proxy)
-        method = !ignored? ? :set : :ignore
-        proxy.send(method, name, @value)
+        proxy.set(name, @value)
       end
     end
 

data/lib/factory_girl/factory.rb

@@ -36,7 +36,7 @@ module FactoryGirl
       assert_valid_options(options)
       @name       = factory_name_for(name)
       @options    = options
-      @attributes   = Attribute::List.new
+      @attributes   = []
     end
 
     def inherit_from(parent) #:nodoc:
@@ -62,17 +62,21 @@ module FactoryGirl
         raise AssociationDefinitionError, "Self-referencing association '#{name}' in factory '#{self.name}'"
       end
       @attributes << attribute
+      attribute
     end
 
     def add_callback(name, &block)
       unless [:after_build, :after_create, :after_stub].include?(name.to_sym)
         raise InvalidCallbackNameError, "#{name} is not a valid callback name. Valid callback names are :after_build, :after_create, and :after_stub"
       end
-      @attributes << Attribute::Callback.new(name.to_sym, block)
+      attribute = Attribute::Callback.new(name.to_sym, block)
+      @attributes << attribute
+      attribute
     end
 
     def run(proxy_class, overrides) #:nodoc:
       proxy = proxy_class.new(build_class)
+      proxy.ignored_attributes = ignored_attributes
       overrides = symbolize_keys(overrides)
       overrides.each {|attr, val| proxy.set(attr, val) }
       passed_keys = overrides.keys.collect {|k| FactoryGirl.aliases_for(k) }.flatten
@@ -127,6 +131,14 @@ module FactoryGirl
 
     private
 
+    def ignored_attributes
+      Hash[@attributes.select do |attribute|
+        attribute.ignored?
+      end.map do |attribute|
+        [attribute.name, nil]
+      end]
+    end
+
     def class_for (class_or_to_s)
       if class_or_to_s.respond_to?(:to_sym)
         class_name = variable_name_to_class_name(class_or_to_s)

data/lib/factory_girl/proxy.rb

@@ -2,20 +2,31 @@ module FactoryGirl
   class Proxy #:nodoc:
 
     attr_reader :callbacks
+    attr_writer :ignored_attributes
 
     def initialize(klass)
     end
 
     def get(attribute)
-      @ignored && @ignored[attribute]
+      if ignored? attribute
+        ignored_attributes[attribute]
+      else
+        get_attr attribute
+      end
+    end
+
+    def get_attr(attribute)
     end
 
     def set(attribute, value)
+      if ignored? attribute
+        ignored_attributes[attribute] = value
+      else
+        set_attr attribute, value
+      end
     end
 
-    def ignore(attribute, value)
-      @ignored = {}
-      @ignored[attribute] = value
+    def set_attr(attribute, value)
     end
 
     def associate(name, factory, attributes)
@@ -83,5 +94,15 @@ module FactoryGirl
     def result(to_create)
       raise NotImplementedError, "Strategies must return a result"
     end
+
+    private
+
+    def ignored?(attribute)
+      ignored_attributes.has_key? attribute
+    end
+
+    def ignored_attributes
+      @ignored_attributes ||= {}
+    end
   end
 end

data/lib/factory_girl/proxy/attributes_for.rb

@@ -5,11 +5,11 @@ module FactoryGirl
         @hash = {}
       end
 
-      def get(attribute)
+      def get_attr(attribute)
         @hash[attribute]
       end
 
-      def set(attribute, value)
+      def set_attr(attribute, value)
         @hash[attribute] = value
       end
 

data/lib/factory_girl/proxy/build.rb

@@ -5,15 +5,11 @@ module FactoryGirl
         @instance = klass.new
       end
 
-      def get(attribute)
-        if @instance.respond_to?(attribute)
-          @instance.send(attribute)
-        else
-          super
-        end
+      def get_attr(attribute)
+        @instance.send(attribute)
       end
 
-      def set(attribute, value)
+      def set_attr(attribute, value)
         @instance.send(:"#{attribute}=", value)
       end
 

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0.beta3"
 end
 

data/spec/acceptance/attributes_for_spec.rb

@@ -23,11 +23,12 @@ describe "a generated attributes hash" do
         body { "default body" }
         summary { title }
         user
+        uploaded_image(nil).ignore
       end
     end
   end
 
-  subject { attributes_for(:post, :title => 'overridden title') }
+  subject { attributes_for(:post, :title => 'overridden title', :uploaded_image => "foo") }
 
   it "assigns an overridden value" do
     subject[:title].should == "overridden title"
@@ -44,5 +45,9 @@ describe "a generated attributes hash" do
   it "doesn't assign associations" do
     subject[:user_id].should be_nil
   end
+
+  it "doesn't assign ignored attributes" do
+    subject[:uploaded_image].should be_nil
+  end
 end
 

data/spec/acceptance/callbacks_spec.rb

@@ -17,7 +17,7 @@ describe "callbacks" do
       end
 
       factory :user_with_proxied_callbacks, :parent => :user_with_callbacks do |u|
-        u.proxified?(true).ignore
+        u.proxified?(false).ignore
         after_create { |user, proxy| user.last_name << ', Proxified' if proxy.proxified? }
       end
     end
@@ -46,7 +46,7 @@ describe "callbacks" do
   end
 
   it "provides the proxy to callbacks that want it" do
-    user = FactoryGirl.create(:user_with_proxied_callbacks)
+    user = FactoryGirl.create(:user_with_proxied_callbacks, :proxified? => true)
     user.first_name.should == 'Buildy'
     user.last_name.should == 'Createy, Proxified'
   end

data/spec/factory_girl/factory_spec.rb

@@ -53,6 +53,7 @@ describe FactoryGirl::Factory do
       stub(@attribute).add_to
       stub(@proxy).set
       stub(@proxy).result { 'result' }
+      stub(@proxy).ignored_attributes = anything
       stub(FactoryGirl::Attribute::Static).new { @attribute }
       stub(FactoryGirl::Proxy::Build).new { @proxy }
 
@@ -69,6 +70,12 @@ describe FactoryGirl::Factory do
       @factory.run(FactoryGirl::Proxy::Build, {})
     end
 
+    it "should add the ignored attributes to the proxy by name when running" do
+      stub(@attribute).ignored? { true }
+      mock(@proxy).ignored_attributes = { :name => nil }
+      @factory.run(FactoryGirl::Proxy::Build, {})
+    end
+
     it "should return the result from the proxy when running" do
       mock(@proxy).result(nil) { 'result' }
       @factory.run(FactoryGirl::Proxy::Build, {}).should == 'result'
@@ -79,6 +86,7 @@ describe FactoryGirl::Factory do
     proxy = 'proxy'
     stub(FactoryGirl::Proxy::Build).new { proxy }
     stub(proxy).result {}
+    stub(proxy).ignored_attributes = anything
     block = lambda {}
     factory = FactoryGirl::Factory.new(:object)
     factory.to_create(&block)

data/spec/factory_girl/proxy_spec.rb

@@ -10,7 +10,7 @@ describe FactoryGirl::Proxy do
   end
 
   it "should return nil when asked for an attribute" do
-    @proxy.get(:name).should be_nil
+    @proxy.get_attr(:name).should be_nil
   end
 
   it "should call get for a missing method" do
@@ -18,13 +18,31 @@ describe FactoryGirl::Proxy do
     @proxy.name.should == "it's a name"
   end
 
-  it "should store ignored attributes" do
-    @proxy.ignore(:name, "it's a name").should == "it's a name"
-  end
+  describe "with ignored attributes" do
+    before do
+      @proxy.ignored_attributes = {
+        :foo => "bar",
+        :baz => 8,
+        :nil_attr => nil
+      }
+      dont_allow(@proxy).get_attr
+      dont_allow(@proxy).set_attr
+    end
+
+    it "#set stores the value rather than calling #set_attr" do
+      @proxy.set(:baz, 5)
+      @proxy.get(:baz).should == 5
+    end
+
+    it "#get returns the stored value of the ignored attribute without calling #get_attr" do
+      @proxy.get(:foo).should == "bar"
+    end
 
-  it "should get an ignored attribute" do
-    @proxy.ignore(:name, "it's a name")
-    @proxy.get(:name).should == "it's a name"
+    it "recognizes nil as a valid value for an ignored attribute" do
+      @proxy.get(:nil_attr).should be_nil
+      @proxy.set(:baz, nil)
+      @proxy.get(:baz).should be_nil
+    end
   end
 
   it "should do nothing when asked to associate with another factory" do

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl_kibiz0r
 version: !ruby/object:Gem::Version 
-  hash: -1848230038
-  prerelease: true
+  hash: 62196453
+  prerelease: 6
   segments: 
   - 2
   - 0
   - 0
-  - beta2
-  version: 2.0.0.beta2
+  - beta
+  - 3
+  version: 2.0.0.beta3
 platform: ruby
 authors: 
 - Joe Ferris
@@ -16,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
-default_executable: 
+date: 2011-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rcov
@@ -85,12 +85,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230021
+        hash: 62196421
         segments: 
         - 3
         - 0
         - 0
-        - beta3
+        - beta
+        - 3
         version: 3.0.0.beta3
   type: :development
   version_requirements: *id005
@@ -148,7 +149,6 @@ files:
 - lib/factory_girl/attribute/callback.rb
 - lib/factory_girl/attribute/dynamic.rb
 - lib/factory_girl/attribute/implicit.rb
-- lib/factory_girl/attribute/list.rb
 - lib/factory_girl/attribute/sequence.rb
 - lib/factory_girl/attribute/static.rb
 - lib/factory_girl/attribute.rb
@@ -216,7 +216,6 @@ files:
 - features/step_definitions/database_steps.rb
 - features/support/env.rb
 - features/support/factories.rb
-has_rdoc: true
 homepage: http://thoughtbot.com/projects/factory_girl
 licenses: []
 
@@ -248,10 +247,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: factory_girl provides a framework and DSL for defining and using model instance factories. (Includes ignorable attributes.)
+summary: factory_girl provides a framework and DSL for defining and using model instance factories.
 test_files: 
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attributes_for_spec.rb

data/lib/factory_girl/attribute/list.rb

@@ -1,19 +0,0 @@
-module FactoryGirl
-
-  class Attribute
-
-    class List < Array
-
-      def method_missing(method, *args, &block)
-        if empty?
-          super
-        else
-          last.send(method, *args, &block)
-        end
-      end
-
-    end
-
-  end
-
-end