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

pushing hash validation up

Browse Source
This commit is contained in:
Aaron Patterson
2011-10-21 11:42:59 -07:00
parent 494ab25772
commit 7459ba4f6c
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1255,25 +1255,26 @@ module ActionDispatch
options[:anchor] = true unless options.key?(:anchor)
if options[:on] && !VALID_ON_OPTIONS.include?(options[:on])
raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
end
paths.each { |path| decomposed_match(path, options.dup) }
self
end
def decomposed_match(path, options) # :nodoc:
on = options.delete(:on)
if VALID_ON_OPTIONS.include?(on)
return send(on){ decomposed_match(path, options) }
elsif on
raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
end
case @scope[:scope_level]
when :resources
nested { decomposed_match(path, options) }
when :resource
member { decomposed_match(path, options) }
if on = options.delete(:on)
send(on) { decomposed_match(path, options) }
else
add_route(path, options)
case @scope[:scope_level]
when :resources
nested { decomposed_match(path, options) }
when :resource
member { decomposed_match(path, options) }
else
add_route(path, options)
end
end
end