sparkle_formation 3.0.14 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd73df7b8e755e8e36ddd934f51b311edb77ced
-  data.tar.gz: 3b6af23a25412aaf3bdfeb0a20554265f8f3dfdb
+  metadata.gz: 2ff339020395b4fde4837cc5e7deb4001b53ffae
+  data.tar.gz: 0dede473ebcec2f710162af551f0a88da821b8cf
 SHA512:
-  metadata.gz: 5c97625131264bdad150586a251920c4318c71f4e13b5bddadeff70d4c0e96ba08002c3ba437e71f7adfb83b699a6e031703878305ab751a7446c2372836d4a7
-  data.tar.gz: 6a2b667da4a2406fa10f33dad57d8e30a160ec87f5d2a024c6301340e23c620bc2d6083d15b6f37f0dbbbcf1d4a07cac3c88bacd061fdae6086607c82b1f9394
+  metadata.gz: a7dae3cb305e19d69618541583e6eba0bd472a69db5d0d4d0335cf8469378ac456df131d6c5be9b2b68f2ed01b2394c8aae2c4d8b9021f38cc2e323bb349463a
+  data.tar.gz: f6d7bea2bea0e9ae058e3d5a1769fbe286767f90627484d801111823df9d4ac2ad3b2d99d9298799e79d92693bb52ebf3280eb1dfb4c05601259071724da02f4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.0.16
+* Allow data structure arguments in AWS helpers
+* Add AWS sub intrinsic function helper
+
 # v3.0.14
 * Fix resource lookup helper when using full match
 

data/README.md

@@ -30,8 +30,9 @@ implementation:
 
 * [SparkleFormation Library Documentation](http://www.sparkleformation.io/docs/sparkle_formation/)
 
-# Infos
+# Info
 * Documentation: http://www.sparkleformation.io/docs/sparkle_formation
 * Repository: https://github.com/sparkleformation/sparkle_formation
 * Mailing List: https://groups.google.com/forum/#!forum/sparkleformation
 * IRC: [#sparkleformation @ Freenode](https://webchat.freenode.net/?channels=#sparkleformation)
+* Gitter: [![Join at https://gitter.im/SparkleFormation/sparkleformation](https://badges.gitter.im/SparkleFormation/sparkleformation.svg)](https://gitter.im/SparkleFormation/sparkleformation?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/lib/sparkle_formation/composition.rb

@@ -63,6 +63,9 @@ class SparkleFormation
     # @param location [Symbol] :prepend or :append (defaults to :append)
     # @return [self]
     def add_component(item, location=:append)
+      unless(item.is_a?(Component) || item.is_a?(Override))
+        raise TypeError.new("Expecting `Component` or `Override` but received `#{item.class}`")
+      end
       if(item.respond_to?(:key) && component_keys.include?(item.key))
         # do nothing
       else
@@ -85,6 +88,9 @@ class SparkleFormation
     # @param location [Symbol] :prepend or :append (defaults to :append)
     # @return [self]
     def add_override(item, location=:append)
+      unless(item.is_a?(Override))
+        raise TypeError.new("Expecting `Override` but received `#{item.class}`")
+      end
       case location
       when :append
         overrides_list.push(item)
@@ -173,7 +179,5 @@ class SparkleFormation
     end
 
     attr_reader :components_list, :overrides_list
-
   end
-
 end

data/lib/sparkle_formation/function_struct.rb

@@ -268,8 +268,6 @@ class SparkleFormation
   # FunctionStruct for customized terraform functions
   class TerraformStruct < FunctionStruct
 
-    SINGLE_ANCHOR = true
-
     # @return [String] start character(s) used to anchor function call
     def __anchor_start
       '${'

data/lib/sparkle_formation/resources/azure.rb

@@ -8,6 +8,8 @@ class SparkleFormation
     # Azure specific resources collection
     class Azure < Resources
 
+      # Characters to be removed from supplied key on matching
+      RESOURCE_TYPE_TR = '/._'
       # String to split for resource namespacing
       RESOURCE_TYPE_NAMESPACE_SPLITTER = ['.', '/']
 

data/lib/sparkle_formation/resources/google.rb

@@ -8,6 +8,8 @@ class SparkleFormation
     # Google specific resources collection
     class Google < Resources
 
+      # Characters to be removed from supplied key on matching
+      RESOURCE_TYPE_TR = '._'
       # String to split for resource namespacing
       RESOURCE_TYPE_NAMESPACE_SPLITTER = ['.']
 

data/lib/sparkle_formation/resources.rb

@@ -12,7 +12,7 @@ class SparkleFormation
     autoload :Terraform, 'sparkle_formation/resources/terraform'
 
     # Characters to be removed from supplied key on matching
-    RESOURCE_TYPE_TR = '_'
+    RESOURCE_TYPE_TR = '_:'
     # String to split for resource namespacing
     RESOURCE_TYPE_NAMESPACE_SPLITTER = '::'
     # Property update conditionals
@@ -90,11 +90,14 @@ class SparkleFormation
       # @param hash [Hash] metadata information
       # @return [TrueClass]
       def register(type, hash)
+        unless(hash.is_a?(Hash))
+          raise TypeError.new("Expecting `Hash` type but received `#{hash.class}`")
+        end
         unless(class_variable_defined?(:@@registry))
           @@registry = AttributeStruct.hashish.new
         end
         @@registry[base_key] ||= AttributeStruct.hashish.new
-        @@registry[base_key][type] = hash
+        @@registry[base_key][type.to_s] = hash
         true
       end
 
@@ -102,7 +105,7 @@ class SparkleFormation
       #
       # @param identifier [String, Symbol] resource identifier
       # @param key [String, Symbol] specific data
-      # @return [Hashish]
+      # @return [Hashish, NilClass]
       def resource(identifier, key=nil)
         res = lookup(identifier)
         if(key && res)
@@ -117,10 +120,13 @@ class SparkleFormation
       # @param json_path_or_hash [String, Hashish] path to files or hash
       # @return [TrueClass]
       def load(json_path_or_hash)
-        if(json_path_or_hash.is_a?(String))
+        case json_path_or_hash
+        when String
           content = AttributeStruct.hashish.new(MultiJson.load(File.read(json_path_or_hash)))
-        else
+        when Hash
           content = json_path_or_hash
+        else
+          raise TypeError.new("Expecting `String` or `Hash` type but received `#{json_path_or_hash.class}`")
         end
         content.each do |type, hash|
           register(type, hash)
@@ -144,7 +150,7 @@ class SparkleFormation
           result = key
         else
           o_key = key
-          key = key.to_s.tr(self.const_get(:RESOURCE_TYPE_TR), '') # rubocop:disable Style/RedundantSelf
+          key = key.to_s.downcase.tr(self.const_get(:RESOURCE_TYPE_TR), '') # rubocop:disable Style/RedundantSelf
           snake_parts = nil
           result = @@registry[base_key].keys.detect do |ref|
             ref = ref.downcase

data/lib/sparkle_formation/sparkle_attribute/aws.rb

@@ -27,16 +27,28 @@ class SparkleFormation
 
       # Split generator
       #
-      # @param string [String] string to split
+      # @param string [String, Hash] string to split
       # @param delimiter [String] delimiter to split string
       # @return [Hash]
       def _cf_split(string, delimiter)
-        __t_stringish(string)
-        __t_stringish(delimiter)
+        __t_stringish(string) unless string.is_a?(Hash)
+        __t_stringish(delimiter) unless delimiter.is_a?(Hash)
         {'Fn::Split' => [delimiter, string]}
       end
       alias_method :split!, :_cf_split
 
+      # Sub generator
+      #
+      # @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]}
+      end
+      alias_method :_sub, :_cf_sub
+      alias_method :sub!, :_cf_sub
+
       # Ref generator
       #
       # @param thing [String, Symbol] reference name
@@ -51,10 +63,10 @@ class SparkleFormation
 
       # ValueImport generator
       #
-      # @param thing [String, String] value import
+      # @param thing [String, Symbol, Hash] value import
       # @return [Hash]
       def _cf_value_import(thing)
-        __t_stringish(thing)
+        __t_stringish(thing) unless thing.is_a?(Hash)
         {'Fn::ImportValue' => __attribute_key(thing)}
       end
       alias_method :_import_value, :_cf_value_import

data/lib/sparkle_formation/sparkle_attribute/heat.rb

@@ -51,7 +51,7 @@ class SparkleFormation
       # @param loc [String]
       # @return [Hash]
       def _get_file(loc)
-        __t_string(loc)
+        __t_stringish(loc)
         {'get_file' => loc}
       end
       alias_method :_file, :_get_file
@@ -92,7 +92,7 @@ class SparkleFormation
       # @param value [String, Hash] thing to be hashed
       # @param algorithm [String] algorithm to use (defaults to 'sha512')
       def _digest(value, algorithm='sha512')
-        __t_string(algorithm)
+        __t_stringish(algorithm)
         {'digest' => [algorithm, value]}
       end
       alias_method :digest!, :_digest
@@ -129,7 +129,7 @@ class SparkleFormation
       # @param idx [Numeric]
       # @return [Hash]
       def _str_split(splitter, string, idx=nil)
-        __t_string(splitter)
+        __t_stringish(splitter) unless splitter.is_a?(Hash)
         {'str_split' => [splitter, string, idx].compact}
       end
       alias_method :_split, :_str_split

data/lib/sparkle_formation/sparkle_formation.rb

@@ -400,22 +400,29 @@ class SparkleFormation
     @component_paths = []
     if(options[:sparkle_collection])
       @sparkle = options[:sparkle_collection]
+      if(options[:sparkle])
+        @sparkle.add_sparkle(options[:sparkle])
+      end
     else
       @sparkle = SparkleCollection.new
-      @sparkle.set_root(
-        Sparkle.new(
-          Smash.new.tap{|h|
-            s_path = options.fetch(:sparkle_path,
-              self.class.custom_paths[:sparkle_path]
-            )
-            if(s_path)
-              h[:root] = s_path
-            else
-              h[:root] = :none
-            end
-          }
+      if(options[:sparkle])
+        @sparkle.set_root(options[:sparkle])
+      else
+        @sparkle.set_root(
+          Sparkle.new(
+            Smash.new.tap{|h|
+              s_path = options.fetch(:sparkle_path,
+                self.class.custom_paths[:sparkle_path]
+              )
+              if(s_path)
+                h[:root] = s_path
+              else
+                h[:root] = :none
+              end
+            }
+          )
         )
-      )
+      end
     end
     self.provider = options.fetch(:provider, @parent ? @parent.provider : :aws)
     if(provider == :aws || !options[:disable_aws_builtins])
@@ -687,10 +694,8 @@ class SparkleFormation
       seed_self
 
       set_compile_time_parameters!
-      if(provider && SparkleAttribute.const_defined?(camel(provider)))
-        const = SparkleAttribute.const_get(camel(provider))
-        struct_class = Class.new(SparkleStruct)
-        struct_class.include(const)
+      if(provider && SparkleStruct.const_defined?(camel(provider)))
+        struct_class = SparkleStruct.const_get(camel(provider))
         struct_name = [SparkleStruct.name, camel(provider)].join('::')
         struct_class.define_singleton_method(:name){ struct_name }
         struct_class.define_singleton_method(:to_s){ struct_name }

data/lib/sparkle_formation/sparkle_struct.rb

@@ -6,6 +6,37 @@ class SparkleFormation
   # SparkleFormation customized AttributeStruct
   class SparkleStruct < AttributeStruct
 
+    # AWS specific struct
+    class Aws < SparkleStruct
+      include SparkleAttribute
+      include SparkleAttribute::Aws
+    end
+    # Azure specific struct
+    class Azure < SparkleStruct
+      include SparkleAttribute
+      include SparkleAttribute::Azure
+    end
+    # Google specific struct
+    class Google < SparkleStruct
+      include SparkleAttribute
+      include SparkleAttribute::Google
+    end
+    # Heat specific struct
+    class Heat < SparkleStruct
+      include SparkleAttribute
+      include SparkleAttribute::Heat
+    end
+    # Rackspace specific struct
+    class Rackspace < SparkleStruct
+      include SparkleAttribute
+      include SparkleAttribute::Rackspace
+    end
+    # Terraform specific struct
+    class Terraform < SparkleStruct
+      include SparkleAttribute
+      include SparkleAttribute::Terraform
+    end
+
     include ::SparkleFormation::SparkleAttribute
     # @!parse include ::SparkleFormation::SparkleAttribute
     include ::SparkleFormation::Utils::TypeCheckers

data/lib/sparkle_formation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.16
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct