lib/convection/model/template.rb in convection-1.0.0.pre.beta.7 vs lib/convection/model/template.rb in convection-1.0.0.pre.beta.8
- old
+ new
@@ -182,10 +182,13 @@
## Recursivly flatten a hash into 1st order key/value pairs
def properties(memo = {}, path = '')
keys.each do |key|
if self[key].is_a?(Hash) || self[key].is_a?(Array)
- self[key].properties(memo, "#{path}.#{key}")
+ new_path = "#{path}#{path.empty? ? '' : '.'}#{key}"
+ resource_type = self['Type']
+ new_path = "#{new_path}.#{resource_type}" if resource_type
+ self[key].properties(memo, new_path)
else
memo["#{path}.#{key}"] = self[key]
end
end