提交 5029c371 编写于 作者: A Aaron Patterson

only do is_a checks on `formatted` once

上级 10c1787b
......@@ -110,7 +110,7 @@ def initialize(scope, path, options)
@conditions[:parsed_path_info] = ast
add_request_method(via, @conditions)
normalize_defaults!(options, formatted)
normalize_defaults!(options)
end
def to_route
......@@ -177,8 +177,10 @@ def normalize_format!(formatted)
@requirements[:format] ||= /.+/
elsif Regexp === formatted
@requirements[:format] = formatted
@defaults[:format] = nil
elsif String === formatted
@requirements[:format] = Regexp.compile(formatted)
@defaults[:format] = formatted
end
end
......@@ -192,18 +194,12 @@ def verify_regexp_requirement(requirement)
end
end
def normalize_defaults!(options, formatted)
options.each do |key, default|
def normalize_defaults!(options)
options.each_pair do |key, default|
unless Regexp === default
@defaults[key] = default
end
end
if Regexp === formatted
@defaults[:format] = nil
elsif String === formatted
@defaults[:format] = formatted
end
end
def verify_callable_constraint(callable_constraint)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册