Remove Rails::ApiApplication, just configure Rails::Application

rails-api · Apr 20, 2012 · cf2364a · cf2364a
1 parent 51008d4
commit cf2364a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 298 deletions.
diff --git a/lib/rails-api/action_controller/api.rb b/lib/rails-api/action_controller/api.rb
@@ -1,5 +1,5 @@
-require 'action_controller/log_subscriber'
 require 'action_controller'
+require 'action_controller/log_subscriber'
 
 module ActionController
   # API Controller is a lightweight version of <tt>ActionController::Base</tt>,

diff --git a/lib/rails-api/application.rb b/lib/rails-api/application.rb
@@ -1,10 +1,8 @@
-require 'rails/engine'
+require 'rails/version'
-require 'rails-api/monkey_patches/application'
+require 'rails/application'
 
 module Rails
-  class ApiApplication < Engine
+  class Application < Engine
-    include Base
-
     def default_middleware_stack
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
         if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
@@ -46,7 +44,7 @@ def default_middleware_stack
       end
     end
 
-    if Rails.version <= "3.2.3"
+    if Rails::VERSION::STRING <= "3.2.3"
       def load_generators(app=self)
         super
         require 'rails/generators/rails/resource/resource_generator'
@@ -70,7 +68,7 @@ def setup_generators!
       generators = config.generators
 
       generators.templates.unshift File::expand_path('../templates', __FILE__)
-      if Rails.version > "3.2.3"
+      if Rails::VERSION::STRING > "3.2.3"
         generators.resource_route = :api_resource_route
       end
 

diff --git a/lib/rails-api/monkey_patches/application.rb b/lib/rails-api/monkey_patches/application.rb
diff --git a/lib/rails-api/templates/rails/app/config/application.rb b/lib/rails-api/templates/rails/app/config/application.rb
diff --git a/test/generators/app_generator_test.rb b/test/generators/app_generator_test.rb
@@ -21,7 +21,6 @@ def test_api_modified_files
       assert_no_match(/gem 'sass-rails'/, content)
     end
     assert_file "app/controllers/application_controller.rb", /ActionController::API/
-    assert_file "config/application.rb", /Rails::ApiApplication/
   end
 
   private

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -6,7 +6,7 @@
 require 'rails-api'
 
 def app
-  @@app ||= Class.new(Rails::ApiApplication) do
+  @@app ||= Class.new(Rails::Application) do
     config.active_support.deprecation = :stderr
     config.generators do |c|
       c.orm :active_record, :migration => true,
@@ -18,6 +18,10 @@ def app
       c.integration_tool :test_unit
       c.performance_tool :test_unit
     end
+
+    def self.name
+      'TestApp'
+    end
   end
 end