snappconfig 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 625e64ac4dd886d0d6d599a022df0ad493ab15ea
-  data.tar.gz: fc9b9b96c0fe406a7eb6abf343cc86840a61e0f0
+  metadata.gz: 4fdb18518b031de8fc2fa843b78f05db17f31098
+  data.tar.gz: 9b859473c81ad042143f05f3ae2b65033e270d5d
 SHA512:
-  metadata.gz: 094c0c42ee8a95efe4f3946ae1bb4e851e458103078739085acfaa35ffb37b4674115f089abc72ad33a96681f8283c4fa33567686319eae07a2cd9a208f0006e
-  data.tar.gz: 92a2be72ad3bea65694c2656d20636f12b27a11a8a23f3fffb909fc4bb42fde9a73292b4247d5929ac54c432b6711b6963619f1bb8e52e8220ef51ecbcb01f90
+  metadata.gz: 01a6858ea79834175afc7b4bf2944404c6244d024671c4494a17523a7cc448eadd48fc1e7478368bc06885a552ca4a3537d2843144a7c35796e2ce4138dd99e3
+  data.tar.gz: 5cfe591a7709e900c1d1141ed4bc055ed7f92d03782403ecc9ff97c846ab54a018b799abae84bec70b9dedffb1fb1dcc61887989c4364ea1b2546e10f12fe3ef

data/lib/snappconfig/railtie.rb

@@ -8,11 +8,15 @@ module Snappconfig
     config.before_configuration do
 
       # Look for CONFIG file in ENV (For Heroku) or else load from file system:
-      appconfig = ENV['CONFIG'] ? YAML.load(ENV['CONFIG']) : Snappconfig.merged_raw
+      appconfig = ENV['CONFIG'] ? YAML.load(ENV['CONFIG']) : Snappconfig.merged_raw.clone
     
       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...
@@ -22,9 +26,6 @@ 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,12 +41,7 @@ module Snappconfig
     
     def check_required(hash)
       
-      env_hash = hash.clone
-      Snappconfig.environments.each do |environment|
-        env_hash.delete(environment)
-      end
-      
-      env_hash.each_pair do |key,value|
+      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/lib/snappconfig/tasks.rake

@@ -2,7 +2,7 @@ require "shellwords"
 
 namespace :snappconfig do
   
-  task :heroku, [:app] => :environment do   
+  task :heroku do   
     puts "Passing application configuration to Heroku..."
     merged_yaml = Snappconfig.merged_raw.to_yaml
     shell_yaml = Shellwords.escape(merged_yaml)

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.3"
+  spec.version       = "0.0.4"
   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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yarin Kessler