lono 6.1.9 → 6.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98eb8c664ca1835e37b72418cff2c983ea5863902b5866597b42deeaef912977
-  data.tar.gz: c2f21dfe5e45dcfb28cea9d9a09702cb79f022dc3747a52dad0c8ceeb4077f26
+  metadata.gz: a497745aa03146372828bb2974c071d971391cfb683a779cf8b6dcb61888b0d5
+  data.tar.gz: 8b6f6c39b7c74e7ec3583e85434039ac124e2538d3af059fa0119174ae37b407
 SHA512:
-  metadata.gz: aa93526540aea34e7166ccfd0d64109333019ebd21b43d58705cc10239ed72a2951de01ec696253e60d8066723187d9288ee5ea10ff2226a44301698c11ded74
-  data.tar.gz: 5c148cb13bf315292b1173f1acea6f4c89d5825e2432a101f5cecec910045c75d3462bce3d7c9f509c98bd2cfa2f9b150302bf7706adf356a2a42d1badcb2c61
+  metadata.gz: 8b561e711d24e6e6750ed37305c330448916f46cb2da5d628fcf9618ac6d4fe6ecb1eae23c3c51b33168aaf61e928a1ef96333614045c5ae2afb316e041d93b9
+  data.tar.gz: 52fa0b0add58c86db1c643025a8e71eca87d31ba47a3e953fa7ee5da519a16798e523dd22baa4ee45185f81ef2ac14c53e7a1dc0d9d26a612b8fd7d74afee445

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.10]
+- #32 use lono dsl scope for the app files erb processing
+- #33 fix squeezer for Array. squeeze hashes nested in arrays too
+- #34 fix squeeze for false values
+
 ## [6.1.9]
 - #30 fix md5 sum calcuation for single file
 - #31 Add app files ERB support docs

data/lib/lono/app_file/build.rb

@@ -29,9 +29,14 @@ module Lono::AppFile
     def copy_to_output
       override_source_paths("#{Lono.blueprint_root}/app/files")
       self.destination_root = @output_files_path
-      directory(".", verbose: false)
+      directory(".", verbose: false, context: context.get_binding) # Thor::Action
     end
 
+    def context
+      Lono::Template::Context.new(@blueprint, @options)
+    end
+    memoize :context
+
     def zip_file(item)
       path = item.path
       zip_file = item.zip_file_name

data/lib/lono/template/context.rb

@@ -20,5 +20,11 @@ class Lono::Template
         instance_variable_set('@' + key.to_s, value)
       end
     end
+
+    # For Lono::AppFile::Build usage of Thor::Action directory
+    # For some reason a send(:binding) doesnt work but get_binding like this works.
+    def get_binding
+      binding
+    end
   end
 end

data/lib/lono/template/context/loader.rb

@@ -8,7 +8,7 @@ class Lono::Template::Context
     #   config/variables/development.rb - will override any variables in base.rb
     #
     def load_variables
-      options = @options.clone
+      options = ActiveSupport::HashWithIndifferentAccess.new(@options.dup)
       options[:blueprint] = @blueprint
       options[:stack] ||= @blueprint
       location = Lono::ConfigLocation.new("variables", options, Lono.env)

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

@@ -35,7 +35,7 @@ class Lono::Template::Dsl::Builder
 
     # Remove items with nil value automatically
     def clean(data)
-      HashSqueezer.new(data).squeeze
+      Squeezer.new(data).squeeze
     end
   end
 end

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

@@ -0,0 +1,23 @@
+class Lono::Template::Dsl::Builder
+  class Squeezer
+    def initialize(data)
+      @data = data
+    end
+
+    def squeeze(new_data=nil)
+      data = new_data.nil? ? @data : new_data
+
+      case data
+      when Array
+        data.map! { |v| squeeze(v) }
+      when Hash
+        data.each_with_object({}) do |(k,v), squeezed|
+          squeezed[k] = squeeze(v) unless v.nil? # only remove nil values within Hash structures
+          squeezed
+        end
+      else
+        data # do not transform
+      end
+    end
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "6.1.9"
+  VERSION = "6.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 6.1.9
+  version: 6.1.10
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -555,7 +555,6 @@ 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
@@ -566,6 +565,7 @@ files:
 - lib/lono/template/dsl/builder/resource/property_mover.rb
 - lib/lono/template/dsl/builder/section.rb
 - lib/lono/template/dsl/builder/section_methods.rb
+- lib/lono/template/dsl/builder/squeezer.rb
 - lib/lono/template/dsl/builder/syntax.rb
 - lib/lono/template/erb.rb
 - lib/lono/template/evaluate.rb

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

@@ -1,20 +0,0 @@
-# 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