anyway_config 2.0.1 → 2.0.6

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

@@ -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

@@ -26,7 +26,7 @@ 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

data/lib/anyway/rails/settings.rb

@@ -10,11 +10,9 @@ end
 module Anyway
   class Settings
     class << self
-      attr_reader :autoload_static_config_path
+      attr_reader :autoload_static_config_path, :autoloader
 
       if defined?(::Zeitwerk)
-        attr_reader :autoloader
-
         def autoload_static_config_path=(val)
           raise "Cannot setup autoloader after application has been initialized" if ::Rails.application.initialized?
 
@@ -40,11 +38,15 @@ module Anyway
       else
         def autoload_static_config_path=(val)
           if autoload_static_config_path
-            ActiveSupport::Dependencies.autoload_paths.delete(::Rails.root.join(autoload_static_config_path).to_s)
+            old_path = ::Rails.root.join(autoload_static_config_path).to_s
+            ActiveSupport::Dependencies.autoload_paths.delete(old_path)
+            ::Rails.application.config.eager_load_paths.delete(old_path)
           end
 
           @autoload_static_config_path = val
-          ActiveSupport::Dependencies.autoload_paths << ::Rails.root.join(val)
+          new_path = ::Rails.root.join(val).to_s
+          ActiveSupport::Dependencies.autoload_paths << new_path
+          ::Rails.application.config.eager_load_paths << new_path
         end
 
         def cleanup_autoload_paths

data/lib/anyway/railtie.rb

@@ -7,11 +7,15 @@ module Anyway # :nodoc:
     # Add settings to Rails config
     config.anyway_config = Anyway::Settings
 
-    ActiveSupport.on_load(:before_configuration) do
+    config.before_configuration do
       next if ::Rails.application.initialized?
       config.anyway_config.autoload_static_config_path = DEFAULT_CONFIGS_PATH
     end
 
+    config.before_eager_load do
+      Anyway::Settings.autoloader&.eager_load
+    end
+
     # Remove `autoload_static_config_path` from Rails `autoload_paths`
     # since we use our own autoloading mechanism
     initializer "anyway_config.cleanup_autoload" do

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,13 +78,9 @@ 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?
@@ -95,9 +90,7 @@ module Anyway
         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,9 +139,7 @@ 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
 
@@ -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: type, **opts)
       else
-        Tracing.current_trace.record_value(val, *path, **source)
+        Tracing.current_trace.record_value(val, *path, type: type, **opts)
       end
       val
     end

data/lib/anyway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyway # :nodoc:
-  VERSION = "2.0.1"
+  VERSION = "2.0.6"
 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"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.6
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-07-07 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.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -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
   \ "
@@ -110,6 +110,10 @@ files:
 - lib/.rbnext/2.7/anyway/config.rb
 - lib/.rbnext/2.7/anyway/option_parser_builder.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/anyway.rb
 - lib/anyway/auto_cast.rb
 - lib/anyway/config.rb