Merge pull request #105 from sinsoku/patch/fix_a_wrong_decoration

Fix wrong decoration for nested classes

lib/active_decorator/decorator.rb

@@ -69,7 +69,7 @@ def decorator_for(model_class)
       return @@decorators[model_class] if @@decorators.key? model_class
 
       decorator_name = "#{model_class.name}#{ActiveDecorator.config.decorator_suffix}"
-      d = Object.const_get decorator_name, false
+      d = decorator_name.constantize
       unless Class === d
         d.send :include, ActiveDecorator::Helpers
         @@decorators[model_class] = d

test/decorator_test.rb

@@ -48,4 +48,11 @@ class DecoratorTest < Test::Unit::TestCase
       assert value.is_a?(BookDecorator)
     end
   end
+
+  test "Don't use the wrong decorator for nested classes" do
+    comic = Foo::Comic.new
+
+    assert_equal comic, ActiveDecorator::Decorator.instance.decorate(comic)
+    assert !comic.is_a?(ComicDecorator)
+  end
 end

test/fake_app/app/decorators/comic_decorator.rb

@@ -0,0 +1,3 @@
+# decorator to test auto-loading behavior
+# this module is intended not to be loaded.
+module ComicDecorator; end

test/fake_app/fake_app.rb

@@ -277,3 +277,7 @@ def method_missing(method, *args, &block)
     @ar_relation.public_send(method, *args, &block)
   end
 end
+
+module Foo
+  class Comic; end
+end