anyway_config 2.5.2 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4d3be4fe0dc48b125dc8eb14be21611e1c9a356953f2a2bdad1444aa21eabe
-  data.tar.gz: 4796c3d47f70459e0732913997c9fa80ce5a0a604cb86d8d3098a9144a692326
+  metadata.gz: ecd889b5a9f662d00312e10d8bb01c25f35cfe56aa1f4e361fee46ead43af918
+  data.tar.gz: 5c3921ddef8bbef598806a55f8f8beb9bf7b27b49df296bf1dc168370a4c159f
 SHA512:
-  metadata.gz: 7892284a2c1f50287dada83b90be86b11c557a0ec5e5d457a672d9d1db6ba6603299cf5060ca2134dc391f2aa02e3f17f8bcd221b0e8473a55dc99e0bea06ec8
-  data.tar.gz: f4f276d19c6a8a25ebcf46c1e55f176070691fa7af76b15bebafdf9b36a5716e7c3e1fb5ddcba2d07e741792eff0ed46d373d2b5651ac77c58d0b4527a097e75
+  metadata.gz: 5e9911f756c77a8110b031a8afef85819915742fe541f9bbfcd58011c6cb4f05f65928da4bed158f82a52fa9ad41c76420d3ad3f9885d2c4c7bd3aeb6307b849
+  data.tar.gz: a6aa11ab9a3681983df6ce936680511fc9cc86658287ff7a3ff5691201d83e85cbac9b18155a04cb8bbccd81f41fdd0cabe203504c11a5baab2afc0b831a470e

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master
 
+## 2.5.4 (2023-10-15)
+
+- Fix tracing with empty config keys. ([@palkan][])
+
+## 2.5.3 (2023-09-12)
+
+- Do not activate Rails secrets loaders in 7.1+. ([@palkan][])
+
+- Set `use_local_files` depending on `Rails.env`. ([@marshall-lee][])
+
 ## 2.5.2 (2023-08-23)
 
 - Disable Rails post-load detection in TruffleRuby. ([@palkan][])

data/README.md

@@ -434,7 +434,7 @@ config.anyway_config.default_config_path = ->(name) { Rails.root.join("data", "c
 
 - By overriding a specific config YML file path via the `<NAME>_CONF` env variable, e.g., `MYCOOLGEM_CONF=path/to/cool.yml`
 
-2) **Rails secrets**: `Rails.application.secrets.my_cool_gem` (if `secrets.yml` present).
+2) (Rails <7.1) **Rails secrets**: `Rails.application.secrets.my_cool_gem` (if `secrets.yml` present).
 
 ```yml
 # config/secrets.yml
@@ -443,6 +443,8 @@ development:
     port: 4444
 ```
 
+**NOTE:** If you want to use secrets with Rails 7.1 (still supported, but deprecated) you must add the corresponding loader manually: `Anyway.loaders.insert_after :yml, :secrets, Anyway::Rails::Loaders::Secrets`.
+
 3) **Rails credentials**: `Rails.application.credentials.my_cool_gem` (if supported):
 
 ```yml
@@ -848,11 +850,17 @@ You can use `Anyway::Loaders::Base` as a base class for your loader and define a
 For example, the [Chamber](https://github.com/thekompanee/chamber) loader could be written as follows:
 
 ```ruby
-class ChamberConfigLoader < Anyway::Loaders::Base
+class ChamberConfigLoader < Base
   def call(name:, **_opts)
-    Chamber.env.to_h[name] || {}
+    Chamber.to_hash[name] || {}
+  rescue Chamber::Errors::DecryptionFailure => e
+    warn "Couldn't decrypt Chamber settings: #{e.message}"
+    {}
   end
 end
+
+# Don't forget to register it
+Anyway.loaders.insert_before :env, :chamber, ChamberConfigLoader
 ```
 
 In order to support [source tracing](#tracing), you need to wrap the resulting Hash via the `#trace!` method with metadata:
@@ -860,7 +868,10 @@ In order to support [source tracing](#tracing), you need to wrap the resulting H
 ```ruby
 def call(name:, **_opts)
   trace!(:chamber) do
-    Chamber.env.to_h[name] || {}
+    Chamber.to_hash[name] || {}
+  rescue Chamber::Errors::DecryptionFailure => e
+    warn "Couldn't decrypt Chamber settings: #{e.message}"
+    {}
   end
 end
 ```

data/lib/.rbnext/2.7/anyway/config.rb

@@ -217,7 +217,8 @@ module Anyway # :nodoc:
         Utils.deep_merge!(coercion_mapping, mapping)
 
         mapping.each do |key, val|
-          next unless val == :boolean || (val.is_a?(::Hash) && val[:type] == :boolean)
+          type = val.is_a?(::Hash) ? val[:type] : val
+          next if type != :boolean
 
           alias_method :"#{key}?", :"#{key}"
         end

data/lib/.rbnext/2.7/anyway/settings.rb

@@ -100,7 +100,7 @@ module Anyway
     self.current_environment = ENV["ANYWAY_ENV"]
 
     # By default, use local files only in development (that's the purpose if the local files)
-    self.use_local_files = (ENV["ANYWAY_ENV"] == "development" || ENV["RACK_ENV"] == "development" || ENV["RAILS_ENV"] == "development")
+    self.use_local_files = (ENV["ANYWAY_ENV"] == "development" || ENV["RACK_ENV"] == "development" || ENV["RAILS_ENV"] == "development" || (defined?(Rails) && Rails.env.development?))
 
     # By default, consider configs are stored in the ./config folder
     self.default_config_path = ->(name) { "./config/#{name}.yml" }

data/lib/.rbnext/2.7/anyway/tracing.rb

@@ -179,7 +179,7 @@ module Anyway
       val = yield
       if val.is_a?(Hash)
         Tracing.current_trace.merge_values(val, type: type, **opts)
-      else
+      elsif !path.empty?
         Tracing.current_trace.record_value(val, *path, type: type, **opts)
       end
       val

data/lib/.rbnext/3.0/anyway/config.rb

@@ -217,7 +217,8 @@ module Anyway # :nodoc:
         Utils.deep_merge!(coercion_mapping, mapping)
 
         mapping.each do |key, val|
-          next unless val == :boolean || (val.is_a?(::Hash) && val[:type] == :boolean)
+          type = val.is_a?(::Hash) ? val[:type] : val
+          next if type != :boolean
 
           alias_method :"#{key}?", :"#{key}"
         end

data/lib/.rbnext/3.0/anyway/tracing.rb

@@ -179,7 +179,7 @@ module Anyway
       val = yield
       if val.is_a?(Hash)
         Tracing.current_trace.merge_values(val, type: type, **opts)
-      else
+      elsif !path.empty?
         Tracing.current_trace.record_value(val, *path, type: type, **opts)
       end
       val

data/lib/.rbnext/3.1/anyway/config.rb

@@ -217,7 +217,8 @@ module Anyway # :nodoc:
         Utils.deep_merge!(coercion_mapping, mapping)
 
         mapping.each do |key, val|
-          next unless val == :boolean || (val.is_a?(::Hash) && val[:type] == :boolean)
+          type = val.is_a?(::Hash) ? val[:type] : val
+          next if type != :boolean
 
           alias_method :"#{key}?", :"#{key}"
         end

data/lib/.rbnext/3.1/anyway/tracing.rb

@@ -179,7 +179,7 @@ module Anyway
       val = yield
       if val.is_a?(Hash)
         Tracing.current_trace.merge_values(val, type: type, **opts)
-      else
+      elsif !path.empty?
         Tracing.current_trace.record_value(val, *path, type: type, **opts)
       end
       val

data/lib/anyway/config.rb

@@ -217,7 +217,8 @@ module Anyway # :nodoc:
         Utils.deep_merge!(coercion_mapping, mapping)
 
         mapping.each do |key, val|
-          next unless val == :boolean || (val.is_a?(::Hash) && val[:type] == :boolean)
+          type = val.is_a?(::Hash) ? val[:type] : val
+          next if type != :boolean
 
           alias_method :"#{key}?", :"#{key}"
         end

data/lib/anyway/rails.rb

@@ -11,8 +11,13 @@ require "anyway/rails/loaders"
 
 # Configure Rails loaders
 Anyway.loaders.override :yml, Anyway::Rails::Loaders::YAML
-Anyway.loaders.insert_after :yml, :secrets, Anyway::Rails::Loaders::Secrets
-Anyway.loaders.insert_after :secrets, :credentials, Anyway::Rails::Loaders::Credentials
+
+if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR >= 1
+  Anyway.loaders.insert_after :yml, :credentials, Anyway::Rails::Loaders::Credentials
+else
+  Anyway.loaders.insert_after :yml, :secrets, Anyway::Rails::Loaders::Secrets
+  Anyway.loaders.insert_after :secrets, :credentials, Anyway::Rails::Loaders::Credentials
+end
 
 # Load Railties after configuring loaders.
 # The application could be already initialized, and that would make `Anyway.loaders` frozen

data/lib/anyway/settings.rb

@@ -100,7 +100,7 @@ module Anyway
     self.current_environment = ENV["ANYWAY_ENV"]
 
     # By default, use local files only in development (that's the purpose if the local files)
-    self.use_local_files = (ENV["ANYWAY_ENV"] == "development" || ENV["RACK_ENV"] == "development" || ENV["RAILS_ENV"] == "development")
+    self.use_local_files = (ENV["ANYWAY_ENV"] == "development" || ENV["RACK_ENV"] == "development" || ENV["RAILS_ENV"] == "development" || (defined?(Rails) && Rails.env.development?))
 
     # By default, consider configs are stored in the ./config folder
     self.default_config_path = ->(name) { "./config/#{name}.yml" }

data/lib/anyway/tracing.rb

@@ -179,7 +179,7 @@ module Anyway
       val = yield
       if val.is_a?(Hash)
         Tracing.current_trace.merge_values(val, type:, **opts)
-      else
+      elsif !path.empty?
         Tracing.current_trace.record_value(val, *path, type:, **opts)
       end
       val

data/lib/anyway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyway # :nodoc:
-  VERSION = "2.5.2"
+  VERSION = "2.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.4
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core