anyway_config 2.3.0 → 2.4.0

data/lib/anyway/tracing.rb

@@ -19,7 +19,7 @@ module Anyway
       def initialize(type = :trace, value = UNDEF, **source)
         @type = type
         @source = source
-        @value = value == UNDEF ? Hash.new { |h, k| h[k] = Trace.new(:trace) } : value
+        @value = (value == UNDEF) ? Hash.new { |h, k| h[k] = Trace.new(:trace) } : value
       end
 
       def dig(...)
@@ -35,7 +35,7 @@ module Anyway
         end
 
         target_trace = path.empty? ? self : value.dig(*path)
-        target_trace.value[key.to_s] = trace
+        target_trace.record_key(key.to_s, trace)
 
         val
       end
@@ -54,6 +54,12 @@ module Anyway
         hash
       end
 
+      def record_key(key, key_trace)
+        @value = Hash.new { |h, k| h[k] = Trace.new(:trace) } unless value.is_a?(::Hash)
+
+        value[key] = key_trace
+      end
+
       def merge!(another_trace)
         raise ArgumentError, "You can only merge into a :trace type, and this is :#{type}" unless trace?
         raise ArgumentError, "You can only merge a :trace type, but trying :#{type}" unless another_trace.trace?

data/lib/anyway/type_casting.rb

@@ -90,6 +90,11 @@ module Anyway
     end
   end
 
+  unless "".respond_to?(:safe_constantize)
+    require "anyway/ext/string_constantize"
+    using Anyway::Ext::StringConstantize
+  end
+
   # TypeCaster is an object responsible for type-casting.
   # It uses a provided types registry and mapping, and also
   # accepts a fallback typecaster.
@@ -109,8 +114,13 @@ module Anyway
       return fallback.coerce(key, val) unless caster_config
 
       case caster_config
-      in array:, type:, **nil
+      in Hash[array:, type:, **nil]
         registry.deserialize(val, type, array: array)
+      in Hash[config: subconfig]
+        subconfig = subconfig.safe_constantize if subconfig.is_a?(::String)
+        raise ArgumentError, "Config is not found: #{subconfig}" unless subconfig
+
+        subconfig.new(val)
       in Hash
         return val unless val.is_a?(Hash)
 

data/lib/anyway/utils/which.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Anyway
+  module Utils
+    # Cross-platform solution
+    # taken from https://stackoverflow.com/a/5471032
+    def self.which(cmd)
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/anyway/version.rb

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

data/lib/anyway_config.rb

@@ -10,8 +10,10 @@ require "anyway/version"
 require "anyway/ext/deep_dup"
 require "anyway/ext/deep_freeze"
 require "anyway/ext/hash"
+require "anyway/ext/flatten_names"
 
 require "anyway/utils/deep_merge"
+require "anyway/utils/which"
 
 require "anyway/settings"
 require "anyway/tracing"
@@ -35,7 +37,12 @@ module Anyway # :nodoc:
 
   # Configure default loaders
   loaders.append :yml, Loaders::YAML
+  loaders.append :ejson, Loaders::EJSON if Utils.which("ejson")
   loaders.append :env, Loaders::Env
+
+  if ENV.key?("DOPPLER_TOKEN") && ENV["ANYWAY_CONFIG_DISABLE_DOPPLER"] != "true"
+    loaders.append :doppler, Loaders::Doppler
+  end
 end
 
 require "anyway/rails" if defined?(::Rails::VERSION)

data/sig/anyway_config.rbs

@@ -56,11 +56,14 @@ module Anyway
 
   type valueType = Symbol | nil
   type arrayType = {array: bool, type: valueType}
+  type configType = {config: Class | String}
   type hashType = Hash[Symbol, valueType | arrayType | hashType]
 
-  type mappingType = valueType | arrayType | hashType
+  type mappingType = valueType | arrayType | hashType | configType
   type envType = String | Symbol | Array[String | Symbol] | {except: String | Symbol | Array[String | Symbol]}
 
+  type requiredType = Array[Symbol | Hash[Symbol, requiredType]]
+
   class Config
     extend RBSGenerator
     extend DynamicConfig::ClassMethods
@@ -71,9 +74,9 @@ module Anyway
     def self.attr_config: (*Symbol args, **untyped) -> void
     def self.defaults: -> Hash[String, untyped]
     def self.config_attributes: -> Array[Symbol]?
-    def self.required: (*Symbol names, ?env: envType) -> void
+    def self.required: (*Symbol names, ?env: envType, **requiredType) -> void
     def self.required_attributes: -> Array[Symbol]
-    def self.on_load: (*Symbol callbacks) ?{ () -> void } -> void
+    def self.on_load: (*Symbol callbacks) ?{ () [self: instance] -> void } -> void
     def self.config_name: (?(Symbol | String) val) -> String?
     def self.env_prefix: (?(Symbol | String) val) -> String
     def self.coerce_types: (**mappingType) -> void
@@ -96,10 +99,12 @@ module Anyway
     def to_source_trace: -> Hash[String, untyped]
     def inspect: -> String
     def pretty_print: (untyped q) -> untyped
+    def as_env: -> Hash[String, String]
 
     private
     attr_reader values: Hash[untyped, untyped]
     def raise_validation_error: (String msg) -> void
+    def flatten_hash: (Hash[untyped, untyped], String, Hash[String, String]) -> Hash[String, String]
 
     class Error < StandardError
     end

data/sig/manifest.yml

@@ -0,0 +1,7 @@
+dependencies:
+  - name: optparse
+  - name: json
+  - name: pathname
+  - name: date
+  - name: time
+  - name: set

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -39,61 +39,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ruby-next
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: ruby-next
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: ejson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.3.1
 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,6 +120,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- lib/.rbnext/2.6/anyway/ejson_parser.rb
 - lib/.rbnext/2.7/anyway/auto_cast.rb
 - lib/.rbnext/2.7/anyway/config.rb
 - lib/.rbnext/2.7/anyway/loaders/yaml.rb
@@ -127,12 +142,17 @@ files:
 - lib/anyway/auto_cast.rb
 - lib/anyway/config.rb
 - lib/anyway/dynamic_config.rb
+- lib/anyway/ejson_parser.rb
 - lib/anyway/env.rb
 - lib/anyway/ext/deep_dup.rb
 - lib/anyway/ext/deep_freeze.rb
+- lib/anyway/ext/flatten_names.rb
 - lib/anyway/ext/hash.rb
+- lib/anyway/ext/string_constantize.rb
 - lib/anyway/loaders.rb
 - lib/anyway/loaders/base.rb
+- lib/anyway/loaders/doppler.rb
+- lib/anyway/loaders/ejson.rb
 - lib/anyway/loaders/env.rb
 - lib/anyway/loaders/yaml.rb
 - lib/anyway/option_parser_builder.rb
@@ -152,6 +172,7 @@ files:
 - lib/anyway/tracing.rb
 - lib/anyway/type_casting.rb
 - lib/anyway/utils/deep_merge.rb
+- lib/anyway/utils/which.rb
 - lib/anyway/version.rb
 - lib/anyway_config.rb
 - lib/generators/anyway/app_config/USAGE
@@ -164,6 +185,7 @@ files:
 - lib/generators/anyway/install/install_generator.rb
 - lib/generators/anyway/install/templates/application_config.rb.tt
 - sig/anyway_config.rbs
+- sig/manifest.yml
 homepage: http://github.com/palkan/anyway_config
 licenses:
 - MIT
@@ -173,6 +195,7 @@ metadata:
   documentation_uri: http://github.com/palkan/anyway_config
   homepage_uri: http://github.com/palkan/anyway_config
   source_code_uri: http://github.com/palkan/anyway_config
+  funding_uri: https://github.com/sponsors/palkan
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -188,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Configuration DSL for Ruby libraries and applications