anyway_config 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fe2702743a353cb8d7d793d59278dea2cfef4075e17204181ffdab9b594274
-  data.tar.gz: dd34c9bf703b5b93b4e5c4a1cce3e9ede85af1666d5de484005e13f217d897bd
+  metadata.gz: 2b7d08d5b962854362876ef57a33cb5a7db900a2b116cfc55e6a111fe67a6908
+  data.tar.gz: 8330ecf2804805dc40fd4966e5f0da06a8e46d87a9f01d1d377f5687b61cbdff
 SHA512:
-  metadata.gz: 3f1d05c31f97864f64b2ace127636d15535ed18c50f44f11e90949d784df40d437e48d9cd37a0bc2b8ccab0c5b17dd6a25062cbf25669f51e654fb1a5b356b2d
-  data.tar.gz: 6a7ceda8a770887e3775d5c75e6d8e5a6afa98f49851926d40d131c4ca0034f60b1739868d142029b35fe44b4bf39205e68d84fe97f65c89c146cbe74a4750aa
+  metadata.gz: 5af5f14653ba282b7c4e89d88c85dc3908d693fa7dc93c0436dba5044c1a8d98cae12284b97bfae9c3b9415dea5b745ac3bb9ee3639fc7880c61b3c3f6bf7465
+  data.tar.gz: b6d44f0500203371beaa12cdc47a24a9e9a66d66305491649e0961a9285d5280692cf5828736fa79afbd8fdd1459e26bf0a2715415c44188604c90616b880242

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## 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][])

data/lib/anyway/rails/autoload.rb

@@ -4,8 +4,10 @@
 # when Anyway Config is loaded before Rails (e.g., in config/puma.rb).
 module Anyway
   module Rails
+    using RubyNext
+
     class << self
-      attr_reader :tracer
+      attr_reader :tracer, :name_method
       attr_accessor :disable_postponed_load_warning
 
       private
@@ -14,26 +16,24 @@ module Anyway
         # Ignore singletons
         return if event.self.singleton_class?
 
-        # We wait till `rails` has been loaded, which is enough to add a railtie
-        # https://github.com/rails/rails/blob/main/railties/lib/rails.rb
-        return unless event.self.name == "Rails"
-
-        # We must check for methods defined in `rails.rb` to distinguish events
-        # happening when we open the `Rails` module in other files.
-        if defined?(::Rails.env)
-          tracer.disable
+        # 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"
 
-          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
+        tracer.disable
 
-          require "anyway/rails"
+        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(:class, &method(:tracepoint_class_callback))
+    @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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core