TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote branch 'drogus/remove_deprecated_routes'

Browse Source 
This merge removes the deprecated routes mapper from Rails and update its tests.
This commit is contained in:
José Valim 2010-09-05 15:45:06 +02:00
commit 9757bfff9b
46 changed files with 878 additions and 1432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actionmailer/test/url_test.rb
View File

@ -56,11 +56,9 @@ def teardown
def test_signed_up_with_url
UrlTestMailer.delivery_method = :test
assert_deprecated do
AppRoutes.draw do |map|
map.connect ':controller/:action/:id'
map.welcome 'welcome', :controller=>"foo", :action=>"bar"
end
AppRoutes.draw do
match ':controller(/:action(/:id))'
match '/welcome' => "foo#bar", :as => "welcome"
end
expected = new_mail

1
actionpack/lib/action_dispatch/routing.rb
View File

@ -264,7 +264,6 @@ module ActionDispatch
# Target specific controllers by prefixing the command with <tt>CONTROLLER=x</tt>.
#
module Routing
autoload :DeprecatedMapper, 'action_dispatch/routing/deprecated_mapper'
autoload :Mapper, 'action_dispatch/routing/mapper'
autoload :Route, 'action_dispatch/routing/route'
autoload :RouteSet, 'action_dispatch/routing/route_set'

525
actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
View File

@ -1,525 +0,0 @@
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/with_options'
require 'active_support/core_ext/object/try'
module ActionDispatch
module Routing
class RouteSet
attr_accessor :controller_namespaces
CONTROLLER_REGEXP = /[_a-zA-Z0-9]+/
def controller_constraints
@controller_constraints ||= begin
namespaces = controller_namespaces + in_memory_controller_namespaces
source = namespaces.map { |ns| "#{Regexp.escape(ns)}/#{CONTROLLER_REGEXP.source}" }
source << CONTROLLER_REGEXP.source
Regexp.compile(source.sort.reverse.join('|'))
end
end
def in_memory_controller_namespaces
namespaces = Set.new
ActionController::Base.descendants.each do |klass|
next if klass.anonymous?
namespaces << klass.name.underscore.split('/')[0...-1].join('/')
end
namespaces.delete('')
namespaces
end
end
class DeprecatedMapper #:nodoc:
def initialize(set) #:nodoc:
ActiveSupport::Deprecation.warn "You are using the old router DSL which will be removed in Rails 3.1. " <<
"Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/"
@set = set
end
def connect(path, options = {})
options = options.dup
if conditions = options.delete(:conditions)
conditions = conditions.dup
method = [conditions.delete(:method)].flatten.compact
method.map! { |m|
m = m.to_s.upcase
if m == "HEAD"
raise ArgumentError, "HTTP method HEAD is invalid in route conditions. Rails processes HEAD requests the same as GETs, returning just the response headers"
end
unless HTTP_METHODS.include?(m.downcase.to_sym)
raise ArgumentError, "Invalid HTTP method specified in route conditions"
end
m
}
if method.length > 1
method = Regexp.union(*method)
elsif method.length == 1
method = method.first
else
method = nil
end
end
path_prefix = options.delete(:path_prefix)
name_prefix = options.delete(:name_prefix)
namespace = options.delete(:namespace)
name = options.delete(:_name)
name = "#{name_prefix}#{name}" if name_prefix
requirements = options.delete(:requirements) || {}
defaults = options.delete(:defaults) || {}
options.each do |k, v|
if v.is_a?(Regexp)
if value = options.delete(k)
requirements[k.to_sym] = value
end
else
value = options.delete(k)
defaults[k.to_sym] = value.is_a?(Symbol) ? value : value.to_param
end
end
requirements.each do |_, requirement|
if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
end
if requirement.multiline?
raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
end
end
requirements[:controller] ||= @set.controller_constraints
if defaults[:controller]
defaults[:action] ||= 'index'
defaults[:controller] = defaults[:controller].to_s
defaults[:controller] = "#{namespace}#{defaults[:controller]}" if namespace
end
if defaults[:action]
defaults[:action] = defaults[:action].to_s
end
if path.is_a?(String)
path = "#{path_prefix}/#{path}" if path_prefix
path = path.gsub('.:format', '(.:format)')
path = optionalize_trailing_dynamic_segments(path, requirements, defaults)
glob = $1.to_sym if path =~ /\/\*(\w+)$/
path = ::Rack::Mount::Utils.normalize_path(path)
if glob && !defaults[glob].blank?
raise ActionController::RoutingError, "paths cannot have non-empty default values"
end
end
app = Routing::RouteSet::Dispatcher.new(:defaults => defaults, :glob => glob)
conditions = {}
conditions[:request_method] = method if method
conditions[:path_info] = path if path
@set.add_route(app, conditions, requirements, defaults, name)
end
def optionalize_trailing_dynamic_segments(path, requirements, defaults) #:nodoc:
path = (path =~ /^\//) ? path.dup : "/#{path}"
optional, segments = true, []
required_segments = requirements.keys
required_segments -= defaults.keys.compact
old_segments = path.split('/')
old_segments.shift
length = old_segments.length
old_segments.reverse.each_with_index do |segment, index|
required_segments.each do |required|
if segment =~ /#{required}/
optional = false
break
end
end
if optional
if segment == ":id" && segments.include?(":action")
optional = false
elsif segment == ":controller" || segment == ":action" || segment == ":id"
# Ignore
elsif !(segment =~ /^:\w+$/) &&
!(segment =~ /^:\w+\(\.:format\)$/)
optional = false
elsif segment =~ /^:(\w+)$/
if defaults.has_key?($1.to_sym)
defaults.delete($1.to_sym) if defaults[$1.to_sym].nil?
else
optional = false
end
end
end
if optional && index < length - 1
segments.unshift('(/', segment)
segments.push(')')
elsif optional
segments.unshift('/(', segment)
segments.push(')')
else
segments.unshift('/', segment)
end
end
segments.join
end
private :optionalize_trailing_dynamic_segments
# Creates a named route called "root" for matching the root level request.
def root(options = {})
if options.is_a?(Symbol)
if source_route = @set.named_routes.routes[options]
options = source_route.defaults.merge({ :conditions => source_route.conditions })
end
end
named_route("root", '', options)
end
def named_route(name, path, options = {}) #:nodoc:
options[:_name] = name
connect(path, options)
end
def namespace(name, options = {}, &block)
if options[:namespace]
with_options({:path_prefix => "#{options.delete(:path_prefix)}/#{name}", :name_prefix => "#{options.delete(:name_prefix)}#{name}_", :namespace => "#{options.delete(:namespace)}#{name}/" }.merge(options), &block)
else
with_options({:path_prefix => name, :name_prefix => "#{name}_", :namespace => "#{name}/" }.merge(options), &block)
end
end
def method_missing(route_name, *args, &proc) #:nodoc:
super unless args.length >= 1 && proc.nil?
named_route(route_name, *args)
end
INHERITABLE_OPTIONS = :namespace, :shallow
class Resource #:nodoc:
DEFAULT_ACTIONS = :index, :create, :new, :edit, :show, :update, :destroy
attr_reader :collection_methods, :member_methods, :new_methods
attr_reader :path_prefix, :name_prefix, :path_segment
attr_reader :plural, :singular
attr_reader :options, :defaults
def initialize(entities, options, defaults)
@plural ||= entities
@singular ||= options[:singular] || plural.to_s.singularize
@path_segment = options.delete(:as) || @plural
@options = options
@defaults = defaults
arrange_actions
add_default_actions
set_allowed_actions
set_prefixes
end
def controller
@controller ||= "#{options[:namespace]}#{(options[:controller] || plural).to_s}"
end
def requirements(with_id = false)
@requirements ||= @options[:requirements] || {}
@id_requirement ||= { :id => @requirements.delete(:id) || /[^#{Routing::SEPARATORS.join}]+/ }
with_id ? @requirements.merge(@id_requirement) : @requirements
end
def conditions
@conditions ||= @options[:conditions] || {}
end
def path
@path ||= "#{path_prefix}/#{path_segment}"
end
def new_path
new_action = self.options[:path_names][:new] if self.options[:path_names]
new_action ||= self.defaults[:path_names][:new]
@new_path ||= "#{path}/#{new_action}"
end
def shallow_path_prefix
@shallow_path_prefix ||= @options[:shallow] ? @options[:namespace].try(:sub, /\/$/, '') : path_prefix
end
def member_path
@member_path ||= "#{shallow_path_prefix}/#{path_segment}/:id"
end
def nesting_path_prefix
@nesting_path_prefix ||= "#{shallow_path_prefix}/#{path_segment}/:#{singular}_id"
end
def shallow_name_prefix
@shallow_name_prefix ||= @options[:shallow] ? @options[:namespace].try(:gsub, /\//, '_') : name_prefix
end
def nesting_name_prefix
"#{shallow_name_prefix}#{singular}_"
end
def action_separator
@action_separator ||= ActionController::Base.resource_action_separator
end
def uncountable?
@singular.to_s == @plural.to_s
end
def has_action?(action)
!DEFAULT_ACTIONS.include?(action) || action_allowed?(action)
end
protected
def arrange_actions
@collection_methods = arrange_actions_by_methods(options.delete(:collection))
@member_methods = arrange_actions_by_methods(options.delete(:member))
@new_methods = arrange_actions_by_methods(options.delete(:new))
end
def add_default_actions
add_default_action(member_methods, :get, :edit)
add_default_action(new_methods, :get, :new)
end
def set_allowed_actions
only, except = @options.values_at(:only, :except)
@allowed_actions ||= {}
if only == :all || except == :none
only = nil
except = []
elsif only == :none || except == :all
only = []
except = nil
end
if only
@allowed_actions[:only] = Array(only).map {|a| a.to_sym }
elsif except
@allowed_actions[:except] = Array(except).map {|a| a.to_sym }
end
end
def action_allowed?(action)
only, except = @allowed_actions.values_at(:only, :except)
(!only || only.include?(action)) && (!except || !except.include?(action))
end
def set_prefixes
@path_prefix = options.delete(:path_prefix)
@name_prefix = options.delete(:name_prefix)
end
def arrange_actions_by_methods(actions)
(actions || {}).inject({}) do |flipped_hash, (key, value)|
(flipped_hash[value] ||= []) << key
flipped_hash
end
end
def add_default_action(collection, method, action)
(collection[method] ||= []).unshift(action)
end
end
class SingletonResource < Resource #:nodoc:
def initialize(entity, options, defaults)
@singular = @plural = entity
options[:controller] ||= @singular.to_s.pluralize
super
end
alias_method :shallow_path_prefix, :path_prefix
alias_method :shallow_name_prefix, :name_prefix
alias_method :member_path, :path
alias_method :nesting_path_prefix, :path
end
def resources(*entities, &block)
options = entities.extract_options!
entities.each { |entity| map_resource(entity, options.dup, &block) }
end
def resource(*entities, &block)
options = entities.extract_options!
entities.each { |entity| map_singleton_resource(entity, options.dup, &block) }
end
private
def map_resource(entities, options = {}, &block)
resource = Resource.new(entities, options, :path_names => @set.resources_path_names)
with_options :controller => resource.controller do |map|
map_associations(resource, options)
if block_given?
with_options(options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix), &block)
end
map_collection_actions(map, resource)
map_default_collection_actions(map, resource)
map_new_actions(map, resource)
map_member_actions(map, resource)
end
end
def map_singleton_resource(entities, options = {}, &block)
resource = SingletonResource.new(entities, options, :path_names => @set.resources_path_names)
with_options :controller => resource.controller do |map|
map_associations(resource, options)
if block_given?
with_options(options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix), &block)
end
map_collection_actions(map, resource)
map_new_actions(map, resource)
map_member_actions(map, resource)
map_default_singleton_actions(map, resource)
end
end
def map_associations(resource, options)
map_has_many_associations(resource, options.delete(:has_many), options) if options[:has_many]
path_prefix = "#{options.delete(:path_prefix)}#{resource.nesting_path_prefix}"
name_prefix = "#{options.delete(:name_prefix)}#{resource.nesting_name_prefix}"
Array(options[:has_one]).each do |association|
resource(association, options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => path_prefix, :name_prefix => name_prefix))
end
end
def map_has_many_associations(resource, associations, options)
case associations
when Hash
associations.each do |association,has_many|
map_has_many_associations(resource, association, options.merge(:has_many => has_many))
end
when Array
associations.each do |association|
map_has_many_associations(resource, association, options)
end
when Symbol, String
resources(associations, options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix, :has_many => options[:has_many]))
else
end
end
def map_collection_actions(map, resource)
resource.collection_methods.each do |method, actions|
actions.each do |action|
[method].flatten.each do |m|
action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
action_path ||= action
map_resource_routes(map, resource, action, "#{resource.path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.name_prefix}#{resource.plural}", m)
end
end
end
end
def map_default_collection_actions(map, resource)
index_route_name = "#{resource.name_prefix}#{resource.plural}"
if resource.uncountable?
index_route_name << "_index"
end
map_resource_routes(map, resource, :index, resource.path, index_route_name)
map_resource_routes(map, resource, :create, resource.path, index_route_name)
end
def map_default_singleton_actions(map, resource)
map_resource_routes(map, resource, :create, resource.path, "#{resource.shallow_name_prefix}#{resource.singular}")
end
def map_new_actions(map, resource)
resource.new_methods.each do |method, actions|
actions.each do |action|
route_path = resource.new_path
route_name = "new_#{resource.name_prefix}#{resource.singular}"
unless action == :new
route_path = "#{route_path}#{resource.action_separator}#{action}"
route_name = "#{action}_#{route_name}"
end
map_resource_routes(map, resource, action, route_path, route_name, method)
end
end
end
def map_member_actions(map, resource)
resource.member_methods.each do |method, actions|
actions.each do |action|
[method].flatten.each do |m|
action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
action_path ||= @set.resources_path_names[action] || action
map_resource_routes(map, resource, action, "#{resource.member_path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", m, { :force_id => true })
end
end
end
route_path = "#{resource.shallow_name_prefix}#{resource.singular}"
map_resource_routes(map, resource, :show, resource.member_path, route_path)
map_resource_routes(map, resource, :update, resource.member_path, route_path)
map_resource_routes(map, resource, :destroy, resource.member_path, route_path)
end
def map_resource_routes(map, resource, action, route_path, route_name = nil, method = nil, resource_options = {} )
if resource.has_action?(action)
action_options = action_options_for(action, resource, method, resource_options)
formatted_route_path = "#{route_path}.:format"
if route_name && @set.named_routes[route_name.to_sym].nil?
map.named_route(route_name, formatted_route_path, action_options)
else
map.connect(formatted_route_path, action_options)
end
end
end
def add_conditions_for(conditions, method)
{:conditions => conditions.dup}.tap do |options|
options[:conditions][:method] = method unless method == :any
end
end
def action_options_for(action, resource, method = nil, resource_options = {})
default_options = { :action => action.to_s }
require_id = !resource.kind_of?(SingletonResource)
force_id = resource_options[:force_id] && !resource.kind_of?(SingletonResource)
case default_options[:action]
when "index", "new"; default_options.merge(add_conditions_for(resource.conditions, method || :get)).merge(resource.requirements)
when "create"; default_options.merge(add_conditions_for(resource.conditions, method || :post)).merge(resource.requirements)
when "show", "edit"; default_options.merge(add_conditions_for(resource.conditions, method || :get)).merge(resource.requirements(require_id))
when "update"; default_options.merge(add_conditions_for(resource.conditions, method || :put)).merge(resource.requirements(require_id))
when "destroy"; default_options.merge(add_conditions_for(resource.conditions, method || :delete)).merge(resource.requirements(require_id))
else default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements(force_id))
end
end
end
end
end

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

@ -113,6 +113,15 @@ def requirements
@requirements ||= (@options[:constraints].is_a?(Hash) ? @options[:constraints] : {}).tap do |requirements|
requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
@options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
requirements.each do |_, requirement|
if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
end
if requirement.multiline?
raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
end
end
end
end
@ -443,11 +452,6 @@ def scope(*args)
options = args.extract_options!
options = options.dup
if name_prefix = options.delete(:name_prefix)
options[:as] ||= name_prefix
ActiveSupport::Deprecation.warn ":name_prefix was deprecated in the new router syntax. Use :as instead.", caller
end
options[:path] = args.first if args.first.is_a?(String)
recover = {}
@ -616,9 +620,18 @@ def default_actions
end
def actions
if only = @options[:only]
only, except = @options.values_at(:only, :except)
if only == :all || except == :none
only = nil
except = []
elsif only == :none || except == :all
only = []
except = nil
end
if only
Array(only).map(&:to_sym)
elsif except = @options[:except]
elsif except
default_actions - Array(except).map(&:to_sym)
else
default_actions
@ -770,7 +783,7 @@ def resources(*resources, &block)
end
resource_scope(Resource.new(resources.pop, options)) do
yield if block_given?
instance_eval(&block) if block_given?
collection_scope do
get :index if parent_resource.actions.include?(:index)
@ -894,6 +907,15 @@ def match(*args)
return self
end
via = Array.wrap(options[:via]).map(&:to_sym)
if via.include?(:head)
raise ArgumentError, "HTTP method HEAD is invalid in route conditions. Rails processes HEAD requests the same as GETs, returning just the response headers"
end
unless (invalid = via - HTTP_METHODS).empty?
raise ArgumentError, "Invalid HTTP method (#{invalid.join(', ')}) specified in :via"
end
on = options.delete(:on)
if VALID_ON_OPTIONS.include?(on)
args.push(options)

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

@ -1,7 +1,6 @@
require 'rack/mount'
require 'forwardable'
require 'active_support/core_ext/object/to_query'
require 'action_dispatch/routing/deprecated_mapper'
module ActionDispatch
module Routing
@ -211,7 +210,6 @@ def initialize(request_class = ActionDispatch::Request)
self.routes = []
self.named_routes = NamedRouteCollection.new
self.resources_path_names = self.class.default_resources_path_names.dup
self.controller_namespaces = Set.new
self.default_url_options = {}
self.request_class = request_class
@ -227,14 +225,10 @@ def draw(&block)
clear! unless @disable_clear_and_finalize
mapper = Mapper.new(self)
if block.arity == 1
mapper.instance_exec(DeprecatedMapper.new(self), &block)
if default_scope
mapper.with_default_scope(default_scope, &block)
else
if default_scope
mapper.with_default_scope(default_scope, &block)
else
mapper.instance_exec(&block)
end
mapper.instance_exec(&block)
end
finalize! unless @disable_clear_and_finalize

18
actionpack/test/abstract_unit.rb
View File

@ -49,14 +49,6 @@
module Rails
end
# Monkey patch the old routes initialization to be silenced.
class ActionDispatch::Routing::DeprecatedMapper
def initialize_with_silencer(*args)
ActiveSupport::Deprecation.silence { initialize_without_silencer(*args) }
end
alias_method_chain :initialize, :silencer
end
ActiveSupport::Dependencies.hook!
# Show backtraces for deprecated behavior for quicker cleanup.
@ -128,14 +120,12 @@ class TestCase
# Hold off drawing routes until all the possible controller classes
# have been loaded.
setup_once do
SharedTestRoutes.draw do |map|
# FIXME: match ':controller(/:action(/:id))'
map.connect ':controller/:action/:id'
SharedTestRoutes.draw do
match ':controller(/:action)'
end
ActionController::IntegrationTest.app.routes.draw do |map|
# FIXME: match ':controller(/:action(/:id))'
map.connect ':controller/:action/:id'
ActionController::IntegrationTest.app.routes.draw do
match ':controller(/:action)'
end
end
end

2
actionpack/test/activerecord/active_record_store_test.rb
View File

@ -198,7 +198,7 @@ def test_allows_session_fixation
def with_test_route_set(options = {})
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => 'active_record_store_test/test'
end

18
actionpack/test/activerecord/polymorphic_routes_test.rb
View File

@ -451,18 +451,18 @@ def with_namespaced_routes(name)
def with_test_routes(options = {})
with_routing do |set|
set.draw do |map|
map.resources :projects do |projects|
projects.resources :tasks
projects.resource :bid do |bid|
bid.resources :tasks
set.draw do
resources :projects do
resources :tasks
resource :bid do
resources :tasks
end
end
map.resources :taxes do |taxes|
taxes.resources :faxes
taxes.resource :bid
resources :taxes do
resources :faxes
resource :bid
end
map.resources :series
resources :series
end
self.class.send(:include, @routes.url_helpers)

19
actionpack/test/controller/action_pack_assertions_test.rb
View File

@ -222,7 +222,7 @@ def test_post
# test the redirection to a named route
def test_assert_redirect_to_named_route
with_routing do |set|
set.draw do |map|
set.draw do
match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
match ':controller/:action'
end
@ -236,7 +236,7 @@ def test_assert_redirect_to_named_route
def test_assert_redirect_to_named_route_failure
with_routing do |set|
set.draw do |map|
set.draw do
match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
match 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
match ':controller/:action'
@ -258,10 +258,9 @@ def test_assert_redirect_to_nested_named_route
@controller = Admin::InnerModuleController.new
with_routing do |set|
set.draw do |map|
set.draw do
match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
process :redirect_to_index
# redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
@ -273,10 +272,9 @@ def test_assert_redirected_to_top_level_named_route_from_nested_controller
@controller = Admin::InnerModuleController.new
with_routing do |set|
set.draw do |map|
set.draw do
match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
process :redirect_to_top_level_named_route
# assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
@ -288,11 +286,10 @@ def test_assert_redirected_to_top_level_named_route_with_same_controller_name_in
@controller = Admin::InnerModuleController.new
with_routing do |set|
set.draw do |map|
set.draw do
# this controller exists in the admin namespace as well which is the only difference from previous test
match '/user/:id', :to => 'user#index', :as => :top_level
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
process :redirect_to_top_level_named_route
# assert_redirected_to top_level_url('foo') would pass because of exact match early return

2
actionpack/test/controller/base_test.rb
View File

@ -294,7 +294,7 @@ def test_named_routes_with_path_without_doing_a_request_first
@controller.request = @request
with_routing do |set|
set.draw do |map|
set.draw do
resources :things
end

4
actionpack/test/controller/caching_test.rb
View File

@ -76,7 +76,7 @@ def teardown
def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
with_routing do |set|
set.draw do |map|
set.draw do
match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
match '/', :to => 'posts#index', :as => :main
end
@ -452,7 +452,7 @@ def test_forbidden_is_not_cached
def test_xml_version_of_resource_is_treated_as_different_cache
with_routing do |set|
set.draw do |map|
set.draw do
match ':controller(/:action(.:format))'
end

2
actionpack/test/controller/flash_test.rb
View File

@ -255,7 +255,7 @@ def get(path, parameters = nil, env = {})
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => FlashIntegrationTest::TestController
end

2
actionpack/test/controller/integration_test.rb
View File

@ -427,7 +427,7 @@ def with_test_route_set
include set.url_helpers
end
set.draw do |map|
set.draw do
match ':action', :to => controller
get 'get/:action', :to => controller
end

2
actionpack/test/controller/mime_responds_test.rb
View File

@ -876,7 +876,7 @@ def test_error_is_raised_if_no_respond_to_is_declared_and_respond_with_is_called
private
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
resources :customers
resources :quiz_stores do
resources :customers

12
actionpack/test/controller/new_base/content_type_test.rb
View File

@ -42,10 +42,16 @@ def set_as_nil_on_response_obj
class ExplicitContentTypeTest < Rack::TestCase
test "default response is HTML and UTF8" do
get "/content_type/base"
with_routing do |set|
set.draw do
match ':controller', :action => 'index'
end
assert_body "Hello world!"
assert_header "Content-Type", "text/html; charset=utf-8"
get "/content_type/base"
assert_body "Hello world!"
assert_header "Content-Type", "text/html; charset=utf-8"
end
end
test "setting the content type of the response directly on the response object" do

3
actionpack/test/controller/new_base/render_action_test.rb
View File

@ -83,6 +83,9 @@ class RenderActionTest < Rack::TestCase
end
class RenderLayoutTest < Rack::TestCase
def setup
end
describe "Both <controller_path>.html.erb and application.html.erb are missing"
test "rendering with layout => true" do

10
actionpack/test/controller/new_base/render_template_test.rb
View File

@ -123,10 +123,14 @@ class TestWithLayout < Rack::TestCase
describe "Rendering with :template using implicit or explicit layout"
test "rendering with implicit layout" do
get "/render_template/with_layout"
with_routing do |set|
set.draw { match ':controller', :action => :index }
assert_body "Hello from basic.html.erb, I'm here!"
assert_status 200
get "/render_template/with_layout"
assert_body "Hello from basic.html.erb, I'm here!"
assert_status 200
end
end
test "rendering with layout => :true" do

22
actionpack/test/controller/new_base/render_test.rb
View File

@ -37,15 +37,27 @@ def index
class RenderTest < Rack::TestCase
test "render with blank" do
get "/render/blank_render"
with_routing do |set|
set.draw do
match ":controller", :action => 'index'
end
assert_body "Hello world!"
assert_status 200
get "/render/blank_render"
assert_body "Hello world!"
assert_status 200
end
end
test "rendering more than once raises an exception" do
assert_raises(AbstractController::DoubleRenderError) do
get "/render/double_render", {}, "action_dispatch.show_exceptions" => false
with_routing do |set|
set.draw do
match ":controller", :action => 'index'
end
assert_raises(AbstractController::DoubleRenderError) do
get "/render/double_render", {}, "action_dispatch.show_exceptions" => false
end
end
end
end

20
actionpack/test/controller/new_base/render_text_test.rb
View File

@ -66,16 +66,24 @@ class RenderTextTest < Rack::TestCase
describe "Rendering text using render :text"
test "rendering text from a action with default options renders the text with the layout" do
get "/render_text/simple"
assert_body "hello david"
assert_status 200
with_routing do |set|
set.draw { match ':controller', :action => 'index' }
get "/render_text/simple"
assert_body "hello david"
assert_status 200
end
end
test "rendering text from a action with default options renders the text without the layout" do
get "/render_text/with_layout"
with_routing do |set|
set.draw { match ':controller', :action => 'index' }
assert_body "hello david"
assert_status 200
get "/render_text/with_layout"
assert_body "hello david"
assert_status 200
end
end
test "rendering text, while also providing a custom status code" do

2
actionpack/test/controller/redirect_test.rb
View File

@ -232,7 +232,7 @@ def test_redirect_to_back_with_no_referer
def test_redirect_to_record
with_routing do |set|
set.draw do |map|
set.draw do
resources :workshops
match ':controller/:action'
end

2
actionpack/test/controller/render_test.rb
View File

@ -1120,7 +1120,7 @@ def test_head_with_location_header
def test_head_with_location_object
with_routing do |set|
set.draw do |map|
set.draw do
resources :customers
match ':controller/:action'
end

5
actionpack/test/controller/render_xml_test.rb
View File

@ -70,10 +70,9 @@ def test_rendering_xml_should_call_to_xml_with_extra_options
def test_rendering_with_object_location_should_set_header_with_url_for
with_routing do |set|
set.draw do |map|
set.draw do
resources :customers
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
get :render_with_object_location

2
actionpack/test/controller/rescue_test.rb
View File

@ -371,7 +371,7 @@ def show_errors(exception)
private
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match 'foo', :to => ::RescueTest::TestController.action(:foo)
match 'invalid', :to => ::RescueTest::TestController.action(:invalid)
match 'b00m', :to => ::RescueTest::TestController.action(:b00m)

594
actionpack/test/controller/resources_test.rb
View File

@ -1,5 +1,6 @@
require 'abstract_unit'
require 'active_support/core_ext/object/try'
require 'active_support/core_ext/object/with_options'
class ResourcesController < ActionController::Base
def index() render :nothing => true end
@ -32,36 +33,6 @@ class ImagesController < ResourcesController; end
end
class ResourcesTest < ActionController::TestCase
def test_should_arrange_actions
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
:collection => { :rss => :get, :reorder => :post, :csv => :post },
:member => { :rss => :get, :atom => :get, :upload => :post, :fix => :post },
:new => { :preview => :get, :draft => :get }}, {})
assert_resource_methods [:rss], resource, :collection, :get
assert_resource_methods [:csv, :reorder], resource, :collection, :post
assert_resource_methods [:edit, :rss, :atom], resource, :member, :get
assert_resource_methods [:upload, :fix], resource, :member, :post
assert_resource_methods [:new, :preview, :draft], resource, :new, :get
end
def test_should_resource_controller_name_equal_resource_name_by_default
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {}, {})
assert_equal 'messages', resource.controller
end
def test_should_resource_controller_name_equal_controller_option
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {:controller => 'posts'}, {})
assert_equal 'posts', resource.controller
end
def test_should_all_singleton_paths_be_the_same
[ :path, :nesting_path_prefix, :member_path ].each do |method|
resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, {:path_prefix => 'admin'}, {})
assert_equal 'admin/messages', resource.send(method)
end
end
def test_default_restful_routes
with_restful_routing :messages do
assert_simply_restful_for :messages
@ -69,9 +40,9 @@ def test_default_restful_routes
end
def test_override_paths_for_member_and_collection_methods
collection_methods = { 'rss' => :get, 'reorder' => :post, 'csv' => :post }
member_methods = { 'rss' => :get, :atom => :get, :upload => :post, :fix => :post }
path_names = {:new => 'nuevo', 'rss' => 'canal', :fix => 'corrigir' }
collection_methods = { :rss => :get, :reorder => :post, :csv => :post }
member_methods = { :rss => :get, :atom => :get, :upload => :post, :fix => :post }
path_names = {:new => 'nuevo', :rss => 'canal', :fix => 'corrigir' }
with_restful_routing :messages,
:collection => collection_methods,
@ -89,7 +60,7 @@ def test_override_paths_for_member_and_collection_methods
end
collection_methods.each do |action, method|
assert_recognizes(options.merge(:action => action),
assert_recognizes(options.merge(:action => action.to_s),
:path => "/messages/#{path_names[action] || action}",
:method => method)
end
@ -112,12 +83,6 @@ def test_override_paths_for_member_and_collection_methods
end
end
def test_override_paths_for_default_restful_actions
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
:path_names => {:new => 'nuevo', :edit => 'editar'}}, {})
assert_equal resource.new_path, "#{resource.path}/nuevo"
end
def test_multiple_default_restful_routes
with_restful_routing :messages, :comments do
assert_simply_restful_for :messages
@ -131,7 +96,7 @@ def test_with_custom_conditions
end
end
def test_irregular_id_with_no_requirements_should_raise_error
def test_irregular_id_with_no_constraints_should_raise_error
expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
with_restful_routing :messages do
@ -141,25 +106,25 @@ def test_irregular_id_with_no_requirements_should_raise_error
end
end
def test_irregular_id_with_requirements_should_pass
def test_irregular_id_with_constraints_should_pass
expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
with_restful_routing(:messages, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
end
end
def test_with_path_prefix_requirements
def test_with_path_prefix_constraints
expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :requirements => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :constraints => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
assert_recognizes(expected_options, :path => 'thread/1.1.1/messages/1', :method => :get)
end
end
def test_irregular_id_requirements_should_get_passed_to_member_actions
def test_irregular_id_constraints_should_get_passed_to_member_actions
expected_options = {:controller => 'messages', :action => 'custom', :id => '1.1.1'}
with_restful_routing(:messages, :member => {:custom => :get}, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
with_restful_routing(:messages, :member => {:custom => :get}, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
assert_recognizes(expected_options, :path => 'messages/1.1.1/custom', :method => :get)
end
end
@ -178,7 +143,7 @@ def test_multiple_with_path_prefix
end
def test_with_name_prefix
with_restful_routing :messages, :name_prefix => 'post_' do
with_restful_routing :messages, :as => 'post_messages' do
assert_simply_restful_for :messages, :name_prefix => 'post_'
end
end
@ -186,7 +151,16 @@ def test_with_name_prefix
def test_with_collection_actions
actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
with_restful_routing :messages, :collection => actions do
with_routing do |set|
set.draw do
resources :messages do
get :a, :on => :collection
put :b, :on => :collection
post :c, :on => :collection
delete :d, :on => :collection
end
end
assert_restful_routes_for :messages do |options|
actions.each do |action, method|
assert_recognizes(options.merge(:action => action), :path => "/messages/#{action}", :method => method)
@ -204,7 +178,18 @@ def test_with_collection_actions
def test_with_collection_actions_and_name_prefix
actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
with_routing do |set|
set.draw do
scope '/threads/:thread_id' do
resources :messages, :as => 'thread_messages' do
get :a, :on => :collection
put :b, :on => :collection
post :c, :on => :collection
delete :d, :on => :collection
end
end
end
assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
actions.each do |action, method|
assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
@ -222,7 +207,16 @@ def test_with_collection_actions_and_name_prefix
def test_with_collection_actions_and_name_prefix_and_member_action_with_same_name
actions = { 'a' => :get }
with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions, :member => actions do
with_routing do |set|
set.draw do
scope '/threads/:thread_id' do
resources :messages, :as => 'thread_messages' do
get :a, :on => :collection
get :a, :on => :member
end
end
end
assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
actions.each do |action, method|
assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
@ -240,7 +234,18 @@ def test_with_collection_actions_and_name_prefix_and_member_action_with_same_nam
def test_with_collection_action_and_name_prefix_and_formatted
actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
with_routing do |set|
set.draw do
scope '/threads/:thread_id' do
resources :messages, :as => 'thread_messages' do
get :a, :on => :collection
put :b, :on => :collection
post :c, :on => :collection
delete :d, :on => :collection
end
end
end
assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
actions.each do |action, method|
assert_recognizes(options.merge(:action => action, :format => 'xml'), :path => "/threads/1/messages/#{action}.xml", :method => method)
@ -274,7 +279,7 @@ def test_with_member_action
def test_with_member_action_and_requirement
expected_options = {:controller => 'messages', :action => 'mark', :id => '1.1.1'}
with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
with_restful_routing(:messages, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
assert_recognizes(expected_options, :path => 'messages/1.1.1/mark', :method => :get)
end
end
@ -320,7 +325,16 @@ def test_member_when_override_paths_for_default_restful_actions_with
def test_with_two_member_actions_with_same_method
[:put, :post].each do |method|
with_restful_routing :messages, :member => { :mark => method, :unmark => method } do
with_routing do |set|
set.draw do
resources :messages do
member do
match :mark , :via => method
match :unmark, :via => method
end
end
end
%w(mark unmark).each do |action|
action_options = {:action => action, :id => '1'}
action_path = "/messages/1/#{action}"
@ -337,7 +351,19 @@ def test_with_two_member_actions_with_same_method
end
def test_array_as_collection_or_member_method_value
with_restful_routing :messages, :collection => { :search => [:get, :post] }, :member => { :toggle => [:get, :post] } do
with_routing do |set|
set.draw do
resources :messages do
collection do
match :search, :via => [:post, :get]
end
member do
match :toggle, :via => [:post, :get]
end
end
end
assert_restful_routes_for :messages do |options|
[:get, :post].each do |method|
assert_recognizes(options.merge(:action => 'search'), :path => "/messages/search", :method => method)
@ -350,7 +376,13 @@ def test_array_as_collection_or_member_method_value
end
def test_with_new_action
with_restful_routing :messages, :new => { :preview => :post } do
with_routing do |set|
set.draw do
resources :messages do
post :preview, :on => :new
end
end
preview_options = {:action => 'preview'}
preview_path = "/messages/new/preview"
assert_restful_routes_for :messages do |options|
@ -364,7 +396,15 @@ def test_with_new_action
end
def test_with_new_action_with_name_prefix
with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
with_routing do |set|
set.draw do
scope('/threads/:thread_id') do
resources :messages, :as => "thread_messages" do
post :preview, :on => :new
end
end
end
preview_options = {:action => 'preview', :thread_id => '1'}
preview_path = "/threads/1/messages/new/preview"
assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
@ -378,7 +418,15 @@ def test_with_new_action_with_name_prefix
end
def test_with_formatted_new_action_with_name_prefix
with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
with_routing do |set|
set.draw do
scope('/threads/:thread_id') do
resources :messages, :as => "thread_messages" do
post :preview, :on => :new
end
end
end
preview_options = {:action => 'preview', :thread_id => '1', :format => 'xml'}
preview_path = "/threads/1/messages/new/preview.xml"
assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
@ -401,7 +449,13 @@ def test_override_new_method
end
end
with_restful_routing :messages, :new => { :new => :any } do
with_routing do |set|
set.draw do
resources :messages do
match :new, :via => [:post, :get], :on => :new
end
end
assert_restful_routes_for :messages do |options|
assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :post)
assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
@ -411,10 +465,10 @@ def test_override_new_method
def test_nested_restful_routes
with_routing do |set|
set.draw do |map|
map.resources :threads do |map|
map.resources :messages do |map|
map.resources :comments
set.draw do
resources :threads do
resources :messages do
resources :comments
end
end
end
@ -431,32 +485,12 @@ def test_nested_restful_routes
end
end
def test_nested_restful_routes_with_overwritten_defaults
with_routing do |set|
set.draw do |map|
map.resources :threads do |map|
map.resources :messages, :name_prefix => nil do |map|
map.resources :comments, :name_prefix => nil
end
end
end
assert_simply_restful_for :threads
assert_simply_restful_for :messages,
:path_prefix => 'threads/1/',
:options => { :thread_id => '1' }
assert_simply_restful_for :comments,
:path_prefix => 'threads/1/messages/2/',
:options => { :thread_id => '1', :message_id => '2' }
end
end
def test_shallow_nested_restful_routes
with_routing do |set|
set.draw do |map|
map.resources :threads, :shallow => true do |map|
map.resources :messages do |map|
map.resources :comments
set.draw do
resources :threads, :shallow => true do
resources :messages do
resources :comments
end
end
end
@ -478,11 +512,11 @@ def test_shallow_nested_restful_routes
def test_shallow_nested_restful_routes_with_namespaces
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |map|
map.namespace :admin do |map|
map.resources :products, :shallow => true do |map|
map.resources :images
set.draw do
namespace :backoffice do
namespace :admin do
resources :products, :shallow => true do
resources :images
end
end
end
@ -531,9 +565,9 @@ def test_should_create_multiple_singleton_resource_routes
def test_should_create_nested_singleton_resource_routes
with_routing do |set|
set.draw do |map|
map.resource :admin, :controller => 'admin' do |admin|
admin.resource :account
set.draw do
resource :admin, :controller => 'admin' do
resource :account
end
end
@ -542,69 +576,15 @@ def test_should_create_nested_singleton_resource_routes
end
end
def test_resource_has_many_should_become_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_many => [ :comments, :authors ]
end
assert_simply_restful_for :messages
assert_simply_restful_for :comments, :name_prefix => "message_", :path_prefix => 'messages/1/', :options => { :message_id => '1' }
assert_simply_restful_for :authors, :name_prefix => "message_", :path_prefix => 'messages/1/', :options => { :message_id => '1' }
end
end
def test_resources_has_many_hash_should_become_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :threads, :has_many => { :messages => [ :comments, { :authors => :threads } ] }
end
assert_simply_restful_for :threads
assert_simply_restful_for :messages, :name_prefix => "thread_", :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
assert_simply_restful_for :comments, :name_prefix => "thread_message_", :path_prefix => 'threads/1/messages/1/', :options => { :thread_id => '1', :message_id => '1' }
assert_simply_restful_for :authors, :name_prefix => "thread_message_", :path_prefix => 'threads/1/messages/1/', :options => { :thread_id => '1', :message_id => '1' }
assert_simply_restful_for :threads, :name_prefix => "thread_message_author_", :path_prefix => 'threads/1/messages/1/authors/1/', :options => { :thread_id => '1', :message_id => '1', :author_id => '1' }
end
end
def test_shallow_resource_has_many_should_become_shallow_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_many => [ :comments, :authors ], :shallow => true
end
assert_simply_restful_for :messages, :shallow => true
assert_simply_restful_for :comments, :name_prefix => "message_", :path_prefix => 'messages/1/', :shallow => true, :options => { :message_id => '1' }
assert_simply_restful_for :authors, :name_prefix => "message_", :path_prefix => 'messages/1/', :shallow => true, :options => { :message_id => '1' }
end
end
def test_resource_has_one_should_become_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_one => :logo
end
assert_simply_restful_for :messages
assert_singleton_restful_for :logo, :name_prefix => 'message_', :path_prefix => 'messages/1/', :options => { :message_id => '1' }
end
end
def test_shallow_resource_has_one_should_become_shallow_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_one => :logo, :shallow => true
end
assert_simply_restful_for :messages, :shallow => true
assert_singleton_restful_for :logo, :name_prefix => 'message_', :path_prefix => 'messages/1/', :shallow => true, :options => { :message_id => '1' }
end
end
def test_singleton_resource_with_member_action
[:put, :post].each do |method|
with_singleton_resources :account, :member => { :reset => method } do
with_routing do |set|
set.draw do
resource :account do
match :reset, :on => :member, :via => method
end
end
reset_options = {:action => 'reset'}
reset_path = "/account/reset"
assert_singleton_routes_for :account do |options|
@ -620,7 +600,14 @@ def test_singleton_resource_with_member_action
def test_singleton_resource_with_two_member_actions_with_same_method
[:put, :post].each do |method|
with_singleton_resources :account, :member => { :reset => method, :disable => method } do
with_routing do |set|
set.draw do
resource :account do
match :reset, :on => :member, :via => method
match :disable, :on => :member, :via => method
end
end
%w(reset disable).each do |action|
action_options = {:action => action}
action_path = "/account/#{action}"
@ -638,9 +625,9 @@ def test_singleton_resource_with_two_member_actions_with_same_method
def test_should_nest_resources_in_singleton_resource
with_routing do |set|
set.draw do |map|
map.resource :account do |account|
account.resources :messages
set.draw do
resource :account do
resources :messages
end
end
@ -649,11 +636,13 @@ def test_should_nest_resources_in_singleton_resource
end
end
def test_should_nest_resources_in_singleton_resource_with_path_prefix
def test_should_nest_resources_in_singleton_resource_with_path_scope
with_routing do |set|
set.draw do |map|
map.resource(:account, :path_prefix => ':site_id') do |account|
account.resources :messages
set.draw do
scope ':site_id' do
resource(:account) do
resources :messages
end
end
end
@ -664,9 +653,9 @@ def test_should_nest_resources_in_singleton_resource_with_path_prefix
def test_should_nest_singleton_resource_in_resources
with_routing do |set|
set.draw do |map|
map.resources :threads do |thread|
thread.resource :admin, :controller => 'admin'
set.draw do
resources :threads do
resource :admin, :controller => 'admin'
end
end
@ -694,8 +683,10 @@ def test_should_not_allow_delete_or_put_on_collection_path
def test_should_not_allow_invalid_head_method_for_member_routes
with_routing do |set|
assert_raise(ArgumentError) do
set.draw do |map|
map.resources :messages, :member => {:something => :head}
set.draw do
resources :messages do
match :something, :on => :member, :via => :head
end
end
end
end
@ -704,8 +695,12 @@ def test_should_not_allow_invalid_head_method_for_member_routes
def test_should_not_allow_invalid_http_methods_for_member_routes
with_routing do |set|
assert_raise(ArgumentError) do
set.draw do |map|
map.resources :messages, :member => {:something => :invalid}
set.draw do
resources :messages do
member do
match :something, :via => [:invalid, :get]
end
end
end
end
end
@ -713,9 +708,19 @@ def test_should_not_allow_invalid_http_methods_for_member_routes
def test_resource_action_separator
with_routing do |set|
set.draw do |map|
map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
set.draw do
scope '/threads/:thread_id' do
resources :messages, :as => :thread_messages do
get :search, :on => :collection
match :preview, :on => :new
end
end
scope '/admin' do
resource :account, :as => :admin_account do
get :login, :on => :member
match :preview, :on => :new
end
end
end
action_separator = ActionController::Base.resource_action_separator
@ -733,9 +738,15 @@ def test_resource_action_separator
def test_new_style_named_routes_for_resource
with_routing do |set|
set.draw do |map|
map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
set.draw do
scope '/threads/:thread_id' do
resources :messages, :as => 'thread_messages' do
get :search, :on => :collection
match :preview, :on => :new
end
end
end
assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
assert_named_route "/threads/1/messages/search", "search_thread_messages_path", {}
assert_named_route "/threads/1/messages/new", "new_thread_message_path", {}
@ -745,8 +756,13 @@ def test_new_style_named_routes_for_resource
def test_new_style_named_routes_for_singleton_resource
with_routing do |set|
set.draw do |map|
map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
set.draw do
scope '/admin' do
resource :account, :as => :admin_account do
get :login, :on => :member
match :preview, :on => :new
end
end
end
assert_singleton_restful_for :account, :name_prefix => 'admin_', :path_prefix => 'admin/'
assert_named_route "/admin/account/login", "login_admin_account_path", {}
@ -757,9 +773,9 @@ def test_new_style_named_routes_for_singleton_resource
def test_resources_in_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products
set.draw do
namespace :backoffice do
resources :products
end
end
@ -767,38 +783,12 @@ def test_resources_in_namespace
end
end
def test_resource_has_many_in_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products, :has_many => :tags
end
end
assert_simply_restful_for :products, :controller => "backoffice/products", :name_prefix => 'backoffice_', :path_prefix => 'backoffice/'
assert_simply_restful_for :tags, :controller => "backoffice/tags", :name_prefix => "backoffice_product_", :path_prefix => 'backoffice/products/1/', :options => { :product_id => '1' }
end
end
def test_resource_has_one_in_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products, :has_one => :manufacturer
end
end
assert_simply_restful_for :products, :controller => "backoffice/products", :name_prefix => 'backoffice_', :path_prefix => 'backoffice/'
assert_singleton_restful_for :manufacturer, :controller => "backoffice/manufacturers", :name_prefix => 'backoffice_product_', :path_prefix => 'backoffice/products/1/', :options => { :product_id => '1' }
end
end
def test_resources_in_nested_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.namespace :admin do |admin|
admin.resources :products
set.draw do
namespace :backoffice do
namespace :admin do
resources :products
end
end
end
@ -809,8 +799,10 @@ def test_resources_in_nested_namespace
def test_resources_using_namespace
with_routing do |set|
set.draw do |map|
map.resources :products, :namespace => "backoffice/"
set.draw do
namespace :backoffice, :path => nil, :as => nil do
resources :products
end
end
assert_simply_restful_for :products, :controller => "backoffice/products"
@ -819,10 +811,10 @@ def test_resources_using_namespace
def test_nested_resources_using_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products do |products|
products.resources :images
set.draw do
namespace :backoffice do
resources :products do
resources :images
end
end
end
@ -833,11 +825,11 @@ def test_nested_resources_using_namespace
def test_nested_resources_in_nested_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.namespace :admin do |admin|
admin.resources :products do |products|
products.resources :images
set.draw do
namespace :backoffice do
namespace :admin do
resources :products do
resources :images
end
end
end
@ -854,21 +846,24 @@ def test_with_path_segment
assert_recognizes({:controller => "messages", :action => "index"}, "/messages/")
end
with_restful_routing :messages, :as => 'reviews' do
assert_simply_restful_for :messages, :as => 'reviews'
assert_recognizes({:controller => "messages", :action => "index"}, "/reviews")
assert_recognizes({:controller => "messages", :action => "index"}, "/reviews/")
with_routing do |set|
set.draw do
resources :messages, :path => 'reviews'
end
assert_simply_restful_for :messages, :as => 'reviews'
assert_recognizes({:controller => "messages", :action => "index"}, "/reviews")
assert_recognizes({:controller => "messages", :action => "index"}, "/reviews/")
end
end
def test_multiple_with_path_segment_and_controller
with_routing do |set|
set.draw do |map|
map.resources :products do |products|
products.resources :product_reviews, :as => 'reviews', :controller => 'messages'
set.draw do
resources :products do
resources :product_reviews, :path => 'reviews', :controller => 'messages'
end
map.resources :tutors do |tutors|
tutors.resources :tutor_reviews, :as => 'reviews', :controller => 'comments'
resources :tutors do
resources :tutor_reviews, :path => 'reviews', :controller => 'comments'
end
end
@ -877,17 +872,22 @@ def test_multiple_with_path_segment_and_controller
end
end
def test_with_path_segment_path_prefix_requirements
def test_with_path_segment_path_prefix_constraints
expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
with_restful_routing :messages, :as => 'comments',:path_prefix => '/thread/:thread_id', :requirements => { :thread_id => /[0-9]\.[0-9]\.[0-9]/ } do
with_routing do |set|
set.draw do
scope '/thread/:thread_id', :constraints => { :thread_id => /[0-9]\.[0-9]\.[0-9]/ } do
resources :messages, :path => 'comments'
end
end
assert_recognizes(expected_options, :path => 'thread/1.1.1/comments/1', :method => :get)
end
end
def test_resource_has_only_show_action
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :show
set.draw do
resources :products, :only => :show
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy])
@ -897,8 +897,8 @@ def test_resource_has_only_show_action
def test_singleton_resource_has_only_show_action
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :show
set.draw do
resource :account, :only => :show
end
assert_singleton_resource_allowed_routes('accounts', {}, :show, [:index, :new, :create, :edit, :update, :destroy])
@ -908,8 +908,8 @@ def test_singleton_resource_has_only_show_action
def test_resource_does_not_have_destroy_action
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :destroy
set.draw do
resources :products, :except => :destroy
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, [:index, :new, :create, :show, :edit, :update], :destroy)
@ -919,8 +919,8 @@ def test_resource_does_not_have_destroy_action
def test_singleton_resource_does_not_have_destroy_action
with_routing do |set|
set.draw do |map|
map.resource :account, :except => :destroy
set.draw do
resource :account, :except => :destroy
end
assert_singleton_resource_allowed_routes('accounts', {}, [:new, :create, :show, :edit, :update], :destroy)
@ -930,8 +930,8 @@ def test_singleton_resource_does_not_have_destroy_action
def test_resource_has_only_create_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :create
set.draw do
resources :products, :only => :create
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :create, [:index, :new, :show, :edit, :update, :destroy])
@ -943,8 +943,8 @@ def test_resource_has_only_create_action_and_named_route
def test_resource_has_only_update_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :update
set.draw do
resources :products, :only => :update
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :update, [:index, :new, :create, :show, :edit, :destroy])
@ -956,8 +956,8 @@ def test_resource_has_only_update_action_and_named_route
def test_resource_has_only_destroy_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :destroy
set.draw do
resources :products, :only => :destroy
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :destroy, [:index, :new, :create, :show, :edit, :update])
@ -969,8 +969,8 @@ def test_resource_has_only_destroy_action_and_named_route
def test_singleton_resource_has_only_create_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :create
set.draw do
resource :account, :only => :create
end
assert_singleton_resource_allowed_routes('accounts', {}, :create, [:new, :show, :edit, :update, :destroy])
@ -982,8 +982,8 @@ def test_singleton_resource_has_only_create_action_and_named_route
def test_singleton_resource_has_only_update_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :update
set.draw do
resource :account, :only => :update
end
assert_singleton_resource_allowed_routes('accounts', {}, :update, [:new, :create, :show, :edit, :destroy])
@ -995,8 +995,8 @@ def test_singleton_resource_has_only_update_action_and_named_route
def test_singleton_resource_has_only_destroy_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :destroy
set.draw do
resource :account, :only => :destroy
end
assert_singleton_resource_allowed_routes('accounts', {}, :destroy, [:new, :create, :show, :edit, :update])
@ -1008,8 +1008,10 @@ def test_singleton_resource_has_only_destroy_action_and_named_route
def test_resource_has_only_collection_action
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :all, :collection => { :sale => :get }
set.draw do
resources :products, :except => :all do
get :sale, :on => :collection
end
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
@ -1022,8 +1024,10 @@ def test_resource_has_only_collection_action
def test_resource_has_only_member_action
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :all, :member => { :preview => :get }
set.draw do
resources :products, :except => :all do
get :preview, :on => :member
end
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
@ -1036,8 +1040,12 @@ def test_resource_has_only_member_action
def test_singleton_resource_has_only_member_action
with_routing do |set|
set.draw do |map|
map.resource :account, :except => :all, :member => { :signup => :get }
set.draw do
resource :account, :except => :all do
member do
get :signup
end
end
end
assert_singleton_resource_allowed_routes('accounts', {}, [], [:new, :create, :show, :edit, :update, :destroy])
@ -1050,9 +1058,11 @@ def test_singleton_resource_has_only_member_action
def test_nested_resource_has_only_show_and_member_action
with_routing do |set|
set.draw do |map|
map.resources :products, :only => [:index, :show] do |product|
product.resources :images, :member => { :thumbnail => :get }, :only => :show
set.draw do
resources :products, :only => [:index, :show] do
resources :images, :only => :show do
get :thumbnail, :on => :member
end
end
end
@ -1066,9 +1076,9 @@ def test_nested_resource_has_only_show_and_member_action
def test_nested_resource_does_not_inherit_only_option
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :show do |product|
product.resources :images, :except => :destroy
set.draw do
resources :products, :only => :show do
resources :images, :except => :destroy
end
end
@ -1079,9 +1089,9 @@ def test_nested_resource_does_not_inherit_only_option
def test_nested_resource_does_not_inherit_only_option_by_default
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :show do |product|
product.resources :images
set.draw do
resources :products, :only => :show do
resources :images
end
end
@ -1092,9 +1102,9 @@ def test_nested_resource_does_not_inherit_only_option_by_default
def test_nested_resource_does_not_inherit_except_option
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :show do |product|
product.resources :images, :only => :destroy
set.draw do
resources :products, :except => :show do
resources :images, :only => :destroy
end
end
@ -1105,9 +1115,9 @@ def test_nested_resource_does_not_inherit_except_option
def test_nested_resource_does_not_inherit_except_option_by_default
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :show do |product|
product.resources :images
set.draw do
resources :products, :except => :show do
resources :images
end
end
@ -1118,8 +1128,8 @@ def test_nested_resource_does_not_inherit_except_option_by_default
def test_default_singleton_restful_route_uses_get
with_routing do |set|
set.draw do |map|
map.resource :product
set.draw do
resource :product
end
assert_routing '/product', :controller => 'products', :action => 'show'
@ -1135,15 +1145,41 @@ def test_singleton_resource_name_is_not_singularized
protected
def with_restful_routing(*args)
options = args.extract_options!
collection_methods = options.delete(:collection)
member_methods = options.delete(:member)
path_prefix = options.delete(:path_prefix)
args.push(options)
with_routing do |set|
set.draw { |map| map.resources(*args) }
set.draw do
scope(path_prefix || '') do
resources(*args) do
if collection_methods
collection do
collection_methods.each do |name, method|
send(method, name)
end
end
end
if member_methods
member do
member_methods.each do |name, method|
send(method, name)
end
end
end
end
end
end
yield
end
end
def with_singleton_resources(*args)
with_routing do |set|
set.draw { |map| map.resource(*args) }
set.draw {resource(*args) }
yield
end
end
@ -1385,7 +1421,7 @@ def assert_not_recognizes(expected_options, path)
end
def distinct_routes? (r1, r2)
if r1.conditions == r2.conditions and r1.requirements == r2.requirements then
if r1.conditions == r2.conditions and r1.constraints == r2.constraints then
if r1.segments.collect(&:to_s) == r2.segments.collect(&:to_s) then
return false
end

879
actionpack/test/controller/routing_test.rb
View File

File diff suppressed because it is too large Load Diff

23
actionpack/test/controller/test_test.rb
View File

@ -135,6 +135,11 @@ def setup
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
@request.env['PATH_INFO'] = nil
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
match ':controller(/:action(/:id))'
end
end
end
def test_raw_post_handling
@ -454,18 +459,26 @@ def test_assert_routing
def test_assert_routing_with_method
with_routing do |set|
set.draw { |map| map.resources(:content) }
set.draw { resources(:content) }
assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
end
end
def test_assert_routing_in_module
assert_routing 'admin/user', :controller => 'admin/user', :action => 'index'
with_routing do |set|
set.draw do
namespace :admin do
match 'user' => 'user#index'
end
end
assert_routing 'admin/user', :controller => 'admin/user', :action => 'index'
end
end
def test_assert_routing_with_glob
with_routing do |set|
set.draw { |map| match('*path' => "pages#show") }
set.draw { match('*path' => "pages#show") }
assert_routing('/company/about', { :controller => 'pages', :action => 'show', :path => 'company/about' })
end
end
@ -487,7 +500,7 @@ def test_id_converted_to_string
def test_array_path_parameter_handled_properly
with_routing do |set|
set.draw do |map|
set.draw do
match 'file/*path', :to => 'test_test/test#test_params'
match ':controller/:action'
end
@ -702,7 +715,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
def test_should_be_able_to_use_named_routes_before_a_request_is_done
with_routing do |set|
set.draw { |map| resources :contents }
set.draw { resources :contents }
assert_equal 'http://test.host/contents/new', new_content_url
assert_equal 'http://test.host/contents/1', content_url(:id => 1)
end

10
actionpack/test/controller/url_for_test.rb
View File

@ -5,7 +5,7 @@ module Testing
class UrlForTests < ActionController::TestCase
class W
include SharedTestRoutes.url_helpers
include ActionDispatch::Routing::RouteSet.new.tap { |r| r.draw { match ':controller(/:action(/:id(.:format)))' } }.url_helpers
end
def teardown
@ -130,7 +130,7 @@ def test_relative_url_root_is_respected
def test_named_routes
with_routing do |set|
set.draw do |map|
set.draw do
match 'this/is/verbose', :to => 'home#index', :as => :no_args
match 'home/sweet/home/:user', :to => 'home#index', :as => :home
end
@ -151,7 +151,7 @@ def test_named_routes
def test_relative_url_root_is_respected_for_named_routes
with_routing do |set|
set.draw do |map|
set.draw do
match '/home/sweet/home/:user', :to => 'home#index', :as => :home
end
@ -165,7 +165,7 @@ def test_relative_url_root_is_respected_for_named_routes
def test_only_path
with_routing do |set|
set.draw do |map|
set.draw do
match 'home/sweet/home/:user', :to => 'home#index', :as => :home
match ':controller/:action/:id'
end
@ -233,7 +233,7 @@ def test_path_generation_for_symbol_parameter_keys
def test_named_routes_with_nil_keys
with_routing do |set|
set.draw do |map|
set.draw do
match 'posts.:format', :to => 'posts#index', :as => :posts
match '/', :to => 'posts#index', :as => :main
end

5
actionpack/test/controller/url_rewriter_test.rb
View File

@ -19,6 +19,11 @@ def setup
@request = ActionController::TestRequest.new
@params = {}
@rewriter = Rewriter.new(@request) #.new(@request, @params)
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
match ':controller(/:action(/:id))'
end
end
end
def test_port

2
actionpack/test/controller/webservice_test.rb
View File

@ -254,7 +254,7 @@ def with_params_parsers(parsers = {})
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match '/', :to => 'web_service_test/test#assign_parameters'
end
yield

2
actionpack/test/dispatch/request/json_params_parsing_test.rb
View File

@ -56,7 +56,7 @@ def assert_parses(expected, actual, headers = {})
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::JsonParamsParsingTest::TestController
end
yield

2
actionpack/test/dispatch/request/multipart_params_parsing_test.rb
View File

@ -156,7 +156,7 @@ def parse_multipart(name)
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => 'multipart_params_parsing_test/test'
end
yield

2
actionpack/test/dispatch/request/query_string_parsing_test.rb
View File

@ -108,7 +108,7 @@ def teardown
private
def assert_parses(expected, actual)
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::QueryStringParsingTest::TestController
end

2
actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
View File

@ -129,7 +129,7 @@ def teardown
private
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::UrlEncodedParamsParsingTest::TestController
end
yield

2
actionpack/test/dispatch/request/xml_params_parsing_test.rb
View File

@ -96,7 +96,7 @@ def call(env)
private
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::XmlParamsParsingTest::TestController
end
yield

2
actionpack/test/dispatch/session/cookie_store_test.rb
View File

@ -298,7 +298,7 @@ def get(path, parameters = nil, env = {})
def with_test_route_set(options = {})
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::CookieStoreTest::TestController
end

2
actionpack/test/dispatch/session/mem_cache_store_test.rb
View File

@ -174,7 +174,7 @@ def test_prevents_session_fixation
private
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::MemCacheStoreTest::TestController
end

2
actionpack/test/template/atom_feed_helper_test.rb
View File

@ -314,7 +314,7 @@ def test_feed_xhtml
private
def with_restful_routing(resources)
with_routing do |set|
set.draw do |map|
set.draw do
resources(resources)
end
yield

4
actionpack/test/template/test_case_test.rb
View File

@ -172,7 +172,7 @@ class ATestHelperTest < ActionView::TestCase
test "is able to use named routes" do
with_routing do |set|
set.draw { |map| resources :contents }
set.draw { resources :contents }
assert_equal 'http://test.host/contents/new', new_content_url
assert_equal 'http://test.host/contents/1', content_url(:id => 1)
end
@ -180,7 +180,7 @@ class ATestHelperTest < ActionView::TestCase
test "named routes can be used from helper included in view" do
with_routing do |set|
set.draw { |map| resources :contents }
set.draw { resources :contents }
_helpers.module_eval do
def render_from_helper
new_content_url

2
actionpack/test/template/test_test.rb
View File

@ -47,7 +47,7 @@ def test_link_to_person
private
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match 'people', :to => 'people#index', :as => :people
end
yield

5
actionpack/test/template/url_helper_test.rb
View File

@ -394,7 +394,7 @@ def sort_query_string_params(uri)
class UrlHelperControllerTest < ActionController::TestCase
class UrlHelperController < ActionController::Base
test_routes do |map|
test_routes do
match 'url_helper_controller_test/url_helper/show/:id',
:to => 'url_helper_controller_test/url_helper#show',
:as => :show
@ -407,8 +407,7 @@ class UrlHelperController < ActionController::Base
:to => 'url_helper_controller_test/url_helper#show_named_route',
:as => :show_named_route
map.connect ":controller/:action/:id"
# match "/:controller(/:action(/:id))"
match "/:controller(/:action(/:id))"
match 'url_helper_controller_test/url_helper/normalize_recall_params',
:to => UrlHelperController.action(:normalize_recall),

11
railties/lib/rails/engine.rb
View File

@ -399,17 +399,6 @@ def config
end
end
# DEPRECATED: Remove in 3.1
initializer :add_routing_namespaces do |app|
paths.app.controllers.to_a.each do |load_path|
load_path = File.expand_path(load_path)
Dir["#{load_path}/*/**/*_controller.rb"].collect do |path|
namespace = File.dirname(path).sub(/#{Regexp.escape(load_path)}\/?/, '')
app.routes.controller_namespaces << namespace unless namespace.empty?
end
end
end
# I18n load paths are a special case since the ones added
# later have higher priority.
initializer :add_locales do

4
railties/test/application/initializers/i18n_test.rb
View File

@ -74,7 +74,7 @@ def assert_no_fallbacks
YAML
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match '/i18n', :to => lambda { |env| [200, {}, [I18n.t(:foo)]] }
end
RUBY
@ -147,4 +147,4 @@ def assert_no_fallbacks
assert_fallbacks :ca => [:ca, :"es-ES", :es, :'en-US', :en]
end
end
end
end

2
railties/test/application/loading_test.rb
View File

@ -70,7 +70,7 @@ class Post < ActiveRecord::Base
MODEL
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match '/load', :to => lambda { |env| [200, {}, Post.all] }
match '/unload', :to => lambda { |env| [200, {}, []] }
end

16
railties/test/application/routing_test.rb
View File

@ -33,7 +33,7 @@ def index
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match ':controller(/:action)'
end
RUBY
@ -91,7 +91,7 @@ def foo_or_bar?
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match ':controller(/:action)'
end
RUBY
@ -102,7 +102,7 @@ def foo_or_bar?
test "mount rack app" do
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
mount lambda { |env| [200, {}, [env["PATH_INFO"]]] }, :at => "/blog"
# The line below is required because mount sometimes
# fails when a resource route is added.
@ -132,7 +132,7 @@ def index
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match ':controller(/:action)'
end
RUBY
@ -164,7 +164,7 @@ def index
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match 'admin/foo', :to => 'admin/foo#index'
match 'foo', :to => 'foo#index'
end
@ -192,7 +192,7 @@ def baz
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match 'foo', :to => 'foo#bar'
end
RUBY
@ -223,7 +223,7 @@ def baz
end
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match 'foo', :to => ::InitializeRackApp
end
RUBY
@ -240,7 +240,7 @@ def baz
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
resources :yazilar
end
RUBY

2
railties/test/railties/mounted_engine_test.rb
View File

@ -14,7 +14,7 @@ def setup
@plugin = engine "blog"
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match "/engine_route" => "application_generating#engine_route"
match "/engine_route_in_view" => "application_generating#engine_route_in_view"
match "/url_for_engine_route" => "application_generating#url_for_engine_route"

4
railties/test/railties/shared_tests.rb
View File

@ -178,7 +178,7 @@ def index
RUBY
app_file "config/routes.rb", <<-RUBY
AppTemplate::Application.routes.draw do |map|
AppTemplate::Application.routes.draw do
match 'foo', :to => 'foo#index'
end
RUBY
@ -192,7 +192,7 @@ def index
RUBY
@plugin.write "config/routes.rb", <<-RUBY
Rails.application.routes.draw do |map|
Rails.application.routes.draw do
match 'foo', :to => 'bar#index'
match 'bar', :to => 'bar#index'
end