Refactoring of previous commit

lib/paperclip/attachment_registry.rb

@@ -51,8 +51,8 @@ module Paperclip
     end
 
     def definitions_for(klass)
-      klass.ancestors.each_with_object({}) do |k, obj|
-        obj.merge! @attachments[k]
+      klass.ancestors.each_with_object({}) do |ancestor, inherited_definitions|
+        inherited_definitions.merge! @attachments[ancestor]
       end
     end
   end

test/attachment_registry_test.rb

@@ -64,15 +64,12 @@ class AttachmentRegistryTest < Test::Unit::TestCase
     end
 
     should "produce defintions for subclasses" do
-      expected_definitions = {
-        avatar: { yo: 'greeting' }
-      }
-      foo = Class.new
-      bar = Class.new(foo)
-
-      Paperclip::AttachmentRegistry.register(foo, :avatar, { yo: 'greeting' })
+      expected_definitions = { avatar: { yo: 'greeting' } }
+      Foo = Class.new
+      Bar = Class.new(Foo)
+      Paperclip::AttachmentRegistry.register(Foo, :avatar, expected_definitions[:avatar])
 
-      definitions = Paperclip::AttachmentRegistry.definitions_for(bar)
+      definitions = Paperclip::AttachmentRegistry.definitions_for(Bar)
 
       assert_equal expected_definitions, definitions
     end