From 1b82590c36bb1404f7b7a9aa9cf196253685d73f Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 10 Dec 2009 22:02:50 -0600
Subject: Reduce usage of interpret_status. It should also return a integer not
 a string.

---
 actionpack/lib/action_controller/base.rb                | 16 ++++++++++++----
 actionpack/lib/action_dispatch/http/status_codes.rb     | 17 -----------------
 .../lib/action_dispatch/middleware/show_exceptions.rb   |  4 +---
 3 files changed, 13 insertions(+), 24 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ed3984c9d4..48bfbab215 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -19,7 +19,6 @@ module ActionController
 
     # Legacy modules
     include SessionManagement
-    include ActionDispatch::StatusCodes
     include ActionController::Caching
     include ActionController::MimeResponds
 
@@ -91,7 +90,7 @@ module ActionController
       end
 
       if options[:status]
-        options[:status] = interpret_status(options[:status]).to_i
+        options[:status] = _interpret_status(options[:status])
       end
 
       options[:update] = blk if block_given?
@@ -140,9 +139,9 @@ module ActionController
       raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
 
       status = if options.is_a?(Hash) && options.key?(:status)
-        interpret_status(options.delete(:status))
+        _interpret_status(options.delete(:status))
       elsif response_status.key?(:status)
-        interpret_status(response_status[:status])
+        _interpret_status(response_status[:status])
       else
         302
       end
@@ -164,5 +163,14 @@ module ActionController
 
       super(url, status)
     end
+
+    private
+      def _interpret_status(status)
+        if status.is_a?(Symbol)
+          (ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[status] || 500)
+        else
+          status.to_i
+        end
+      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/status_codes.rb b/actionpack/lib/action_dispatch/http/status_codes.rb
index 5bac842ec1..ea1475e827 100644
--- a/actionpack/lib/action_dispatch/http/status_codes.rb
+++ b/actionpack/lib/action_dispatch/http/status_codes.rb
@@ -21,22 +21,5 @@ module ActionDispatch
       hash[ActiveSupport::Inflector.underscore(message.gsub(/ /, "")).to_sym] = code
       hash
     }.freeze
-
-    private
-      # Given a status parameter, determine whether it needs to be converted
-      # to a string. If it is a fixnum, use the STATUS_CODES hash to lookup
-      # the default message. If it is a symbol, use the SYMBOL_TO_STATUS_CODE
-      # hash to convert it.
-      def interpret_status(status)
-        case status
-        when Fixnum then
-          "#{status} #{STATUS_CODES[status]}".strip
-        when Symbol then
-          interpret_status(SYMBOL_TO_STATUS_CODE[status] ||
-            "500 Unknown Status #{status.inspect}")
-        else
-          status.to_s
-        end
-      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 67c70a0418..471d18491c 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -2,8 +2,6 @@ require "active_support/core_ext/exception"
 
 module ActionDispatch
   class ShowExceptions
-    include StatusCodes
-
     LOCALHOST = '127.0.0.1'.freeze
 
     RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
@@ -104,7 +102,7 @@ module ActionDispatch
       end
 
       def status_code(exception)
-        interpret_status(@@rescue_responses[exception.class.name]).to_i
+        ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[@@rescue_responses[exception.class.name]]
       end
 
       def render(status, body)
-- 
cgit v1.2.3