rux-rails 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51fa772fea7bce41b30a22aa190760f24c9bab67a28014c1fa3de6239ecb384f
-  data.tar.gz: 6a939775af5fbf70b50fa48edd585ecb3d97843f28a89e24279bf0890808a7ae
+  metadata.gz: 71cd84c42747191f92518e982abfb2f631dc2d4238dfc377e58abdd168d9bf0a
+  data.tar.gz: '098b4d8af3d352512a82143fae3ac3c8ac04b9d8f080906838017410c6d17324'
 SHA512:
-  metadata.gz: c17266130151a337eb71bf026ae284180faccc4b896393b6f22d1383fb52c2bf09746ef9350582e6a8aceef6491dd8c5c51dcaf0d5ab8a4b56b858362429c18d
-  data.tar.gz: 5fb976f13344dfd17e8944dbbc9d3cc2de8de530254a53ee1cee44d1cee2818bf80dc76352b5f0b0f900482d437c783bafbc29e8304d03439649d1385831fab0
+  metadata.gz: b4a554cd0d719bbd78dc46d99aaaa801fedd83b10c8917242dae01f3e4bbe51f0aabe7f2f7eb626f25379fd0bbfce01e934c055ad98443a56d6f698af2210334
+  data.tar.gz: 82e1d14c6083c55bdb653147e07fdf16f4416f000d4555c094ac7700fd98db0da989723d89adcee4df4e00524926f945004bce936cb84f7fcd1ab4c2734b976b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.2.2
+* Fix calling private Zeitwerk method.
+* Check railties version in dummy app instead of rails.
+
+## 1.2.1
+* Support newer versions of Zeitwerk (2.5 and beyond).
+* Support Rails 7.
+
 ## 1.2.0
 * Require ext patches in railtie to take advantage of Rails' `config.autoloader` setting.
   - This should fix Rails setups in which Zeitwerk is part of the Gemfile but `config.autoloader` is set to `:classic` (previously rux-rails relied on attempting to `require` zeitwerk and `rescue`ing the possible `LoadError`).

data/lib/rux-rails/core_ext/kernel_zeitwerk.rb

@@ -14,7 +14,7 @@ module Kernel
       # an uninitialized constant, and it's like... yeah, I _know_ it's
       # uninitialized, that's why I'm loading this file. Whatevs.
       loader = Zeitwerk::Registry.loader_for(file)
-      parent, cname = loader.autoloads[file]
+      parent, cname = loader.send(:autoloads)[file]
       parent.send(:remove_const, cname)
 
       return rux_orig_load(tmpl.default_outfile, *args)
@@ -48,7 +48,7 @@ module Kernel
       # This will be either Ruby's original require or bootsnap's monkeypatched
       # require in setups that use bootsnap. Lord help us with all these layers
       # of patches.
-      return zeitwerk_original_require(file)
+      return rux_orig_require(file)
     end
 
     return false if $LOADED_FEATURES.include?(path)

data/lib/rux-rails/ext/zeitwerk/loader.rb

@@ -10,11 +10,12 @@ module RuxRails
 
     def autoload_file(parent, cname, file)
       if file.end_with?('.rux')
-        # Zeitwerk very naïvely tries to remove only the last 3 characters in
-        # an attempt to strip off the .rb file extension, which it assumes all
-        # autoloadable files will contain. This line is necessary to remove the
-        # trailing leftover period.
-        cname = cname.to_s.chomp('.').to_sym
+        # Some older versions of Zeitwerk very naïvely try to remove only the
+        # last 3 characters in an attempt to strip off the .rb file extension,
+        # while newer ones only remove it if it's actually there. This line is
+        # necessary to remove the trailing leftover period for older versions,
+        # and remove the entire .rux extension for newer versions.
+        cname = cname.to_s.chomp('.').chomp('.rux').to_sym
       else
         # if there is a corresponding .rux file, autoload it instead of the .rb
         # file

data/lib/rux-rails/railtie.rb

@@ -1,20 +1,23 @@
 require 'rails/railtie'
 
+require 'active_support'
+require 'active_support/isolated_execution_state' if ActiveSupport::VERSION::MAJOR > 6
+
 module RuxRails
   class Railtie < Rails::Railtie
     config.rux = ActiveSupport::OrderedOptions.new
 
     initializer 'rux-rails.initialize', before: :set_autoload_paths do |app|
-      if !app.config.respond_to?(:autoloader) || app.config.autoloader == :classic
-        require 'rux-rails/core_ext/kernel'
-        require 'rux-rails/ext/activesupport/dependencies'
-
-        RuxRails.zeitwerk_mode = false
-      else
+      if Rails.respond_to?(:autoloaders) && Rails.autoloaders.zeitwerk_enabled?
         require 'rux-rails/core_ext/kernel_zeitwerk'
         require 'rux-rails/ext/zeitwerk/loader'
 
         RuxRails.zeitwerk_mode = true
+      else
+        require 'rux-rails/core_ext/kernel'
+        require 'rux-rails/ext/activesupport/dependencies'
+
+        RuxRails.zeitwerk_mode = false
       end
 
       begin

data/lib/rux-rails/version.rb

@@ -1,3 +1,3 @@
 module RuxRails
-  VERSION = '1.2.0'
+  VERSION = '1.2.2'
 end

data/spec/dummy/app/components/home_component.rb

@@ -1,7 +1,7 @@
 class HomeComponent < ViewComponent::Base
   def call
-    Rux.tag("div", class: "container") {
-      Rux.create_buffer.tap { |_rux_buf_,|
+    Rux.tag("div", { class: "container" }) {
+      Rux.create_buffer.tap { |_rux_buf_|
         _rux_buf_ << " "
         _rux_buf_ << render(Image.new(src: "cat.png", size: "40"))
         _rux_buf_ << " "

data/spec/dummy/config/application.rb

@@ -2,7 +2,7 @@ module RuxRails
   class DummyApplication < ::Rails::Application
     if config.respond_to?(:load_defaults)
       config.load_defaults(
-        Gem.loaded_specs['rails'].version.to_s.split('.')[0..1].join('.')
+        Gem.loaded_specs['railties'].version.to_s.split('.')[0..1].join('.')
       )
     end