From 7a093afd03fd0f6e613a84394284b3ef8a7b6e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 17 May 2012 19:16:11 +0200 Subject: [PATCH] Revert "Fix build for real" This reverts commit 43f32c868a6bbe2c1061c8c58e0fdd9da43a29e3. --- lib/generators/serializer/serializer_generator.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/generators/serializer/serializer_generator.rb b/lib/generators/serializer/serializer_generator.rb index dcc5ccf3..4d631575 100644 --- a/lib/generators/serializer/serializer_generator.rb +++ b/lib/generators/serializer/serializer_generator.rb @@ -27,8 +27,13 @@ module Rails def parent_class_name if options[:parent] options[:parent] - else + # Only works on 3.2 + # elsif (n = Rails::Generators.namespace) && n.const_defined?(:ApplicationSerializer) + # "ApplicationSerializer" + elsif defined?(::ApplicationSerializer) "ApplicationSerializer" + else + "ActiveModel::Serializer" end end end