github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

named_prefix doesn't join with "_"

Browse Source
This commit is contained in:
Joshua Peek
2009-12-07 19:31:29 -06:00
parent e8489b43e2
commit 5835447b6f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@@ -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)

2
actionpack/test/dispatch/routing_test.rb
View File

@@ -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