提交 e852daa6 编写于 作者: A Aaron Patterson

pull `defaults` extraction up the stack.

Now we can see where `defaults` options originate
上级 7c6c048f
......@@ -70,7 +70,7 @@ def self.build(scope, set, path, as, options)
options.delete :shallow_prefix
options.delete :shallow
defaults = (scope[:defaults] || {}).merge options.delete(:defaults) || {}
defaults = (scope[:defaults] || {}).dup
new scope, set, path, defaults, as, options
end
......@@ -684,7 +684,11 @@ def delete(*args, &block)
def map_method(method, args, &block)
options = args.extract_options!
options[:via] = method
match(*args, options, &block)
if options.key?(:defaults)
defaults(options.delete(:defaults)) { match(*args, options, &block) }
else
match(*args, options, &block)
end
self
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册