factory_girl 2.3.1 → 2.3.2

data/Changelog

@@ -1,3 +1,12 @@
+2.3.2 (November 26, 2011)
+  Move logic of where instance.save! is set to Definition
+  Fix method name from aliases_for? to alias_for?
+  Refactor internal attribute handling to use an anonymous class instead of
+    faking Ruby's variable resolution. This allows for more sane usage of
+    attributes without having to manage sorting priority because attributes
+    can turn themselves into procs, which are used with define_method on a
+    class so attributes work correctly all the time.
+
 2.3.1 (November 23, 2011)
   Remove internally-used associate method from all the FactoryGirl::Proxy subclasses
   Move around requiring of files

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.3.1)
+    factory_girl (2.3.2)
       activesupport
 
 GEM

data/gemfiles/2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.1)
+    factory_girl (2.3.2)
       activesupport
 
 GEM

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.1)
+    factory_girl (2.3.2)
       activesupport
 
 GEM

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.1)
+    factory_girl (2.3.2)
       activesupport
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.3.1)
+    factory_girl (2.3.2)
       activesupport
 
 GEM

data/lib/factory_girl/attribute.rb

@@ -6,8 +6,6 @@ require "factory_girl/attribute/sequence"
 module FactoryGirl
 
   class Attribute #:nodoc:
-    include Comparable
-
     attr_reader :name, :ignored
 
     def initialize(name, ignored)
@@ -17,29 +15,25 @@ module FactoryGirl
     end
 
     def add_to(proxy)
+      if @ignored
+        proxy.set_ignored(self, to_proc(proxy))
+      else
+        proxy.set(self, to_proc(proxy))
+      end
     end
 
-    def association?
-      false
+    def to_proc(proxy)
+      lambda { }
     end
 
-    def priority
-      1
+    def association?
+      false
     end
 
-    def aliases_for?(attr)
+    def alias_for?(attr)
       FactoryGirl.aliases_for(attr).include?(name)
     end
 
-    def <=>(another)
-      return nil unless another.is_a? Attribute
-      self.priority <=> another.priority
-    end
-
-    def ==(another)
-      self.object_id == another.object_id
-    end
-
     private
 
     def ensure_non_attribute_writer!
@@ -50,13 +44,5 @@ module FactoryGirl
           "rather than 'f.#{attribute_name} = value'"
       end
     end
-
-    def set_proxy_value(proxy, value)
-      if @ignored
-        proxy.set_ignored(self, value)
-      else
-        proxy.set(self, value)
-      end
-    end
   end
 end

data/lib/factory_girl/attribute/association.rb

@@ -9,8 +9,10 @@ module FactoryGirl
         @overrides = overrides
       end
 
-      def add_to(proxy)
-        proxy.set(self, proxy.association(@factory, @overrides))
+      def to_proc(proxy)
+        factory   = @factory
+        overrides = @overrides
+        lambda { proxy.association(factory, overrides) }
       end
 
       def association?

data/lib/factory_girl/attribute/dynamic.rb

@@ -6,13 +6,14 @@ module FactoryGirl
         @block = block
       end
 
-      def add_to(proxy)
-        value = @block.arity == 1 ? @block.call(proxy) : proxy.instance_exec(&@block)
-        if FactoryGirl::Sequence === value
-          raise SequenceAbuseError
-        end
+      def to_proc(proxy)
+        block = @block
 
-        set_proxy_value(proxy, value)
+        lambda {
+          value = block.arity == 1 ? block.call(proxy) : proxy.instance_exec(&block)
+          raise SequenceAbuseError if FactoryGirl::Sequence === value
+          value
+        }
       end
     end
   end

data/lib/factory_girl/attribute/sequence.rb

@@ -7,9 +7,9 @@ module FactoryGirl
         @sequence = sequence
       end
 
-      def add_to(proxy)
-        value = FactoryGirl.generate(@sequence)
-        set_proxy_value(proxy, value)
+      def to_proc(proxy)
+        sequence = @sequence
+        lambda { FactoryGirl.generate(sequence) }
       end
     end
 

data/lib/factory_girl/attribute/static.rb

@@ -1,27 +1,14 @@
 module FactoryGirl
   class Attribute #:nodoc:
-
     class Static < Attribute  #:nodoc:
-
-      attr_reader :value
-
       def initialize(name, value, ignored)
         super(name, ignored)
         @value = value
       end
 
-      def add_to(proxy)
-        set_proxy_value(proxy, @value)
-      end
-
-      def priority
-        0
-      end
-
-      def ==(another)
-        self.name == another.name &&
-          self.value == another.value &&
-          self.ignored == another.ignored
+      def to_proc(proxy)
+        value = @value
+        lambda { value }
       end
     end
   end

data/lib/factory_girl/attribute_list.rb

@@ -15,19 +15,16 @@ module FactoryGirl
     end
 
     def each(&block)
-      sorted_attributes.each(&block)
+      @attributes.each(&block)
     end
 
     def apply_attributes(attributes_to_apply)
-      new_attributes = []
-
       attributes_to_apply.each do |attribute|
         new_attribute = find_attribute(attribute.name) || attribute
         delete_attribute(attribute.name)
-        new_attributes << new_attribute
-      end
 
-      prepend_attributes new_attributes
+        add_attribute new_attribute
+      end
     end
 
     private
@@ -37,19 +34,6 @@ module FactoryGirl
       attribute
     end
 
-    def prepend_attributes(new_attributes)
-      @attributes.unshift *new_attributes
-    end
-
-    def sorted_attributes
-      attributes_hash = attributes_hash_by_priority
-
-      attributes_hash.keys.sort.inject([]) do |result, key|
-        result << attributes_hash[key]
-        result
-      end.flatten
-    end
-
     def ensure_attribute_not_defined!(attribute)
       if attribute_defined?(attribute.name)
         raise AttributeDefinitionError, "Attribute already defined: #{attribute.name}"
@@ -75,13 +59,5 @@ module FactoryGirl
     def delete_attribute(attribute_name)
       @attributes.delete_if {|attrib| attrib.name == attribute_name }
     end
-
-    def attributes_hash_by_priority
-      @attributes.inject({}) do |result, attribute|
-        result[attribute.priority] ||= []
-        result[attribute.priority] << attribute
-        result
-      end
-    end
   end
 end

data/lib/factory_girl/definition.rb

@@ -6,7 +6,7 @@ module FactoryGirl
       @declarations   = DeclarationList.new(name)
       @callbacks      = []
       @defined_traits = []
-      @to_create      = nil
+      @to_create      = lambda {|instance| instance.save! }
       @traits         = []
     end
 

data/lib/factory_girl/factory.rb

@@ -180,7 +180,7 @@ module FactoryGirl
       end
 
       def overrides_for_attribute(attribute)
-        @overrides.select { |attr, val| attribute.aliases_for?(attr) }
+        @overrides.select { |attr, val| attribute.alias_for?(attr) }
       end
 
       def handle_attribute_with_overrides(attribute)

data/lib/factory_girl/proxy.rb

@@ -7,29 +7,16 @@ require "factory_girl/proxy/stub"
 module FactoryGirl
   class Proxy #:nodoc:
     def initialize(klass, callbacks = [])
-      @callbacks = callbacks.inject({}) do |result, callback|
-        result[callback.name] ||= []
-        result[callback.name] << callback
-        result
-      end
-
-      @ignored_attributes = {}
-    end
-
-    def get(attribute)
+      @callbacks = process_callbacks(callbacks)
+      @proxy     = ObjectWrapper.new(klass)
     end
 
-    def set(attribute, value)
-    end
-
-    def set_ignored(attribute, value)
-      @ignored_attributes[attribute.name] = value
-    end
+    delegate :get, :set, :set_ignored, :to => :@proxy
 
     def run_callbacks(name)
       if @callbacks[name]
         @callbacks[name].each do |callback|
-          callback.run(@instance, self)
+          callback.run(result_instance, self)
         end
       end
     end
@@ -69,10 +56,6 @@ module FactoryGirl
     def association(name, overrides = {})
     end
 
-    def method_missing(method, *args, &block)
-      get(method)
-    end
-
     def result(to_create)
       raise NotImplementedError, "Strategies must return a result"
     end
@@ -82,5 +65,81 @@ module FactoryGirl
         raise ArgumentError, "Unknown strategy: #{strategy}"
       end
     end
+
+    private
+
+    def method_missing(method, *args, &block)
+      get(method)
+    end
+
+    def process_callbacks(callbacks)
+      callbacks.inject({}) do |result, callback|
+        result[callback.name] ||= []
+        result[callback.name] << callback
+        result
+      end
+    end
+
+    def result_instance
+      @proxy.object
+    end
+
+    def result_hash
+      @proxy.to_hash
+    end
+
+    class ObjectWrapper
+      def initialize(klass)
+        @klass      = klass
+        @attributes = []
+        @cached_attribute_values = {}
+      end
+
+      def to_hash
+        @attributes.inject({}) do |result, attribute|
+          result[attribute] = get(attribute)
+          result
+        end
+      end
+
+      def object
+        @object ||= @klass.new
+        assign_object_attributes
+        @object
+      end
+
+      def set(attribute, value)
+        define_attribute(attribute, value)
+        @attributes << attribute.name
+      end
+
+      def set_ignored(attribute, value)
+        define_attribute(attribute, value)
+      end
+
+      def get(attribute)
+        @cached_attribute_values[attribute] ||= anonymous_instance.send(attribute)
+      end
+
+      private
+
+      def define_attribute(attribute, value)
+        anonymous_class.send(:define_method, attribute.name, value)
+      end
+
+      def assign_object_attributes
+        (@attributes - @cached_attribute_values.keys).each do |attribute|
+          @object.send("#{attribute}=", get(attribute))
+        end
+      end
+
+      def anonymous_class
+        @anonymous_class ||= Class.new
+      end
+
+      def anonymous_instance
+        @anonymous_instance ||= anonymous_class.new
+      end
+    end
   end
 end

data/lib/factory_girl/proxy/attributes_for.rb

@@ -1,23 +1,13 @@
 module FactoryGirl
   class Proxy #:nodoc:
     class AttributesFor < Proxy #:nodoc:
-      def initialize(klass, callbacks = [])
-        super
-        @hash = {}
-      end
-
-      def get(attribute)
-        @ignored_attributes[attribute] || @hash[attribute]
-      end
-
       def set(attribute, value)
         return if attribute.is_a? Attribute::Association
-
-        @hash[attribute.name] = value
+        super
       end
 
       def result(to_create)
-        @hash
+        result_hash
       end
     end
   end

data/lib/factory_girl/proxy/build.rb

@@ -1,32 +1,14 @@
 module FactoryGirl
   class Proxy #:nodoc:
     class Build < Proxy #:nodoc:
-      def initialize(klass, callbacks = [])
-        super
-        @instance = klass.new
-      end
-
-      def get(attribute)
-        if @ignored_attributes.has_key?(attribute)
-          @ignored_attributes[attribute]
-        else
-          @instance.send(attribute)
-        end
-      end
-
-      def set(attribute, value)
-        @instance.send(:"#{attribute.name}=", value)
-      end
-
       def association(factory_name, overrides = {})
-        method = get_method(overrides[:method])
         factory = FactoryGirl.factory_by_name(factory_name)
-        factory.run(method, overrides.except(:method))
+        factory.run(get_method(overrides[:method]), overrides.except(:method))
       end
 
       def result(to_create)
         run_callbacks(:after_build)
-        @instance
+        result_instance
       end
 
       private