From bd6b61be88dfe6eb1ff1dcc5c17542d804a842c7 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 6 Aug 2009 19:52:11 -0300
Subject: Rename /base to /metal and make base.rb and metal.rb top-level to
 reflect their module locations

---
 actionpack/lib/action_controller/metal.rb | 99 +++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 actionpack/lib/action_controller/metal.rb

(limited to 'actionpack/lib/action_controller/metal.rb')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
new file mode 100644
index 0000000000..e7d776b63e
--- /dev/null
+++ b/actionpack/lib/action_controller/metal.rb
@@ -0,0 +1,99 @@
+require 'action_controller/abstract'
+
+module ActionController
+  # 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::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 Metal < AbstractController::Base
+    abstract!
+
+    # :api: public
+    attr_internal :params, :env
+
+    # Returns the last part of the controller's name, underscored, without the ending
+    # "Controller". For instance, MyApp::MyPostsController would return "my_posts" for
+    # controller_name
+    #
+    # ==== Returns
+    # String
+    def self.controller_name
+      @controller_name ||= controller_path.split("/").last
+    end
+
+    # Delegates to the class' #controller_name
+    def controller_name
+      self.class.controller_name
+    end
+
+    # Returns the full controller name, underscored, without the ending Controller.
+    # For instance, MyApp::MyPostsController would return "my_app/my_posts" for
+    # controller_name.
+    #
+    # ==== Returns
+    # String
+    def self.controller_path
+      @controller_path ||= name && name.sub(/Controller$/, '').underscore
+    end
+
+    # Delegates to the class' #controller_path
+    def controller_path
+      self.class.controller_path
+    end
+
+    # The details below can be overridden to support a specific
+    # Request and Response object. The default ActionController::Base
+    # implementation includes RackConvenience, which makes a request
+    # and response object available. You might wish to control the
+    # environment and response manually for performance reasons.
+
+    attr_internal :status, :headers, :content_type
+
+    def initialize(*)
+      @_headers = {}
+      super
+    end
+
+    # Basic implementations for content_type=, location=, and headers are
+    # provided to reduce the dependency on the RackConvenience module
+    # in Renderer and Redirector.
+
+    def content_type=(type)
+      headers["Content-Type"] = type.to_s
+    end
+
+    def location=(url)
+      headers["Location"] = url
+    end
+
+    # :api: private
+    def call(name, env)
+      @_env = env
+      process(name)
+      to_rack
+    end
+
+    # :api: private
+    def to_rack
+      [status, headers, response_body]
+    end
+
+    # Return a rack endpoint for the given action. Memoize the endpoint, so
+    # multiple calls into MyController.action will return the same object
+    # for the same action.
+    #
+    # ==== Parameters
+    # action<#to_s>:: An action name
+    #
+    # ==== Returns
+    # Proc:: A rack application
+    def self.action(name)
+      @actions ||= {}
+      @actions[name.to_s] ||= proc do |env|
+        new.call(name, env)
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 16c01224cbe503ab1f4d0f02955b16662be00116 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 6 Aug 2009 20:05:14 -0300
Subject: ActionController::Metal#to_rack converted to #to_a to match normal
 rack convention

---
 actionpack/lib/action_controller/metal.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/metal.rb')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index e7d776b63e..82d05414b9 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -72,11 +72,11 @@ module ActionController
     def call(name, env)
       @_env = env
       process(name)
-      to_rack
+      to_a
     end
 
     # :api: private
-    def to_rack
+    def to_a
       [status, headers, response_body]
     end
 
-- 
cgit v1.2.3


From 71638e6760bed0445e5fefc185924b07076fef47 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 6 Aug 2009 22:51:24 -0300
Subject: Move AbstractController to a top-level component

---
 actionpack/lib/action_controller/metal.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack/lib/action_controller/metal.rb')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 82d05414b9..5333ca497c 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -1,5 +1,3 @@
-require 'action_controller/abstract'
-
 module ActionController
   # ActionController::Metal provides a way to get a valid Rack application from a controller.
   #
-- 
cgit v1.2.3