From 918a9de5469d23d7b604803f70d73d6030701210 Mon Sep 17 00:00:00 2001
From: Nicholas Mulder <nicholas.mulder@gmail.com>
Date: Thu, 28 Feb 2013 10:02:38 -0500
Subject: [PATCH] Remove caching of Serializer constants to allow
 ActiveSupport::Dependency reloading to work

---
 lib/active_model_serializers.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb
index 55709e0e..d27eb4b7 100644
--- a/lib/active_model_serializers.rb
+++ b/lib/active_model_serializers.rb
@@ -33,14 +33,12 @@ module ActiveModel::SerializerSupport
   module ClassMethods #:nodoc:
     if "".respond_to?(:safe_constantize)
       def active_model_serializer
-        @active_model_serializer ||= "#{self.name}Serializer".safe_constantize
+        "#{self.name}Serializer".safe_constantize
       end
     else
       def active_model_serializer
-        return @active_model_serializer if defined?(@active_model_serializer)
-
         begin
-          @active_model_serializer = "#{self.name}Serializer".constantize
+          "#{self.name}Serializer".constantize
         rescue NameError => e
           raise unless e.message =~ /uninitialized constant/
         end