collapsium-config 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f73bde177ede4ff9e18afef840427c05f50f512
-  data.tar.gz: bbc9fc38003b7353d28137deeaf719990eb8c53a
+  metadata.gz: 864866cc70755161288c70c089cd5155a14788a2
+  data.tar.gz: 6805636bed0bbe910383b8ca1a3df495b6f91a35
 SHA512:
-  metadata.gz: 5173c739f0c6c9a368238791f642850be2991d4ef74b78eec967a835fd33027b67842d6897940b5f7f3961d37045b88a9fcc0e3c3cd3f087ff321a54e236c4c7
-  data.tar.gz: 94f98c030682cce256543d6dc93647afec109edd5db1868437bfe7a13958d3a547d266831b87fd521a9c48e3f37d2199045e8ae635913ba682077b9fe8cb6a6e
+  metadata.gz: 2b1e073bb766a8a3d205b41e2258e8f1a8b565c94655c67c4a2ff09c36ba985a3cc796fdea5306d57cda63e3d65a0575990e3716273036e8ff9247c990b9fb97
+  data.tar.gz: fc8c076ad57a877f95694cf304aaf217bc264dc3ce6f115046bd5408b5ba1641657a0c731f17e69287c26847e9352746b46ce94f6fd360ae95281865a33a7319

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    collapsium-config (0.4.1)
+    collapsium-config (0.4.2)
       collapsium (~> 0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    codeclimate-test-reporter (1.0.1)
+    codeclimate-test-reporter (1.0.2)
     collapsium (0.6.1)
     diff-lcs (1.2.5)
     docile (1.1.5)

data/README.md

@@ -190,8 +190,8 @@ bases merged into the value.
 - Multiple levels of extension are supported.
 - The order of items in `base` is deterministic:
   1. Items are added in the order in which they appear in `extends`, but...
-  1. ... after each item, the items it itself extends are added before the next
-     item is processed.
+  1. ... before each item, it's ancestors are listed in depth-first order,
+     which means the root of each item's hierarchy is listed first.
 
 ### Includes
 

data/lib/collapsium-config/configuration.rb

@@ -337,20 +337,16 @@ module Collapsium
         bases.each do |base_path, base_value|
           base_value.recursive_resolve(root, base_path)
           merged_base.recursive_merge!(base_value, true)
+
+          # Modify bases for this path: we go depth first into the hierarchy
+          base_val = merged_base.fetch("base", []).dup
+          base_val << base_path
+          base_val.uniq!
+          merged_base["base"] = base_val
         end
 
         # ... but value needs to stay authoritative.
         value.recursive_merge!(merged_base, false)
-
-        # Set the base if all is well.
-        base_val = value["base"] || []
-        base_val += bases.map { |p, _| p }
-        base_val.uniq!
-        if base_val.empty?
-          return
-        end
-
-        value["base"] = base_val
       end
     end # class Configuration
   end # module Config

data/lib/collapsium-config/version.rb

@@ -9,6 +9,6 @@
 module Collapsium
   module Config
     # The current release version
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.2".freeze
   end # module Config
 end # module Collapsium

data/spec/configuration_spec.rb

@@ -2,8 +2,11 @@ require 'spec_helper'
 require_relative '../lib/collapsium-config/configuration'
 
 describe Collapsium::Config::Configuration do
-  before do
+  before(:all) do
     @data_path = File.join(File.dirname(__FILE__), 'data')
+  end
+
+  before(:each) do
     ENV.delete("BAZ")
   end
 
@@ -96,66 +99,117 @@ describe Collapsium::Config::Configuration do
   end
 
   describe "extend functionality" do
-    it "extends configuration hashes" do
-      config = File.join(@data_path, 'driverconfig.yml')
-      cfg = Collapsium::Config::Configuration.load_config(config)
-
-      # First, test for non-extended values
-      expect(cfg["drivers.mock.mockoption"]).to eql 42
-      expect(cfg["drivers.branch1.branch1option"]).to eql "foo"
-      expect(cfg["drivers.branch2.branch2option"]).to eql "bar"
-      expect(cfg["drivers.branch3.branch3option"]).to eql "baz"
-      expect(cfg["drivers.leaf.leafoption"]).to eql "baz"
-
-      # Now test extended values
-      expect(cfg["drivers.branch1.mockoption"]).to eql 42
-      expect(cfg["drivers.branch2.mockoption"]).to eql 42
-      expect(cfg["drivers.leaf.mockoption"]).to eql 42
-
-      expect(cfg["drivers.branch2.branch1option"]).to eql "foo"
-      expect(cfg["drivers.leaf.branch1option"]).to eql "override" # not "foo" !
-
-      expect(cfg["drivers.leaf.branch2option"]).to eql "bar"
-      expect(cfg["drivers.leaf.global_opt"]).to eql "set"
-
-      expect(cfg["drivers.branch3.global_opt"]).to eql "set"
-
-      # Also test that all levels go back to base == mock
-      expect(cfg["drivers.branch1.base"]).to eql %w(.drivers.mock)
-      expect(cfg["drivers.branch2.base"]).to eql %w(.drivers.mock .drivers.branch1)
-      expect(cfg["drivers.branch3.base"]).to eql %w(.global)
-      expect(cfg["drivers.leaf.base"]).to eql %w(.drivers.mock .drivers.branch1
-                                                 .drivers.branch2 .global)
-
-      # We expect that 'derived' is extended with '.other.base', too
-      expect(cfg["derived.test.foo"]).to eql 'bar'
-      expect(cfg["derived.test.some"]).to eql 'option'
-
-      # Expect this to also work with list items
-      expect(cfg["derived.test2.0.foo"]).to eql 'bar'
-      expect(cfg["derived.test2.0.some"]).to eql 'option'
-
-      expect(cfg["derived.test3.foo"]).to eql 'bar'
-      expect(cfg["derived.test3.some2"]).to eql 'option2'
-
-      # Expect this to work with multiple inheritance
-      expect(cfg["derived.test4.foo"]).to eql 'bar'
-      expect(cfg["derived.test4.some"]).to eql 'option_override'
-      expect(cfg["derived.test4.some2"]).to eql 'option2'
-    end
-
-    it "extends configuration hashes when the base does not exist" do
-      config = File.join(@data_path, 'driverconfig.yml')
-      cfg = Collapsium::Config::Configuration.load_config(config)
-
-      # Ensure the hash contains its own value
-      expect(cfg["drivers.base_does_not_exist.some"]).to eql "value"
-
-      # Also ensure the "base" is _not_ set properly
-      expect(cfg["drivers.base_does_not_exist.base"]).to be_nil
-
-      # On the other hand, "extends" should stay.
-      expect(cfg["drivers.base_does_not_exist.extends"]).to eql "nonexistent_base"
+    context "merging" do
+      before(:all) do
+        @config_path = File.join(@data_path, 'driverconfig.yml')
+        @config = Collapsium::Config::Configuration.load_config(@config_path)
+      end
+
+      context "drivers" do
+        it "accepts mock drivers" do
+          # There is no built-in driver labelled 'mock'
+          expect(@config["drivers.mock.mockoption"]).to eql 42
+        end
+
+        it "merges a single ancestor" do
+          # Check merged values
+          expect(@config["drivers.branch1.branch1option"]).to eql "foo"
+          expect(@config["drivers.branch1.mockoption"]).to eql 42
+
+          # Check merge metadata
+          expect(@config["drivers.branch1.extends"]).to be_nil
+          expect(@config["drivers.branch1.base"]).to eql %w(.drivers.mock)
+        end
+
+        it "merges multiple ancestor depths" do
+          # Check merged values
+          expect(@config["drivers.branch2.branch2option"]).to eql "bar"
+          expect(@config["drivers.branch2.branch1option"]).to eql "foo"
+          expect(@config["drivers.branch2.mockoption"]).to eql 42
+
+          # Check merge metadata
+          expect(@config["drivers.branch2.extends"]).to be_nil
+          expect(@config["drivers.branch2.base"]).to eql %w(.drivers.mock
+                                                            .drivers.branch1)
+        end
+
+        it "merges from absolute paths" do
+          # Check merged values
+          expect(@config["drivers.branch3.branch3option"]).to eql "baz"
+          expect(@config["drivers.branch3.global_opt"]).to eql "set"
+
+          # Check merge metadata
+          expect(@config["drivers.branch3.extends"]).to be_nil
+          expect(@config["drivers.branch3.base"]).to eql %w(.global)
+        end
+
+        it "merges from sibling and absolute path" do
+          # Check merged values
+          expect(@config["drivers.leaf.leafoption"]).to eql "baz"
+          expect(@config["drivers.leaf.branch2option"]).to eql "bar"
+          expect(@config["drivers.leaf.branch1option"]).to eql "override"
+          expect(@config["drivers.leaf.mockoption"]).to eql 42
+          expect(@config["drivers.leaf.global_opt"]).to eql "set"
+
+          # Check merge metadata
+          expect(@config["drivers.leaf.extends"]).to be_nil
+          expect(@config["drivers.leaf.base"]).to eql %w(.drivers.mock
+                                                         .drivers.branch1
+                                                         .drivers.branch2
+                                                         .global)
+        end
+
+        it "merges from global and absolute path" do
+          # Check merged values
+          expect(@config["drivers.leaf2.leafoption"]).to eql "baz"
+          expect(@config["drivers.leaf2.global_opt"]).to eql "set"
+          expect(@config["drivers.leaf2.branch2option"]).to eql "bar"
+          expect(@config["drivers.leaf2.branch1option"]).to eql "override"
+          expect(@config["drivers.leaf2.mockoption"]).to eql 42
+
+          # Check merge metadata
+          expect(@config["drivers.leaf2.extends"]).to be_nil
+          expect(@config["drivers.leaf2.base"]).to eql %w(.global
+                                                          .drivers.mock
+                                                          .drivers.branch1
+                                                          .drivers.branch2)
+        end
+
+        it "works when a base does not exist" do
+          # Ensure the hash contains its own value
+          expect(@config["drivers.base_does_not_exist.some"]).to eql "value"
+
+          # Also ensure the "base" is _not_ set properly
+          expect(@config["drivers.base_does_not_exist.base"]).to be_nil
+
+          # On the other hand, "extends" should stay.
+          expect(@config["drivers.base_does_not_exist.extends"]).to eql \
+            "nonexistent_base"
+        end
+      end
+
+      context "non-driver values" do
+        it "merges from absolute paths" do
+          expect(@config["derived.test.foo"]).to eql 'bar'
+          expect(@config["derived.test.some"]).to eql 'option'
+        end
+
+        it "can merge into list items" do
+          expect(@config["derived.test2.0.foo"]).to eql 'bar'
+          expect(@config["derived.test2.0.some"]).to eql 'option'
+        end
+
+        it "can merge from list items" do
+          expect(@config["derived.test3.foo"]).to eql 'bar'
+          expect(@config["derived.test3.some2"]).to eql 'option2'
+        end
+
+        it "accepts multiple extensions" do
+          expect(@config["derived.test4.foo"]).to eql 'bar'
+          expect(@config["derived.test4.some"]).to eql 'option_override'
+          expect(@config["derived.test4.some2"]).to eql 'option2'
+        end
+      end
     end
 
     it "does nothing when a hash extends itself" do

data/spec/data/driverconfig.yml

@@ -26,6 +26,10 @@ drivers:
     extends: branch2,.global
     leafoption: baz
     branch1option: override
+  leaf2:
+    extends: .global, branch2
+    leafoption: baz
+    branch1option: override
   base_does_not_exist:
     extends: nonexistent_base
     some: value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collapsium-config
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jens Finkhaeuser