From bb33cf3d905e125bbc54c0b6226d147bd0f41324 Mon Sep 17 00:00:00 2001
From: Fab Mackojc <fab.mackojc@gmail.com>
Date: Mon, 2 Dec 2013 21:33:28 -0800
Subject: [PATCH] Generator now properly detects ApplicationSerializer

---
 .../serializer/generators/serializer/serializer_generator.rb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_model/serializer/generators/serializer/serializer_generator.rb b/lib/active_model/serializer/generators/serializer/serializer_generator.rb
index 7c4c036df..40a8f939c 100644
--- a/lib/active_model/serializer/generators/serializer/serializer_generator.rb
+++ b/lib/active_model/serializer/generators/serializer/serializer_generator.rb
@@ -26,7 +26,7 @@ def parent_class_name
         if options[:parent]
           options[:parent]
         elsif (ns = Rails::Generators.namespace) && ns.const_defined?(:ApplicationSerializer) ||
-               defined?(::ApplicationSerializer)
+               (Object.const_get(:ApplicationSerializer) rescue nil)
           'ApplicationSerializer'
         else
           'ActiveModel::Serializer'