lono 6.1.7 → 6.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f4d3a51484e76af1308434e1d244f95aa327d12db1211243e20064e2e9fa09
-  data.tar.gz: 7f90e0346d71229a09de3af0283d1bfa14799bf1946a6d6bc5f0a3bbe8661438
+  metadata.gz: b44dae2e1a33765ce3e3d969e0f2ca6ad0230f027b1ff94863b27bb3077b4e26
+  data.tar.gz: 280c9073d25b90b02afe7e44aa22514fb21ad8affd3ed3272c4315edd6f2acd6
 SHA512:
-  metadata.gz: aa404e26de9101dba2de7e8412a3865624d64ffd479d9ba9d6c48826e6c0afdbc7e77f5f4dcca1c2c1f129814f5570ad80dac3fb9c43eca704d0ff9d563bd666
-  data.tar.gz: a062d07213d4eb375ed9f0501e7db3ffbd93e386a03582b1ab3f75132e0bf7703046e609545831155aa495f3a387b1c4e099af8162cdc75bcf72f37a011ba311
+  metadata.gz: 7ed15e4146cfb29b71e6399f1f7424ec6533bbe0def6886b931e2bf506a1913bdb8bf518a599e100679638de1a603942a814aa1e3b7268b29d49fb1664a1b614
+  data.tar.gz: 45dfae54e67bdd6b51ac6ad2943b86126c4e1f4d8ac6fe6c1f24d923e9e67d12e514bbcf6f3cc636e08ca0f0a7a352df84dc0c981345bb551dd6e145c70d838f

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [6.1.8]
+- #28 add user_data_script helper
+- #29 remove items in Hash structure with nil value at any level
+
 ## [6.1.7]
 - #25 add stack_name helper
 - #26 ref Split: true option

data/lib/lono/template/dsl/builder/base.rb

@@ -13,11 +13,12 @@ class Lono::Template::Dsl::Builder
       blueprint_meta = Lono::Blueprint::Meta.new(@blueprint)
       target_section = self.class.to_s.split('::').last.underscore
       # target_section: Lono::Template::Dsl::Builder::Parameter => parameter
-      if blueprint_meta.auto_camelize?(target_section)
-        CfnCamelizer.transform(attributes)
-      else
-        stringify_keys!(attributes)
-      end
+      data = if blueprint_meta.auto_camelize?(target_section)
+               CfnCamelizer.transform(attributes)
+             else
+               stringify_keys!(attributes)
+             end
+      clean(data)
     end
 
     # Accounts for Arrays also. ActiveSupport only works for Hashes.
@@ -31,5 +32,10 @@ class Lono::Template::Dsl::Builder
         data # do not transform
       end
     end
+
+    # Remove items with nil value automatically
+    def clean(data)
+      HashSqueezer.new(data).squeeze
+    end
   end
 end

data/lib/lono/template/dsl/builder/hash_squeezer.rb

@@ -0,0 +1,20 @@
+# Based on https://stackoverflow.com/questions/32174183/remove-nil-values-from-hash
+class Lono::Template::Dsl::Builder
+  class HashSqueezer
+    def initialize(data)
+      @data = data
+    end
+
+    def squeeze(new_data=nil)
+      data = new_data || @data
+      data.each_with_object({}) do |(k, v), squeezed|
+        if v.is_a?(Hash)
+          squeezed[k] = squeeze(v)
+        else
+          squeezed[k] = v unless v.nil?
+        end
+        squeezed
+      end
+    end
+  end
+end

data/lib/lono/template/dsl/builder/helpers/core_helper.rb

@@ -59,6 +59,18 @@ module Lono::Template::Dsl::Builder::Helpers
       render_file(Lono.config.user_data_path, path)
     end
 
+    def user_data_script
+      return "# @user_data variable not set" unless @user_data
+
+      if File.exist?(@user_data)
+        IO.read(@user_data)
+      else
+        message = "WARN: #{@user_data} not found"
+        puts message.color(:yellow)
+        "# #{message}"
+      end
+    end
+
     def render_file(folder, path)
       path = "#{folder}/#{path}"
       if File.exist?(path)

data/lib/lono/template/dsl/builder/resource.rb

@@ -5,7 +5,7 @@
 class Lono::Template::Dsl::Builder
   class Resource < Base
     def template
-      camelize(clean(standarize(@definition)))
+      camelize(standarize(@definition))
     end
 
     # Type is the only required property: https://amzn.to/2x8W5aD
@@ -40,19 +40,5 @@ class Lono::Template::Dsl::Builder
         raise "Invalid form provided. definition #{definition.inspect}"
       end
     end
-
-    # Remove properties with nil value automatically
-    def clean(resource)
-      logical_id = resource.keys.first
-      attributes = resource[logical_id]
-      properties = attributes["Properties"]
-
-      if properties
-        properties.delete_if { |k,v| v.nil? }
-        resource[logical_id]["Properties"] = properties
-      end
-
-      resource
-    end
   end
 end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "6.1.7"
+  VERSION = "6.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 6.1.7
+  version: 6.1.8
 platform: ruby
 authors:
 - Tung Nguyen
@@ -555,6 +555,7 @@ files:
 - lib/lono/template/dsl/builder/base.rb
 - lib/lono/template/dsl/builder/condition.rb
 - lib/lono/template/dsl/builder/fn.rb
+- lib/lono/template/dsl/builder/hash_squeezer.rb
 - lib/lono/template/dsl/builder/helpers.rb
 - lib/lono/template/dsl/builder/helpers/core_helper.rb
 - lib/lono/template/dsl/builder/helpers/param_helper.rb