Merge pull request #17784 from bruno-/refactor-nested-ifs

Refactor nested if
rails · Nov 26, 2014 · b0328ea · b0328ea
2 parents 73a7192 + 9530c57
commit b0328ea
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -244,12 +244,10 @@ def add_request_method(via, conditions)
           def app(blocks)
             if to.respond_to?(:call)
               Constraints.new(to, blocks, false)
+            elsif blocks.any?
+              Constraints.new(dispatcher(defaults), blocks, true)
             else
-              if blocks.any?
-                Constraints.new(dispatcher(defaults), blocks, true)
-              else
-                dispatcher(defaults)
-              end
+              dispatcher(defaults)
             end
           end