cheffish 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18704ce9d93e9b7f2e0009aec7fae8796e7b890b
-  data.tar.gz: 94d26ffa96ea4363482d9c76dd0b734a3b06c15e
+  metadata.gz: c319e55f4faad24ef6fb157b9fc9f903c47cc466
+  data.tar.gz: bf2cb3572b55f1805eedc069e2ee0ac10078aa91
 SHA512:
-  metadata.gz: 750e6567aeb409b1f68d692d4a7f41b22592a0cfabd6d1081b43c44fa24a50fc37fc9a73be328e250815a53ac75c13478ebb6372b4c133b4308512c22eb47f90
-  data.tar.gz: 21a7ce7717192db9bf36fc18ceccdf10e528fae29bf35417f751b0b88250e7dd33d5f0aed2c4cc13b1d3abd33df9ba132ccf8e06521611e105bdd1e29e16b24c
+  metadata.gz: 1e73940e8d05a661d28a8f9b616b1b7ffa07453b28ca60c0dd4af2968a609e0147d97eebfee0e513c9467c592af500dd19862ea6be0e00d7342551a5bc1fde41
+  data.tar.gz: 4731f43daf08d9943a46fd004145f4880f71e1ccc706dbad6512dfd795df2178912916f5e15d05364fa05737a678b7f22d47e9e9cb9046ab3ace93c16e334c76

data/lib/cheffish/merged_config.rb

@@ -1,8 +1,10 @@
+require "chef/mash"
+
 module Cheffish
   class MergedConfig
     def initialize(*configs)
-      @configs = configs
-      @merge_arrays = {}
+      @configs = configs.map { |config| Chef::Mash.from_hash config }
+      @merge_arrays = Chef::Mash.new
     end
 
     include Enumerable

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "4.1.1"
+  VERSION = "5.0.0"
 end

data/spec/functional/merged_config_spec.rb

@@ -6,6 +6,24 @@ describe "merged_config" do
     Cheffish::MergedConfig.new({ :test => "val" })
   end
 
+  let(:collision) do
+    c1 = { :test1 => "c1.1", "test2" => "c1.2" }
+    c2 = { "test1" => "c2.1", "test3" => "c2.3" }
+    Cheffish::MergedConfig.new(c1, c2)
+  end
+
+  let(:config_mismatch) do
+    c1 = { :test => { :test => "val" } }
+    c2 = { :test => [2, 3, 4] }
+    Cheffish::MergedConfig.new(c1, c2)
+  end
+
+  let(:config_hashes) do
+    c1 = { :test => { :test => "val" } }
+    c2 = { :test => { :test2 => "val2" } }
+    Cheffish::MergedConfig.new(c1, c2)
+  end
+
   it "returns value in config" do
     expect(config.test).to eq("val")
   end
@@ -15,6 +33,28 @@ describe "merged_config" do
   end
 
   it "has an informative string representation" do
-    expect("#{config}").to eq("{:test=>\"val\"}")
+    expect("#{config}").to eq("{\"test\"=>\"val\"}")
+  end
+
+  it "has indifferent str/sym access" do
+    expect(config["test"]).to eq("val")
+  end
+
+  it "respects precedence between the different configs" do
+    expect(collision["test1"]).to eq("c1.1")
+    expect(collision[:test1]).to eq("c1.1")
+  end
+
+  it "merges the configs" do
+    expect(collision[:test2]).to eq("c1.2")
+    expect(collision[:test3]).to eq("c2.3")
+  end
+
+  it "handle merged value type mismatch" do
+    expect(config_mismatch[:test]).to eq("test" => "val")
+  end
+
+  it "merges values when they're hashes" do
+    expect(config_hashes[:test].keys).to eq(%w{test test2})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - John Keiser