active_version 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec3713fc6fd0f073d9bb77d1e44c674a2023cf15f263fa05180457648052e8a1
-  data.tar.gz: 65ba5308255d161420e028564050e75044b975c9f8b520605d1caedab3d7f05b
+  metadata.gz: 4636e51affa996a3f7c8cd98f32e05d6d1892ffe2dc3a79b58edb17bde8619f4
+  data.tar.gz: 42b4f546aeec443faf25d9d3b039ed515499f6b9284b520792afd4af711a721e
 SHA512:
-  metadata.gz: eaf25bb79e12b3a85144c6c191a31ab97dea2a94c91dca682fa3cc9a729e648c29fd2e593605452945bfce0da7e2b391e290998aa9e69113ab00434b7627adca
-  data.tar.gz: fba81088323b53f4ad45acf8e04e82c63085854fcc407c7b4321dd687d06a12f336c1e4fe5f9224ce99cb3125f5e4735ac5237622f39008dbb9da74361562682
+  metadata.gz: b78b064c4a79a1d1ce1780de50e009116e2e0864c25323745f6596385d197d058cc7c4a08bc58f07a7ff7addc678415482d7011698f1114da920b3f282498cc0
+  data.tar.gz: 3b35459213700a318435ea787706e6565dfa6c95e311fa7e0f3ef7ad39206f9330b465791cc074be818f1b045e60c154d6d188d1385a4aa54bb81cd0b9daef3f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.0.1 (2026-03-11)
+
+- Fixed Rails 7.2 thread-local audited options handling in `with_audited_options`
+- Added Rails 6 appraisal and CI matrix coverage
+- Improved test DB connection setup to honor `DATABASE_URL` and fail fast when PostgreSQL is explicitly requested
+- Added compatibility fix for ActiveSupport on older Rails with newer Ruby by loading `logger` early
+- Updated generator integration spec behavior on TruffleRuby to avoid known native extension incompatibility
+
 ## 1.0.0 (2026-03-08)
 
 - Initial release of ActiveVersion library
@@ -33,4 +41,3 @@
 - Added instrumentation hooks via ActiveSupport::Notifications
 - Added configurable column naming and per-model and global configuration options
 - Added comprehensive test suite with unit tests, integration tests, and test helpers
-

data/README.md

@@ -59,6 +59,8 @@ For a step-by-step guide (prerequisites, generators, migrations, model setup, an
 
 Quick checklist: add the gem → `bundle install` → `rails g active_version:install` → run the feature generators for your models (e.g. `rails g active_version:audits Post --storage=json_column`) → `rails db:migrate` → include the concerns and `has_translations` / `has_revisions` / `has_audits` in each model.
 
+For production usage, also configure destination models (`PostAudit`, `PostRevision`, `PostTranslation`) with `configure_audit`, `configure_revision`, and `configure_translation`.
+
 ## Quick Start
 
 ### Setup
@@ -221,20 +223,44 @@ end
 class PostRevision < ApplicationRecord
   include ActiveVersion::Revisions::RevisionRecord
 
-  configure_revision(version_column: :version,
-    foreign_key: :post_id
-  )
+  configure_revision do
+    version_column :version
+    foreign_key :post_id
+  end
 end
 
 class PostTranslation < ApplicationRecord
   include ActiveVersion::Translations::TranslationRecord
 
-  configure_translation(locale_column: :locale,
-    foreign_key: :post_id
-  )
+  configure_translation do
+    locale_column :locale
+    foreign_key :post_id
+  end
 end
 ```
 
+Keyword-argument style is also supported:
+
+```ruby
+configure_revision(version_column: :version, foreign_key: :post_id)
+configure_translation(locale_column: :locale, foreign_key: :post_id)
+```
+
+### Schema Evolution and Sync Strategy
+
+When using `:mirror_columns` audits, revisions, and translations, destination tables must stay schema-compatible with their source model payload.
+
+- Keep source and destination columns in sync for attributes you persist.
+- Avoid destructive one-shot renames/drops across source and destination.
+- Prefer gradual schema rollout:
+  1. add new column(s) to source and destination
+  2. deploy write path that can populate both shapes
+  3. backfill historical rows as needed
+  4. migrate readers to the new shape
+  5. deprecate and later remove old columns in a separate rollout
+
+This phased approach avoids runtime mismatches and preserves audit/revision/translation continuity during deploys.
+
 ### Per-Model Configuration
 
 ```ruby

data/lib/active_version/audits/audit_record.rb

@@ -151,6 +151,10 @@ module ActiveVersion
             end
           rescue NameError
             # Source class not yet defined, will be set up later
+          rescue *ActiveVersion::Runtime.active_record_connection_errors => e
+            if defined?(Rails) && Rails.respond_to?(:logger)
+              Rails.logger&.debug("[ActiveVersion] Deferred audit association setup for #{name}: #{e.class}: #{e.message}")
+            end
           end
         end
 

data/lib/active_version/audits/has_audits/audit_combiner.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module ActiveVersion
   module Audits
     module HasAudits
@@ -27,28 +29,31 @@ module ActiveVersion
               reload
             end
 
-            # Clear association cache to ensure we get fresh data from database
-            if respond_to?(:audits)
-              audits.reset
-              if respond_to?(:association)
-                assoc = association(:audits)
-                assoc.reset if assoc.respond_to?(:loaded?) && assoc.loaded?
-              end
+            # Clear association cache to ensure we get fresh data from database.
+            # Avoid calling audits reader directly here to prevent AR 6.1
+            # delegation edge cases on dynamic models.
+            if respond_to?(:association) && association_cached?(:audits)
+              association(:audits).reset
             end
 
             # Get all audits fresh from database (not from cache)
             # Query directly to ensure we get updated values after SQL updates
             auditable_type = audited_options[:class_name] || self.class.name
-            if auditable_type != self.class.name
-              auditable_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :auditable)
-              version_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :version)
-              all_audits = self.class.audit_class.where({"#{auditable_column}_type" => auditable_type}.merge(active_version_audit_identity_map))
-                .order(version_column => :asc)
-                .to_a
-            else
-              # Use association but ensure it's not cached
-              all_audits = audits.reload.to_a
+            auditable_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :auditable)
+            version_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :version)
+            audit_klass =
+              if self.class.reflect_on_association(:audits)
+                association(:audits).klass
+              else
+                self.class.audit_class
+              end
+            if audit_klass.nil? && self.class.respond_to?(:resolve_audit_class_option, true)
+              audit_klass = self.class.send(:resolve_audit_class_option, audited_options[:as])
             end
+            break unless audit_klass
+            all_audits = audit_klass.where({"#{auditable_column}_type" => auditable_type}.merge(active_version_audit_identity_map))
+              .order(version_column => :asc)
+              .to_a
 
             # Filter out combined audits (those with empty changes)
             # Check raw column value first (before JSON parsing) for "{}" string
@@ -160,9 +165,9 @@ module ActiveVersion
           conn = audit_class.connection
           table_name = audit_class.table_name
           updates = []
-          updates << "#{conn.quote_column_name(changes_column)} = #{conn.quote(combined_changes.to_json)}"
+          updates << "#{conn.quote_column_name(changes_column)} = #{conn.quote(JSON.generate(combined_changes))}"
           if combined_context.any?
-            updates << "#{conn.quote_column_name(context_column)} = #{conn.quote(combined_context.to_json)}"
+            updates << "#{conn.quote_column_name(context_column)} = #{conn.quote(JSON.generate(combined_context))}"
           end
           target_id = conn.quote(combine_target.read_attribute(:id))
           sql = "UPDATE #{conn.quote_table_name(table_name)} SET #{updates.join(", ")} WHERE id = #{target_id}"
@@ -180,7 +185,7 @@ module ActiveVersion
               # Use raw SQL with proper escaping to bypass ActiveRecord's readonly checks
               conn = audit_class.connection
               table_name = audit_class.table_name
-              empty_json_str = {}.to_json  # This is "{}"
+              empty_json_str = JSON.generate({})
               empty_json = conn.quote(empty_json_str)
               quoted_comment = conn.quote(combined_comment)
 
@@ -194,16 +199,13 @@ module ActiveVersion
           end
 
           # Clear association cache to ensure fresh data is loaded after updates
-          if respond_to?(:audits)
-            # Clear the association cache
+          if respond_to?(:association) && association_cached?(:audits)
+            association(:audits).reset
+          end
+          begin
             audits.reset
-            # Also clear any loaded association state
-            if respond_to?(:association)
-              assoc = association(:audits)
-              if assoc.respond_to?(:loaded?) && assoc.loaded?
-                assoc.reset
-              end
-            end
+          rescue NoMethodError
+            nil
           end
         end
       end

data/lib/active_version/audits/has_audits/audit_writer.rb

@@ -190,7 +190,7 @@ module ActiveVersion
               begin
                 audit_class.create!(insert_attrs)
                 combine_audits_if_needed if attrs[:action] != "create"
-                audits.reset
+                association(:audits).reset if association_cached?(:audits)
                 nil
               rescue ActiveRecord::RecordNotUnique => e
                 # Handle unique constraint violation (likely version conflict)
@@ -208,7 +208,7 @@ module ActiveVersion
                   begin
                     audit_class.create!(insert_attrs)
                     combine_audits_if_needed if attrs[:action] != "create"
-                    audits.reset
+                    association(:audits).reset if association_cached?(:audits)
                     nil
                   rescue => retry_error
                     handle_audit_errors(retry_error, attrs[:action])

data/lib/active_version/audits/has_audits/change_filters.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module ActiveVersion
   module Audits
     module HasAudits
@@ -105,7 +107,7 @@ module ActiveVersion
           changes.each_with_object({}) do |(k, v), h|
             h[k] = v.last if v.is_a?(Array)
             h[k] = v unless v.is_a?(Array)
-            h[k] = h[k].to_json if h[k].is_a?(Hash)
+            h[k] = JSON.generate(h[k]) if h[k].is_a?(Hash) || h[k].is_a?(Array)
           end
         end
       end

data/lib/active_version/audits/has_audits.rb

@@ -24,14 +24,8 @@ module ActiveVersion
 
         # Get audit class name
         def self.audit_class
-          # Check class attribute first (set by set_audit)
-          return superclass.audit_class if respond_to?(:superclass) && superclass.respond_to?(:audit_class) && superclass.audit_class
           return @audit_class if @audit_class
 
-          # Check if class attribute was set via class_attribute
-          attr_value = read_inheritable_attribute(:audit_class) if respond_to?(:read_inheritable_attribute)
-          return attr_value if attr_value
-
           if audited_options && audited_options[:as]
             klass = case audited_options[:as]
             when String, Symbol
@@ -168,35 +162,7 @@ module ActiveVersion
           # This ensures class_audited_options can find it
           @audited_options_base = normalized.dup
           self.audited_options = normalized
-
-          # Override audited_options to merge thread-local config
-          # class_attribute methods can't be easily overridden, so we need to use alias_method
-          unless respond_to?(:audited_options_without_thread_local, true)
-            alias_method :audited_options_without_thread_local, :audited_options
-            define_singleton_method :audited_options do
-              # Get base class-level options (without thread-local)
-              # Use send to call private method in correct context
-              class_level = send(:class_audited_options)
-              key = send(:audited_current_options_key)
-              thread_local = ActiveVersion.store_get(key)
-
-              # Start with class-level options (deep copy to avoid reference issues)
-              result = if class_level.is_a?(Hash)
-                class_level.deep_dup
-              else
-                {}
-              end
-
-              # Merge thread-local over class-level (thread-local takes precedence)
-              if thread_local.is_a?(Hash) && !thread_local.empty?
-                thread_local.each do |k, v|
-                  result[k] = v
-                end
-              end
-
-              result
-            end
-          end
+          install_thread_local_audited_options_reader!
 
           self.audit_associated_with = audited_options[:associated_with]
 
@@ -261,6 +227,7 @@ module ActiveVersion
           @audited_options_base = normalized.dup
           self.audit_class = resolved_audit_class
           @audit_class = resolved_audit_class  # Also set instance variable for the custom method
+          install_thread_local_audited_options_reader!
 
           # Ensure audit class associations are set up
           resolved_audit_class.setup_associations if resolved_audit_class.respond_to?(:setup_associations)
@@ -324,15 +291,35 @@ module ActiveVersion
         # This overrides the class_attribute reader to merge thread-local overrides
         def update_audited_options(new_options)
           normalized = normalize_audited_options(new_options)
-          resolved_audit_class = audit_class
+          resolved_audit_class = resolve_audit_class_option(normalized[:as]) || audit_class
+          if resolved_audit_class
+            self.audit_class = resolved_audit_class
+            @audit_class = resolved_audit_class
+            if resolved_audit_class.name.present?
+              has_many :audits,
+                as: :auditable,
+                class_name: resolved_audit_class.name.to_s,
+                inverse_of: false
+            end
+          end
           register_audit_column_mappings_from_destination(resolved_audit_class) if resolved_audit_class
           normalized = infer_audit_storage_and_columns(resolved_audit_class, normalized) if resolved_audit_class
           self.audited_options = normalized
           # Store base value in instance variable for class_audited_options to access
           @audited_options_base = normalized.dup
+          install_thread_local_audited_options_reader!
           self.audit_associated_with = audited_options[:associated_with]
         end
 
+        def resolve_audit_class_option(value)
+          case value
+          when String, Symbol
+            value.to_s.safe_constantize
+          when Class
+            value
+          end
+        end
+
         def normalize_audited_options(options)
           {
             on: Array.wrap(options[:on] || [:create, :update, :destroy]),
@@ -366,6 +353,7 @@ module ActiveVersion
         public
 
         def with_audited_options(options = {})
+          install_thread_local_audited_options_reader!
           thread_key = audited_current_options_key
           current = ActiveVersion.store_get(thread_key)
           # Store only the thread-local overrides (merge with existing if any)
@@ -375,14 +363,24 @@ module ActiveVersion
           normalized = {}
           # Convert options to hash (paper_trail pattern: simple to_h call)
           # Handle both Hash and objects that respond to to_h
-          opts_hash = if options.respond_to?(:to_h)
-            options.to_h
-          elsif options.is_a?(Hash)
+          opts_hash = if options.is_a?(Hash)
             options
+          elsif options.respond_to?(:to_h)
+            options.to_h
           else
             {}
           end
 
+          # Some objects (e.g. Struct.new(:to_h).new({...})) stringify into
+          # { to_h: {...} } instead of returning the intended options hash.
+          if opts_hash.is_a?(Hash)
+            if opts_hash.key?(:to_h) && opts_hash[:to_h].is_a?(Hash)
+              opts_hash = opts_hash[:to_h]
+            elsif opts_hash.key?("to_h") && opts_hash["to_h"].is_a?(Hash)
+              opts_hash = opts_hash["to_h"]
+            end
+          end
+
           opts_hash.each do |k, v|
             next if v.nil?
             key = k.is_a?(Symbol) ? k : k.to_sym
@@ -422,6 +420,46 @@ module ActiveVersion
 
         private
 
+        def install_thread_local_audited_options_reader!
+          unless singleton_class.instance_methods(false).include?(:audited_options_without_thread_local)
+            singleton_class.alias_method :audited_options_without_thread_local, :audited_options
+          end
+
+          define_singleton_method :audited_options do
+            class_level = send(:class_audited_options)
+            key = send(:audited_current_options_key)
+            thread_local = ActiveVersion.store_get(key)
+
+            result = if class_level.is_a?(Hash)
+              class_level.each_with_object({}) do |(k, v), hash|
+                hash[k] = safe_dup_audited_option_value(v)
+              end
+            else
+              {}
+            end
+
+            if thread_local.is_a?(Hash) && !thread_local.empty?
+              thread_local.each do |k, v|
+                result[k] = v
+              end
+            end
+
+            result
+          end
+          @active_version_audited_options_wrapped = true
+        end
+
+        def safe_dup_audited_option_value(value)
+          case value
+          when Hash
+            value.each_with_object({}) { |(k, v), hash| hash[k] = safe_dup_audited_option_value(v) }
+          when Array
+            value.map { |item| safe_dup_audited_option_value(item) }
+          else
+            value
+          end
+        end
+
         # Get the base class_attribute value without thread-local merging
         def class_audited_options
           # Try to get from instance variable first (most direct)
@@ -516,7 +554,7 @@ module ActiveVersion
             else
               inferred[:only] ||= []
             end
-          rescue ActiveRecord::ConnectionNotDefined, ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
+          rescue *ActiveVersion::Runtime.active_record_connection_errors
             inferred[:storage] ||= ActiveVersion.config.audit_storage
             inferred[:only] ||= []
           end
@@ -763,7 +801,7 @@ module ActiveVersion
       end
 
       def clear_rolled_back_audits
-        audits.reset
+        association(:audits).reset if association_cached?(:audits)
       end
 
       # Override audits method to handle dynamically created classes
@@ -777,18 +815,24 @@ module ActiveVersion
           raise ConfigurationError, "Cannot determine class name for dynamically created class. Please specify class_name option in has_audits (e.g., has_audits as: PostAudit, class_name: 'Post')"
         end
 
-        # If class_name is different from actual class name, query directly
         uses_custom_auditable_id = audited_options[:identity_resolver].present? ||
           Array(active_version_audit_identity_columns).length > 1
-        if auditable_type != self.class.name || uses_custom_auditable_id
-          auditable_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :auditable)
-          version_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :version)
-          self.class.audit_class.where({"#{auditable_column}_type" => auditable_type}.merge(active_version_audit_identity_map))
-            .order(version_column => :asc)
-        else
-          # Use normal association for classes with proper names
-          super
+
+        audit_klass =
+          if !uses_custom_auditable_id && self.class.reflect_on_association(:audits)
+            association(:audits).klass
+          else
+            self.class.audit_class
+          end
+        audit_klass ||= self.class.send(:resolve_audit_class_option, audited_options[:as]) if self.class.respond_to?(:resolve_audit_class_option, true)
+        raise ConfigurationError, "No audit class configured for #{self.class.name}" unless audit_klass
+
+        if !uses_custom_auditable_id && auditable_type == self.class.name && self.class.reflect_on_association(:audits)
+          return super
         end
+
+        auditable_column = ActiveVersion.column_mapper.column_for(self.class, :audits, :auditable)
+        audit_klass.where({"#{auditable_column}_type" => auditable_type}.merge(active_version_audit_identity_map))
       end
 
       def active_version_auditable_id_value

data/lib/active_version/audits/sql_builder.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module ActiveVersion
   module Audits
     # SQL builder for batch audit operations
@@ -248,7 +250,7 @@ module ActiveVersion
         def prepare_sql_value(value)
           case value
           when Hash, Array
-            value.to_json
+            JSON.generate(value)
           when Time, DateTime
             value.utc
           when Date

data/lib/active_version/revisions/has_revisions.rb

@@ -1,5 +1,6 @@
 require "active_version/revisions/has_revisions/revision_queries"
 require "active_version/revisions/has_revisions/revision_manipulation"
+require "json"
 
 module ActiveVersion
   module Revisions
@@ -329,7 +330,7 @@ module ActiveVersion
       def revision_sql_value(value)
         case value
         when Hash, Array
-          value.to_json
+          JSON.generate(value)
         when Time, DateTime
           value.utc
         when Date
@@ -394,16 +395,18 @@ module ActiveVersion
 
       def create_revision_before_update
         pointer = instance_variable_get(:@active_version_pointer)
+        truncated_forward_history = false
         if pointer
           version_column = revision_version_column
           # Classic linear undo/redo behavior: editing after undo drops forward history.
           revisions_scope.where("#{version_column} > ?", pointer).delete_all
           revisions.reset
           remove_instance_variable(:@active_version_pointer)
+          truncated_forward_history = true
         end
         # Check if we should create revision
         return unless should_create_revision?
-        return if latest_revision_matches_current_state?
+        return if truncated_forward_history && latest_revision_matches_current_state?
 
         result = create_snapshot!(use_old_values: true)
 

data/lib/active_version/revisions/revision_record.rb

@@ -103,7 +103,7 @@ module ActiveVersion
               version_column = fallback_column.to_sym if fallback_column
             end
             validates version_column, presence: true, uniqueness: {scope: Array(source_foreign_key)} if version_column
-          rescue NameError, ActiveRecord::ConnectionNotDefined
+          rescue NameError, *ActiveVersion::Runtime.active_record_connection_errors
             # Source class not yet defined, will be set up later
           end
         end

data/lib/active_version/revisions/sql_builder.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module ActiveVersion
   module Revisions
     # SQL builder for batch revision operations
@@ -251,7 +253,7 @@ module ActiveVersion
         def prepare_sql_value(value)
           case value
           when Hash, Array
-            value.to_json
+            JSON.generate(value)
           when Time, DateTime
             value.utc
           when Date

data/lib/active_version/runtime.rb

@@ -91,12 +91,13 @@ module ActiveVersion
       def active_record_connection_errors
         return [] unless defined?(::ActiveRecord)
 
-        [
+        errors = [
           ::ActiveRecord::ConnectionNotEstablished,
           ::ActiveRecord::NoDatabaseError,
-          ::ActiveRecord::StatementInvalid,
-          ::ActiveRecord::ConnectionNotDefined
+          ::ActiveRecord::StatementInvalid
         ]
+        errors << ::ActiveRecord::ConnectionNotDefined if defined?(::ActiveRecord::ConnectionNotDefined)
+        errors
       end
 
       def supports_transactional_context?(connection)

data/lib/active_version/translations/translation_record.rb

@@ -76,7 +76,7 @@ module ActiveVersion
           return locale_column if column_names.include?(locale_column.to_s)
 
           ActiveVersion.config.translation_locale_column
-        rescue NameError, ActiveRecord::ConnectionNotDefined
+        rescue NameError, *ActiveVersion::Runtime.active_record_connection_errors
           ActiveVersion.config.translation_locale_column
         end
 
@@ -99,7 +99,7 @@ module ActiveVersion
           begin
             locale_column = locale_column_name
             validates locale_column, presence: true, uniqueness: {scope: Array(source_foreign_key)}
-          rescue NameError, ActiveRecord::ConnectionNotDefined
+          rescue NameError, *ActiveVersion::Runtime.active_record_connection_errors
             # Source class not yet defined, will be set up later
           end
         end
@@ -116,7 +116,7 @@ module ActiveVersion
             column = columns_hash[locale_column.to_s]
             return unless column&.type == :integer
             enum locale_column, I18n.available_locales.index_by(&:to_s)
-          rescue NameError, ActiveRecord::ConnectionNotDefined
+          rescue NameError, *ActiveVersion::Runtime.active_record_connection_errors
             # Source class not yet defined
           end
         end

data/lib/active_version/version.rb

@@ -1,3 +1,3 @@
 module ActiveVersion
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/active_version.rb

@@ -1,3 +1,4 @@
+require "logger"
 require "active_support"
 begin
   require "active_record"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_version
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrei Makarov
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement