From 31e1dab69ff5f4f24f961ec7ea8fe954160d6282 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Thu, 30 May 2013 09:28:13 -0600
Subject: [PATCH] require rails >= 3.2

* remove ancient confusing comment in SerializerGenerator
---
 CHANGELOG.md                                      | 2 ++
 active_model_serializers.gemspec                  | 4 ++--
 lib/active_model_serializers.rb                   | 2 --
 lib/generators/serializer/serializer_generator.rb | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07f9b02d..b4c2913d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,8 @@
 
 * Remove support for ruby 1.8 versions.
 
+* Require rails >= 3.2.
+
 # VERSION 0.8.1
 
 * Fix bug whereby a serializer using 'options' would blow up.
diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec
index 9711c564..62e3aaa1 100644
--- a/active_model_serializers.gemspec
+++ b/active_model_serializers.gemspec
@@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.2"
 
-  gem.add_dependency "activemodel", ">= 3.0"
+  gem.add_dependency "activemodel", ">= 3.2"
 
-  gem.add_development_dependency "rails", ">= 3.0"
+  gem.add_development_dependency "rails", ">= 3.2"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "coveralls"
diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb
index c1357c75..4ae2d743 100644
--- a/lib/active_model_serializers.rb
+++ b/lib/active_model_serializers.rb
@@ -11,8 +11,6 @@ if defined?(Rails)
   module ActiveModel
     class Railtie < Rails::Railtie
       generators do |app|
-        app ||= Rails.application # Rails 3.0.x does not yield `app`
-
         Rails::Generators.configure!(app.config.generators)
         Rails::Generators.hidden_namespaces.uniq!
         require_relative "generators/resource_override"
diff --git a/lib/generators/serializer/serializer_generator.rb b/lib/generators/serializer/serializer_generator.rb
index 129da440..8212d62c 100644
--- a/lib/generators/serializer/serializer_generator.rb
+++ b/lib/generators/serializer/serializer_generator.rb
@@ -25,9 +25,6 @@ module Rails
       def parent_class_name
         if options[:parent]
           options[:parent]
-        # Only works on 3.2
-        # elsif (n = Rails::Generators.namespace) && n.const_defined?(:ApplicationSerializer)
-        #   "ApplicationSerializer"
         elsif defined?(::ApplicationSerializer)
           "ApplicationSerializer"
         else