config_layers 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7a432fca427d87b73206a452f4cad5e646de09
-  data.tar.gz: 86ec483949c57c2c33a5cd5f13c6ddf3904e7f91
+  metadata.gz: 09de39566647f0ec53aeb3241730de770fbe6991
+  data.tar.gz: b72fa67b9d02647fac54bd0cc21dafbc8161d511
 SHA512:
-  metadata.gz: 788f88c57145a06f88637d15bc71bb8f21a507921233c9ce52c2a1e6abf84956ed50c2e956311cba38a52a001301a609302df0c8c30cded68376d83547548f02
-  data.tar.gz: 196d113fb3f9b70e2a9023be54e1c6ecce4a7077fc5564a66b30dc87fe7cf98c172e3248c0fc3663e75bdd9122b71f3a6b4592bace9039377eeff5cc5b8dd50b
+  metadata.gz: a4e778e5a67f2674a065927caea04b9c48006168065da28bfc8d421a8d38c49c99f31d9337966a53ae9db3fa56458fca570f87267b5cd7547b3f2010172f9bf3
+  data.tar.gz: 8cdd444889903b37247d4d0127e56736846d10a6b78124637b14e0766b147d29ccc6879a0c3b01e66aa30f74f3dc836bc4e5e796b8e2259f5af52f684e03cc0a

data/config_layers.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "subhash", '~> 0.1.0'
+  spec.add_runtime_dependency "subhash", '~> 0.1.1'
   spec.add_runtime_dependency "pry"
 
   spec.add_development_dependency "bundler", "~> 1.9"

data/lib/config_layers/version.rb

@@ -1,5 +1,5 @@
 # Config Layers
 module ConfigLayers
-  VERSION = '0.1.1'
-  DATE = '2015-04-21'
+  VERSION = '0.1.2'
+  DATE = '2015-05-11'
 end

data/lib/prc_core_config.rb

@@ -211,7 +211,10 @@ module PRC
 
         result = result.rh_merge(layer[:config][keys[0..-2]])
       end
-      result[keys[-1]]
+
+      res = result[keys[-1]]
+      return res.merge_cleanup if [Array, Hash].include?(res.class)
+      res
     end
 
     # Return true if at least the first key value found is of type Hash/Array,
@@ -600,6 +603,72 @@ module PRC
 
       config_layers[0][:config].save
     end
+
+    # This function add a config layer at runtime.
+    # The new layer added at runtime, can be removed at runtime
+    # with layer_remove
+    # The name MUST be different than other existing config layer names
+    # This function is typically used by a Child Class or #layer_add.
+    #
+    # *Args*
+    #   - +options+ : Hash data
+    #     - :name     : Required. Name of the layer to add
+    #     - :index    : Config position to use. 0 is the default. 0 is the first
+    #       Config layer use by get.
+    #     - :config   : A Config instance of class type PRC::BaseConfig
+    #     - :set      : Boolean. True if is authorized to set a variable.
+    #     - :load     : Boolean. True if is authorized to load from a file.
+    #     - :save     : Boolean. True if is authorized to save to a file.
+    #     - :file_set : Boolean. True if is authorized to change the file name.
+    #
+    # *returns*
+    #   - true if layer is added.
+    #   OR
+    #   - nil : if layer name already exist
+    def p_layer_add(options)
+      layer = CoreConfig.define_layer(options)
+
+      layer[:init] = false # Runtime layer
+
+      index = 0
+      index = options[:index] if options[:index].is_a?(Fixnum)
+      names = []
+      @config_layers.each { |alayer| names << alayer[:name] }
+
+      return nil if names.include?(layer[:name])
+      @config_layers.insert(index, layer)
+      true
+    end
+
+    # Function to remove a runtime layer.
+    # You cannot remove a predefined layer, created during CoreConfig
+    # instanciation.
+    # This function is typically used by a Child Class or #layer_remove.
+    #
+    # *Args*
+    #   - +options+ : Hash data
+    #     - +:name+ : Name of the layer to remove.
+    #     - +:index+: Index of the layer to remove.
+    #
+    # At least, :name or :index is required.
+    # If both; :name and :index are set, :name is used.
+    # *return*
+    #   - true if layer name is removed.
+    #   OR
+    #   - nil : if not found or invalid.
+    def p_layer_remove(options)
+      index = layer_index(options[:name])
+      index = options[:index] if index.nil?
+
+      return nil if index.nil?
+
+      layer = @config_layers[index]
+
+      return nil if layer.nil? || layer[:init]
+
+      @config_layers.delete_at(index)
+      true
+    end
   end
 
   # private functions usable by child classes
@@ -662,66 +731,23 @@ module PRC
     end
 
     # This function add a config layer at runtime.
-    # The new layer added at runtime, can be removed at runtime
-    # with layer_remove
-    # The name MUST be different than other existing config layer names
     #
-    # *Args*
-    #   - +options+ : Hash data
-    #     - :name     : Required. Name of the layer to add
-    #     - :index    : Config position to use. 0 is the default. 0 is the first
-    #       Config layer use by get.
-    #     - :config   : A Config instance of class type PRC::BaseConfig
-    #     - :set      : Boolean. True if is authorized to set a variable.
-    #     - :load     : Boolean. True if is authorized to load from a file.
-    #     - :save     : Boolean. True if is authorized to save to a file.
-    #     - :file_set : Boolean. True if is authorized to change the file name.
+    # It call an internal private function #p_layer_add
+    # which can be used by redefined in Child class.
     #
-    # *returns*
-    #   - true if layer is added.
-    #   OR
-    #   - nil : if layer name already exist
+    # For options and details, see #p_layer_add
     def layer_add(options)
-      layer = CoreConfig.define_layer(options)
-
-      layer[:init] = false # Runtime layer
-
-      index = 0
-      index = options[:index] if options[:index].is_a?(Fixnum)
-      names = []
-      @config_layers.each { |alayer| names << alayer[:name] }
-
-      return nil if names.include?(layer[:name])
-      @config_layers.insert(index, layer)
-      true
+      p_layer_add(options)
     end
 
     # Function to remove a runtime layer.
-    # You cannot remove a predefined layer, created during CoreConfig
-    # instanciation.
-    # *Args*
-    #   - +options+ : Hash data
-    #     - +:name+ : Name of the layer to remove.
-    #     - +:index+: Index of the layer to remove.
     #
-    # At least, :name or :index is required.
-    # If both; :name and :index are set, :name is used.
-    # *return*
-    #   - true if layer name is removed.
-    #   OR
-    #   - nil : if not found or invalid.
+    # It call an internal private function #p_layer_remove
+    # which can be used by redefined in Child class.
+    #
+    # For options and details, see #p_layer_remove
     def layer_remove(options)
-      index = layer_index(options[:name])
-      index = options[:index] if index.nil?
-
-      return nil if index.nil?
-
-      layer = @config_layers[index]
-
-      return nil if layer.nil? || layer[:init]
-
-      @config_layers.delete_at(index)
-      true
+      p_layer_remove(options)
     end
 
     # Function to define layer options.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_layers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subhash
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement