config_reader 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2737e810595affa2baee1814d8d0291e25be7748f40eb215634b52401677c533
-  data.tar.gz: c55a5f5a2bce2d866cdc93c8a1fc6b4e004d7fc693d4d26b1cb7c2fb96e11038
+  metadata.gz: ff6af0d4ec72275cf3d8186e9f889a8a0dee9c94e9ca16552d8a7da3e4f057a0
+  data.tar.gz: 6be5d22c4fb82c0fb60927a6f63d5abe287f2dbc7bedb87e67fb0bfa39dd7bb7
 SHA512:
-  metadata.gz: bb4d11127268cd8dd236cb51c2237f9b6f8ee77174491ed406e788072a5ac92376eb91e7d7f4f20596f5378870426727c95eb8f38c31a079d14b6880c93953c4
-  data.tar.gz: 14c4bff99f6ed3ca2e75186dc019e7380af414143edcb588e494b2069083125e9371d3b704597368a590c269b1e279cfe3bc7cdd8a9a53f9b5745dc58a1fbef7
+  metadata.gz: 600ea0a78d494acecc50f787fa8ab4d8594592f5ccd70dfbc892b3e4068f31c12dc79c56d7c4801089dc47834af26da65bfbacceef09e8d3ee3962b352720ff6
+  data.tar.gz: 2d39e35dbcd26edd3b9a50e364b0d4ec1dd091691ba43989baaf386d28212c04250fdc04946f636b728fb3754546d65c3ac74be2ff74e5d5ea52c24a0867c570

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## 3.0.0 2024-12-12
+## 3.0.2 2024-12-13
+
+Fix an issue when merging multiple envs.
+
+## 3.0.1 2024-12-13 (yanked)
+
+Don't merge! in deep_merge
+
+## 3.0.0 2024-12-12 (yanked)
 
 Update to latest Sekrets (1.14.0)
 Explicitly require abbrev gem

data/lib/config_reader/config_hash.rb

@@ -24,9 +24,7 @@ class ConfigReader
     end
 
     def method_missing(key, *args, &block)
-      key?(key) ? fetch(key) : super
-    rescue KeyError, NoMethodError => e # skipcq: RB-P1001
-      raise e unless ignore_missing_keys
+      ignore_missing_keys ? self[key] : fetch(key)
     end
 
     def respond_to_missing?(m, *)

data/lib/config_reader/version.rb

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

data/lib/config_reader.rb

@@ -2,6 +2,11 @@ require "config_reader/version"
 require "config_reader/config_hash"
 require "psych"
 
+begin
+  require "sekrets"
+rescue LoadError
+end
+
 begin
   require "erb"
 rescue LoadError
@@ -31,11 +36,11 @@ class ConfigReader
     end
 
     def deep_merge(hash, other_hash)
-      hash.merge!(other_hash) do |_key, this_val, other_val|
+      hash.merge(other_hash) do |key, this_val, other_val|
         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
           deep_merge(this_val, other_val)
         else
-          other_val
+          hash[key] = other_val
         end
       end
     end
@@ -58,26 +63,13 @@ class ConfigReader
     end
 
     def inspect
-      puts config.inspect
+      config.inspect
     end
 
     def load_config
       raise "No config file set" unless find_config
 
-      conf =
-        if defined?(ERB)
-          Psych.safe_load(
-            ERB.new(File.read(find_config)).result,
-            aliases: true,
-            permitted_classes: configuration.permitted_classes.to_a + [Symbol]
-          )
-        else
-          Psych.safe_load_file(
-            File.read(find_config),
-            aliases: true,
-            permitted_classes: configuration.permitted_classes.to_a + [Symbol]
-          )
-        end
+      conf = load_yaml
 
       raise "No config found" unless conf
 
@@ -85,43 +77,59 @@ class ConfigReader
     end
 
     def load_sekrets
-      sekrets = {}
-
       if configuration.sekrets_file
-        begin
-          require "sekrets"
-          sekrets = ::Sekrets.settings_for(configuration.sekrets_file)
-          raise "No sekrets found" unless sekrets
-        rescue LoadError
-          warn "You specified a sekrets_file, but the sekrets gem isn't available."
+        if !defined?(::Sekrets)
+          raise ArgumentError,
+                "You specified a sekrets_file, but the sekrets gem isn't available."
+        else
+          ::Sekrets.settings_for(configuration.sekrets_file) ||
+            raise("No sekrets found")
         end
       end
-
-      sekrets
     end
 
-    def merge_configs(conf, sekrets)
-      @envs = {}
-      env_keys = conf.keys - ["defaults"]
-      env = configuration.environment
+    def load_yaml
+      permitted_classes = configuration.permitted_classes.to_a + [Symbol]
 
-      defaults = conf["defaults"]
-
-      if sekrets && sekrets["defaults"]
-        defaults = deep_merge(defaults, sekrets["defaults"])
+      if defined?(ERB)
+        Psych.safe_load(
+          ERB.new(File.read(find_config)).result,
+          aliases: true,
+          permitted_classes: permitted_classes
+        )
+      else
+        Psych.safe_load_file(
+          File.read(find_config),
+          aliases: true,
+          permitted_classes: permitted_classes
+        )
       end
+    end
 
-      env_keys.each do |key|
-        key_hash = deep_merge(defaults, conf[key]) if conf[key]
-        key_hash = deep_merge(defaults, sekrets[key]) if sekrets && sekrets[key]
+    def merge_all_configs(conf, defaults, sekrets)
+      @envs = {}
 
-        @envs[key] = ConfigHash.convert_hash(
+      (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)
+
+        @envs[env] = ConfigHash.convert_hash(
           key_hash,
           configuration.ignore_missing_keys
         )
       end
+    end
+
+    def merge_configs(conf, sekrets)
+      defaults = conf["defaults"]
+
+      if sekrets&.[]("defaults")
+        defaults = deep_merge(defaults, sekrets["defaults"])
+      end
+
+      merge_all_configs(conf, defaults, sekrets)
 
-      @envs[env]
+      @envs[configuration.environment]
     end
 
     def method_missing(key, *_args, &_block)

data/spec/config_reader_spec.rb

@@ -27,7 +27,7 @@ describe "ConfigReader" do
     end
 
     it "should raise on missing nested key with #key accessor" do
-      expect { TestConfig.nested_key.missing }.to raise_error(NoMethodError)
+      expect { TestConfig.nested_key.missing }.to raise_error(KeyError)
     end
   end
 

data/spec/sekrets_config.yml.enc

@@ -1,2 +1,3 @@
 
-�Y"������,K�m4�9-�T�it}ju�v�
+�Y"������,K�m4�9-�T�i6	�dT~�7��w�kp��Coy6Ōݕ
+��7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_reader
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Michael Moen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abbrev