handy 0.0.24 → 0.0.25

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0805b88d3fb08b9131780696ba4f4d2d10b052a
+  data.tar.gz: fbd334c0a5c1e293c4caa04129a503b4d8184c6a
+SHA512:
+  metadata.gz: a78465698bf5b479549e5e0fbec8f03fee482509a7486e62bd715e7f931bd286400eb065d61e8666ed5e3676ffbd5aa359033692e860d1e325813d2b4e8d60e2
+  data.tar.gz: f2a50381965eb872d243aab432c34ea8c52a5c23421081c8cfd48c5a49258ee4284a70cf808f34dd36a2bfb0fea56d72d5995ce4b686c0e30ef4c294ac423fad

data/README.md

@@ -16,4 +16,4 @@ Besides having some useful rake tasks it also sets up a constant called
 `Settings`. It reads the `application.yml` file and populates
 `Settings`.
 
-
+You can use a separate file for each environment. Example `config/settings/development.yml` contains development settings.

data/lib/handy/config_loader.rb

@@ -10,16 +10,24 @@ module Handy
     end
 
     def load(key = Rails.env)
-      file            = Rails.root.join('config', filename)
-      return unless File.exist?(file)
+      global_file = Rails.root.join('config', filename)
+      settings = read_settings_from_file(global_file)
+      common_settings = settings['common'] || {}
+      env_settings = settings[key.to_s] || {}
 
-      hash            = YAML.load(ERB.new(File.read(file)).result)
+      env_file = Rails.root.join('config', File.basename(filename, '.yml'), "#{key}.yml")
 
-      common_hash = hash['common'] || {}
-      env_hash = hash[key.to_s] || {}
+      env_settings_from_file = read_settings_from_file(env_file)
+      env_settings = env_settings.deep_merge(env_settings_from_file)
 
-      final_hash = common_hash.deep_merge(env_hash)
-      ::Hashr.new(final_hash)
+      result_settings = common_settings.deep_merge(env_settings)
+      ::Hashr.new(result_settings)
+    end
+
+    private
+    def read_settings_from_file(filepath)
+      return {} unless File.exist?(filepath)
+      YAML.load(ERB.new(File.read(filepath)).result)
     end
   end
 end

data/lib/handy/version.rb

@@ -1,3 +1,3 @@
 module Handy
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: handy
 version: !ruby/object:Gem::Version
-  version: 0.0.24
-  prerelease: 
+  version: 0.0.25
 platform: ruby
 authors:
 - Neeraj Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: handy tool
@@ -50,32 +47,25 @@ files:
 - lib/handy/version.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2247089959255402212
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2247089959255402212
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of handy tools
 test_files: []