Merge pull request #462 from fab/master

Generator now properly detects ApplicationSerializer
2026-01-25 07:16:49 +00:00 · 2014-02-04 10:05:03 -08:00
parent 9436d73b92 74d3398016
commit d985e6424c
2 changed files with 24 additions and 5 deletions
--- a/lib/active_model/serializer/generators/serializer/serializer_generator.rb
+++ b/lib/active_model/serializer/generators/serializer/serializer_generator.rb
@@ -26,7 +26,7 @@ module Rails
        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'