Generator now properly detects ApplicationSerializer

ursm · Feb 1, 2014 · a49e04a · a49e04a
1 parent 39b2a2b
commit a49e04a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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'