evilution 0.22.5 → 0.22.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dfc39a794faace7567c4539876cb9c331cba15f62420625aafc8adf9d3fb7bf
-  data.tar.gz: e199a8d90e70db722e76fe785968385dc1725297ee6020b31760fdfad5745c70
+  metadata.gz: 953b824799c03617e8e41a67f759c5edbd122b63046f8916e19d215021de5871
+  data.tar.gz: 38e3498c7cc763e44a5cded169c035b1a48d02c14c95b9ff4ae0800dd63389cd
 SHA512:
-  metadata.gz: 32d62ef27f34042244512d5d52082c4a53d82b0f6de91e924faebd8317d5d2d8c57a5fa53b8b5f3cc6bee325723e62dcfbd0b32d9bc8c2b17f368cde027a93b1
-  data.tar.gz: c4695099eb10bbdd2f69995fa95f3f9dcb8dbb3497532758b9177594fb9e098021080924276cf582c5b951dc95e6af39d1d7e2d1fae404f2e451bf8622fefa39
+  metadata.gz: cceb0046285ad1efdd63914af840da66354006d97f1f9da0642dcf649e3628a342c6ed5f3c6776f3b76dee7eb41af833033a4c9c18992eaa6773bf1c5da8ca75
+  data.tar.gz: 6928979ecd999f213b87c3460179f4a09008894866e31d5e822f214ab521235e8463a389768e40bff065512fc1e55355d0ca249e739cb571210ccd429d94db82

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.22.7] - 2026-04-13
+
+### Fixed
+
+- **Rails 8 models with `enum`: every mutation errors with `ArgumentError`** — re-running the class body via `load`/`require` retriggered Rails 8's `detect_enum_conflict!` because the enum's predicate methods already existed from the first load, so mutations scored 0% on any affected file; now `remove_defined_constants` drops constants defined by the mutated source (via `remove_const` on the parent namespace) before re-loading, so the class body runs on a fresh constant and DSLs with conflict detection (enum, and any future DSL with redefinition guards) see a clean slate (#683)
+
+## [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

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,8 +88,11 @@ 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"))
+    with_redefinition_recovery(mutation.original_source) do
+      require(subpath.delete_suffix(".rb"))
+    end
   end
 
   def apply_via_load(mutation)
@@ -96,8 +100,24 @@ 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)
+    with_redefinition_recovery(mutation.original_source) do
+      load(dest)
+    end
+  end
+
+  def with_redefinition_recovery(original_source)
+    yield
+  rescue ArgumentError => e
+    raise unless redefinition_conflict?(e)
+
+    remove_defined_constants(original_source)
+    yield
+  end
+
+  def redefinition_conflict?(error)
+    error.message.include?("already defined")
   end
 
   def restore_original(_mutation)
@@ -112,6 +132,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 remove_defined_constants(source)
+    collect_constant_names(Prism.parse(source).value).reverse_each do |name|
+      parent_name, _, local_name = name.rpartition("::")
+      parent = resolve_loaded_constant_parent(parent_name)
+      next unless parent
+      next unless parent.const_defined?(local_name, false)
+      next if parent.autoload?(local_name)
+
+      parent.send(:remove_const, local_name.to_sym)
+    end
+  end
+
+  def resolve_loaded_constant_parent(parent_name)
+    return Object if parent_name.empty?
+
+    parent_name.split("::").reduce(Object) do |mod, part|
+      return nil unless mod.const_defined?(part, false)
+      return nil if mod.autoload?(part)
+
+      resolved = mod.const_get(part, false)
+      return nil unless resolved.is_a?(Module)
+
+      resolved
+    end
+  end
+
   def clear_concern_state(file_path)
     return unless defined?(ActiveSupport::Concern)
 
@@ -135,10 +205,7 @@ class Evilution::Integration::Base
   end
 
   def source_matches?(block_path, absolute, subpath)
-    return true if block_path == absolute
-    return true if subpath && block_path.end_with?("/#{subpath}")
-
-    false
+    block_path == absolute || (subpath && block_path.end_with?("/#{subpath}"))
   end
 
   def resolve_require_subpath(file_path)

data/lib/evilution/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evilution
 version: !ruby/object:Gem::Version
-  version: 0.22.5
+  version: 0.22.7
 platform: ruby
 authors:
 - Denis Kiselev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-12 00:00:00.000000000 Z
+date: 2026-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs