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

Implemented RouteSet#default_scope, which allows to set the scope for the entire routes object

Browse Source
This commit is contained in:
Piotr Sarnacki
2010-09-01 19:17:47 +02:00
parent b43b686b02
commit b8d6dc3c84
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,6 +274,12 @@ module ActionDispatch
end
alias_method :default_url_options, :default_url_options=
def with_default_scope(scope, &block)
scope(scope) do
instance_exec(&block)
end
end
private
def app_name(app)
return unless app.respond_to?(:routes)

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

@@ -199,7 +199,7 @@ module ActionDispatch
end
end
attr_accessor :set, :routes, :named_routes
attr_accessor :set, :routes, :named_routes, :default_scope
attr_accessor :disable_clear_and_finalize, :resources_path_names
attr_accessor :default_url_options, :request_class, :valid_conditions
@@ -230,7 +230,11 @@ module ActionDispatch
if block.arity == 1
mapper.instance_exec(DeprecatedMapper.new(self), &block)
else
mapper.instance_exec(&block)
if default_scope
mapper.with_default_scope(default_scope, &block)
else
mapper.instance_exec(&block)
end
end
finalize! unless @disable_clear_and_finalize

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

@@ -2151,3 +2151,32 @@ private
%(<html><body>You are being <a href="#{ERB::Util.h(url)}">redirected</a>.</body></html>)
end
end
class TestDefaultScope < ActionController::IntegrationTest
module ::Blog
class PostsController < ActionController::Base
def index
render :text => "blog/posts#index"
end
end
end
DefaultScopeRoutes = ActionDispatch::Routing::RouteSet.new
DefaultScopeRoutes.default_scope = {:module => :blog}
DefaultScopeRoutes.draw do
resources :posts
end
def app
DefaultScopeRoutes
end
include DefaultScopeRoutes.url_helpers
def test_default_scope
get '/posts'
assert_equal "blog/posts#index", @response.body
end
end