Merge master.

7 files changed, 19 insertions, 13 deletions

diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 9ff67cbf88..ca3a7550e5 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -100,7 +100,7 @@ module AbstractController
       def helper(*args, &block)
         self._helper_serial = AbstractController::Helpers.next_serial + 1
 
-        _modules_for_helpers(args).each do |mod|
+        modules_for_helpers(args).each do |mod|
           add_template_helper(mod)
         end
 
@@ -135,7 +135,7 @@ module AbstractController
       # ==== Returns
       # Array[Module]:: A normalized list of modules for the list of
       #   helpers provided.
-      def _modules_for_helpers(args)
+      def modules_for_helpers(args)
         args.flatten.map! do |arg|
           case arg
           when String, Symbol
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 619a49571b..f5c20e8013 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -37,7 +37,7 @@ module AbstractController
     #   options<Hash>:: See _render_template_with_layout in ActionView::Base
     #   partial<Boolean>:: Whether or not the template to render is a partial
     #
-    # Override this method in a to change the default behavior.
+    # Override this method in a module to change the default behavior.
     def view_context
       @_view_context ||= ActionView::Base.for_controller(self)
     end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 10244f8216..7f1aa95f6f 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -52,7 +52,7 @@ module ActionController
 
       def method_for_action(action_name)
         super || begin
-          if template_exists?(action_name.to_s, {:formats => formats}, :_prefix => controller_path)
+          if view_paths.exists?(action_name.to_s, {:formats => formats}, controller_path)
             "default_render"
           end
         end
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 2b35e111ec..4fd37e7f31 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -49,6 +49,14 @@ module ActionController
       headers["Content-Type"] = type.to_s
     end
 
+    def content_type
+      headers["Content-Type"]
+    end
+
+    def location
+      headers["Location"]
+    end
+
     def location=(url)
       headers["Location"] = url
     end
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 1b5a4c3080..8efe01e37b 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -86,7 +86,7 @@ module ActionController
       end
 
       private
-        # Overwrite _modules_for_helpers to accept :all as argument, which loads
+        # Overwrite modules_for_helpers to accept :all as argument, which loads
         # all helpers in helpers_dir.
         #
         # ==== Parameters
@@ -95,7 +95,7 @@ module ActionController
         # ==== Returns
         # Array[Module]:: A normalized list of modules for the list of
         #   helpers provided.
-        def _modules_for_helpers(args)
+        def modules_for_helpers(args)
           args += all_application_helpers if args.delete(:all)
           super(args)
         end
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb
index e893acffdf..3358d80c35 100644
--- a/actionpack/lib/action_controller/metal/hide_actions.rb
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -15,10 +15,8 @@ module ActionController
 
     # Overrides AbstractController::Base#action_method? to return false if the
     # action name is in the list of hidden actions.
-    def action_method?(action_name)
-      self.class.visible_action?(action_name) do
-        !self.class.hidden_actions.include?(action_name) && super
-      end
+    def method_for_action(action_name)
+      self.class.visible_action?(action_name) && super
     end
 
     module ClassMethods
@@ -31,13 +29,13 @@ module ActionController
       end
 
       def inherited(klass)
-        klass.instance_variable_set("@visible_actions", {})
+        klass.class_eval { @visible_actions = {} }
         super
       end
 
       def visible_action?(action_name)
         return @visible_actions[action_name] if @visible_actions.key?(action_name)
-        @visible_actions[action_name] = yield
+        @visible_actions[action_name] = !hidden_actions.include?(action_name)
       end
 
       # Overrides AbstractController::Base#action_methods to remove any methods
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c3fda0aaef..8778fd2932 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -430,7 +430,7 @@ module ActionDispatch
         end
 
         req = Rack::Request.new(env)
-        @set.recognize(req) do |route, params|
+        @set.recognize(req) do |route, matches, params|
           dispatcher = route.app
           if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false)
             dispatcher.prepare_params!(params)