From 80b52cad6eb74bc8e8820c8bc7381f1ee9f22dd3 Mon Sep 17 00:00:00 2001 From: Neeraj Singh Date: Mon, 7 Jun 2010 16:10:19 -0400 Subject: [PATCH] making helper urls unprotected [#4696 state:resolved] --- actionpack/lib/abstract_controller/base.rb | 4 +++- .../lib/action_dispatch/routing/route_set.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index ff97a7e..657324e 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -8,6 +8,7 @@ module AbstractController class Base attr_internal :response_body attr_internal :action_name + cattr_accessor :named_routes include ActiveSupport::Configurable @@ -77,7 +78,8 @@ module AbstractController hidden_actions # Clear out AS callback method pollution - methods.reject { |method| method =~ /_one_time_conditions/ } + methods.reject { |method| method =~ /_one_time_conditions/ } - + (AbstractController::Base.named_routes || []) end end diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 57a73dd..f68004d 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -147,9 +147,9 @@ module ActionDispatch def #{selector}(options = nil) # def hash_for_users_url(options = nil) options ? #{options.inspect}.merge(options) : #{options.inspect} # options ? {:only_path=>false}.merge(options) : {:only_path=>false} end # end - protected :#{selector} # protected :hash_for_users_url END_EVAL helpers << selector + AbstractController::Base.named_routes = helpers.map(&:to_s) end # Create a url helper allowing ordered parameters to be associated -- 1.6.5.2