aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-07 19:31:29 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-07 19:31:29 -0600
commit5835447b6fbc956f22011fc33bcc882db144c7c1 (patch)
tree58aec62b6ba3e579e90d885ee9d0ddcf34313446
parente8489b43e2746d9b3605eef86731232fa823ce69 (diff)
downloadrails-5835447b6fbc956f22011fc33bcc882db144c7c1.tar.gz
rails-5835447b6fbc956f22011fc33bcc882db144c7c1.tar.bz2
rails-5835447b6fbc956f22011fc33bcc882db144c7c1.zip
named_prefix doesn't join with "_"
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb8
-rw-r--r--actionpack/test/dispatch/routing_test.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index abcaa529ae..7eb648cedf 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -63,7 +63,7 @@ module ActionDispatch
controller(resource.controller) do
namespace(resource.name) do
- with_scope_level(:resource, :name => resource.singular, :name_prefix => resource.member_name) do
+ with_scope_level(:resource, :name => resource.singular, :name_prefix => "#{resource.member_name}_") do
yield if block_given?
get "", :to => :show, :as => resource.member_name
@@ -103,7 +103,7 @@ module ActionDispatch
controller(resource.controller) do
namespace(resource.name) do
- with_scope_level(:resources, :name => resource.singular, :name_prefix => resource.member_name) do
+ with_scope_level(:resources, :name => resource.singular, :name_prefix => "#{resource.member_name}_") do
yield if block_given?
collection do
@@ -202,7 +202,7 @@ module ActionDispatch
if name_prefix = options.delete(:name_prefix)
name_prefix_set = true
- name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{name_prefix}" : name_prefix)
+ name_prefix, @scope[:name_prefix] = @scope[:name_prefix], (@scope[:name_prefix] ? "#{@scope[:name_prefix]}#{name_prefix}" : name_prefix)
else
name_prefix_set = false
end
@@ -382,7 +382,7 @@ module ActionDispatch
validate_defaults!(app, defaults, segment_keys)
app = Constraints.new(app, blocks)
- name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}_#{options[:as]}" : options[:as]
+ name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}#{options[:as]}" : options[:as]
@set.add_route(app, conditions, requirements, defaults, name)
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 86cf2ce335..0a35868d7c 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -93,7 +93,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end
controller :articles do
- scope 'articles', :name_prefix => 'article' do
+ scope 'articles', :name_prefix => 'article_' do
scope :path => ':title', :title => /[a-z]+/, :as => :with_title do
match ':id', :to => :with_id
end