sparkle_formation 3.0.24 → 3.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f10d97f5400c05205b7164247b875d778ae0491
-  data.tar.gz: 6b3dd43d3cbd5a63117f03c7241bb47cc1fa3926
+  metadata.gz: 33f948df7a83782e8ab90fd9900cae9e88e5e4bb
+  data.tar.gz: 9329bf4f33788f8ad4589828f1a38ace0c3c0af7
 SHA512:
-  metadata.gz: d7aafb751e1c143ac1e19fbb2b18965f66a7d7b92d6d5254495dc05603462bec8359d0866f7be643bb5603106e9be2352fd627e6669f13873d27c0d0e27a2dc6
-  data.tar.gz: 12e0402332fd2b41605847be8c10243648203a3e8d63facfe230cd86a3660f8e9a4335c9e51f76c4466a93e322f18ebd2fc5c43afcc3e69d51cc077a1ceb0e58
+  metadata.gz: 63f3a963ac6233c943c897df5e9d462933384060e42e6beb00a6502186a3f35f6e97659a66b757e60d48a3b44322bc31f8bd2bb5a5dd5a37262db3fbcc2f55c8
+  data.tar.gz: 35ede30d5db9519d4d8c41db21119d4d9de5328ce525f41d086f583a6212b7a2a3a5102feb9579a537c1a1f56f5a4128f04dbbcf29f7808a1d172c559aa60ac6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v3.0.26
+* Allow Fn::Sub helper to accept no arguments
+* Fix Ruby 2.4 deprecation warnings
+* Only store compile state when value is set
+* Fix FunctionStruct clone behavior for Azure
+* Lookup resources for taggable? helper through loaded provider
+
 # v3.0.24
 * Update value storage to handle FunctionStruct usage
 * Add Complex data type to allowed compile time parameter types

data/lib/sparkle_formation/function_struct.rb

@@ -29,9 +29,25 @@ class SparkleFormation
       end
     end
 
-    # # Create a clone of this instance
+    # Create a clone of this instance
     def _clone(*_)
-      _klass.new(_fn_name, *_fn_args)
+      new_inst = _klass_new(_fn_name, *_fn_args)
+      new_inst._data.replace(__hashish[
+        @table.map{ |_key, _value|
+          if(_key.is_a?(::AttributeStruct))
+            _key = _key._clone
+          else
+            _key = _do_dup(_key)
+          end
+          if(_value.is_a?(::AttributeStruct))
+            _value = _value._clone
+          else
+            _value = _do_dup(_value)
+          end
+          [_key, _value]
+        }
+      ])
+      new_inst
     end
 
     # @return [Numeric] hash value for instance
@@ -138,6 +154,7 @@ class SparkleFormation
         suffix
       end
     end
+    alias_method :_sparkle_dump, :_dump
 
     # Join arguments into a string for remote evaluation
     #

data/lib/sparkle_formation/sparkle.rb

@@ -108,9 +108,18 @@ class SparkleFormation
 
       # NOTE: Enable access to top level constants but do not
       # include deprecated constants to prevent warning outputs
+      deprecated_constants = [
+        :Config,
+        :TimeoutError,
+        :Fixnum,
+        :Bignum,
+        :NIL,
+        :TRUE,
+        :FALSE
+      ]
       ::Object.constants.each do |const|
         unless(self.const_defined?(const)) # rubocop:disable Style/RedundantSelf
-          next if const == :Config || const == :TimeoutError
+          next if deprecated_constants.include?(const)
           self.const_set(const, ::Object.const_get(const)) # rubocop:disable Style/RedundantSelf
         end
       end

data/lib/sparkle_formation/sparkle_attribute/aws.rb

@@ -42,9 +42,9 @@ class SparkleFormation
       # @param string [String, Hash] string to apply substitution
       # @param variables [Hash] key value mappings for substitution
       # @return [Hash]
-      def _cf_sub(string, variables)
-        __t_hashish(variables)
-        {'Fn::Sub' => [string, variables]}
+      def _cf_sub(string, variables = nil)
+        __t_hashish(variables) if variables
+        {'Fn::Sub' => [string, variables].compact}
       end
       alias_method :_sub, :_cf_sub
       alias_method :sub!, :_cf_sub
@@ -329,7 +329,7 @@ class SparkleFormation
       # @return [TrueClass, FalseClass] resource can be tagged
       def taggable?
         if(self[:type])
-          resource = _self.lookup(self[:type].gsub('::', '_').downcase)
+          resource = _self._provider._resources.lookup(self[:type].gsub('::', '_').downcase)
           resource && resource[:properties].include?('Tags')
         else
           if(_parent)

data/lib/sparkle_formation/sparkle_formation.rb

@@ -689,8 +689,8 @@ class SparkleFormation
   # @option args [Hash] :state local state parameters
   # @return [SparkleStruct]
   def compile(args={})
-    if(args.key?(:state))
-      @compile_state = args[:state]
+    if(args.key?(:state) && args.is_a?(Hash))
+      @compile_state = args[:state].to_smash
       unmemoize(:compile)
     end
     memoize(:compile) do
@@ -758,7 +758,9 @@ class SparkleFormation
         storage_compile_state[param_key] = compile_state[param_key]
       end
     end
-    compiled.outputs.compile_state.value MultiJson.dump(storage_compile_state)
+    unless(storage_compile_state.empty?)
+      compiled.outputs.compile_state.value MultiJson.dump(storage_compile_state)
+    end
     compiled
   end
 

data/lib/sparkle_formation/sparkle_struct.rb

@@ -123,11 +123,15 @@ class SparkleFormation
       else
         sym = function_bubbler(sym)
       end
-      # Always reset parent in case this is a clone
+      # When setting an AttributeStruct type instance check parent or context if
+      # available and reset if it has been moved.
       if(@table[sym].is_a?(::AttributeStruct))
-        if(@table[sym]._parent.nil?)
-          @table[sym] = @table[sym]._clone
-        else
+        if(@table[sym].is_a?(::SparkleFormation::FunctionStruct))
+          if(@table[sym].respond_to?(:_fn_context) && @table[sym]._fn_context != self)
+            @table[sym] = @table[sym]._clone
+            @table[sym]._fn_context = self
+          end
+        elsif(@table[sym]._parent != self)
           @table[sym]._parent(self)
         end
       end

data/lib/sparkle_formation/version.rb

@@ -1,5 +1,5 @@
 # Unicorns and rainbows
 class SparkleFormation
   # Current library version
-  VERSION = Gem::Version.new('3.0.24')
+  VERSION = Gem::Version.new('3.0.26')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.26
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Orchestration Template Generator