diff options
| author | Amr Tamimi <amrnt0@gmail.com> | 2013-10-21 15:40:39 +0300 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2014-01-20 15:24:30 +0000 |
| commit | 746abbcc31f795eaa8e31d7b3a94d63cc4d5c581 (patch) | |
| tree | 5d710cec0ad5f39eab935023ea2cb053cb3b18c2 /actionpack/lib/action_dispatch | |
| parent | 080fc9cad39a98b6973cd7a7106f1bcb10d3ad02 (diff) | |
| download | rails-746abbcc31f795eaa8e31d7b3a94d63cc4d5c581.tar.gz rails-746abbcc31f795eaa8e31d7b3a94d63cc4d5c581.tar.bz2 rails-746abbcc31f795eaa8e31d7b3a94d63cc4d5c581.zip | |
Automatically convert dashes to underscores for url helpers
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 18f37dc732..d724633245 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1440,7 +1440,7 @@ module ActionDispatch path = path_for_action(action, options.delete(:path)) action = action.to_s.dup - if action =~ /^[\w\/]+$/ + if action =~ /^[\w\-\/]+$/ options[:action] ||= action unless action.include?("/") else action = nil @@ -1636,6 +1636,7 @@ module ActionDispatch when :root [name_prefix, collection_name, prefix] else + prefix.gsub!(/\-/, '_') if prefix.is_a?(String) [name_prefix, member_name, prefix] end |