Standardize on ability to define attributes on an evaluator

shindo-r · May 5, 2012 · 2d01b6f · 2d01b6f
1 parent d475033
commit 2d01b6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/lib/factory_girl/evaluator.rb b/lib/factory_girl/evaluator.rb
@@ -13,6 +13,16 @@ def self.attribute_list
       end
     end
 
+    def self.define_cached_attribute(name, &block)
+      define_method(name) do
+        if @cached_attributes.key?(name)
+          @cached_attributes[name]
+        else
+          @cached_attributes[name] = instance_exec(&block)
+        end
+      end
+    end
+
     private_instance_methods.each do |method|
       undef_method(method) unless method =~ /^__|initialize/
     end
@@ -24,7 +34,7 @@ def initialize(build_class, build_strategy, overrides = {})
       @cached_attributes = overrides
 
       @overrides.each do |name, value|
-        singleton_class.send :define_method, name, -> { value }
+        singleton_class.define_cached_attribute(name) { value }
       end
     end
 

diff --git a/lib/factory_girl/evaluator_class_definer.rb b/lib/factory_girl/evaluator_class_definer.rb
@@ -5,7 +5,7 @@ def initialize(attributes, parent_class)
       @attributes   = attributes
 
       attributes.each do |attribute|
-        define_attribute(attribute.name, attribute.to_proc)
+        evaluator_class.define_cached_attribute(attribute.name, &attribute.to_proc)
       end
     end
 
@@ -15,17 +15,5 @@ def evaluator_class
         klass.attribute_lists += [@attributes]
       end
     end
-
-    private
-
-    def define_attribute(attribute_name, attribute_proc)
-      evaluator_class.send(:define_method, attribute_name) do
-        if @cached_attributes.key?(attribute_name)
-          @cached_attributes[attribute_name]
-        else
-          @cached_attributes[attribute_name] = instance_exec(&attribute_proc)
-        end
-      end
-    end
   end
 end