evilution 0.22.4 → 0.22.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e44290d350e92d6c70bdd99a4a982fa8f0a33cf36062e3fa8f0fa5eea553a8
-  data.tar.gz: 31c5dbe19058f73d8c8ae2301649ec44127b1b0487955c8b26b2732e1e69f967
+  metadata.gz: 8dfc39a794faace7567c4539876cb9c331cba15f62420625aafc8adf9d3fb7bf
+  data.tar.gz: e199a8d90e70db722e76fe785968385dc1725297ee6020b31760fdfad5745c70
 SHA512:
-  metadata.gz: 24d6294bd7f0ef343fb7b3d4573e1217389e3c1e38ac5a4056da51ac3cda0a298dbd33abae25d2bdd927f82f07d0079f1d7b3530e65ff2efb8acc96778631e46
-  data.tar.gz: d767b3b380fcfed64b64915e177931d72939d5fbb6a5498676c989daed2f34df969843e1a2c5f04be83e0498bfba2e4198cc65eb04a9904d654db49758904e99
+  metadata.gz: 32d62ef27f34042244512d5d52082c4a53d82b0f6de91e924faebd8317d5d2d8c57a5fa53b8b5f3cc6bee325723e62dcfbd0b32d9bc8c2b17f368cde027a93b1
+  data.tar.gz: c4695099eb10bbdd2f69995fa95f3f9dcb8dbb3497532758b9177594fb9e098021080924276cf582c5b951dc95e6af39d1d7e2d1fae404f2e451bf8622fefa39

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [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

@@ -87,6 +87,7 @@ class Evilution::Integration::Base
     File.write(dest, mutation.mutated_source)
     $LOAD_PATH.unshift(@temp_dir)
     displace_loaded_feature(mutation.file_path)
+    clear_concern_state(mutation.file_path)
     require(subpath.delete_suffix(".rb"))
   end
 
@@ -95,6 +96,7 @@ class Evilution::Integration::Base
     dest = File.join(@temp_dir, absolute)
     FileUtils.mkdir_p(File.dirname(dest))
     File.write(dest, mutation.mutated_source)
+    clear_concern_state(mutation.file_path)
     load(dest)
   end
 
@@ -110,6 +112,35 @@ class Evilution::Integration::Base
     @temp_dir = nil
   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)
+    return true if block_path == absolute
+    return true if subpath && block_path.end_with?("/#{subpath}")
+
+    false
+  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.5"
 end

metadata

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