anyway_config 2.0.6 → 2.1.0

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

@@ -34,11 +34,13 @@ module Anyway
 
       def record_value(val, *path, **opts)
         key = path.pop
-        trace = if val.is_a?(Hash)
-          Trace.new.tap { |_1| _1.merge_values(val, **opts) }
-        else
-          Trace.new(:value, val, **opts)
-        end
+        (__m__ = if val.is_a?(Hash)
+  Trace.new.tap { |_1|
+    _1.merge_values(val, **opts)
+  }
+else
+  Trace.new(:value, val, **opts)
+end) && (((trace = __m__) || true) || Kernel.raise(NoMatchingPatternError, __m__.inspect))
 
         target_trace = path.empty? ? self : value.dig(*path)
         target_trace.value[key.to_s] = trace
@@ -141,7 +143,7 @@ module Anyway
 
       def current_trace() ;  trace_stack.last; end
 
-      alias tracing? current_trace
+      alias_method :tracing?, :current_trace
 
       def source_stack
         (Thread.current[:__anyway__trace_source_stack__] ||= [])

data/lib/.rbnext/{2.8 → 3.0}/anyway/config.rb

@@ -19,7 +19,7 @@ module Anyway # :nodoc:
   # Provides `attr_config` method to describe
   # configuration parameters and set defaults
   class Config
-    PARAM_NAME = /^[a-z_]([\w]+)?$/
+    PARAM_NAME = /^[a-z_](\w+)?$/
 
     # List of names that couldn't be used as config names
     # (the class instance methods we use)
@@ -40,12 +40,14 @@ module Anyway # :nodoc:
       raise_validation_error
       reload
       resolve_config_path
+      tap
       to_h
       to_source_trace
       write_config_attr
     ].freeze
 
     class Error < StandardError; end
+
     class ValidationError < Error; end
 
     include OptparseConfig
@@ -142,9 +144,9 @@ module Anyway # :nodoc:
       end
 
       def on_load(*names, &block)
-        raise ArgumentError, "Either methods or block should be specified, not both" if block_given? && !names.empty?
+        raise ArgumentError, "Either methods or block should be specified, not both" if block && !names.empty?
 
-        if block_given?
+        if block
           load_callbacks << BlockCallback.new(block)
         else
           load_callbacks.push(*names.map { NamedCallback.new(_1) })
@@ -201,8 +203,7 @@ module Anyway # :nodoc:
           accessors_module.module_eval <<~RUBY, __FILE__, __LINE__ + 1
             def #{name}=(val)
               __trace__&.record_value(val, \"#{name}\", **Tracing.current_trace_source)
-              # DEPRECATED: instance variable set will be removed in 2.1
-              @#{name} = values[:#{name}] = val
+              values[:#{name}] = val
             end
 
             def #{name}
@@ -229,7 +230,7 @@ module Anyway # :nodoc:
         # handle two cases:
         # - SomeModule::Config => "some_module"
         # - SomeConfig => "some"
-        unless name =~ /^(\w+)(\:\:)?Config$/
+        unless name =~ /^(\w+)(::)?Config$/
           raise "Couldn't infer config name, please, specify it explicitly" \
             "via `config_name :my_config`"
         end
@@ -288,17 +289,14 @@ module Anyway # :nodoc:
       trace = Tracing.capture do
         Tracing.trace!(:defaults) { base_config }
 
-        load_from_sources(
-          base_config,
-          name: config_name,
-          env_prefix: env_prefix,
-          config_path: resolve_config_path(config_name, env_prefix)
-        )
+        config_path = resolve_config_path(config_name, env_prefix)
+
+        load_from_sources(base_config, name: config_name, env_prefix: env_prefix, config_path: config_path)
 
         if overrides
           Tracing.trace!(:load) { overrides }
 
-          base_config.deep_merge!(overrides)
+          Utils.deep_merge!(base_config, overrides)
         end
       end
 
@@ -321,7 +319,7 @@ module Anyway # :nodoc:
 
     def load_from_sources(base_config, **options)
       Anyway.loaders.each do |(_id, loader)|
-        base_config.deep_merge!(loader.call(**options))
+        Utils.deep_merge!(base_config, loader.call(**options))
       end
       base_config
     end

data/lib/.rbnext/{2.8 → 3.0}/anyway/tracing.rb

@@ -34,11 +34,13 @@ module Anyway
 
       def record_value(val, *path, **opts)
         key = path.pop
-        trace = if val.is_a?(Hash)
-          Trace.new.tap { _1.merge_values(val, **opts) }
-        else
-          Trace.new(:value, val, **opts)
-        end
+        (__m__ = if val.is_a?(Hash)
+  Trace.new.tap {
+    _1.merge_values(val, **opts)
+  }
+else
+  Trace.new(:value, val, **opts)
+end) && (((trace = __m__) || true) || Kernel.raise(NoMatchingPatternError, __m__.inspect))
 
         target_trace = path.empty? ? self : value.dig(*path)
         target_trace.value[key.to_s] = trace
@@ -141,7 +143,7 @@ module Anyway
 
       def current_trace() ;  trace_stack.last; end
 
-      alias tracing? current_trace
+      alias_method :tracing?, :current_trace
 
       def source_stack
         (Thread.current[:__anyway__trace_source_stack__] ||= [])

data/lib/anyway/config.rb

@@ -19,7 +19,7 @@ module Anyway # :nodoc:
   # Provides `attr_config` method to describe
   # configuration parameters and set defaults
   class Config
-    PARAM_NAME = /^[a-z_]([\w]+)?$/
+    PARAM_NAME = /^[a-z_](\w+)?$/
 
     # List of names that couldn't be used as config names
     # (the class instance methods we use)
@@ -40,12 +40,14 @@ module Anyway # :nodoc:
       raise_validation_error
       reload
       resolve_config_path
+      tap
       to_h
       to_source_trace
       write_config_attr
     ].freeze
 
     class Error < StandardError; end
+
     class ValidationError < Error; end
 
     include OptparseConfig
@@ -106,21 +108,21 @@ module Anyway # :nodoc:
       def defaults
         return @defaults if instance_variable_defined?(:@defaults)
 
-        if superclass < Anyway::Config
+        @defaults = if superclass < Anyway::Config
           superclass.defaults.deep_dup
         else
           new_empty_config
-        end => @defaults
+        end
       end
 
       def config_attributes
         return @config_attributes if instance_variable_defined?(:@config_attributes)
 
-        if superclass < Anyway::Config
+        @config_attributes = if superclass < Anyway::Config
           superclass.config_attributes.dup
         else
           []
-        end => @config_attributes
+        end
       end
 
       def required(*names)
@@ -134,17 +136,17 @@ module Anyway # :nodoc:
       def required_attributes
         return @required_attributes if instance_variable_defined?(:@required_attributes)
 
-        if superclass < Anyway::Config
+        @required_attributes = if superclass < Anyway::Config
           superclass.required_attributes.dup
         else
           []
-        end => @required_attributes
+        end
       end
 
       def on_load(*names, &block)
-        raise ArgumentError, "Either methods or block should be specified, not both" if block_given? && !names.empty?
+        raise ArgumentError, "Either methods or block should be specified, not both" if block && !names.empty?
 
-        if block_given?
+        if block
           load_callbacks << BlockCallback.new(block)
         else
           load_callbacks.push(*names.map { NamedCallback.new(_1) })
@@ -154,11 +156,11 @@ module Anyway # :nodoc:
       def load_callbacks
         return @load_callbacks if instance_variable_defined?(:@load_callbacks)
 
-        if superclass <= Anyway::Config
+        @load_callbacks = if superclass <= Anyway::Config
           superclass.load_callbacks.dup
         else
           []
-        end => @load_callbacks
+        end
       end
 
       def config_name(val = nil)
@@ -185,11 +187,11 @@ module Anyway # :nodoc:
 
         return @env_prefix if instance_variable_defined?(:@env_prefix)
 
-        if superclass < Anyway::Config && superclass.explicit_config_name?
+        @env_prefix = if superclass < Anyway::Config && superclass.explicit_config_name?
           superclass.env_prefix
         else
           config_name.upcase
-        end => @env_prefix
+        end
       end
 
       def new_empty_config() = {}
@@ -201,8 +203,7 @@ module Anyway # :nodoc:
           accessors_module.module_eval <<~RUBY, __FILE__, __LINE__ + 1
             def #{name}=(val)
               __trace__&.record_value(val, \"#{name}\", **Tracing.current_trace_source)
-              # DEPRECATED: instance variable set will be removed in 2.1
-              @#{name} = values[:#{name}] = val
+              values[:#{name}] = val
             end
 
             def #{name}
@@ -215,9 +216,9 @@ module Anyway # :nodoc:
       def accessors_module
         return @accessors_module if instance_variable_defined?(:@accessors_module)
 
-        Module.new.tap do |mod|
+        @accessors_module = Module.new.tap do |mod|
           include mod
-        end => @accessors_module
+        end
       end
 
       def build_config_name
@@ -229,7 +230,7 @@ module Anyway # :nodoc:
         # handle two cases:
         # - SomeModule::Config => "some_module"
         # - SomeConfig => "some"
-        unless name =~ /^(\w+)(\:\:)?Config$/
+        unless name =~ /^(\w+)(::)?Config$/
           raise "Couldn't infer config name, please, specify it explicitly" \
             "via `config_name :my_config`"
         end
@@ -285,22 +286,19 @@ module Anyway # :nodoc:
     def load(overrides = nil)
       base_config = self.class.defaults.deep_dup
 
-      Tracing.capture do
+      trace = Tracing.capture do
         Tracing.trace!(:defaults) { base_config }
 
-        load_from_sources(
-          base_config,
-          name: config_name,
-          env_prefix: env_prefix,
-          config_path: resolve_config_path(config_name, env_prefix)
-        )
+        config_path = resolve_config_path(config_name, env_prefix)
+
+        load_from_sources(base_config, name: config_name, env_prefix:, config_path:)
 
         if overrides
           Tracing.trace!(:load) { overrides }
 
-          base_config.deep_merge!(overrides)
+          Utils.deep_merge!(base_config, overrides)
         end
-      end => trace
+      end
 
       base_config.each do |key, val|
         write_config_attr(key.to_sym, val)
@@ -321,7 +319,7 @@ module Anyway # :nodoc:
 
     def load_from_sources(base_config, **options)
       Anyway.loaders.each do |(_id, loader)|
-        base_config.deep_merge!(loader.call(**options))
+        Utils.deep_merge!(base_config, loader.call(**options))
       end
       base_config
     end

data/lib/anyway/dynamic_config.rb

@@ -16,7 +16,7 @@ module Anyway
         config = allocate
         options[:env_prefix] ||= name.to_s.upcase
         options[:config_path] ||= config.resolve_config_path(name, options[:env_prefix])
-        config.load_from_sources(new_empty_config, name: name, **options)
+        config.load_from_sources(new_empty_config, name:, **options)
       end
     end
 

data/lib/anyway/env.rb

@@ -49,7 +49,7 @@ module Anyway
         path = key.sub(/^#{prefix}_/, "").downcase
 
         paths = path.split("__")
-        trace!(:env, *paths, key: key) { data.bury(type_cast.call(val), *paths) }
+        trace!(:env, *paths, key:) { data.bury(type_cast.call(val), *paths) }
       end
     end
   end

data/lib/anyway/ext/deep_dup.rb

@@ -30,6 +30,12 @@ module Anyway
         end
       end
 
+      refine ::Object do
+        def deep_dup
+          dup
+        end
+      end
+
       using self
     end
   end

data/lib/anyway/ext/hash.rb

@@ -5,18 +5,6 @@ module Anyway
     # Extend Hash through refinements
     module Hash
       refine ::Hash do
-        # From ActiveSupport http://api.rubyonrails.org/classes/Hash.html#method-i-deep_merge
-        def deep_merge!(other_hash)
-          merge!(other_hash) do |key, this_value, other_value|
-            if this_value.is_a?(::Hash) && other_value.is_a?(::Hash)
-              this_value.deep_merge!(other_value)
-              this_value
-            else
-              other_value
-            end
-          end
-        end
-
         def stringify_keys!
           keys.each do |key|
             value = delete(key)

data/lib/anyway/loaders/base.rb

@@ -7,7 +7,7 @@ module Anyway
 
       class << self
         def call(local: Anyway::Settings.use_local_files, **opts)
-          new(local: local).call(**opts)
+          new(local:).call(**opts)
         end
       end
 

data/lib/anyway/loaders/yaml.rb

@@ -17,7 +17,7 @@ module Anyway
         local_path = local_config_path(config_path)
         local_config = trace!(:yml, path: relative_config_path(local_path).to_s) { load_local_yml(local_path) }
 
-        base_config.deep_merge!(local_config)
+        Utils.deep_merge!(base_config, local_config)
       end
 
       private
@@ -32,8 +32,8 @@ module Anyway
         end
       end
 
-      alias load_base_yml parse_yml
-      alias load_local_yml parse_yml
+      alias_method :load_base_yml, :parse_yml
+      alias_method :load_local_yml, :parse_yml
 
       def local_config_path(path)
         path.sub(/\.yml/, ".local.yml")

data/lib/anyway/rails/loaders/credentials.rb

@@ -24,13 +24,13 @@ module Anyway
           ) do
             ::Rails.application.credentials.public_send(name)
           end.then do |creds|
-            config.deep_merge!(creds) if creds
+            Utils.deep_merge!(config, creds) if creds
           end
 
           if use_local?
             trace!(:credentials, store: LOCAL_CONTENT_PATH) do
               local_credentials(name)
-            end.then { |creds| config.deep_merge!(creds) if creds }
+            end.then { |creds| Utils.deep_merge!(config, creds) if creds }
           end
 
           config

data/lib/anyway/rails/loaders/secrets.rb

@@ -15,7 +15,7 @@ module Anyway
           trace!(:secrets) do
             secrets.public_send(name)
           end.then do |secrets|
-            config.deep_merge!(secrets) if secrets
+            Utils.deep_merge!(config, secrets) if secrets
           end
 
           config

data/lib/anyway/rails/loaders/yaml.rb

@@ -5,11 +5,22 @@ module Anyway
     module Loaders
       class YAML < Anyway::Loaders::YAML
         def load_base_yml(*)
+          parsed_yml = super
+          return parsed_yml unless environmental?(parsed_yml)
+
           super[::Rails.env] || {}
         end
 
         private
 
+        def environmental?(parsed_yml)
+          return true unless Settings.future.unwrap_known_environments
+          # likely
+          return true if parsed_yml.key?(::Rails.env)
+          # less likely
+          ::Rails.application.config.anyway_config.known_environments.any? { parsed_yml.key?(_1) }
+        end
+
         def relative_config_path(path)
           Pathname.new(path).relative_path_from(::Rails.root)
         end

data/lib/anyway/rails/settings.rb

@@ -9,8 +9,13 @@ end
 
 module Anyway
   class Settings
+    class Future
+      setting :unwrap_known_environments, true
+    end
+
     class << self
       attr_reader :autoload_static_config_path, :autoloader
+      attr_accessor :known_environments
 
       if defined?(::Zeitwerk)
         def autoload_static_config_path=(val)
@@ -56,5 +61,6 @@ module Anyway
     end
 
     self.default_config_path = ->(name) { ::Rails.root.join("config", "#{name}.yml") }
+    self.known_environments = %w[test development production]
   end
 end