snappconfig 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44533ca3098680534d2d4576f9806b7189330e7
-  data.tar.gz: a89a0cbbba9b0e6591603f1fca9dba1db694e954
+  metadata.gz: 625e64ac4dd886d0d6d599a022df0ad493ab15ea
+  data.tar.gz: fc9b9b96c0fe406a7eb6abf343cc86840a61e0f0
 SHA512:
-  metadata.gz: b2eb6b88eb7ef1a1a212d55314d775075f17d4dd9661c1d7097056765e22625ac9bc28ea8ca1bdce96d9d09dc2f905a565121a0a99fe5f8d1fdfe69fb46165a6
-  data.tar.gz: c8e77806e6c2b2caa621251e7c8500deed04447cfcd35e477810a5ca23f351a308339727ee9e7c252429db7962df0b3a4bb75d285184ca346f00cb7f73ffb96d
+  metadata.gz: 094c0c42ee8a95efe4f3946ae1bb4e851e458103078739085acfaa35ffb37b4674115f089abc72ad33a96681f8283c4fa33567686319eae07a2cd9a208f0006e
+  data.tar.gz: 92a2be72ad3bea65694c2656d20636f12b27a11a8a23f3fffb909fc4bb42fde9a73292b4247d5929ac54c432b6711b6963619f1bb8e52e8220ef51ecbcb01f90

data/lib/snappconfig/railtie.rb

@@ -13,10 +13,6 @@ module Snappconfig
       appconfig.deep_merge! appconfig.fetch('defaults', {})
       appconfig.deep_merge! appconfig.fetch(Rails.env, {})
 
-      Snappconfig.environments.each do |environment|
-        appconfig.delete(environment)
-      end
-
       check_required(appconfig)
 
       # Assign ENV values...
@@ -26,6 +22,9 @@ module Snappconfig
         end
         # ... and clear ENV values from CONFIG so we don't have duplicate data:
         appconfig.delete('ENV')
+        appconfig.each do |key,value|
+          value.delete('ENV') if value.is_a?(Hash) && value.has_key?('ENV')
+        end
       end
 
       appconfig = recursively_symbolize_keys(appconfig)
@@ -40,7 +39,13 @@ module Snappconfig
     private
     
     def check_required(hash)
-      hash.each_pair do |key,value|
+      
+      env_hash = hash.clone
+      Snappconfig.environments.each do |environment|
+        env_hash.delete(environment)
+      end
+      
+      env_hash.each_pair do |key,value|
         if value == '_REQUIRED'
           raise "The configuration value #{key} is required but was not supplied. Check your application.yml file(s)."
         elsif value.is_a?(Hash)

data/snappconfig.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "snappconfig"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Yarin Kessler"]
   spec.email         = "ykessler@appgrinders.com"
   spec.summary       = %q{Smarter Rails configuration with YAML}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snappconfig
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yarin Kessler