提交 dbcd0850 编写于 作者: A Akshay Vishnoi

avoiding next statements

上级 fdf36d81
...@@ -147,14 +147,16 @@ def normalize_defaults! ...@@ -147,14 +147,16 @@ def normalize_defaults!
@defaults.merge!(options[:defaults]) if options[:defaults] @defaults.merge!(options[:defaults]) if options[:defaults]
options.each do |key, default| options.each do |key, default|
next if Regexp === default || IGNORE_OPTIONS.include?(key) unless Regexp === default || IGNORE_OPTIONS.include?(key)
@defaults[key] = default @defaults[key] = default
end
end end
if options[:constraints].is_a?(Hash) if options[:constraints].is_a?(Hash)
options[:constraints].each do |key, default| options[:constraints].each do |key, default|
next unless URL_OPTIONS.include?(key) && (String === default || Fixnum === default) if URL_OPTIONS.include?(key) && (String === default || Fixnum === default)
@defaults[key] ||= default @defaults[key] ||= default
end
end end
end end
...@@ -169,15 +171,16 @@ def normalize_conditions! ...@@ -169,15 +171,16 @@ def normalize_conditions!
@conditions.merge!(:path_info => path) @conditions.merge!(:path_info => path)
constraints.each do |key, condition| constraints.each do |key, condition|
next if segment_keys.include?(key) || key == :controller unless segment_keys.include?(key) || key == :controller
@conditions[key] = condition @conditions[key] = condition
end
end end
@conditions[:required_defaults] = [] @conditions[:required_defaults] = []
options.each do |key, required_default| options.each do |key, required_default|
next if segment_keys.include?(key) || IGNORE_OPTIONS.include?(key) unless segment_keys.include?(key) || IGNORE_OPTIONS.include?(key) || Regexp === required_default
next if Regexp === required_default @conditions[:required_defaults] << key
@conditions[:required_defaults] << key end
end end
via_all = options.delete(:via) if options[:via] == :all via_all = options.delete(:via) if options[:via] == :all
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册