cfndsl 0.6.2 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJkNTA0ODkzM2Q1ZTA5ZjQxYzNiYWU5MmQwYTlhMmUyMDRkMjY2Nw==
+    NzBmYTE1Y2U0ZDJkZmY4OTg4MDI1NmIyMjQ0NTZiOGYxMzFmMjZhMg==
   data.tar.gz: !binary |-
-    OGU0MjRiODc0MzJiYjIxNTZkZjk5MGIxZWI2Y2U3Y2Y2YzFkMjQ5NA==
+    MDgxYTVlNGExMDY5NGEwNzU1MDYzODVkYWMyMjdjYmUyYWIwYzNhMQ==
 SHA512:
   metadata.gz: !binary |-
-    YjU0YTZlNjQ5YmJmNGE1YzRkNzEyMmFkMzVlMDcxZTUzMjQyMDRlZTM5ZTAz
-    MTA5OTZlNjQxODVlMjBkYTllY2FmNDlkY2VhOTU4OTdjZjE0NTNmYTU1YmMy
-    ZWU5MTIyZjdhY2VhMWVkYjhjOGRmZDAxNjJkYzI4NWY3NDI4YmY=
+    ZTE0ZTcwNDNmMjRiZWFhOTQ0NTZhY2VhNjU5ZmJhMTBlZDY1NDg2ZjhlOTI3
+    M2U3ODU2Njk2YzY1NWVjYWQwOWFhNDk5YzE0N2EzMjY2ZDQxOWRkM2Q1Mzdk
+    OTY0ZTY5YTBjMmY3NTc0Yzk0MDMwNmU2ODllNTJkMzMzZWMyMzA=
   data.tar.gz: !binary |-
-    ODJlMGFmYjEyNzcwMzIyNGVjMTNmNDA1ZGEwMWIyMzcxNGNiMWE2NjE5ZmUw
-    Zjk4NGFkYzlhZTk5MmRmODlmNGI4MjJiODY3ZGQxZjczN2QzZTg5NGMwZTk4
-    NzVhYzJjZGQwYzE2OGUwYTBiZTc0ZWFjMzA4MTFiYjcwNmZjMDI=
+    YjhlM2NiYThlMGZkMmI5YzY0ZDg2ZTIzNjFmNWMxMjA3NzFmY2ZhMjdjZDVl
+    ZWJlMDVhNzkwZjA4MjdmNWM1NzhmOTQxZDU3NTM1ZTdiNzBhMWE4NTQwZTAx
+    MGUyY2NmZDA5MWZhMTMxMmM5MDA2OGZmNzlmMjQxMGJkMjk1ZmM=

data/lib/cfndsl/orchestration_template.rb

@@ -118,8 +118,6 @@ module CfnDsl
             end
           else
             # Array version
-            sing_name = CfnDsl::Plurals.singularize(pname)
-            create_klass = type_module.const_get(ptype[0])
             klass.class_eval do
               CfnDsl.method_names(pname) do |method|
                 define_method(method) do |*values, &block|
@@ -130,15 +128,23 @@ module CfnDsl
                   @Properties[pname].value
                 end
               end
+            end
 
-              CfnDsl.method_names(sing_name) do |method|
-                define_method(method) do |value = nil, &block|
-                  @Properties ||= {}
-                  @Properties[pname] ||= PropertyDefinition.new([])
-                  value = create_klass.new unless value
-                  @Properties[pname].value.push value
-                  value.instance_eval(&block) if block
-                  value
+            sing_name = CfnDsl::Plurals.singularize(pname)
+            create_klass = type_module.const_get(ptype[0])
+            sing_names = sing_name == pname ? [ptype[0]] : [ptype[0], sing_name]
+
+            klass.class_eval do
+              sing_names.each do |sname|
+                CfnDsl.method_names(sname) do |method|
+                  define_method(method) do |value = nil, &block|
+                    @Properties ||= {}
+                    @Properties[pname] ||= PropertyDefinition.new([])
+                    value = create_klass.new unless value
+                    @Properties[pname].value.push value
+                    value.instance_eval(&block) if block
+                    value
+                  end
                 end
               end
             end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler