cfhighlander 0.3.0.alpha.1531270316 → 0.3.0.alpha.1531277099

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e24583ffb52dd7b67178ec79684808d14fd0219a9ca6a03aa3a42fc249971fe7
-  data.tar.gz: 7f42b19cb4f05b087bdcf31593a53c04db7008d5c2670273d4b00134aa2007ce
+  metadata.gz: ee93dab3e190066e620443ca9283b26a72ebbd43ea25867eb6e5383195a58e83
+  data.tar.gz: ada2b580e00179870e19f2454b56cba23609901150841fd74cba8b5df6785b48
 SHA512:
-  metadata.gz: b237aebd3bbd2084945f494d41ef9599f73e5d91f18263fc8434fb061ebc65c61ebde430c9de0fa76833fa7324fcbc12efa308ebcbc8ae8c9427a4a4480b356b
-  data.tar.gz: 64712d1386bf517399b47aadb51f53fc11177737386201e7c2e25ed26888039ab59dc056c2c48fe2e41b94d9d5aff72a19c11cbc104e7632dc62ceefa07049f8
+  metadata.gz: facbcc57178f8c1f30383acc6b31ced2c26a6f1fd171d204509e158983f2374a792e5d3cba8241f669c4c449816ae6db2827c93d4c989ff4c1cd7b77b5c14dfa
+  data.tar.gz: 062d0cd9f4f62331ae4161812bb7637aa8ad36645efda66d9a636f21b38de85ae69135d910394a06af8fed4999630dcb7e7438f78b77e8eae5b137d30e16ec3b

data/hl_ext/common_helper.rb

@@ -1,12 +1,12 @@
 class ::Hash
   def deep_merge(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+    merger = proc {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2}
     self.merge(second.to_h, &merger)
   end
 
 
   def extend(second)
-    second.each { |k, v|
+    second.each {|k, v|
 
       if ((self.key? k) and (v.is_a? Hash and self[k].is_a? Hash))
         self[k].extend(v)

data/lib/cfhighlander.dsl.template.rb

@@ -475,10 +475,22 @@ def CfhighlanderTemplate(&block)
 
   # process convention over configuration componentname.config.yaml files
   @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?)
       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'
+
+      # prevention of infinite recursion when applied to legacy configurations
+      if config.key? 'components'
+        if config['components'].key? name
+          if config['components'][name].key? 'config'
+           config = config['components'][name]['config']
+          end
+        end
+      end
+
       instance.config['components'][name]['config'].extend config
     end
   end

data/lib/cfhighlander.model.component.rb

@@ -72,6 +72,10 @@ module Cfhighlander
         Dir["#{@component_dir}/*.config.yaml"].each do |config_file|
           puts "INFO Loading config for #{@name}: read file:#{config_file} "
           partial_config = YAML.load(File.read(config_file))
+          if (not partial_config)
+            STDERR.puts "WARNING: Configuration file #{config_file} could not be loaded"
+            next
+          end
           unless (partial_config.nil? or partial_config.key? 'subcomponent_config_file')
             @config.extend(partial_config)
             @component_files << config_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.1531270316
+  version: 0.3.0.alpha.1531277099
 platform: ruby
 authors:
 - Nikola Tosic