cfn-model 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203d06651118db7866fd78a6ca8fab93040ce9944193a491a0495513d283e9a8
-  data.tar.gz: 89ece250c90b5cfaacba9bc3304eb89b76cb1bc0bd12b1d4e09ee777cb2f1a49
+  metadata.gz: ddb403868e5c1cd8891f12598a4434986dc4d21a0073da942ac0b92f33599179
+  data.tar.gz: 535b2ceba004340b7aac1390dddc7664b732a247ee8eda3d66cfaabe17f84770
 SHA512:
-  metadata.gz: b573849cfa9518bd0e4d3e537312fc2b10dfbc867480b29dd4a75f421caedde8502e9a23493ddbc6580e90e20ae9457ab09fe24003f043df1394ca04996fe5e6
-  data.tar.gz: 6fa3f35aeeb5eb5ab7d4b1fa155769ea93a6295781a786286f3932c88b6f5e3aa3eb85df7d39d62e574726ada59c1f9f5316ff6c6cf32385e26c68d36cb2be96
+  metadata.gz: 9a4ec3560981190103c77af50128e9f54eee8360fb989203608028c9e5eb9ae56b192d3302f29466ac63884fa8a9b52802531b4310ca908eb0a4fa7a17eec02c
+  data.tar.gz: 16114fa99ff6491b7b247721e5119f5d997ea01b14f8951d074a95551a1999d70aa4941cbcd145be681847777251469a29aec39f46ec3dc697e72e4d0f900b0e

data/lib/cfn-model/parser/cfn_parser.rb

@@ -198,18 +198,32 @@ class CfnParser
     (str.slice(0).downcase + str[1..(str.length)]).gsub /-/, '_'
   end
 
+  ##
+  # strip any characters that are legal in a resource name that
+  # are going to make for a legal character in a ruby class name
+  def clean_module_name(module_name)
+    module_name.gsub /[\-@]/, ''
+  end
+
+  def map_non_aws_resource_name_to_class_name(module_names)
+    # this is a little hacky.  we've been ignoring Custom so more for
+    # backward compat.  for Alexa and other transformed resources just jam the whole
+    # thing together
+    if module_names.first == 'Custom'
+      first_module_index = 1
+    else
+      first_module_index = 0
+    end
+    module_names[first_module_index..-1].reduce('') do |class_name, module_name|
+      class_name + initial_upper(clean_module_name(module_name))
+    end
+  end
+
   def generate_resource_class_from_type(type_name)
     resource_class = Class.new(ModelElement)
 
     module_names = type_name.split('::')
-    if module_names.first == 'Custom'
-      custom_resource_class_name = initial_upper(module_names[1])
-      begin
-        resource_class = Object.const_get custom_resource_class_name
-      rescue NameError
-        Object.const_set(custom_resource_class_name, resource_class)
-      end
-    elsif module_names.first == 'AWS'
+    if module_names.first == 'AWS'
       begin
         module_constant = AWS.const_get(module_names[1])
       rescue NameError
@@ -218,7 +232,12 @@ class CfnParser
       end
       module_constant.const_set(module_names[2], resource_class)
     else
-      raise "Unknown namespace in resource type: #{module_names.first}"
+      custom_resource_class_name = map_non_aws_resource_name_to_class_name(module_names)
+      begin
+        resource_class = Object.const_get custom_resource_class_name
+      rescue NameError
+        Object.const_set(custom_resource_class_name, resource_class)
+      end
     end
     resource_class
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop