From e273fc58540bdbae52ab6a54cf94dc9504b2798e Mon Sep 17 00:00:00 2001
From: Gauthier Delacroix <gauthier.delacroix@gmail.com>
Date: Mon, 8 Sep 2014 13:59:50 +0200
Subject: [PATCH] Fix namespaced serializers reloading

---
 lib/active_model/serializable/utils.rb | 8 ++++++--
 lib/active_model/serializer.rb         | 6 +-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/active_model/serializable/utils.rb b/lib/active_model/serializable/utils.rb
index 7471bd0f..efabb6c4 100644
--- a/lib/active_model/serializable/utils.rb
+++ b/lib/active_model/serializable/utils.rb
@@ -4,8 +4,12 @@ module ActiveModel
       extend self
 
       def _const_get(const)
-        method = RUBY_VERSION >= '2.0' ? :const_get : :qualified_const_get
-        Object.send method, const
+        begin
+          method = RUBY_VERSION >= '2.0' ? :const_get : :qualified_const_get
+          Object.send method, const
+        rescue NameError
+          const.safe_constantize
+        end
       end
     end
   end
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 689e132a..dd82e976 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -63,11 +63,7 @@ end
             ArraySerializer
           end
         else
-          begin
-            _const_get build_serializer_class(resource, options)
-          rescue NameError
-            nil
-          end
+          _const_get build_serializer_class(resource, options)
         end
       end