Style cleanup

lib/factory_girl/attribute.rb

@@ -29,6 +29,10 @@ def association?
       false
     end
 
+    def callback?
+      false
+    end
+
     def priority
       1
     end

lib/factory_girl/attribute/callback.rb

@@ -9,6 +9,10 @@ def initialize(name, block)
       def add_to(proxy)
         proxy.add_callback(name, @block)
       end
+
+      def callback?
+        true
+      end
     end
   end
 end

lib/factory_girl/attribute/implicit.rb

@@ -22,18 +22,16 @@ def factory
       private
 
       def implementation
-        @implementation ||= resolve_name
-      end
-
-      def resolve_name
-        if FactoryGirl.factories.registered?(name)
-          Attribute::Association.new(name, name, {})
-        elsif FactoryGirl.sequences.registered?(name)
-          Attribute::Sequence.new(name, name)
-        else
-          Attribute::Trait.new(name, @factory)
-        end
+        @implementation ||=
+          if FactoryGirl.factories.registered?(name)
+            Attribute::Association.new(name, name, {})
+          elsif FactoryGirl.sequences.registered?(name)
+            Attribute::Sequence.new(name, name)
+          else
+            Attribute::Trait.new(name, @factory)
+          end
       end
     end
+
   end
 end

lib/factory_girl/attribute_list.rb

@@ -85,9 +85,8 @@ def flattened_attributes
     end
 
     def find_attribute(attribute_name)
-      @attributes.values.flatten.detect do |attribute|
-        attribute.name == attribute_name &&
-          !attribute.is_a?(FactoryGirl::Attribute::Callback)
+      @attributes.values.flatten.reject(&:callback?).detect do |attribute|
+        attribute.name == attribute_name
       end
     end
 

spec/factory_girl/attribute/callback_spec.rb

@@ -9,6 +9,8 @@
 
   its(:name)  { should == name }
 
+  it { should be_callback }
+
   it "set its callback on a proxy" do
     proxy.stubs(:add_callback)
     subject.add_to(proxy)

spec/factory_girl/attribute_spec.rb

@@ -7,6 +7,7 @@
 
   its(:name) { should == name.to_sym }
   it { should_not be_association }
+  it { should_not be_callback }
 
   it "doesn't set any attributes on a proxy when added" do
     proxy.stubs(:set)