Simplify AttributeList

thoughtbot · Nov 28, 2011 · 56a6f67 · 56a6f67
1 parent 17eacf0
commit 56a6f67
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/lib/factory_girl/attribute_list.rb b/lib/factory_girl/attribute_list.rb
@@ -20,10 +20,7 @@ def each(&block)
 
     def apply_attributes(attributes_to_apply)
       attributes_to_apply.each do |attribute|
-        new_attribute = find_attribute(attribute.name) || attribute
-        delete_attribute(attribute.name)
-
-        add_attribute new_attribute
+        add_attribute(attribute) unless attribute_defined?(attribute.name)
       end
     end
 
@@ -47,17 +44,9 @@ def ensure_attribute_not_self_referencing!(attribute)
     end
 
     def attribute_defined?(attribute_name)
-      !!find_attribute(attribute_name)
-    end
-
-    def find_attribute(attribute_name)
-      @attributes.detect do |attribute|
+      @attributes.any? do |attribute|
         attribute.name == attribute_name
       end
     end
-
-    def delete_attribute(attribute_name)
-      @attributes.delete_if {|attrib| attrib.name == attribute_name }
-    end
   end
 end