Simplify Factory::Runner by always having attribute add_to(proxy)

thoughtbot · Nov 1, 2011 · 3803be3 · 3803be3
1 parent 5a48129
commit 3803be3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/lib/factory_girl/attribute.rb b/lib/factory_girl/attribute.rb
@@ -52,5 +52,13 @@ def ensure_non_attribute_writer!
           "rather than 'f.#{attribute_name} = value'"
       end
     end
+
+    def set_proxy_value(proxy, value)
+      if @ignored
+        proxy.set_ignored(name, value)
+      else
+        proxy.set(name, value)
+      end
+    end
   end
 end
diff --git a/lib/factory_girl/attribute/dynamic.rb b/lib/factory_girl/attribute/dynamic.rb
@@ -12,11 +12,7 @@ def add_to(proxy)
           raise SequenceAbuseError
         end
 
-        if @ignored
-          proxy.set_ignored(name, value)
-        else
-          proxy.set(name, value)
-        end
+        set_proxy_value(proxy, value)
       end
     end
   end

diff --git a/lib/factory_girl/attribute/sequence.rb b/lib/factory_girl/attribute/sequence.rb
@@ -9,11 +9,7 @@ def initialize(name, sequence, ignored)
 
       def add_to(proxy)
         value = FactoryGirl.generate(@sequence)
-        if @ignored
-          proxy.set_ignored(name, value)
-        else
-          proxy.set(name, value)
-        end
+        set_proxy_value(proxy, value)
       end
     end
 

diff --git a/lib/factory_girl/attribute/static.rb b/lib/factory_girl/attribute/static.rb
@@ -11,11 +11,7 @@ def initialize(name, value, ignored)
       end
 
       def add_to(proxy)
-        if @ignored
-          proxy.set_ignored(name, @value)
-        else
-          proxy.set(name, @value)
-        end
+        set_proxy_value(proxy, @value)
       end
 
       def priority

diff --git a/lib/factory_girl/factory.rb b/lib/factory_girl/factory.rb
@@ -165,7 +165,7 @@ def apply_attributes
       end
 
       def apply_remaining_overrides
-        @overrides.each { |attr, val| proxy.set(attr, val) }
+        @overrides.each { |attr, val| add_static_attribute(attr, val) }
       end
 
       def overrides_for_attribute(attribute)
@@ -174,16 +174,15 @@ def overrides_for_attribute(attribute)
 
       def handle_attribute_with_overrides(attribute)
         overrides_for_attribute(attribute).each do |attr, val|
-          if attribute.ignored
-            proxy.set_ignored(attr, val)
-          else
-            proxy.set(attr, val)
-          end
-
+          add_static_attribute(attr, val, attribute.ignored)
           @overrides.delete(attr)
         end
       end
 
+      def add_static_attribute(attr, val, ignored = false)
+        Attribute::Static.new(attr, val, ignored).add_to(proxy)
+      end
+
       def handle_attribute_without_overrides(attribute)
         attribute.add_to(proxy)
       end