aws-cfn-dsl 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08ad7a94302cc092928716d3d4bedac7c16ea6b
-  data.tar.gz: d902908466c32063b8e0d455342797e5dc3a9385
+  metadata.gz: 8ec78e5e2b024d70a58ffcffe96f81b84cae003e
+  data.tar.gz: 24a6639f78ae814c9200ffbf3620fae5683f2750
 SHA512:
-  metadata.gz: 2a04a991358aea6328f0a84af52dbd29490c509067b2303da66086db93c553870e17c8623b38c11b05ad082f49f7c1e2e74d29015edea4d11d4e854725edb535
-  data.tar.gz: 5df589bb87eb5bbd2beb81061e89f29616b61ff7fd4c5ad48bb4cd85624152f24bd13b5c7e23c7f1a61749c15bc5f50d5d2b74a0b4b8c208345c6ce85ae8e3dc
+  metadata.gz: dc491c71f170cebbc14e2242c908c2c391594dcd1ccacb3b52fea8bdb61dd096d3a9897d143313ebc64f00b546214fe1dc1574cb720fbffb05c0e26ba638fb35
+  data.tar.gz: fb1f784f49f493d1be603b6727b893da8db63b8aa2a11030af570c476019cd449d87c7f81328cb7ba5439e97e461279ae92d7845b3e867aa2d0058848ad2da3d

data/lib/aws/cfn/dsl/template.rb

@@ -71,21 +71,35 @@ module Aws
         end
 
         def hash_refs(line,scope)
-          match = line.match %r/^(.*?)(\{\s*:\S+\s*=>.*?\}|\{\s*\S+:\s*.*?\})(.*)$/
+          block_regex = %r/\{\s*:\S+\s*=>.*?\}|\{\s*\S+:\s*.*?\}/
+          match = line.match %r/^(.*?)(#{block_regex})(.*)$/
           if match
+            left = match[1]
+            code = match[2]
+            tail = match[3]
+            while true
+              braces = code.gsub(%r/[^{}]+/, '')
+              len    = braces.size
+              if len % 2 != 0
+                nest = tail.match %r/^(.*\})(.*)$/
+                if nest
+                  code += nest[1]
+                  tail  = nest[2]
+                else
+                  abort! "Mismatched {}'s"
+                end
+              else
+                break
+              end
+            end
             h = nil
-            eval "h = #{match[2]}", binding
+            eval "h = #{code}", binding
             k = h.keys[0]
             v = h.delete(k)
-            v = if v.is_a?Array
-                  v.map{|e| e.to_s }
-                else
-                  v.to_s
-                end
-
+            v = scope[:compiler].sym_to_s(v)
             h[k.to_s] = v
             scope[:logger].debug h
-            [match[1], h, hash_refs(match[3],scope) ]
+            [left, h, tail.size > 0 ? hash_refs(tail,scope) : tail ]
           else
             "#{line}\n"
           end

data/lib/aws/cfn/dsl/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Dsl
-      VERSION = '0.8.3'
+      VERSION = '0.8.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-dsl
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Christo DeLange