From 29c8a43056f40759a8c64cbcbd4e71d4283b233d Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 20 Dec 2009 20:05:26 -0600
Subject: Rename RackConvenience => RackDelegation

---
 .../lib/action_controller/metal/conditional_get.rb |  2 +-
 actionpack/lib/action_controller/metal/cookies.rb  |  2 +-
 .../action_controller/metal/rack_convenience.rb    | 28 ----------------------
 .../lib/action_controller/metal/rack_delegation.rb | 28 ++++++++++++++++++++++
 actionpack/lib/action_controller/metal/testing.rb  |  2 +-
 actionpack/lib/action_controller/metal/url_for.rb  |  2 +-
 6 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/metal/rack_convenience.rb
 create mode 100644 actionpack/lib/action_controller/metal/rack_delegation.rb

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

diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 5156fbc1d5..61e7ece90d 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -2,7 +2,7 @@ module ActionController
   module ConditionalGet
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
     include Head
 
     # Sets the etag, last_modified, or both on the response and renders a
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb
index 6855ca1478..e27374e4c4 100644
--- a/actionpack/lib/action_controller/metal/cookies.rb
+++ b/actionpack/lib/action_controller/metal/cookies.rb
@@ -46,7 +46,7 @@ module ActionController #:nodoc:
   module Cookies
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
 
     included do
       helper_method :cookies
diff --git a/actionpack/lib/action_controller/metal/rack_convenience.rb b/actionpack/lib/action_controller/metal/rack_convenience.rb
deleted file mode 100644
index f0837c10e8..0000000000
--- a/actionpack/lib/action_controller/metal/rack_convenience.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module ActionController
-  module RackConvenience
-    extend ActiveSupport::Concern
-
-    included do
-      delegate :session, :reset_session, :to => "@_request"
-      delegate :headers, :status=, :location=, :content_type=,
-               :status, :location, :content_type, :to => "@_response"
-      attr_internal :request
-    end
-
-    def dispatch(action, env)
-      @_request = ActionDispatch::Request.new(env)
-      @_response = ActionDispatch::Response.new
-      @_response.request = request
-      super
-    end
-
-    def params
-      @_params ||= @_request.parameters
-    end
-
-    def response_body=(body)
-      response.body = body if response
-      super
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
new file mode 100644
index 0000000000..5141918499
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -0,0 +1,28 @@
+module ActionController
+  module RackDelegation
+    extend ActiveSupport::Concern
+
+    included do
+      delegate :session, :reset_session, :to => "@_request"
+      delegate :headers, :status=, :location=, :content_type=,
+               :status, :location, :content_type, :to => "@_response"
+      attr_internal :request
+    end
+
+    def dispatch(action, env)
+      @_request = ActionDispatch::Request.new(env)
+      @_response = ActionDispatch::Response.new
+      @_response.request = request
+      super
+    end
+
+    def params
+      @_params ||= @_request.parameters
+    end
+
+    def response_body=(body)
+      response.body = body if response
+      super
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index a4a1116d9e..c193a5eff4 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -2,7 +2,7 @@ module ActionController
   module Testing
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
 
     # OMG MEGA HAX
     def process_with_new_base_test(request, response)
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 14c6523045..8c3810ebcb 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -2,7 +2,7 @@ module ActionController
   module UrlFor
     extend ActiveSupport::Concern
 
-    include RackConvenience
+    include RackDelegation
 
     # Overwrite to implement a number of default options that all url_for-based methods will use. The default options should come in
     # the form of a hash, just like the one you would use for url_for directly. Example:
-- 
cgit v1.2.3