config_hound 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb89f3e818a6b9ceb8e00aa4d10702425efb7e03
-  data.tar.gz: bb2391444edc55b0639372c426a00685f7c5fdbb
+  metadata.gz: 2274553ac129370bd650d33390fe3fbde49a86b3
+  data.tar.gz: 690579fd733a8670f587ef9e190a2bb1d0843e2e
 SHA512:
-  metadata.gz: 87e70b81bef285e6ef51d55d314794d2b6606e4ab1bcfeab8d640ffee49f21968be1b23db14f9e085b1b93febe3dbcd8942bfa3df8728d6b435bf3763c15d1db
-  data.tar.gz: d85b9c7a397c671e0df5ef9693f80781d822029d7e9e793b1ed7621d21bbd065f6789284f7521ca4f8755514b5f95c06a5d6448b3bbf98a5e6f27efa58b6399a
+  metadata.gz: be1159fe1d0adc7ec520f5df420ad2f639efe0e3937ace781519aa6dccc3b1b4b4284719196c839e5a0ed2f42c1ee03a1f4175b7b218c118fb3e5bb6d7e1b206
+  data.tar.gz: 7d4a46f6e76069e9518e02ab6904d5a953ec0839d8cb5a588dd4d028835f31a2f4bb444291a976c002279bb252409882df7873dc1de80734831d9c9ecf4df4cc

data/lib/config_hound/deep_merge.rb

@@ -0,0 +1,10 @@
+module ConfigHound
+
+  def self.deep_merge_into(h1, h2)
+    return h2 unless h1.is_a?(Hash) && h2.is_a?(Hash)
+    h1.merge(h2) do |_key, v1, v2|
+      deep_merge_into(v1, v2)
+    end
+  end
+
+end

data/lib/config_hound/loader.rb

@@ -6,43 +6,27 @@ module ConfigHound
 
     DEFAULT_INCLUDE_KEY = "_include"
 
-    def self.load(paths, options = {})
-      data = {}
-      loader = new(data, options)
-      Array(paths).each do |path|
-        loader.load(path)
-      end
-      data
-    end
-
-    def initialize(data, options)
-      @data = data
+    def initialize(options = {})
       @include_key = options.fetch(:include_key, DEFAULT_INCLUDE_KEY)
     end
 
-    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
+    def load(paths)
+      Array(paths).reverse.map do |path|
+        load_resource(Resource[path])
+      end.reduce({}, &ConfigHound.method(:deep_merge_into))
     end
 
     private
 
-    attr_reader :data
     attr_reader :include_key
 
-    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[key] = value
-        end
+    def load_resource(resource)
+      raw_data = resource.load
+      includes = Array(raw_data.delete(include_key))
+      included_resources = includes.map do |relative_path|
+        resource.resolve(relative_path)
       end
+      ConfigHound.deep_merge_into(load(included_resources), raw_data)
     end
 
   end

data/lib/config_hound/resource.rb

@@ -10,8 +10,30 @@ module ConfigHound
   #
   class Resource
 
-    def initialize(path)
-      @uri = uri_for(path)
+    class << self
+
+      def [](arg)
+        return arg if arg.is_a?(Resource)
+        new(uri_for(arg))
+      end
+
+      private(:new)
+
+      private
+
+      def uri_for(arg)
+        case arg
+        when URI
+          arg
+        when %r{^\w+:/}
+          URI(arg)
+        when %r{^/}
+          URI("file:#{arg}")
+        else
+          URI("file:#{File.expand_path(arg)}")
+        end
+      end
+
     end
 
     def to_s
@@ -19,7 +41,7 @@ module ConfigHound
     end
 
     def resolve(path)
-      self.class.new(uri + path)
+      Resource[uri + path]
     end
 
     def read
@@ -40,21 +62,12 @@ module ConfigHound
 
     private
 
-    attr_reader :uri
-
-    def uri_for(path)
-      case path
-      when URI
-        path
-      when %r{^\w+:/}
-        URI(path)
-      when %r{^/}
-        URI("file:#{path}")
-      else
-        URI("file:#{File.expand_path(path)}")
-      end
+    def initialize(uri)
+      @uri = uri
     end
 
+    attr_reader :uri
+
   end
 
 end

data/lib/config_hound/version.rb

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

data/lib/config_hound.rb

@@ -3,8 +3,8 @@ require "config_hound/version"
 
 module ConfigHound
 
-  def self.load(*args)
-    Loader.load(*args)
+  def self.load(paths, options = {})
+    Loader.new(options).load(paths)
   end
 
 end

data/spec/config_hound/deep_merge_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+
+require "config_hound/deep_merge"
+
+describe ConfigHound do
+
+  describe ".deep_merge_into" do
+
+    let(:result) { ConfigHound.deep_merge_into(v1, v2) }
+
+    context "with non-Hash arguments" do
+
+      let(:v1) { "a" }
+      let(:v2) { "b" }
+
+      it "takes the second value" do
+        expect(result).to eq("b")
+      end
+
+    end
+
+    context "with independent keys" do
+
+      let(:v1) { {a: 1} }
+      let(:v2) { {b: 2} }
+
+      it "merges" do
+        expect(result).to eq(a: 1, b: 2)
+      end
+
+    end
+
+    context "when keys clash" do
+
+      let(:v1) { {x: 1} }
+      let(:v2) { {x: 2} }
+
+      it "takes the second value" do
+        expect(result).to eq(x: 2)
+      end
+
+    end
+
+    context "with nested values" do
+
+      let(:v1) do
+        {
+          :foo => {
+            :bar => {
+              :x => 1
+            }
+          }
+        }
+      end
+
+      let(:v2) do
+        {
+          :foo => {
+            :bar => {
+              :y => 2
+            }
+          }
+        }
+      end
+
+      it "merges deeply" do
+        expect(result).to eq(
+          :foo => {
+            :bar => {
+              :x => 1,
+              :y => 2
+            }
+          }
+        )
+      end
+
+    end
+
+  end
+
+end

data/spec/config_hound/resource_spec.rb

@@ -5,7 +5,7 @@ require "uri"
 
 describe ConfigHound::Resource do
 
-  let(:resource) { described_class.new(path) }
+  let(:resource) { described_class[path] }
 
   context "with a URI" do
 

data/spec/features/multi_file_spec.rb

@@ -4,11 +4,7 @@ require "config_hound"
 
 describe ConfigHound do
 
-  def load(path)
-    ConfigHound.load(path)
-  end
-
-  let(:config) { load(["fileA.yml", "fileB.yml"]) }
+  let(:config) { ConfigHound.load(["fileA.yml", "fileB.yml"]) }
 
   given_resource "fileA.yml", %{
     source: A

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_hound
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,10 +53,12 @@ files:
 - Rakefile
 - config_hound.gemspec
 - lib/config_hound.rb
+- lib/config_hound/deep_merge.rb
 - lib/config_hound/loader.rb
 - lib/config_hound/parser.rb
 - lib/config_hound/resource.rb
 - lib/config_hound/version.rb
+- spec/config_hound/deep_merge_spec.rb
 - spec/config_hound/resource_spec.rb
 - spec/features/basics_spec.rb
 - spec/features/include_spec.rb
@@ -82,11 +84,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sniffs out config, wherever it may be.
 test_files:
+- spec/config_hound/deep_merge_spec.rb
 - spec/config_hound/resource_spec.rb
 - spec/features/basics_spec.rb
 - spec/features/include_spec.rb