Make named helpers unprotected without becoming actions [#4696 state:resolved]

2 files changed, 12 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 10c7ca9021..c465035ca1 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -16,5 +16,13 @@ module ActionController
       raise "In order to use #url_for, you must include the helpers of a particular " \
             "router. For instance, `include Rails.application.routes.url_helpers"
     end
+
+    module ClassMethods
+      def action_methods
+        @action_methods ||= begin
+          super - _router.named_routes.helper_names
+        end
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 750912b251..57a73dde75 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -68,6 +68,10 @@ module ActionDispatch
           clear!
         end
 
+        def helper_names
+          self.module.instance_methods.map(&:to_s)
+        end
+
         def clear!
           @routes = {}
           @helpers = []
@@ -176,7 +180,6 @@ module ActionDispatch
 
                 url_for(options)
               end
-              protected :#{selector}
             END_EVAL
             helpers << selector
           end