anyway_config 2.0.6 → 2.1.0

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

@@ -86,7 +86,7 @@ module Anyway
         if trace?
           value.transform_values(&:to_h).tap { _1.default_proc = nil }
         else
-          {value: value, source: source}
+          {value, source}
         end
       end
 
@@ -141,7 +141,7 @@ module Anyway
 
       def current_trace() = trace_stack.last
 
-      alias tracing? current_trace
+      alias_method :tracing?, :current_trace
 
       def source_stack
         (Thread.current[:__anyway__trace_source_stack__] ||= [])
@@ -171,9 +171,9 @@ module Anyway
       return yield unless Tracing.tracing?
       val = yield
       if val.is_a?(Hash)
-        Tracing.current_trace.merge_values(val, type: type, **opts)
+        Tracing.current_trace.merge_values(val, type:, **opts)
       else
-        Tracing.current_trace.record_value(val, *path, type: type, **opts)
+        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.6"
+  VERSION = "2.1.0"
 end

data/lib/anyway_config.rb

@@ -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.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 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.8.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        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
@@ -106,14 +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/2.8/anyway/config.rb
-- lib/.rbnext/2.8/anyway/loaders.rb
-- lib/.rbnext/2.8/anyway/loaders/base.rb
-- lib/.rbnext/2.8/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
@@ -140,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