anyway_config 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc95d6a5792ef79aaa6abc3156e11fb9cfe45c48637f6763d16ec5b4645667fb
-  data.tar.gz: 13c6d72ce0d659945e08f2e6e457f745876338d4fdc74a94a5cd049e201b5904
+  metadata.gz: 0e4b1e98155e34f0220746d9230e433072143638e838f8975023c79cf75a9fe1
+  data.tar.gz: e5d8b4f78fe7f32fc2dd3068f90897a28f57a292596346f5bb368a36094cea36
 SHA512:
-  metadata.gz: a4bdc75c88708b8da49ced8b757e897b0bb6a8f21787ebaee65c5b154518fd343203b583542078058159c53bed0ba5700ed01f66387901a75e440e072cd3cbad
-  data.tar.gz: f6410c3f38b6d877b4ae9ba6adde192957fed52bba5943242c80420d742a266c0739c45a9105054dc04da921219a179e30ca8811b065b2dfbd70d3523d4b6f2c
+  metadata.gz: 849c9c7fb4bc1101444dfec952a84ac3b1f605f3415d65d31ea727f176d9281cddc90e8b56ff73a3b25431126d61640931cfbc2621dc607493014e9a97d4ee3a
+  data.tar.gz: 840073b4420e4c1a792db2571b29eb7605cbc7066833bc4afe91defd94ba08153a4f32036a6cd09c6cf8f1da718f7f11d41bb46c8b9ea1ab0a0bfd2a81ab0a20

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## master
 
+## 2.2.3 (2022-01-21)
+
+- Fix Ruby 3.1 compatibility. ([@palkan][])
+
+- Add ability to set default key for environmental YAML files. ([@skryukov])
+
+Define a key for environmental yaml files to read default values from with `config.anyway_config.default_environmental_key = "default"`.
+This way Anyway Config will try to read settings under the `"default"` key and then merge environmental settings into them.
+
 ## 2.2.2 (2020-10-26)
 
 - Fixed regression introduced by the `#deep_merge!` refinement.
@@ -439,3 +448,4 @@ No we're dependency-free!
 [@jastkand]: https://github.com/jastkand
 [@envek]: https://github.com/Envek
 [@progapandist]: https://github.com/progapandist
+[@skryukov]: https://github.com/skryukov

data/README.md

@@ -373,6 +373,26 @@ staging:
 port: 3002 # This value will not be loaded at all
 ```
 
+To provide default values you can use YAML anchors, but they do not deep-merge settings, so Anyway Config provides a way to define a special top-level key for default values like this:
+
+```ruby
+config.anyway_config.default_environmental_key = "default"
+```
+
+After that, Anyway Config will start reading settings under the `"default"` key and then merge environmental settings into them.
+
+```yml
+default:
+  server: # This values will be loaded in all environments by default
+    host: localhost
+    port: 3002
+
+staging:
+  server:
+    host: staging.example.com # This value will override the defaults when Rails.env.staging? is true
+    # port will be set to the value from the defaults — 3002
+```
+
 You can specify the lookup path for YAML files in one of the following ways:
 
 - By setting `config.anyway_config.default_config_path` to a target directory path:

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

@@ -4,8 +4,8 @@ module Anyway
   module AutoCast
     # Regexp to detect array values
     # Array value is a values that contains at least one comma
-    # and doesn't start/end with quote
-    ARRAY_RXP = /\A[^'"].*\s*,\s*.*[^'"]\z/
+    # and doesn't start/end with quote or curly braces
+    ARRAY_RXP = /\A[^'"{].*\s*,\s*.*[^'"}]\z/
 
     class << self
       def call(val)

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

@@ -8,7 +8,11 @@ module Anyway
           parsed_yml = super
           return parsed_yml unless environmental?(parsed_yml)
 
-          super[::Rails.env] || {}
+          env_config = parsed_yml[::Rails.env] || {}
+          return env_config if Anyway::Settings.default_environmental_key.blank?
+
+          default_config = parsed_yml[Anyway::Settings.default_environmental_key] || {}
+          Utils.deep_merge!(default_config, env_config)
         end
 
         private
@@ -18,7 +22,9 @@ module Anyway
           # likely
           return true if parsed_yml.key?(::Rails.env)
           # less likely
-          ::Rails.application.config.anyway_config.known_environments.any? { |_1| parsed_yml.key?(_1) }
+          return true if ::Rails.application.config.anyway_config.known_environments.any? { |_1| parsed_yml.key?(_1) }
+          # strange, but still possible
+          Anyway::Settings.default_environmental_key.present? && parsed_yml.key?(Anyway::Settings.default_environmental_key)
         end
 
         def relative_config_path(path)

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

@@ -4,8 +4,8 @@ module Anyway
   module AutoCast
     # Regexp to detect array values
     # Array value is a values that contains at least one comma
-    # and doesn't start/end with quote
-    ARRAY_RXP = /\A[^'"].*\s*,\s*.*[^'"]\z/
+    # and doesn't start/end with quote or curly braces
+    ARRAY_RXP = /\A[^'"{].*\s*,\s*.*[^'"}]\z/
 
     class << self
       def call(val)

data/lib/anyway/auto_cast.rb

@@ -4,8 +4,8 @@ module Anyway
   module AutoCast
     # Regexp to detect array values
     # Array value is a values that contains at least one comma
-    # and doesn't start/end with quote
-    ARRAY_RXP = /\A[^'"].*\s*,\s*.*[^'"]\z/
+    # and doesn't start/end with quote or curly braces
+    ARRAY_RXP = /\A[^'"{].*\s*,\s*.*[^'"}]\z/
 
     class << self
       def call(val)

data/lib/anyway/loaders/yaml.rb

@@ -29,10 +29,18 @@ module Anyway
         # By default, YAML load will return `false` when the yaml document is
         # empty. When this occurs, we return an empty hash instead, to match
         # the interface when no config file is present.
-        if defined?(ERB)
-          ::YAML.load(ERB.new(File.read(path)).result) || {} # rubocop:disable Security/YAMLLoad
-        else
-          ::YAML.load_file(path) || {}
+        begin
+          if defined?(ERB)
+            ::YAML.load(ERB.new(File.read(path)).result, aliases: true) || {} # rubocop:disable Security/YAMLLoad
+          else
+            ::YAML.load_file(path, aliases: true) || {}
+          end
+        rescue ArgumentError
+          if defined?(ERB)
+            ::YAML.load(ERB.new(File.read(path)).result) || {} # rubocop:disable Security/YAMLLoad
+          else
+            ::YAML.load_file(path) || {}
+          end
         end
       end
 

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

@@ -8,7 +8,11 @@ module Anyway
           parsed_yml = super
           return parsed_yml unless environmental?(parsed_yml)
 
-          super[::Rails.env] || {}
+          env_config = parsed_yml[::Rails.env] || {}
+          return env_config if Anyway::Settings.default_environmental_key.blank?
+
+          default_config = parsed_yml[Anyway::Settings.default_environmental_key] || {}
+          Utils.deep_merge!(default_config, env_config)
         end
 
         private
@@ -18,7 +22,9 @@ module Anyway
           # likely
           return true if parsed_yml.key?(::Rails.env)
           # less likely
-          ::Rails.application.config.anyway_config.known_environments.any? { parsed_yml.key?(_1) }
+          return true if ::Rails.application.config.anyway_config.known_environments.any? { parsed_yml.key?(_1) }
+          # strange, but still possible
+          Anyway::Settings.default_environmental_key.present? && parsed_yml.key?(Anyway::Settings.default_environmental_key)
         end
 
         def relative_config_path(path)

data/lib/anyway/rails/settings.rb

@@ -17,6 +17,9 @@ module Anyway
       attr_reader :autoload_static_config_path, :autoloader
       attr_accessor :known_environments
 
+      # Define a key for environmental yaml files to read default values from
+      attr_accessor :default_environmental_key
+
       if defined?(::Zeitwerk)
         def autoload_static_config_path=(val)
           raise "Cannot setup autoloader after application has been initialized" if ::Rails.application.initialized?
@@ -63,5 +66,7 @@ module Anyway
 
     self.default_config_path = ->(name) { ::Rails.root.join("config", "#{name}.yml") }
     self.known_environments = %w[test development production]
+    # Don't try read defaults when no key defined
+    self.default_environmental_key = nil
   end
 end

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, source}
+          {value:, source:}
         end
       end
 

data/lib/anyway/version.rb

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

data/lib/generators/anyway/install/templates/application_config.rb.tt

@@ -4,7 +4,7 @@
 class ApplicationConfig < Anyway::Config
   class << self
     # Make it possible to access a singleton config instance
-    # via class methods (i.e., without explictly calling `instance`)
+    # via class methods (i.e., without explicitly calling `instance`)
     delegate_missing_to :instance
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-01-21 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.11.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: steep
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 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
   \ "
@@ -120,11 +106,6 @@ 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/rails/loaders/yaml.rb
@@ -137,6 +118,11 @@ files:
 - lib/.rbnext/3.0/anyway/loaders.rb
 - lib/.rbnext/3.0/anyway/loaders/base.rb
 - lib/.rbnext/3.0/anyway/tracing.rb
+- lib/.rbnext/3.1/anyway/config.rb
+- lib/.rbnext/3.1/anyway/dynamic_config.rb
+- lib/.rbnext/3.1/anyway/env.rb
+- lib/.rbnext/3.1/anyway/loaders/base.rb
+- lib/.rbnext/3.1/anyway/tracing.rb
 - lib/anyway.rb
 - lib/anyway/auto_cast.rb
 - lib/anyway/config.rb