active_version 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b9a886b4b5c2fd7b75b33e9f8d06557da0e51d221bf2c5bee1b88a33a79894e
-  data.tar.gz: 170d8b76a41e56d68e7ae22d2316cfdfbd4f559c27784a8bfcc0fc2e4e8c713b
+  metadata.gz: 5f1b2d07a134e66e4e4330b9d195b32d831d3a2ce0599c324bed86157eb2e3fc
+  data.tar.gz: f612e466b59f335183016fc5d9d601005a4b66b07efa6276b54c1260bbd08736
 SHA512:
-  metadata.gz: b3a6edf6a90368e5a2b65d20439a4b7b2496dc432e75f6ea6a4805b25ac84dfe24155680da924ec3a696ba004d40826382b6547d45ca0769e400c71e14d05eea
-  data.tar.gz: 30a796563f87edfd7b54e938d2a93b75381e1d494febf1ed51748fcb4d45058d24343f2267275bdf6462d63059bf0fa8ab7f44ef5ac0f8d27e31cea7c765faea
+  metadata.gz: '068727dace361f83992e6b6e92b25e2dcb50cc5128e5cbb80114cfd4d48fa7f4f406f0fe216de0518becbe75f9186ab18637211452ce2a98b66825ea513172f7'
+  data.tar.gz: 6d09e28cbb0b651a4aaa89fb879a48e978bb9d9fcde7d3c312226ca256963ed119b9aba9e016eaddbe6a0a613d2e10140c5474f280d545f318fdb80282007930

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.3.0 (2026-04-15)
+
+- Add `polyrun` `~> 1.2.0` development dependency; `bin/polyrun`, `bin/rspec`, `polyrun.yml`, and `config/polyrun_coverage.yml` for parallel RSpec and merged coverage.
+- Add `script/create_postgres_shard_databases.sh` for CI and local Postgres shard databases; document in `POLYRUN.md`; set job-level `DATABASE_URL` in GitHub Actions test workflow.
+- Add internal library logger.
+- Fix audits, Sequel foreign keys, revision debounce, and versions walk edge cases.
+- Adjust RSpec and RuboCop test configuration; update spec coverage.
+
+## 1.2.0 (2026-03-27)
+
+- Fixed SQL generation for audit creation to avoid duplicate `created_at` and `updated_at` columns (or other possible duplicate columns)
+
 ## 1.1.0 (2026-03-27)
 
 - Added `audit_auditable_optional` configuration option to control polymorphic `belongs_to :auditable` optionality

data/README.md

@@ -447,8 +447,8 @@ The report includes per-record overhead vs ActiveRecord baseline (`p5`, `mean`,
 The report also separates ActiveRecord and Sequel benchmark groups to avoid cross-ORM baseline mixing.
 
 ```bash
-# Normal test run (benchmarks excluded)
-bundle exec rspec
+# Normal test run (benchmarks excluded) — parallel OS processes via Polyrun (same as CI)
+./bin/polyrun
 
 # Explicit benchmark run
 usr/bin/benchmark.rb
@@ -507,6 +507,8 @@ Environment knobs:
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/amkisko/active_version.rb.
 
+Development dependencies include [polyrun](https://rubygems.org/gems/polyrun) **`~> 1.2.0`** (declared in `active_version.gemspec`) for **parallel RSpec** (`./bin/polyrun`), coverage, and CI report formats—see [POLYRUN.md](POLYRUN.md).
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/active_version/adapters/sequel/versioning.rb

@@ -1,4 +1,5 @@
 require "json"
+require "active_support/core_ext/string/inflections"
 
 module ActiveVersion
   module Adapters
@@ -51,7 +52,7 @@ module ActiveVersion
 
         module InstanceMethods
           def active_version_foreign_key
-            self.class.active_version_config[:foreign_key] || :"#{model_name.singular}_id"
+            self.class.active_version_config[:foreign_key] || :"#{model_name.singularize}_id"
           end
 
           def active_version_tracked_columns

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

@@ -104,11 +104,15 @@ module ActiveVersion
         end
 
         def prepare_sql_values(changes)
-          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] = JSON.generate(h[k]) if h[k].is_a?(Hash) || h[k].is_a?(Array)
+          h = changes.each_with_object({}) do |(k, v), acc|
+            acc[k] = v.last if v.is_a?(Array)
+            acc[k] = v unless v.is_a?(Array)
+            acc[k] = JSON.generate(acc[k]) if acc[k].is_a?(Hash) || acc[k].is_a?(Array)
           end
+          # Arel INSERT uses keys as column names; stringify so :action / mirror :attrs match
+          # string keys from column_mapper and so symbol + string for the same column cannot
+          # both appear (PG::DuplicateColumn).
+          h.transform_keys(&:to_s)
         end
       end
     end

data/lib/active_version/audits/has_audits.rb

@@ -22,7 +22,13 @@ module ActiveVersion
           false
         end
 
-        # Get audit class name
+        # Class attributes (must be declared before the custom .audit_class reader below —
+        # otherwise class_attribute :audit_class overwrites the resolver and leaves it dead code.)
+        class_attribute :audit_associated_with, instance_writer: false
+        class_attribute :audited_options, instance_writer: false
+        class_attribute :audit_class, instance_writer: false
+
+        # Get audit class name (overrides class_attribute reader with resolution logic)
         def self.audit_class
           return @audit_class if @audit_class
 
@@ -53,11 +59,6 @@ module ActiveVersion
           end
         end
 
-        # Class attributes
-        class_attribute :audit_associated_with, instance_writer: false
-        class_attribute :audited_options, instance_writer: false
-        class_attribute :audit_class, instance_writer: false
-
         # Instance attributes
         attr_accessor :audit_version, :audit_comment, :audit_context
 
@@ -121,13 +122,10 @@ module ActiveVersion
         def revisions(from_version = 1)
           return [] unless audits.from_version(from_version).exists?
 
-          version_column = ActiveVersion.column_mapper.column_for(self, :audits, :version)
-          all_audits = audits.to_a
-          targeted_audits = all_audits.select do |audit|
-            audit.read_attribute(version_column).to_i >= from_version
-          end
+          prior_audits = audits.to_version(from_version - 1).ascending.to_a
+          targeted_audits = audits.from_version(from_version).ascending.to_a
 
-          previous_attributes = audit_class.reconstruct_attributes(all_audits - targeted_audits)
+          previous_attributes = audit_class.reconstruct_attributes(prior_audits)
 
           targeted_audits.map do |audit|
             previous_attributes.merge!(audit.new_attributes)

data/lib/active_version/query.rb

@@ -92,14 +92,6 @@ module ActiveVersion
         version_column = ActiveVersion.column_mapper.column_for(record.class, :revisions, :version)
         query.order(version_column => :asc)
       end
-
-      private
-
-      def log_debug(message)
-        if defined?(Rails) && Rails.respond_to?(:logger)
-          Rails.logger&.debug("[ActiveVersion::Query] #{message}")
-        end
-      end
     end
   end
 end

data/lib/active_version/revisions/has_revisions/revision_manipulation.rb

@@ -17,10 +17,13 @@ module ActiveVersion
 
           # Check debounce time - merge with previous revision if within window
           debounce_time = opts[:debounce_time] || ActiveVersion.config.debounce_time
-          if !batch_capture_active && debounce_time && should_merge_with_previous?(debounce_time, timestamp)
-            merge_with_previous_revision!(timestamp, only_attrs, except_attrs, use_old_values)
-            version_column = revision_version_column
-            return revisions_scope.order(version_column => :desc).first
+          if !batch_capture_active && debounce_time
+            last_for_merge = last_revision_for_debounce_merge(debounce_time, timestamp)
+            if last_for_merge
+              merge_with_previous_revision!(timestamp, only_attrs, except_attrs, use_old_values, last_revision: last_for_merge)
+              version_column = revision_version_column
+              return revisions_scope.order(version_column => :desc).first
+            end
           end
 
           new_version = if batch_capture_active
@@ -113,7 +116,7 @@ module ActiveVersion
 
             # Use create! instead of build + save to get better error messages
             begin
-              revision = revisions.create!(revision_attrs)
+              revision = create_revision_record_with_version_retry!(revision_attrs, version_column_sym)
             rescue ActiveRecord::RecordInvalid => e
               ActiveVersion::Instrumentation.instrument_revision_write_failed(self, error: e)
               error_msg = "Failed to create revision: #{e.class}"
@@ -251,7 +254,7 @@ module ActiveVersion
             end
 
             # Create the revision using the association (it will set foreign_key automatically)
-            revision = revisions.create!(revision_attrs)
+            revision = create_revision_record_with_version_retry!(revision_attrs, version_column_sym)
             # Ensure it was created and persisted
             raise "Failed to create revision" unless revision.persisted?
             # Reload the post to clear all caches and see the new revision
@@ -350,19 +353,26 @@ module ActiveVersion
         end
 
         def should_merge_with_previous?(debounce_time, timestamp)
-          return false unless revisions_scope.exists?
+          !last_revision_for_debounce_merge(debounce_time, timestamp).nil?
+        end
+
+        # Latest revision row if +timestamp+ falls within +debounce_time+ seconds after that revision; one query.
+        def last_revision_for_debounce_merge(debounce_time, timestamp)
+          return nil unless debounce_time
 
           version_column = ActiveVersion.column_mapper.column_for(self.class, :revisions, :version)
           last_revision = revisions_scope.order(version_column => :desc).first
-          return false unless last_revision
+          return nil unless last_revision
 
           time_diff = timestamp.to_f - last_revision.created_at.to_f
-          time_diff <= debounce_time
+          return nil if time_diff > debounce_time
+
+          last_revision
         end
 
-        def merge_with_previous_revision!(timestamp, only_attrs, except_attrs, use_old_values)
+        def merge_with_previous_revision!(timestamp, only_attrs, except_attrs, use_old_values, last_revision: nil)
           version_column = ActiveVersion.column_mapper.column_for(self.class, :revisions, :version)
-          last_revision = revisions_scope.order(version_column => :desc).first
+          last_revision ||= revisions_scope.order(version_column => :desc).first
           return unless last_revision
 
           # Update last revision with current or persisted attributes (filtered by only/except)
@@ -416,6 +426,22 @@ module ActiveVersion
           revisions.reset
         end
 
+        # One retry on unique (version) violation, matching audit_writer behavior when a DB unique index exists.
+        def create_revision_record_with_version_retry!(revision_attrs, version_column_sym)
+          attempt = 0
+          begin
+            attempt += 1
+            revisions.create!(revision_attrs)
+          rescue ActiveRecord::RecordNotUnique => e
+            raise e if attempt >= 2
+
+            max_version = revisions_scope.maximum(version_column_sym) || 0
+            revision_attrs[version_column_sym] = max_version + 1
+            retry
+          end
+        end
+        private :create_revision_record_with_version_retry!
+
         def refreshable_column_names
           @refreshable_column_names ||=
             self.class.columns

data/lib/active_version/revisions/has_revisions/revision_queries.rb

@@ -91,7 +91,9 @@ module ActiveVersion
         # Enumerate all versions (lazy enumerator returning revision instances)
         def versions(reverse: false, include_self: false)
           version_column = revision_version_column
-          version_list = revisions_scope.order(version_column => (reverse ? :desc : :asc)).pluck(version_column)
+          ordered_rows = revisions_scope.order(version_column => (reverse ? :desc : :asc)).to_a
+          entries_by_version = ordered_rows.index_by { |row| row.public_send(version_column) }
+          version_list = ordered_rows.map { |row| row.public_send(version_column) }
 
           # If include_self, prepare current state as a revision instance
           current_self = nil
@@ -104,7 +106,10 @@ module ActiveVersion
 
           Enumerator.new do |yielder|
             version_list.each do |v|
-              revision = at_version(v)
+              revision_entry = entries_by_version[v]
+              next unless revision_entry
+
+              revision = build_revision_dup(revision_entry)
               yielder << revision if revision
             end
             if include_self

data/lib/active_version/version.rb

@@ -1,3 +1,3 @@
 module ActiveVersion
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

data/lib/active_version/version_registry.rb

@@ -17,9 +17,11 @@ module ActiveVersion
 
         # Detect option conflicts
         if existing[:options] != options
-          warn "[ActiveVersion] Re-registering #{model_class.name} with :#{version_type} " \
-               "with different options. Previous: #{existing[:options].inspect}, " \
-               "New: #{options.inspect}. This may indicate a configuration issue."
+          ActiveVersion.logger&.warn(
+            "[ActiveVersion] Re-registering #{model_class.name} with :#{version_type} " \
+            "with different options. Previous: #{existing[:options].inspect}, " \
+            "New: #{options.inspect}. This may indicate a configuration issue."
+          )
         else
           # Same options - likely a double include, but not necessarily a problem
           # Log at debug level if needed

data/lib/active_version.rb

@@ -163,7 +163,7 @@ module ActiveVersion
     elsif Fiber.current.respond_to?(:[])
       Fiber.current[key]
     else
-      Thread.current[key]
+      thread_current_for_fallback_store[key]
     end
   end
 
@@ -173,7 +173,7 @@ module ActiveVersion
     elsif Fiber.current.respond_to?(:[]=)
       Fiber.current[key] = value
     else
-      Thread.current[key] = value
+      thread_current_for_fallback_store[key] = value
     end
   end
 
@@ -184,13 +184,18 @@ module ActiveVersion
   def self.store_keys
     if config.execution_scope == :thread
       Thread.current.thread_variables
-    elsif Thread.current.respond_to?(:keys)
-      Thread.current.keys
+    elsif thread_current_for_fallback_store.respond_to?(:keys)
+      thread_current_for_fallback_store.keys
     else
       []
     end
   end
 
+  def self.thread_current_for_fallback_store
+    Thread.current
+  end
+  private_class_method :thread_current_for_fallback_store
+
   def self.clear_scoped_keys!(pattern)
     store_keys.grep(pattern).each { |key| store_delete(key) }
   end
@@ -322,6 +327,25 @@ module ActiveVersion
   def self.with_connection(model_class, version_type, &block)
     yield(Runtime.adapter.connection_for(model_class, version_type))
   end
+
+  # Library warnings (defaults to stderr). Set to +nil+ to silence; use +Logger.new(File::NULL)+ in tests.
+  class << self
+    attr_writer :logger
+
+    def logger
+      return @logger if defined?(@logger)
+
+      @logger = default_logger
+    end
+
+    def default_logger
+      l = Logger.new($stderr)
+      l.level = Logger::WARN
+      l.formatter = proc { |_, _, _, msg| "#{msg}\n" }
+      l
+    end
+    private :default_logger
+  end
 end
 
 # Load Rails integration if available

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_version
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -136,61 +136,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: polyrun
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement