Browse files

pushing hash validation up

  • Loading branch information...
1 parent 494ab25 commit 7459ba4f6c7d7b98fc0985255ccfd93186b0950f @tenderlove tenderlove committed Oct 21, 2011
Showing with 14 additions and 13 deletions.
  1. +14 −13 actionpack/lib/action_dispatch/routing/mapper.rb
View
27 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1255,25 +1255,26 @@ def match(path, *rest)
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

0 comments on commit 7459ba4

Please sign in to comment.