whodunit 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c3f8d658cdf1f7b9e7ee954ba759ccddb2d70171f1e755ecbcd2146e314143
-  data.tar.gz: 33e6c62249309d051b20197d5a4a20df8a51fd9472a05aaf9243f88a2a092a4c
+  metadata.gz: ec3f89bd20ea577eb0a740137c86a7927500ccd189e9d9375d18b21c0b36ffdc
+  data.tar.gz: 20586d959bc0d25a47319f615f333021d1ebbec331d865c6a18400987f24ef39
 SHA512:
-  metadata.gz: b34b74b871fa5a07491bf0a2516131024d3f6b464bc387815ec61b423c3ab32384b394581ca21b1a6d69508b8aa1c3d9b71f77878681ce4f6604b844d86ea2e8
-  data.tar.gz: 3b790f6f5edb918b609689de6dceee29699ae19d85e214019b6bfc55e7c4ab820907e67e631d7fb68b4bb11289a66d62e5a81857e78c3007428bd81b4e1d938d
+  metadata.gz: 5cca573bee0c6d0313d5adf4079e18996d4bc5ecf354b7de39f77e9537b078c67d6122d4a2a7c8c3314ec9da44f40a5ec262a573c06e12b092f86935a951b327
+  data.tar.gz: 810bd48aaf36a9605802c62d8f6616d0d68eb63b78a2f92c955c0f06b0cc609f0f6c729274bfc33d5caf42e8263ce8a49d4aa253480db7103dd0c0ea756ce5e1

data/.rubocop.yml

@@ -6,7 +6,7 @@ plugins:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   Exclude:
     - 'vendor/**/*'
     - 'tmp/**/*'
@@ -35,6 +35,7 @@ Metrics/BlockLength:
 
 # Allow longer methods in specs and configuration
 Metrics/MethodLength:
+  Max: 15
   Exclude:
     - 'spec/**/*'
 
@@ -114,12 +115,12 @@ Metrics/AbcSize:
     - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 10
   Exclude:
     - 'spec/**/*'
 
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 10
   Exclude:
     - 'spec/**/*'
 Gemspec/DevelopmentDependencies:

data/CHANGELOG.md

@@ -5,7 +5,57 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.4.1] - 2026-06-01
+
+### Fixed
+
+- Fixed `Whodunit::Stampable` when included on an abstract ActiveRecord base class, such as `ApplicationRecord`. Association setup and model registration are now deferred to concrete subclasses.
+- Preserved existing `inherited` hooks by prepending an internal hook instead of replacing `self.inherited`.
+- Supported multi-level abstract inheritance, such as `ApplicationRecord -> TenantRecord -> Post`, without registering abstract classes.
+
+### Added
+
+- Added RSpec regression coverage for abstract-base inclusion, inherited-hook preservation, abstract subclass exclusion, concrete subclass registration, multi-level abstract inheritance, and inherited callback stamping.
+
+## [0.4.0] - 2025-05-20
+
+### Breaking Changes
+
+- Dropped support for Ruby 3.1. Minimum supported Ruby version is now **3.2**.
+
+### Fixed
+
+- `TableDefinitionExtension`: replaced `included { attr_accessor :_whodunit_stamps_added }` with
+  explicit reader/writer methods so the accessor is defined correctly when the module is **prepended**
+  (as the Railtie does) rather than included. Previously the accessor was silently missing in
+  production, causing `@_whodunit_stamps_added` to be inaccessible via the public API.
+
+### Changed
+
+- **Test suite**: eliminated all hand-rolled ActiveRecord and Railtie mocks in favour of genuine
+  infrastructure — real `ActiveRecord::Base` subclasses backed by an in-memory SQLite3 database,
+  and real `ActiveRecord::ConnectionAdapters::TableDefinition` instances for migration-helper tests.
+  Callbacks, dirty tracking, `belongs_to` reflections, and `column_names` now go through actual AR
+  code paths rather than no-op stubs.
+  - `spec/support/rails_mocks.rb` — emptied; `activesupport` is a runtime dependency and needs no
+    re-implementation in tests.
+  - `spec/support/test_models.rb` — replaced `MockActiveRecord` stub class with real AR models
+    (`WhodunitRecord`, `WhodunitSoftDeleteRecord`) on an in-memory SQLite3 schema; backward-compat
+    aliases preserved.
+  - `spec/spec_helper.rb` — added `rescue Bundler::GemNotFound` guard on `require "bundler/setup"`
+    to allow running specs directly without `bundle exec`; wrapped every example in an AR transaction
+    that rolls back on completion; added missing config keys to `ORIGINAL_WHODUNIT_CONFIG`.
+  - `spec/whodunit/table_definition_extension_spec.rb` — now tests the real
+    `ActiveRecord::ConnectionAdapters::TableDefinition` with `TableDefinitionExtension` prepended,
+    rather than an anonymous class that reimplemented the extension logic internally.
+  - `spec/whodunit/stampable_spec.rb` — `being_soft_deleted?` tests use real AR dirty tracking via
+    genuine attribute writes; callback-integration tests persist records and assert database values
+    after `reload`.
+  - `spec/whodunit/migration_helpers_spec.rb` — `whodunit_stamps(table_def)` path uses a real
+    `TableDefinitionExtension`-prepended `TableDefinition` instance instead of a double.
+  - `spec/whodunit/per_model_config_spec.rb`, `railtie_spec.rb`,
+    `reverse_associations_integration_spec.rb` — all converted to real AR anonymous subclasses;
+    removed stubs for `before_create`, `belongs_to`, and `column_names`.
 
 ## [0.3.0] - 2025-01-24
 

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/whodunit.svg)](https://badge.fury.io/rb/whodunit)
 [![CI](https://github.com/kanutocd/whodunit/workflows/CI/badge.svg)](https://github.com/kanutocd/whodunit/actions)
 [![Coverage Status](https://codecov.io/gh/kanutocd/whodunit/branch/main/graph/badge.svg)](https://codecov.io/gh/kanutocd/whodunit)
-[![Ruby Version](https://img.shields.io/badge/ruby-%3E%3D%203.1.0-ruby.svg)](https://www.ruby-lang.org/en/)
+[![Ruby Version](https://img.shields.io/badge/ruby-%3E%3D%203.2-ruby.svg)](https://www.ruby-lang.org/en/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Lightweight creator/updater/deleter tracking for Rails ActiveRecord models.
@@ -16,7 +16,7 @@ Whodunit provides simple auditing for Rails applications by tracking who created
 
 ## Requirements
 
-- Ruby 3.1.1+ (tested on 3.1.1, 3.2.0, 3.3.0, 3.4, 4.0). See the [the ruby-version matrix strategy of the CI workflow](https://github.com/kanutocd/whodunit/blob/main/.github/workflows/ci.yml#L15).
+- Ruby 3.2+ (tested on 3.2, 3.3, 3.4, 4.0). See the [the ruby-version matrix strategy of the CI workflow](https://github.com/kanutocd/whodunit/blob/main/.github/workflows/ci.yml#L15).
 - Rails 7.2+ (tested on 7.2, 8.2, and edge)
 - ActiveRecord for database operations
 

data/lib/whodunit/railtie.rb

@@ -22,19 +22,19 @@ module Whodunit
 
       # Extend ActiveRecord with migration helpers.
       #
-      # This initializer adds the MigrationHelpers module to ActiveRecord,
+      # This initializer adds the MigrationHelpers module to ActiveRecord::Migration,
       # making methods like add_whodunit_stamps available in migrations.
       # It also extends TableDefinition for automatic whodunit_stamps injection.
       #
       # @api private
       initializer "whodunit.extend_active_record" do |_app|
         ActiveSupport.on_load(:active_record) do
-          extend Whodunit::MigrationHelpers
+          ActiveRecord::Migration.include(Whodunit::MigrationHelpers)
 
-          # Extend TableDefinition for automatic whodunit_stamps injection
-          ActiveRecord::ConnectionAdapters::TableDefinition.include(
-            Whodunit::TableDefinitionExtension
-          )
+          # We use ActiveRecord::ConnectionAdapters::TableDefinition#timestamps to automatically inject whodunit_stamps
+          ActiveRecord::ConnectionAdapters::TableDefinition.prepend(Whodunit::TableDefinitionExtension)
+          # Reuse the `whodunit_stamps` flow in Whodunit::MigrationHelpers module
+          ActiveRecord::ConnectionAdapters::TableDefinition.extend(Whodunit::MigrationHelpers)
         end
       end
 

data/lib/whodunit/stampable.rb

@@ -50,12 +50,16 @@ module Whodunit
       before_destroy :set_whodunit_deleter, if: :deleter_column?
       before_update :set_whodunit_deleter, if: :being_soft_deleted?
 
-      # Set up associations - call on the class
-      setup_whodunit_associations
-
-      # Register this model for reverse association setup
-      # This happens immediately, but the check for enabled status is done in register_model
-      Whodunit.register_model(self)
+      if abstract_class?
+        install_whodunit_inherited_hook
+      else
+        # Set up associations - call on the including concrete class.
+        setup_whodunit_associations
+
+        # Register this including model for reverse association setup.
+        # This happens immediately, but the check for enabled status is done in register_model.
+        Whodunit.register_model(self)
+      end
     end
 
     class_methods do # rubocop:disable Metrics/BlockLength
@@ -144,7 +148,46 @@ module Whodunit
 
       private
 
+      # Install an inherited hook when Stampable is included on an abstract ActiveRecord
+      # base class, such as ApplicationRecord. Associations require concrete table
+      # metadata, so setup must be deferred until concrete subclasses are defined.
+      #
+      # The hook is prepended instead of assigned with `def self.inherited` so existing
+      # inherited hooks on the application base class remain intact. When the subclass
+      # is also abstract, the same hook is propagated so multi-level abstract
+      # inheritance is supported.
+      #
+      # @return [void]
+      # @api private
+      def install_whodunit_inherited_hook
+        return if instance_variable_defined?(:@whodunit_inherited_hook_installed) &&
+                  @whodunit_inherited_hook_installed
+
+        inherited_hook = Module.new do
+          def inherited(subclass)
+            super
+
+            subclass.send(:install_whodunit_inherited_hook)
+
+            return if subclass.abstract_class?
+            return if subclass.name.nil?
+
+            subclass.send(:setup_whodunit_associations)
+            Whodunit.register_model(subclass)
+          end
+        end
+
+        singleton_class.prepend(inherited_hook)
+        @whodunit_inherited_hook_installed = true
+      end
+
+      # Set up associations for concrete ActiveRecord models.
+      #
+      # @return [void]
+      # @api private
       def setup_whodunit_associations
+        return if abstract_class?
+
         setup_creator_association if creator_column_exists? && model_creator_enabled?
         setup_updater_association if updater_column_exists? && model_updater_enabled?
         setup_deleter_association if deleter_column_exists? && model_deleter_enabled? && soft_delete_enabled?

data/lib/whodunit/table_definition_extension.rb

@@ -28,30 +28,33 @@ module Whodunit
   module TableDefinitionExtension
     extend ActiveSupport::Concern
 
-    included do
-      # Track whether whodunit_stamps have been automatically added
-      attr_accessor :_whodunit_stamps_added
+    def _whodunit_stamps_added
+      @_whodunit_stamps_added
+    end
+
+    def _whodunit_stamps_added=(value)
+      @_whodunit_stamps_added = value
     end
 
     # Override timestamps to trigger automatic whodunit_stamps injection
     def timestamps(**options)
+      options = options.dup
+      skip = options.delete(:skip_whodunit_stamps)
       result = super
 
-      # Auto-inject whodunit_stamps after timestamps if enabled and not already added
-      if Whodunit.auto_inject_whodunit_stamps &&
-         !@_whodunit_stamps_added &&
-         !options[:skip_whodunit_stamps]
+      if Whodunit.auto_inject_whodunit_stamps && !_whodunit_stamps_added && !skip
         whodunit_stamps(include_deleter: :auto)
-        @_whodunit_stamps_added = true
       end
 
       result
     end
 
-    # Also override whodunit_stamps to track that they've been added
-    def whodunit_stamps(**options)
-      @_whodunit_stamps_added = true
-      super
+    # assign true tp the tracker `@_whodunit_stamps_added` before the
+    # reuse/call of the `whodunit_stamps` flow from the Whodunit::MigrationHelpers module (see railtie.rb)
+    #
+    def whodunit_stamps(include_deleter: :auto, creator_type: nil, updater_type: nil, deleter_type: nil)
+      self._whodunit_stamps_added = true
+      self.class.whodunit_stamps(self, include_deleter:, creator_type:, updater_type:, deleter_type:)
     end
   end
 end

data/lib/whodunit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Whodunit
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whodunit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Ken C. Demanawa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-13 00:00:00.000000000 Z
+date: 2026-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -259,9 +273,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="