anyway_config 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4661661a2d8cbce7e35a4eef45520a290855af228b1d20d69367708b11be3f
-  data.tar.gz: 97f07abb3e194f490069d6dc1ef7076a88f3775f5b06a3cc99d15314da845c54
+  metadata.gz: 47d019e511f1654a2cad179c162f388df74fef736569f6e09189f6ba48295d11
+  data.tar.gz: 5a7513880f6f8f436491828d405bd09f63e1226beddfa785ecc59f15b8b15a9d
 SHA512:
-  metadata.gz: 9897240812d5ae7522b99c0d4ac2ec1c3e2ec5759ef481ff3db6d9fbeb1c46312a895ed64fd94fc6b3c1a416a3ccee9325458c1aeacd0ff7dbc9a10593fabf89
-  data.tar.gz: c590c11acb69e99ff0ada09fa7ebb4ae44f777da626f2f9dd053935d9d201fa6b3d6296642271e7d56260b9258d0baca65ade78fd10c9397e5205a03d8551b1a
+  metadata.gz: 9fde04c3b432208e9448bf69b198a1bd22f433f0511cb4238f4f725e83cd6fa5af2f19c8fa27638c68aae9b611df883a9be0a32e99686c4e8947a7704c9cc446
+  data.tar.gz: b4c3e05462f1c6de323c614e9a89d185ffcc03d84fff5f8f5e083ae1be93ed8b93d896e6502a8604f4bba74ce46c03378e49aaba9d5f18e53d0a1225605fb54c

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change log
 
-## master
+## 2.0.0 (2020-04-14)
+
+- Fix double `yield` in tracing for ENV loader. ([@Envek][])
 
 ## 2.0.0.rc1 (2020-03-31)
 
@@ -348,3 +350,4 @@ Now works on JRuby 9.1+.
 [@dsalahutdinov]: https://github.com/dsalahutdinov
 [@charlie-wasp]: https://github.com/charlie-wasp
 [@jastkand]: https://github.com/jastkand
+[@Envek]: https://github.com/Envek

data/README.md

@@ -18,8 +18,8 @@ For application developers, Anyway Config could be useful to:
 - **Keep configuration organized** and use _named configs_ instead of bloated `.env`/`settings.yml`/whatever.
 - **Free code of ENV/credentials/secrets dependency** and use configuration classes instead—your code should not rely on configuration data sources.
 
-**NOTE:** this readme shows documentation for the upcoming 2.0 version (`2.0.0.rc1` is available on RubyGems).
-For version 1.x see [1-4-stable branch](https://github.com/palkan/anyway_config/tree/1-4-stable).
+**NOTE:** this readme shows documentation for 2.x version.
+For version 1.x see the [1-4-stable branch](https://github.com/palkan/anyway_config/tree/1-4-stable).
 
 ## Table of contents
 
@@ -78,7 +78,7 @@ Adding to a gem:
 # my-cool-gem.gemspec
 Gem::Specification.new do |spec|
   # ...
-  spec.add_dependency "anyway_config", "2.0.0.rc1"
+  spec.add_dependency "anyway_config", ">= 2.0.0"
   # ...
 end
 ```
@@ -87,7 +87,7 @@ Or adding to your project:
 
 ```ruby
 # Gemfile
-gem "anyway_config", "2.0.0.rc1"
+gem "anyway_config", "~> 2.0.0"
 ```
 
 ### Supported Ruby versions

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

@@ -33,6 +33,7 @@ module Anyway # :nodoc:
       clear
       deconstruct_keys
       dig
+      dup
       initialize
       load
       load_from_sources
@@ -346,6 +347,15 @@ module Anyway # :nodoc:
       values.deep_dup.deep_freeze
     end
 
+    def dup
+      self.class.allocate.tap do |new_config|
+        %i[config_name env_prefix __trace__].each do |ivar|
+          new_config.instance_variable_set(:"@#{ivar}", send(ivar).dup)
+        end
+        new_config.instance_variable_set(:@values, values.deep_dup)
+      end
+    end
+
     def resolve_config_path(name, env_prefix)
       Anyway.env.fetch(env_prefix).delete("conf") || Settings.default_config_path.call(name)
     end

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

@@ -95,6 +95,10 @@ module Anyway
         end
       end
 
+      def dup
+        self.class.new(type, value.dup, source)
+      end
+
       def pretty_print(q)
         if trace?
           q.nest(2) do
@@ -179,7 +183,7 @@ module Anyway
       if val.is_a?(Hash)
         Tracing.current_trace.merge_values(val, **source)
       else
-        Tracing.current_trace.record_value(yield, *path, **source)
+        Tracing.current_trace.record_value(val, *path, **source)
       end
       val
     end

data/lib/anyway/config.rb

@@ -33,6 +33,7 @@ module Anyway # :nodoc:
       clear
       deconstruct_keys
       dig
+      dup
       initialize
       load
       load_from_sources
@@ -346,6 +347,15 @@ module Anyway # :nodoc:
       values.deep_dup.deep_freeze
     end
 
+    def dup
+      self.class.allocate.tap do |new_config|
+        %i[config_name env_prefix __trace__].each do |ivar|
+          new_config.instance_variable_set(:"@#{ivar}", send(ivar).dup)
+        end
+        new_config.instance_variable_set(:@values, values.deep_dup)
+      end
+    end
+
     def resolve_config_path(name, env_prefix)
       Anyway.env.fetch(env_prefix).delete("conf") || Settings.default_config_path.call(name)
     end

data/lib/anyway/loaders/yaml.rb

@@ -10,17 +10,18 @@ module Anyway
   module Loaders
     class YAML < Base
       def call(config_path:, **_options)
-        load_yml(config_path).tap do |config|
-          config.deep_merge!(load_yml(local_config_path(config_path))) if use_local?
-        end
-      end
+        base_config = trace!(:yml, path: relative_config_path(config_path).to_s) { load_base_yml(config_path) }
 
-      private
+        return base_config unless use_local?
+
+        local_path = local_config_path(config_path)
+        local_config = trace!(:yml, path: relative_config_path(local_path).to_s) { load_local_yml(local_path) }
 
-      def load_yml(path)
-        trace!(:yml, path: relative_config_path(path).to_s) { parse_yml(path) }
+        base_config.deep_merge!(local_config)
       end
 
+      private
+
       def parse_yml(path)
         return {} unless File.file?(path)
         require "yaml" unless defined?(::YAML)
@@ -31,6 +32,9 @@ module Anyway
         end
       end
 
+      alias load_base_yml parse_yml
+      alias load_local_yml parse_yml
+
       def local_config_path(path)
         path.sub(/\.yml/, ".local.yml")
       end

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

@@ -4,7 +4,7 @@ module Anyway
   module Rails
     module Loaders
       class YAML < Anyway::Loaders::YAML
-        def parse_yml(*)
+        def load_base_yml(*)
           super[::Rails.env] || {}
         end
 

data/lib/anyway/railtie.rb

@@ -8,6 +8,7 @@ module Anyway # :nodoc:
     config.anyway_config = Anyway::Settings
 
     ActiveSupport.on_load(:before_configuration) do
+      next if ::Rails.application.initialized?
       config.anyway_config.autoload_static_config_path = DEFAULT_CONFIGS_PATH
     end
 

data/lib/anyway/tracing.rb

@@ -95,6 +95,10 @@ module Anyway
         end
       end
 
+      def dup
+        self.class.new(type, value.dup, source)
+      end
+
       def pretty_print(q)
         if trace?
           q.nest(2) do
@@ -179,7 +183,7 @@ module Anyway
       if val.is_a?(Hash)
         Tracing.current_trace.merge_values(val, **source)
       else
-        Tracing.current_trace.record_value(yield, *path, **source)
+        Tracing.current_trace.record_value(val, *path, **source)
       end
       val
     end

data/lib/anyway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyway # :nodoc:
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0"
 end

data/lib/generators/anyway/install/install_generator.rb

@@ -19,15 +19,19 @@ module Anyway
         end
       end
 
+      # rubocop:disable Layout/HeredocIndentation
       def add_setup_autoload_to_config
+        maybe_comment_indented = default_configs_path? ? "    # " : "    "
         inject_into_file "config/application.rb", after: %r{< Rails::Application\n} do
           <<-RUBY
     # Configure the path for configuration classes that should be used before initialization
     # NOTE: path should be relative to the project root (Rails.root)
-    #{default_configs_path? ? "# " : ""}config.anyway_config.autoload_static_config_path = "#{static_config_root}"
+#{maybe_comment_indented}config.anyway_config.autoload_static_config_path = "#{static_config_root}"
+#{maybe_comment_indented.sub(/\s+$/, "")}
           RUBY
         end
       end
+      # rubocop:enable Layout/HeredocIndentation
 
       private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -167,9 +167,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: