rename ActionController::Http to ActionController::Metal at Josh's suggestion

This commit is contained in:
Yehuda Katz 2009-08-06 19:50:22 -03:00
parent af375a5eb3
commit 52798fd479
6 changed files with 10 additions and 12 deletions

View File

@ -45,11 +45,9 @@ end
OK = [200, {}, []]
MetalPostController = lambda { OK }
if ActionController.const_defined?(:Http)
class HttpPostController < ActionController::Http
def index
self.response_body = ''
end
class HttpPostController < ActionController::Metal
def index
self.response_body = ''
end
end

View File

@ -3,7 +3,7 @@ $:.push "rails/actionpack/lib"
require "action_controller"
class Kaigi < ActionController::Http
class Kaigi < ActionController::Metal
include AbstractController::Callbacks
include ActionController::RackConvenience
include ActionController::Renderer

View File

@ -2,7 +2,7 @@ module ActionController
autoload :Base, "action_controller/base/base"
autoload :ConditionalGet, "action_controller/base/conditional_get"
autoload :HideActions, "action_controller/base/hide_actions"
autoload :Http, "action_controller/base/http"
autoload :Metal, "action_controller/base/metal"
autoload :Layouts, "action_controller/base/layouts"
autoload :RackConvenience, "action_controller/base/rack_convenience"
autoload :Rails2Compatibility, "action_controller/base/compatibility"

View File

@ -30,7 +30,7 @@ module AbstractController
# instance methods on that abstract class. Public instance methods of
# a controller would normally be considered action methods, so we
# are removing those methods on classes declared as abstract
# (ActionController::Http and ActionController::Base are defined
# (ActionController::Metal and ActionController::Base are defined
# as abstract)
def internal_methods
controller = self

View File

@ -1,5 +1,5 @@
module ActionController
class Base < Http
class Base < Metal
abstract!
include AbstractController::Benchmarker

View File

@ -1,13 +1,13 @@
require 'action_controller/abstract'
module ActionController
# ActionController::Http provides a way to get a valid Rack application from a controller.
# ActionController::Metal provides a way to get a valid Rack application from a controller.
#
# In AbstractController, dispatching is triggered directly by calling #process on a new controller.
# ActionController::Http provides an #action method that returns a valid Rack application for a
# ActionController::Metal provides an #action method that returns a valid Rack application for a
# given action. Other rack builders, such as Rack::Builder, Rack::URLMap, and the Rails router,
# can dispatch directly to the action returned by FooController.action(:index).
class Http < AbstractController::Base
class Metal < AbstractController::Base
abstract!
# :api: public