anyway_config 2.0.2 → 2.1.0

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.rb

@@ -55,9 +55,7 @@ module Anyway
         registry.each(&block)
       end
 
-      def freeze
-        registry.freeze
-      end
+      def freeze() = registry.freeze
 
       private
 

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
 
@@ -15,9 +15,7 @@ module Anyway
         @local = local
       end
 
-      def use_local?
-        @local == true
-      end
+      def use_local?() = @local == true
     end
   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
@@ -26,14 +26,14 @@ module Anyway
         return {} unless File.file?(path)
         require "yaml" unless defined?(::YAML)
         if defined?(ERB)
-          ::YAML.safe_load(ERB.new(File.read(path)).result, [], [], true)
+          ::YAML.load(ERB.new(File.read(path)).result) # rubocop:disable Security/YAMLLoad
         else
           ::YAML.load_file(path)
         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

data/lib/anyway/settings.rb

@@ -5,16 +5,66 @@ module Anyway
   #
   # Settings contain the library-wide configuration.
   class Settings
+    # Future encapsulates settings that will be introduced in the upcoming version
+    # with the default values, which could break compatibility
+    class Future
+      class << self
+        def setting(name, default_value)
+          settings[name] = default_value
+
+          define_method(name) do
+            store[name]
+          end
+
+          define_method(:"#{name}=") do |val|
+            store[name] = val
+          end
+        end
+
+        def settings
+          @settings ||= {}
+        end
+      end
+
+      def initialize
+        @store = {}
+      end
+
+      def use(*names)
+        store.clear
+        names.each { store[_1] = self.class.settings[_1] }
+      end
+
+      private
+
+      attr_reader :store
+    end
+
     class << self
       # Define whether to load data from
       # *.yml.local (or credentials/local.yml.enc)
       attr_accessor :use_local_files
 
-      # Return a path to YML config file given the config name
-      attr_accessor :default_config_path
+      # A proc returning a path to YML config file given the config name
+      attr_reader :default_config_path
+
+      def default_config_path=(val)
+        if val.is_a?(Proc)
+          @default_config_path = val
+          return
+        end
+
+        val = val.to_s
+
+        @default_config_path = ->(name) { File.join(val, "#{name}.yml") }
+      end
 
       # Enable source tracing
       attr_accessor :tracing_enabled
+
+      def future
+        @future ||= Future.new
+      end
     end
 
     # By default, use local files only in development (that's the purpose if the local files)

data/lib/anyway/testing.rb

@@ -2,7 +2,7 @@
 
 require "anyway/testing/helpers"
 
-if defined?(RSpec)
+if defined?(RSpec::Core)
   RSpec.configure do |config|
     config.include(
       Anyway::Testing::Helpers,

data/lib/anyway/tracing.rb

@@ -13,9 +13,7 @@ module Anyway
       end
 
       refine Thread::Backtrace::Location do
-        def path_lineno
-          "#{path}:#{lineno}"
-        end
+        def path_lineno() = "#{path}:#{lineno}"
       end
     end)
 
@@ -34,13 +32,14 @@ module Anyway
         value.dig(...)
       end
 
-      def record_value(val, *path, key, **opts)
-        trace =
-          if val.is_a?(Hash)
-            Trace.new.tap { _1.merge_values(val, **opts) }
-          else
-            Trace.new(:value, val, **opts)
-          end
+      def record_value(val, *path, **opts)
+        key = path.pop
+        if val.is_a?(Hash)
+          Trace.new.tap { _1.merge_values(val, **opts) }
+        else
+          Trace.new(:value, val, **opts)
+        end => trace
+
         target_trace = path.empty? ? self : value.dig(*path)
         target_trace.value[key.to_s] = trace
 
@@ -79,25 +78,19 @@ module Anyway
         value.keep_if(...)
       end
 
-      def clear
-        value.clear
-      end
+      def clear() = value.clear
 
-      def trace?
-        type == :trace
-      end
+      def trace?() = type == :trace
 
       def to_h
         if trace?
           value.transform_values(&:to_h).tap { _1.default_proc = nil }
         else
-          {value: value, source: source}
+          {value, source}
         end
       end
 
-      def dup
-        self.class.new(type, value.dup, source)
-      end
+      def dup() = self.class.new(type, value.dup, **source)
 
       def pretty_print(q)
         if trace?
@@ -146,11 +139,9 @@ module Anyway
         (Thread.current[:__anyway__trace_stack__] ||= [])
       end
 
-      def current_trace
-        trace_stack.last
-      end
+      def current_trace() = trace_stack.last
 
-      alias tracing? current_trace
+      alias_method :tracing?, :current_trace
 
       def source_stack
         (Thread.current[:__anyway__trace_source_stack__] ||= [])
@@ -178,12 +169,11 @@ module Anyway
 
     def trace!(type, *path, **opts)
       return yield unless Tracing.tracing?
-      source = {type: type}.merge(opts)
       val = yield
       if val.is_a?(Hash)
-        Tracing.current_trace.merge_values(val, **source)
+        Tracing.current_trace.merge_values(val, type:, **opts)
       else
-        Tracing.current_trace.record_value(val, *path, **source)
+        Tracing.current_trace.record_value(val, *path, type:, **opts)
       end
       val
     end

data/lib/anyway/utils/deep_merge.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Anyway
+  using Anyway::Ext::DeepDup
+
+  module Utils
+    def self.deep_merge!(source, other)
+      other.each do |key, other_value|
+        this_value = source[key]
+
+        if this_value.is_a?(::Hash) && other_value.is_a?(::Hash)
+          deep_merge!(this_value, other_value)
+        else
+          source[key] = other_value.deep_dup
+        end
+      end
+
+      source
+    end
+  end
+end

data/lib/anyway/version.rb

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

data/lib/anyway_config.rb

@@ -3,7 +3,7 @@
 require "ruby-next"
 
 require "ruby-next/language/setup"
-RubyNext::Language.setup_gem_load_path
+RubyNext::Language.setup_gem_load_path(transpile: true)
 
 require "anyway/version"
 
@@ -11,6 +11,8 @@ require "anyway/ext/deep_dup"
 require "anyway/ext/deep_freeze"
 require "anyway/ext/hash"
 
+require "anyway/utils/deep_merge"
+
 require "anyway/settings"
 require "anyway/tracing"
 require "anyway/config"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
 description: "\n    Configuration DSL for Ruby libraries and applications.\n    Allows
   you to easily follow the twelve-factor application principles (https://12factor.net/config).\n
   \ "
@@ -106,10 +106,21 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- lib/.rbnext/1995.next/anyway/config.rb
+- lib/.rbnext/1995.next/anyway/dynamic_config.rb
+- lib/.rbnext/1995.next/anyway/env.rb
+- lib/.rbnext/1995.next/anyway/loaders/base.rb
+- lib/.rbnext/1995.next/anyway/tracing.rb
 - lib/.rbnext/2.7/anyway/auto_cast.rb
 - lib/.rbnext/2.7/anyway/config.rb
 - lib/.rbnext/2.7/anyway/option_parser_builder.rb
+- lib/.rbnext/2.7/anyway/rails/loaders/yaml.rb
+- lib/.rbnext/2.7/anyway/settings.rb
 - lib/.rbnext/2.7/anyway/tracing.rb
+- lib/.rbnext/3.0/anyway/config.rb
+- lib/.rbnext/3.0/anyway/loaders.rb
+- lib/.rbnext/3.0/anyway/loaders/base.rb
+- lib/.rbnext/3.0/anyway/tracing.rb
 - lib/anyway.rb
 - lib/anyway/auto_cast.rb
 - lib/anyway/config.rb
@@ -136,6 +147,7 @@ files:
 - lib/anyway/testing.rb
 - lib/anyway/testing/helpers.rb
 - lib/anyway/tracing.rb
+- lib/anyway/utils/deep_merge.rb
 - lib/anyway/version.rb
 - lib/anyway_config.rb
 - lib/generators/anyway/app_config/USAGE