Permalink
Browse files

remove IGNORE_OPTIONS

  • Loading branch information...
1 parent 5b71006 commit 43d2105a1ee13a3e50066552f8c24704ea284669 @tenderlove tenderlove committed May 30, 2014
Showing with 8 additions and 4 deletions.
  1. +8 −4 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -60,7 +60,6 @@ def constraint_args(constraint, request)
end
class Mapping #:nodoc:
- IGNORE_OPTIONS = [:except, :shallow, :shallow_path, :shallow_prefix]
ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
attr_reader :scope, :options, :requirements, :conditions, :defaults
@@ -174,7 +173,7 @@ def verify_regexp_requirement(requirement)
def normalize_defaults!(formatted, options_constraints)
options.each do |key, default|
- unless Regexp === default || IGNORE_OPTIONS.include?(key)
+ unless Regexp === default
@defaults[key] = default
end
end
@@ -214,7 +213,7 @@ def normalize_conditions!(path_params, path, ast, via, constraints)
required_defaults = []
options.each do |key, required_default|
- unless path_params.include?(key) || IGNORE_OPTIONS.include?(key) || Regexp === required_default
+ unless path_params.include?(key) || Regexp === required_default
required_defaults << key
end
end
@@ -317,7 +316,7 @@ def constraints(option_constraints, scope_constraints)
constraints = {}
constraints.merge!(scope_constraints) if scope_constraints
- options.except(*IGNORE_OPTIONS).each do |key, option|
+ options.each do |key, option|
constraints[key] = option if Regexp === option
end
@@ -1525,6 +1524,11 @@ def add_route(action, options) # :nodoc:
end
options.delete :only
+ options.delete :except
+ options.delete :shallow_path
+ options.delete :shallow_prefix
+ options.delete :shallow
+
mapping = Mapping.new(@scope, URI.parser.escape(path), options)
app, conditions, requirements, defaults, as, anchor = mapping.to_route
@set.add_route(app, conditions, requirements, defaults, as, anchor)

0 comments on commit 43d2105

Please sign in to comment.