evilution 0.22.4 → 0.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e44290d350e92d6c70bdd99a4a982fa8f0a33cf36062e3fa8f0fa5eea553a8
-  data.tar.gz: 31c5dbe19058f73d8c8ae2301649ec44127b1b0487955c8b26b2732e1e69f967
+  metadata.gz: f88a719ecd12ca2576f1254f3ef1771359f64345eea28e3537e0d9dae38e2c78
+  data.tar.gz: 01c65258b5a9d496a566437b74460ff77175d0dbea9988643d048df3b2e18171
 SHA512:
-  metadata.gz: 24d6294bd7f0ef343fb7b3d4573e1217389e3c1e38ac5a4056da51ac3cda0a298dbd33abae25d2bdd927f82f07d0079f1d7b3530e65ff2efb8acc96778631e46
-  data.tar.gz: d767b3b380fcfed64b64915e177931d72939d5fbb6a5498676c989daed2f34df969843e1a2c5f04be83e0498bfba2e4198cc65eb04a9904d654db49758904e99
+  metadata.gz: 136e6f94f55a9e312b777573bd73391d6ec7d05ac8c7455817341589edf018002836db6e550255ff16deb974e6a320a8e818e08661b7918bd2ac6e2f4e85aea1
+  data.tar.gz: 8e48faca42c452ba1d8ba1b8800deaf1eafc89d264997f34dc04840324296d2431fdc7e9ccb31f2cff5127862adeb818c15a10da5d060301bdcae0b0352d0cf4

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.22.6] - 2026-04-12
+
+### Fixed
+
+- **Zeitwerk re-autoloads original file during mutation load** — Zeitwerk's `const_added` hook re-autoloaded the original source when a module constant was reopened from a temp-dir copy, re-setting `@_included_block` after `clear_concern_state` already removed it; now `pin_autoloaded_constants` resolves all module/class constants from the source via `Object.const_get` before loading, preventing the autoloader from re-triggering (#680)
+
+## [0.22.5] - 2026-04-12
+
+### Fixed
+
+- **`ActiveSupport::Concern` modules: all mutations error with `MultipleIncludedBlocks`** — re-evaluating a mutated concern file triggered Rails' guard because `@_included_block` (and `@_prepended_block`) was already set from the original load with a different `source_location`; now `clear_concern_state` removes these instance variables from affected concern modules before `require`/`load`, matching both original file paths and temp-dir copies via subpath suffix so consecutive mutations of the same concern also succeed (#676, PR #678)
+
 ## [0.22.4] - 2026-04-12
 
 ### Fixed

data/lib/evilution/integration/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "prism"
 require "tmpdir"
 require_relative "../integration"
 require_relative "../temp_dir_tracker"
@@ -87,6 +88,8 @@ class Evilution::Integration::Base
     File.write(dest, mutation.mutated_source)
     $LOAD_PATH.unshift(@temp_dir)
     displace_loaded_feature(mutation.file_path)
+    pin_autoloaded_constants(mutation.original_source)
+    clear_concern_state(mutation.file_path)
     require(subpath.delete_suffix(".rb"))
   end
 
@@ -95,6 +98,8 @@ class Evilution::Integration::Base
     dest = File.join(@temp_dir, absolute)
     FileUtils.mkdir_p(File.dirname(dest))
     File.write(dest, mutation.mutated_source)
+    pin_autoloaded_constants(mutation.original_source)
+    clear_concern_state(mutation.file_path)
     load(dest)
   end
 
@@ -110,6 +115,56 @@ class Evilution::Integration::Base
     @temp_dir = nil
   end
 
+  def pin_autoloaded_constants(source)
+    collect_constant_names(Prism.parse(source).value).each do |name|
+      Object.const_get(name) if Object.const_defined?(name, false)
+    rescue NameError # :nodoc:
+      nil
+    end
+  end
+
+  def collect_constant_names(node, nesting = [])
+    names = []
+    case node
+    when Prism::ModuleNode, Prism::ClassNode
+      const = node.constant_path.full_name
+      qualified = nesting.any? && !const.include?("::") ? "#{nesting.join("::")}::#{const}" : const
+      names << qualified
+      names.concat(collect_constant_names(node.body, nesting + [const])) if node.body
+    when Prism::ProgramNode
+      names.concat(collect_constant_names(node.statements, nesting)) if node.statements
+    when Prism::StatementsNode
+      node.body.each { |child| names.concat(collect_constant_names(child, nesting)) }
+    end
+    names
+  end
+
+  def clear_concern_state(file_path)
+    return unless defined?(ActiveSupport::Concern)
+
+    absolute = File.expand_path(file_path)
+    subpath = resolve_require_subpath(file_path)
+
+    ObjectSpace.each_object(Module) do |mod|
+      next unless mod.singleton_class.ancestors.include?(ActiveSupport::Concern)
+
+      %i[@_included_block @_prepended_block].each do |ivar|
+        next unless mod.instance_variable_defined?(ivar)
+
+        block = mod.instance_variable_get(ivar)
+        block_file = block.source_location&.first
+        next unless block_file
+
+        expanded = File.expand_path(block_file)
+        mod.remove_instance_variable(ivar) if source_matches?(expanded, absolute, subpath)
+      end
+    end
+  end
+
+  def source_matches?(block_path, absolute, subpath)
+    block_path == absolute || (subpath && block_path.end_with?("/#{subpath}"))
+  end
+
   def resolve_require_subpath(file_path)
     absolute = File.expand_path(file_path)
     best_subpath = nil

data/lib/evilution/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evilution
-  VERSION = "0.22.4"
+  VERSION = "0.22.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evilution
 version: !ruby/object:Gem::Version
-  version: 0.22.4
+  version: 0.22.6
 platform: ruby
 authors:
 - Denis Kiselev