rux-rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51fa772fea7bce41b30a22aa190760f24c9bab67a28014c1fa3de6239ecb384f
-  data.tar.gz: 6a939775af5fbf70b50fa48edd585ecb3d97843f28a89e24279bf0890808a7ae
+  metadata.gz: 7eab4f715bf1a690c2203a58abb43387cbf9069a351448c29d19fae7eca71e4e
+  data.tar.gz: 569d1715c3649eec7809864fe76e29d7094eddea038618d25da220b307940d83
 SHA512:
-  metadata.gz: c17266130151a337eb71bf026ae284180faccc4b896393b6f22d1383fb52c2bf09746ef9350582e6a8aceef6491dd8c5c51dcaf0d5ab8a4b56b858362429c18d
-  data.tar.gz: 5fb976f13344dfd17e8944dbbc9d3cc2de8de530254a53ee1cee44d1cee2818bf80dc76352b5f0b0f900482d437c783bafbc29e8304d03439649d1385831fab0
+  metadata.gz: 5eff94f3b29f81201639657faf5f765f61a16d35df439b53cf3bb2bad0025634fbae5aa2fcb32ecdf2fbaafd94d6a183941c16e501847fdc81e343194eef5077
+  data.tar.gz: 92d3fec8830c2de5c7ad41b0fd011f8c6d550a855f9e8eaa47a00aaf585944f163933b6a5c6d971ff5e37fd9dbc44ae62cf320f64c0db803d7c419d9e886a29a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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/Rakefile

@@ -2,8 +2,6 @@ require 'bundler'
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 
-require 'rux-rails'
-
 Bundler::GemHelper.install_tasks
 
 task default: :spec

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

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

@@ -5,16 +5,16 @@ module RuxRails
     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.1'
 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_ << " "