lib/lono/template/dsl/builder/parameter.rb in lono-5.2.8 vs lib/lono/template/dsl/builder/parameter.rb in lono-5.3.0
- old
+ new
@@ -14,14 +14,14 @@
if definition.size == 1 && first.is_a?(Hash) # long form
first # pass through
elsif definition.size == 2 && second.is_a?(Hash) # medium form
logical_id, properties = first, second
{ logical_id => properties }
- elsif (definition.size == 2 && num_or_str?(second)) || # short form
+ elsif (definition.size == 2 && valid_value?(second)) || # short form
definition.size == 1
logical_id = first
- properties = num_or_str?(second) ? { default: second } : {}
+ properties = valid_value?(second) ? { default: second } : {}
{ logical_id => properties }
else # I dont know what form
raise "Invalid form provided. definition #{definition.inspect}"
end
end
@@ -30,10 +30,10 @@
properties = attributes.values.first
properties[:type] ||= 'String'
attributes
end
- def num_or_str?(o)
- o.is_a?(Float) || o.is_a?(Integer) || o.is_a?(String)
+ def valid_value?(o)
+ o.is_a?(Float) || o.is_a?(Integer) || o.is_a?(String) || o.is_a?(TrueClass) || o.is_a?(FalseClass)
end
end
end