config_hound 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889819e5d375efbd4ba6f012a02332fe2f79c0d1
-  data.tar.gz: f0b888501712c79f5e0f4f7e6d0db269ee7eda0a
+  metadata.gz: cb89f3e818a6b9ceb8e00aa4d10702425efb7e03
+  data.tar.gz: bb2391444edc55b0639372c426a00685f7c5fdbb
 SHA512:
-  metadata.gz: a53953b012bf1acb2eb819d2a32265edf410a2691cb933b29706a9c82964e189c17b16aa6a282c2c45afd9c3c99beab581c3c949465a697b5d03041d62f9d7ef
-  data.tar.gz: 674d5e2e1c9f45ca97f2a3a2a8777f14ef4e9454bd7dfa6f651db9afce1504b82f95c88dcb7de0a4cbd7b9ca650dccee40f2a30c383817530cb17b732014185a
+  metadata.gz: 87e70b81bef285e6ef51d55d314794d2b6606e4ab1bcfeab8d640ffee49f21968be1b23db14f9e085b1b93febe3dbcd8942bfa3df8728d6b435bf3763c15d1db
+  data.tar.gz: d85b9c7a397c671e0df5ef9693f80781d822029d7e9e793b1ed7621d21bbd065f6789284f7521ca4f8755514b5f95c06a5d6448b3bbf98a5e6f27efa58b6399a

data/lib/config_hound/loader.rb

@@ -1,4 +1,3 @@
-require "config_hound/parser"
 require "config_hound/resource"
 
 module ConfigHound
@@ -7,32 +6,37 @@ module ConfigHound
 
     DEFAULT_INCLUDE_KEY = "_include"
 
-    def self.load(path, options = {})
-      new(path, options).load
+    def self.load(paths, options = {})
+      data = {}
+      loader = new(data, options)
+      Array(paths).each do |path|
+        loader.load(path)
+      end
+      data
     end
 
-    def initialize(path, options)
-      @resource = Resource.new(path.to_s)
+    def initialize(data, options)
+      @data = data
       @include_key = options.fetch(:include_key, DEFAULT_INCLUDE_KEY)
     end
 
-    def load
-      data = Parser.parse(resource.read, resource.format)
-      Array(data.delete(include_key)).each do |i|
-        defaults = Loader.load(resource.resolve(i))
-        include_into!(data, defaults)
+    def load(path)
+      resource = Resource.new(path.to_s)
+      include_into!(data, resource.load)
+      includes = Array(data.delete(include_key))
+      includes.each do |i|
+        load(resource.resolve(i))
       end
-      data
     end
 
     private
 
-    attr_reader :resource
+    attr_reader :data
     attr_reader :include_key
 
-    def include_into!(data, defaults)
-      return unless data.is_a?(Hash) && defaults.is_a?(Hash)
-      defaults.each do |key, value|
+    def include_into!(data, more_data)
+      return unless data.is_a?(Hash) && more_data.is_a?(Hash)
+      more_data.each do |key, value|
         if data.has_key?(key)
           include_into!(data[key], value)
         else

data/lib/config_hound/resource.rb

@@ -1,3 +1,4 @@
+require "config_hound/parser"
 require "open-uri"
 require "uri"
 
@@ -33,6 +34,10 @@ module ConfigHound
       File.extname(uri.to_s)[1..-1]
     end
 
+    def load
+      Parser.parse(read, format)
+    end
+
     private
 
     attr_reader :uri

data/lib/config_hound/version.rb

@@ -1,3 +1,3 @@
 module ConfigHound
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/features/include_spec.rb

@@ -164,6 +164,34 @@ describe ConfigHound do
 
   end
 
+  context "with multiple includes" do
+
+    given_resource "config.yml", %{
+      _include:
+      - fileA.yml
+      - fileB.yml
+    }
+
+    given_resource "fileA.yml", %{
+      source: A
+      fromA: true
+    }
+
+    given_resource "fileB.yml", %{
+      source: B
+      fromB: true
+    }
+
+    it "loads both files" do
+      expect(config).to have_key("fromA")
+      expect(config).to have_key("fromB")
+    end
+
+    it "favours earliest included file" do
+      expect(config["source"]).to eq("A")
+    end
+
+  end
 end
 
 

data/spec/features/multi_file_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+require "config_hound"
+
+describe ConfigHound do
+
+  def load(path)
+    ConfigHound.load(path)
+  end
+
+  let(:config) { load(["fileA.yml", "fileB.yml"]) }
+
+  given_resource "fileA.yml", %{
+    source: A
+    fromA: true
+  }
+
+  given_resource "fileB.yml", %{
+    source: B
+    fromB: true
+  }
+
+  it "loads both files" do
+    expect(config).to have_key("fromA")
+    expect(config).to have_key("fromB")
+  end
+
+  it "favours earliest included file" do
+    expect(config["source"]).to eq("A")
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_hound
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - spec/config_hound/resource_spec.rb
 - spec/features/basics_spec.rb
 - spec/features/include_spec.rb
+- spec/features/multi_file_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mdub/config_hound
 licenses:
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sniffs out config, wherever it may be.
@@ -89,4 +90,5 @@ test_files:
 - spec/config_hound/resource_spec.rb
 - spec/features/basics_spec.rb
 - spec/features/include_spec.rb
+- spec/features/multi_file_spec.rb
 - spec/spec_helper.rb