config_hound 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876182cbec6fa89633e1fd3b2fdbed37b88a714a
-  data.tar.gz: 9c342ccc39c549785c660c4b13b9ab52d17a6024
+  metadata.gz: 5c9d095029273d13356b6ca01b179ebb1a96e0a3
+  data.tar.gz: e3a485583a06cda2ed86bef8fb293cd239c96623
 SHA512:
-  metadata.gz: c05735b52a238ba1fd28189880ee341b95f61cbebc96ac733e6411531ec197e433ba931acdf660d98958c297db0c3396c3aae4141b5b4388f1ded3f162d290ee
-  data.tar.gz: b9a148f6097f6c42849845a8881367716629d7a97709efab0393ba95c89e01b177abbdcd1654783aeaeabe33c77eed3201c687c9a1d8de42fa23908573eb9b25
+  metadata.gz: e1b3d7b5dd354e1a01794275c786054182018b158d07a1fb942bdc23dd9bba1e23fb8feb74193e36d598f618530bcaec17a9ef23413813ae07e72d5b6da85148
+  data.tar.gz: b7e76f0b580e107aada88783fcc844c4dfb3ce30625a6dae2803702a67b081bf595b59a92ddab475c179c1180aed03e21540f74fb447e1f7525d24c2faaceac9

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.2
+  - 2.4

data/README.md

@@ -1,5 +1,7 @@
 # ConfigHound
 
+[![Build Status](https://travis-ci.org/mdub/config_hound.svg?branch=master)](https://travis-ci.org/mdub/config_hound)
+
 ConfigHound makes it easy to load configuration data.
 
 ## Usage

data/config_hound.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "dig_rb"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/lib/config_hound/interpolation.rb

@@ -1,4 +1,5 @@
 require "config_hound/error"
+require "dig_rb"
 
 module ConfigHound
 

data/lib/config_hound/loader.rb

@@ -1,5 +1,4 @@
 require "config_hound/deep_merge"
-require "config_hound/interpolation"
 require "config_hound/resource"
 
 module ConfigHound
@@ -9,7 +8,6 @@ module ConfigHound
     DEFAULT_INCLUDE_KEY = "_include"
 
     attr_accessor :include_key
-    attr_accessor :expand_refs
 
     def initialize(options = {})
       @include_key = DEFAULT_INCLUDE_KEY
@@ -20,9 +18,7 @@ module ConfigHound
 
     def load(sources)
       raw_hashes = Array(sources).map(&method(:load_source))
-      result = raw_hashes.reverse.reduce({}, &ConfigHound.method(:deep_merge_into))
-      result = Interpolation.expand(result) if expand_refs
-      result
+      raw_hashes.reverse.reduce({}, &ConfigHound.method(:deep_merge_into))
     end
 
     private

data/lib/config_hound/version.rb

@@ -1,3 +1,3 @@
 module ConfigHound
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

data/lib/config_hound.rb

@@ -1,10 +1,15 @@
+require "config_hound/interpolation"
 require "config_hound/loader"
 require "config_hound/version"
 
 module ConfigHound
 
   def self.load(paths, options = {})
-    Loader.new(options).load(paths)
+    options = Hash[options]
+    expand_refs = options.delete(:expand_refs)
+    result = Loader.new(options).load(paths)
+    result = Interpolation.expand(result) if expand_refs
+    result
   end
 
 end

data/spec/features/expansion_spec.rb

@@ -4,16 +4,33 @@ require "config_hound"
 
 describe ConfigHound, "expansion" do
 
-  let(:config) { ConfigHound.load("config.yml", :expand_refs => true) }
-
   given_resource "config.yml", %{
     var:
       port: 5678
     address: host:<(var.port)>
   }
 
+  let(:config) { ConfigHound.load("config.yml", :expand_refs => true) }
+
   it "expands references" do
     expect(config["address"]).to eq("host:5678")
   end
 
+  context "with overrides" do
+
+    given_resource "overrides.yml", %{
+      _include:
+        - config.yml
+      var:
+        port: 9999
+    }
+
+    let(:config) { ConfigHound.load("overrides.yml", :expand_refs => true) }
+
+    it "merges before expanding" do
+      expect(config["address"]).to eq("host:9999")
+    end
+
+  end
+
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: config_hound
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dig_rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md