From 3c03e7e2ab65a154bf82cbe697a9bddbecc20897 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 May 2014 16:14:22 -0700
Subject: swtich to returning early if to responds to call

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 67 +++++++++++-------------
 1 file changed, 32 insertions(+), 35 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index b8aadff5e6..227ceec90f 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -237,47 +237,44 @@ module ActionDispatch
           end
 
           def default_controller_and_action
-            if to.respond_to?(:call)
-              { }
-            else
-              controller = default_controller
-              action     = default_action
-
-              case to
-              when Symbol
-                action = to.to_s
-              when /#/
-                controller, action = to.split('#')
-              when String
-                controller = to
-              end
-
-              if @scope[:module] && !controller.is_a?(Regexp)
-                if controller =~ %r{\A/}
-                  controller = controller[1..-1]
-                else
-                  controller = [@scope[:module], controller].compact.join("/").presence
-                end
-              end
-
-              hash = {}
+            hash = {}
+            return hash if to.respond_to? :call
+
+            controller = default_controller
+            action     = default_action
+
+            case to
+            when Symbol
+              action = to.to_s
+            when /#/
+              controller, action = to.split('#')
+            when String
+              controller = to
+            end
 
-              if controller.is_a? Regexp
-                hash[:controller] = controller
+            if @scope[:module] && !controller.is_a?(Regexp)
+              if controller =~ %r{\A/}
+                controller = controller[1..-1]
               else
-                check_controller! controller
-                hash[:controller] = controller.to_s if controller
+                controller = [@scope[:module], controller].compact.join("/").presence
               end
+            end
 
-              if action.is_a? Regexp
-                hash[:action] = action
-              else
-                check_action! action
-                hash[:action] = action.to_s if action
-              end
+            if controller.is_a? Regexp
+              hash[:controller] = controller
+            else
+              check_controller! controller
+              hash[:controller] = controller.to_s if controller
+            end
 
-              hash
+            if action.is_a? Regexp
+              hash[:action] = action
+            else
+              check_action! action
+              hash[:action] = action.to_s if action
             end
+
+            hash
           end
 
           def check_action!(action)
-- 
cgit v1.2.3