app_config_loader 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a9784e8b7cbbb457d574c16c03a76a8c647de00
-  data.tar.gz: 8f96083cbcb8493b9fb250fafb763e67552d2400
+  metadata.gz: 1f6fcbc8cf8afaf0cf827cdfbd109435935adb52
+  data.tar.gz: 1cfe704eb579fb86e97e7c99ac44555a28ddf490
 SHA512:
-  metadata.gz: 7a79629f517c0e2b2a895780d2043f6cb90dd22babd6482f53f22bf0000ac1777de269e955b72381779bc5abdae41d7232afd5618a5a9e80839bc8189aa1dbdd
-  data.tar.gz: 04944fbfe2ecc152ebeaec0a15834df3a0dc8b4f675f470c7faed8eee5c4d19308c38efdeb4cd95592a6f01ff9d8b853c097ccfb84bfd9726f0b7946613cf526
+  metadata.gz: d840c314529c38da7df35390e6dcfd666b5c748ff9a390c289caf6702080bd8f147da30199071ff69fe621400f48a5cbbc2baa7d6d8474abaf22ae1b7a714c31
+  data.tar.gz: 1191bd4b2b0c7e4668349260c5d571090b2d8cacdac03d38ce2257f8ceba83f7370f7863d0477ad1245bb7400420da0aefeaa36cd056d206b8dd44d3a25ec8b2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## [v1.0.2](https://github.com/lscspirit/app_config_loader/tree/v1.0.2) (2017-04-23)
+[Full list of commits](https://github.com/lscspirit/app_config_loader/compare/v1.0.1...v1.0.2)
+
+- properly raise ConfigKeyConflict exception in ConfigMap#deep_add 
+
 ## [v1.0.1](https://github.com/lscspirit/app_config_loader/tree/v1.0.1) (2017-01-12)
 [Full list of commits](https://github.com/lscspirit/app_config_loader/compare/58ae3bea8d929ce97ac2985f4485d435bd6056c6...v1.0.1)
 

data/lib/app_config_loader/config_map.rb

@@ -5,18 +5,14 @@ module AppConfigLoader
     end
 
     def add(entry, overwrite = false)
-      begin
-        deep_add(@key_map, entry.key_components) do |existing|
-          if existing
-            # only override the existing entry if 'force' is true or
-            # the new entry has a higher specificity
-            overwrite || entry.specificity >= existing.specificity ? entry : existing
-          else
-            entry
-          end
+      deep_add(@key_map, entry.key_components) do |existing|
+        if existing
+          # only override the existing entry if 'force' is true or
+          # the new entry has a higher specificity
+          overwrite || entry.specificity >= existing.specificity ? entry : existing
+        else
+          entry
         end
-      rescue => ex
-        raise ConfigKeyConflict, "key conflict for '#{entry.key}': #{ex.message}"
       end
     end
 
@@ -47,15 +43,16 @@ module AppConfigLoader
     def deep_add(parent, keys, &block)
       current_key = keys[0].to_sym
 
+      val = parent[current_key]
+
       if keys.count == 1
-        val = parent[current_key]
 
         #
         # the last key
         #
 
         # check if the key has child configuration
-        raise "key '#{current_key}' has at least one child config" if val.is_a?(Hash)
+        raise ConfigKeyConflict, "key conflict: '#{current_key}' has at least one child config" if val.is_a?(Hash)
 
         # yield to the block to determine what value to assign to the key
         parent[current_key] = yield val
@@ -65,7 +62,7 @@ module AppConfigLoader
         #
 
         # check if the key already has a value assigned
-        raise "key '#{current_key}' already has a value assigned" unless val.nil? || val.is_a?(Hash)
+        raise ConfigKeyConflict, "key conflict: '#{current_key}' already has a value assigned" unless val.nil? || val.is_a?(Hash)
 
         # go to the next level
         val = (parent[current_key] ||= {})

data/lib/app_config_loader/version.rb

@@ -1,3 +1,3 @@
 module AppConfigLoader
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: app_config_loader
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Derrick Yeung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A easy way to define application configurations using YAML in your Rails
@@ -74,8 +74,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -101,17 +101,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Application configuration using YAML