cfhighlander 0.8.1 → 0.8.2.alpha.1551064496

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2517ba474a565383bc6a0c921b2c2d2c8aa06b5e8735853d094526a3ef2edf
-  data.tar.gz: 38204d0c32c8523012edacfbc3f1a6fbb505372bc3499f8c44693d58e23ec66a
+  metadata.gz: cce94745ecdb8897540bd384b79990b1ababcdea8667a2ae3d58f62487ba4716
+  data.tar.gz: 74596ee2a94bcdb39bf42f2f38862cb3b7559a0d6c323c723e637bcbbac60f5a
 SHA512:
-  metadata.gz: 869a4178746a2a272bee3bbe051ba7379843d9fb566dbc468fbc04c2ffa0183fba8e5c486b4b15dffa05800631ebb559fa4e724182f7864e7b1596ce25fca40f
-  data.tar.gz: cb64b5d7d59f43241c53b669c3acbe484abf563dc5d03f5fd18777313b14f65e316f9b9db9733064ecb02e6913be66a5b82dd742bf670ebcaab9b0c7e38d7cd9
+  metadata.gz: eb58ace4d06a009ef0e12d6d2236d36870fecfedeef2afca72420be783d3d4fdd50feba6d3180ab182663122204c1f5afd59e623b3d5bea7e26504bdaa54d232
+  data.tar.gz: c79f3f89b9988b7f674d32c578d8173f551126724df2e3419e4176f58dc1a664a7cf49b7c5f46689d272ecb1675b07b47769221461fa7d33c6cd0a9d3f53227d

data/lib/cfhighlander.config.loader.rb

@@ -0,0 +1,34 @@
+require_relative '../hl_ext/common_helper'
+
+module Cfhighlander
+
+  module Config
+
+    class Loader
+      # creates top-level component configuration
+      # for component.subcomponent.subsubcomponent.....config.yaml
+      # configuration file
+      # method allows for N-level configuration (no limitation on level)
+      #  parameters
+      #     component_location: component in hierarchy e.g. app.db.rds
+      #     config: actual component configuration
+      def get_nested_config(component_location, config)
+        parts = component_location.split('.')
+        i = 0
+        current_config = Hash.new
+        rval = current_config
+        while i < parts.size
+          current_config['components'] = Hash.new
+          component_name = parts[i]
+          current_config['components'][component_name] = { 'config' => Hash.new }
+          current_config = current_config['components'][component_name]['config']
+          i = i+1
+        end
+        current_config.extend config
+        return rval
+      end
+
+    end
+
+  end
+end

data/lib/cfhighlander.dsl.template.rb

@@ -11,6 +11,7 @@ Dir["#{extensions_folder}/*.rb"].each {|f|
 require_relative './cfhighlander.dsl.base'
 require_relative './cfhighlander.dsl.params'
 require_relative './cfhighlander.dsl.subcomponent'
+require_relative './cfhighlander.config.loader'
 
 module Cfhighlander
 
@@ -486,10 +487,13 @@ def CfhighlanderTemplate(&block)
   end
 
   # process convention over configuration componentname.config.yaml files
+  config_loader = Cfhighlander::Config::Loader.new
+
   @potential_subcomponent_overrides.each do |name, config|
 
     # if there is component with given file name
-    if (not instance.subcomponents.find {|s| s.name == name}.nil?)
+    first_component = name.split('.').first
+    if (not instance.subcomponents.find { |s| s.name == first_component }.nil?)
       instance.config['components'] = {} unless instance.config.key? 'components'
       instance.config['components'][name] = {} unless instance.config['components'].key? name
       instance.config['components'][name]['config'] = {} unless instance.config['components'][name].key? 'config'
@@ -503,8 +507,7 @@ def CfhighlanderTemplate(&block)
           end
         end
       end
-
-      instance.config['components'][name]['config'].extend config
+      instance.config.extend(config_loader.get_nested_config(name, config))
     end
   end
 

data/lib/cfhighlander.version.rb

@@ -1,3 +1,3 @@
 module Cfhighlander
-  VERSION="0.8.1".freeze
+  VERSION="0.8.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2.alpha.1551064496
 platform: ruby
 authors:
 - Nikola Tosic
@@ -262,6 +262,7 @@ files:
 - hl_ext/mapping_helper.rb
 - hl_ext/vpc.rb
 - lib/cfhighlander.compiler.rb
+- lib/cfhighlander.config.loader.rb
 - lib/cfhighlander.dsl.base.rb
 - lib/cfhighlander.dsl.params.rb
 - lib/cfhighlander.dsl.subcomponent.rb
@@ -296,9 +297,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.2
 signing_key: