config_reader 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6af0d4ec72275cf3d8186e9f889a8a0dee9c94e9ca16552d8a7da3e4f057a0
-  data.tar.gz: 6be5d22c4fb82c0fb60927a6f63d5abe287f2dbc7bedb87e67fb0bfa39dd7bb7
+  metadata.gz: c5f34ccb03e315e9301ebedd211dca7e5fde4842e14e15a4f809ee6c0e5f16cd
+  data.tar.gz: 45f064ce87458166d7ccec76e18d8f3ceeaee36ac91665d6c0db6037f8e84d9b
 SHA512:
-  metadata.gz: 600ea0a78d494acecc50f787fa8ab4d8594592f5ccd70dfbc892b3e4068f31c12dc79c56d7c4801089dc47834af26da65bfbacceef09e8d3ee3962b352720ff6
-  data.tar.gz: 2d39e35dbcd26edd3b9a50e364b0d4ec1dd091691ba43989baaf386d28212c04250fdc04946f636b728fb3754546d65c3ac74be2ff74e5d5ea52c24a0867c570
+  metadata.gz: 297c24bc4211132943f69e3a5b85f7d2686389f481c4b3b51fc10d530abebd638bb2705b274ac4546be65f9738331f573b39f10ea5b8d2d088270653c41058d5
+  data.tar.gz: 171d64da65475f7188967b1152715ec63730a4322b814372b66c4f5da1f8601b9619ff82c437907efc3acaf3e9ecff06bbcb7cd068584a0adb44e613cfb5c024

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.3 2025-01-06
+
+Fix a bug in deep merge where values weren't getting set properly.
+
 ## 3.0.2 2024-12-13
 
 Fix an issue when merging multiple envs.

data/lib/config_reader/config_hash.rb

@@ -28,7 +28,7 @@ class ConfigReader
     end
 
     def respond_to_missing?(m, *)
-      config.key?(m)
+      key?(m)
     end
   end
 end

data/lib/config_reader/version.rb

@@ -1,3 +1,3 @@
 class ConfigReader
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/lib/config_reader.rb

@@ -40,7 +40,7 @@ class ConfigReader
         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
           deep_merge(this_val, other_val)
         else
-          hash[key] = other_val
+          other_val
         end
       end
     end
@@ -109,12 +109,12 @@ class ConfigReader
     def merge_all_configs(conf, defaults, sekrets)
       @envs = {}
 
-      (conf.keys - ["defaults"]).each do |env|
-        key_hash = deep_merge(defaults.dup, conf[env]) if conf[env]
-        key_hash = deep_merge(key_hash, sekrets[env]) if sekrets&.[](env)
+      conf.keys.each do |env|
+        env_hash = deep_merge(defaults, conf[env] || {})
+        env_hash = deep_merge(env_hash, sekrets[env] || {}) if sekrets
 
         @envs[env] = ConfigHash.convert_hash(
-          key_hash,
+          env_hash,
           configuration.ignore_missing_keys
         )
       end

data/spec/config_reader_spec.rb

@@ -33,7 +33,8 @@ describe "ConfigReader" do
 
   describe "all envs available" do
     it "should have all envs available" do
-      expect(TestConfig.envs.keys).to eq(%w[test not_test])
+      TestConfig.reload
+      expect(TestConfig.envs.keys).to eq(%w[defaults test not_test])
     end
 
     it "should have ConfigHash for all envs" do

data/spec/multi_envs/merge_config.rb

@@ -0,0 +1,6 @@
+class MergeConfig < ConfigReader
+  configure do |config|
+    config.environment = "merge"
+    config.config_file = "spec/multi_envs/merge_config.yml"
+  end
+end

data/spec/multi_envs/merge_config.yml

@@ -0,0 +1,15 @@
+---
+defaults:
+  app_name: default_app
+  nested_key:
+    value: test
+
+test:
+  app_name: test_app
+  nested_key:
+    only_in_test_env: true
+
+not_test:
+  app_name: not_test_app
+
+merge:

data/spec/multi_envs/merge_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+require "multi_envs/merge_config"
+
+describe "ConfigReader" do
+  before(:all) { MergeConfig.reload }
+
+  describe "all envs available" do
+    it "should have all envs available" do
+      expect(MergeConfig.envs.keys).to eq(%w[defaults test not_test merge])
+    end
+
+    it "should have ConfigHash for all envs" do
+      expect(MergeConfig.envs["test"].app_name).to eq("test_app")
+      expect(MergeConfig.envs["not_test"].app_name).to eq("not_test_app")
+      expect(MergeConfig.envs["merge"]).to eq(MergeConfig.envs["defaults"])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_reader
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Michael Moen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abbrev
@@ -113,6 +113,9 @@ files:
 - lib/config_reader/config_hash.rb
 - lib/config_reader/version.rb
 - spec/config_reader_spec.rb
+- spec/multi_envs/merge_config.rb
+- spec/multi_envs/merge_config.yml
+- spec/multi_envs/merge_spec.rb
 - spec/no_key_no_error_config.rb
 - spec/sekrets_config.rb
 - spec/sekrets_config.yml.enc