anyway_config 2.4.2 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 822e17fb52f85c3f3066322083d1d2d30265bb58fbce6f50e88590ebea140ba4
-  data.tar.gz: c3cfd97af9fe5de290b8a378517b3f11a7a020e550929c7e3765e34411988246
+  metadata.gz: 2b7d08d5b962854362876ef57a33cb5a7db900a2b116cfc55e6a111fe67a6908
+  data.tar.gz: 8330ecf2804805dc40fd4966e5f0da06a8e46d87a9f01d1d377f5687b61cbdff
 SHA512:
-  metadata.gz: 8fabe569de72f9a65d22a4a69a8b2b4cad0d97ef2dc62f245133352b142402ec2eb2b6f9492c713aceaac6518ca1453e1527855e6eaf5b4adb12ec0b2c2c1b50
-  data.tar.gz: 2fe2eef92329925f2626a501bd34c0081170e507f30214b9199710e509f208b0f3df7bfda163b304304e1fda58c8b4f757f527e748afd21708514877e4a1765c
+  metadata.gz: 5af5f14653ba282b7c4e89d88c85dc3908d693fa7dc93c0436dba5044c1a8d98cae12284b97bfae9c3b9415dea5b745ac3bb9ee3639fc7880c61b3c3f6bf7465
+  data.tar.gz: b6d44f0500203371beaa12cdc47a24a9e9a66d66305491649e0961a9285d5280692cf5828736fa79afbd8fdd1459e26bf0a2715415c44188604c90616b880242

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## 2.5.1 (2023-08-04)
+
+- Fix Rails detection. ([@palkan][])
+
+Fixes [#134](https://github.com/palkan/anyway_config/issues/134).
+
+## 2.5.0 (2023-07-24)
+
+- Generators: Add `config_name` to generated classes if name contains underscore. ([@palkan][])
+
+- Load Rails extensions even if Rails was loaded after Anyway Config. ([@palkan][])
+
+- Fix handling `config.credentials.content_path` provided as String. ([@palkan][])
+
 ## 2.4.2 (2023-06-07)
 
 - Use ANYWAY_ENV as the current environment if defined. ([@palkan][])

data/README.md

@@ -548,6 +548,14 @@ Alternatively, you can call `rails g anyway:app_config name param1 param2 ...`.
 
 **NOTE:** The generated `ApplicationConfig` class uses a singleton pattern along with `delegate_missing_to` to re-use the same instance across the application. However, the delegation can lead to unexpected behaviour and break Anyway Config internals if you have attributes named as `Anyway::Config` class methods. See [#120](https://github.com/palkan/anyway_config/issues/120).
 
+### Loading Anyway Config before Rails
+
+Anyway Config activates Rails-specific features automatically on the gem load only if Rails has been already required (we check for the `Rails::VERSION` constant presence). However, in some cases you may want to use Anyway Config before Rails initialization (e.g., in `config/puma.rb` when starting a Puma web server).
+
+By default, Anyway Config sets up a hook (via TracePoint API) and waits for Rails to be loaded to require the Rails extensions (`require "anyway/rails"`). In case you load Rails after Anyway Config, you will see a warning telling you about that. Note that config classes loaded before Rails are not populated from Rails-specific data sources (e.g., credentials).
+
+You can disable the warning by setting `Anyway::Rails.disable_postponed_load_warning = true` in your application. Also, you can disable the _hook_ completely by calling `Anyway::Rails.tracer.disable`.
+
 ## Using with Ruby
 
 The default data loading mechanism for non-Rails applications is the following (ordered by priority from low to high):

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

@@ -299,6 +299,7 @@ module Anyway # :nodoc:
             "via `config_name :my_config`"
         end
 
+        # TODO(v3.0): Replace downcase with underscore
         Regexp.last_match[1].tap(&:downcase!)
       end
 

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

@@ -44,7 +44,7 @@ module Anyway
             TYPE_TO_CLASS.fetch(type) { defaults[param] ? "Symbol" : "untyped" }
           when (Array === __m__)
             "Array[untyped]"
-          when (((array, type) = nil) || ((__m__.respond_to?(:deconstruct_keys) && (((__m_hash__src__ = __m__.deconstruct_keys(nil)) || true) && (Hash === __m_hash__src__ || Kernel.raise(TypeError, "#deconstruct_keys must return Hash"))) && (__m_hash__ = __m_hash__src__.dup)) && ((__m_hash__.key?(:array) && __m_hash__.key?(:type)) && (((array = __m_hash__.delete(:array)) || true) && (((type = __m_hash__.delete(:type)) || true) && __m_hash__.empty?)))))
+          when (((type,) = nil) || ((__m__.respond_to?(:deconstruct_keys) && (((__m_hash__src__ = __m__.deconstruct_keys(nil)) || true) && (Hash === __m_hash__src__ || Kernel.raise(TypeError, "#deconstruct_keys must return Hash"))) && (__m_hash__ = __m_hash__src__.dup)) && ((__m_hash__.key?(:array) && __m_hash__.key?(:type)) && ((((type = __m_hash__.delete(:type)) || true) && __m_hash__.empty?)))))
             "Array[#{TYPE_TO_CLASS.fetch(type, "untyped")}]"
           when (Hash === __m__)
             "Hash[string,untyped]"

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

@@ -299,6 +299,7 @@ module Anyway # :nodoc:
             "via `config_name :my_config`"
         end
 
+        # TODO(v3.0): Replace downcase with underscore
         Regexp.last_match[1].tap(&:downcase!)
       end
 

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

@@ -299,6 +299,7 @@ module Anyway # :nodoc:
             "via `config_name :my_config`"
         end
 
+        # TODO(v3.0): Replace downcase with underscore
         Regexp.last_match[1].tap(&:downcase!)
       end
 

data/lib/anyway/config.rb

@@ -299,6 +299,7 @@ module Anyway # :nodoc:
             "via `config_name :my_config`"
         end
 
+        # TODO(v3.0): Replace downcase with underscore
         Regexp.last_match[1].tap(&:downcase!)
       end
 

data/lib/anyway/rails/autoload.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# This module is used to detect a Rails application and activate the corresponding plugins
+# when Anyway Config is loaded before Rails (e.g., in config/puma.rb).
+module Anyway
+  module Rails
+    using RubyNext
+
+    class << self
+      attr_reader :tracer, :name_method
+      attr_accessor :disable_postponed_load_warning
+
+      private
+
+      def tracepoint_class_callback(event)
+        # Ignore singletons
+        return if event.self.singleton_class?
+
+        # We wait till `rails/application/configuration.rb` has been loaded, since we rely on it
+        # See https://github.com/palkan/anyway_config/issues/134
+        return unless name_method.bind_call(event.self) == "Rails::Application::Configuration"
+
+        tracer.disable
+
+        unless disable_postponed_load_warning
+          warn "Anyway Config was loaded before Rails. Activating Anyway Config Rails plugins now.\n" \
+                "NOTE: Already loaded configs were provisioned without Rails-specific sources."
+        end
+
+        require "anyway/rails"
+      end
+    end
+
+    @tracer = TracePoint.new(:end, &method(:tracepoint_class_callback))
+    @tracer.enable
+    # Use `Module#name` instead of `self.name` to handle overwritten `name` method
+    @name_method = Module.instance_method(:name)
+  end
+end

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

@@ -53,7 +53,7 @@ module Anyway
 
         def credentials_path
           if ::Rails.application.config.respond_to?(:credentials)
-            ::Rails.application.config.credentials.content_path.relative_path_from(::Rails.root).to_s
+            ::Rails.root.join(::Rails.application.config.credentials.content_path).relative_path_from(::Rails.root).to_s
           else
             "config/credentials.yml.enc"
           end

data/lib/anyway/rbs.rb

@@ -44,7 +44,7 @@ module Anyway
             TYPE_TO_CLASS.fetch(type) { defaults[param] ? "Symbol" : "untyped" }
           in Array
             "Array[untyped]"
-          in array:, type:, **nil
+          in array: _, type:, **nil
             "Array[#{TYPE_TO_CLASS.fetch(type, "untyped")}]"
           in Hash
             "Hash[string,untyped]"

data/lib/anyway/version.rb

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

data/lib/anyway_config.rb

@@ -45,5 +45,10 @@ module Anyway # :nodoc:
   end
 end
 
-require "anyway/rails" if defined?(::Rails::VERSION)
+if defined?(::Rails::VERSION)
+  require "anyway/rails"
+else
+  require "anyway/rails/autoload"
+end
+
 require "anyway/testing" if ENV["RACK_ENV"] == "test" || ENV["RAILS_ENV"] == "test"

data/lib/generators/anyway/config/config_generator.rb

@@ -41,6 +41,11 @@ module Anyway
           static_config_root
         end
       end
+
+      def needs_config_name?
+        raise "No longer needed" if Gem::Version.new(Anyway::VERSION) >= Gem::Version.new("3.0.0")
+        file_name.include?("_")
+      end
     end
   end
 end

data/lib/generators/anyway/config/templates/config.rb.tt

@@ -2,6 +2,9 @@
 
 <% module_namespacing do -%>
 class <%= class_name %>Config < ApplicationConfig
+<%- if needs_config_name? %>
+  config_name :<%= file_name %>
+<%- end -%>
 <%- unless parameters.empty? -%>
   attr_config <%= parameters.map { |param| ":#{param}" }.join(", ") %>
 <%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -158,6 +158,7 @@ files:
 - lib/anyway/option_parser_builder.rb
 - lib/anyway/optparse_config.rb
 - lib/anyway/rails.rb
+- lib/anyway/rails/autoload.rb
 - lib/anyway/rails/config.rb
 - lib/anyway/rails/loaders.rb
 - lib/anyway/rails/loaders/credentials.rb