Anshorei/squib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Warn on non-existing layout

Browse Source 
Fix #99 and refactor args_loader a bit
This commit is contained in:
Andy Meneely
2015-07-26 21:50:43 -04:00
parent 003a26ae68
commit 54185fe9eb
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/squib/args/arg_loader.rb
+9 -8
View File
@@ -52,16 +52,17 @@ module Squib
#
def defaultify(p, args, layout)
return args[p] if args.key? p # arg was specified, no defaults used
dsl_method_defaults = @dsl_method_defaults || {}
defaults = self.class.parameters.merge(@dsl_method_defaults || {})
args[:layout].map do |layout_arg|
if layout_arg.nil?
self.class.parameters.merge(dsl_method_defaults)[p] # no layout specified, use default
return defaults[p] if layout_arg.nil? # no layout specified, use default
unless layout.key? layout_arg.to_s # specified a layout, but it doesn't exist in layout. Oops!
Squib.logger.warn("Layout \"#{layout_arg.to_s}\" does not exist in layout file - using default instead")
return defaults[p]
end
if layout[layout_arg.to_s].key?(p.to_s)
layout[layout_arg.to_s][p.to_s] # param specified in layout
else
if layout[layout_arg.to_s].key? p.to_s
layout[layout_arg.to_s][p.to_s] # param specified in layout
else
self.class.parameters.merge(dsl_method_defaults)[p] # layout specified, but not this param
end
defaults[p] # layout specified, but not this param
end
end
end