active_version 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08398a92e326503be43e704b7681562a6c3c4d220bd7cf934e295ff3afada135'
-  data.tar.gz: a3678d669239918343732b02b8ff8285b32e549bb44ae6eae1cffde75abf0ae1
+  metadata.gz: d52287aa8ea68e0c77baff3065a3140d397c2e638460967880b0b0dbc904b42c
+  data.tar.gz: aff296230f04d04d90bafe26e12fe0876fc2cd292cd07e6083d71a595a9ea6f6
 SHA512:
-  metadata.gz: 158e15ac369fcbe7f730cf6e11ef638f888b5e14fb996be1f555321ddb0b08f11975c96809df18980d66b32402175dd660651791ffd8f3959798cb66b285a882
-  data.tar.gz: d0b501f02a783beaab992849dd91420980ccb592d2f56b8b7c810f49ff0952c1e61bc60cb8b8a202cc8af269928924f947243b15349606b8ddc0c4a0f33d414c
+  metadata.gz: 35c7b1c96056c61e5c36a72166d2be067504da0fa922fd439ad4a6b1a09a7630ae80734fb2ad8e97dfb81fd3302c75ed168cb92adb22669f222e5cd6aa363a90
+  data.tar.gz: db6759859ffd1139a818c45a23ae486e819e035553b32762f586465cbef3a2597507a80ea424036ecc0718fe6a9dbf25cb11fe5c8e4e6c7556d27e124e13704f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.0.0 (2026-08-21)
+
+- BREAKING: Require Active Support and Active Record `>= 7.2.3.2` and `< 9.0`.
+- Retry unique version collisions so a revision snapshot or audit still writes after a concurrent insert, including inside an open PostgreSQL transaction.
+- Add `rfcs/` starter pack: process (RFC 0001), positioning (RFC 0002), and Standards Track design RFCs 0003–0006 for translations, revisions, audits, and generators.
+
 ## 1.4.0 (2026-07-13)
 
 - Add `revision_error_behavior` configuration (`:exception`, `:log`, `:silent`) and per-model `has_revisions error_behavior:` override for revision snapshot failures.

data/README.md

@@ -1,9 +1,11 @@
 # ActiveVersion
 
-[![Gem Version](https://badge.fury.io/rb/active_version.svg)](https://badge.fury.io/rb/active_version) [![Test Status](https://github.com/amkisko/active_version.rb/actions/workflows/test.yml/badge.svg)](https://github.com/amkisko/active_version.rb/actions/workflows/test.yml) [![codecov](https://codecov.io/gh/amkisko/active_version.rb/graph/badge.svg?token=2U6NXJOVVM)](https://codecov.io/gh/amkisko/active_version.rb)
+[![Gem Version](https://badge.fury.io/rb/active_version.svg)](https://badge.fury.io/rb/active_version) [![Test Status](https://github.com/amkisko/active_version.rb/actions/workflows/test.yml/badge.svg)](https://github.com/amkisko/active_version.rb/actions/workflows/test.yml) [![codecov](https://codecov.io/gh/amkisko/active_version.rb/graph/badge.svg?token=2U6NXJOVVM)](https://app.codecov.io/github/amkisko/active_version.rb)
 
 A unified versioning library for ActiveRecord that handles translations, revisions, and audits in a single, extensible architecture.
 
+Design changes go through `rfcs/` (RFC 0001).
+
 ## Features
 
 - Translations: Locale-based versioning with automatic value copying
@@ -502,7 +504,7 @@ Environment knobs:
 ## Requirements
 
 - Ruby >= 3.0.0
-- ActiveRecord >= 6.0.0 (default runtime)
+- ActiveRecord >= 7.2.3.2 and < 9.0 (default runtime)
 - SQLite or MySQL or PostgreSQL (optional, for triggers and JSONB support)
 
 ## Contributing
@@ -511,6 +513,19 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/amkisk
 
 Development dependencies include [polyrun](https://rubygems.org/gems/polyrun) (declared in `active_version.gemspec`) for **parallel RSpec** (`./bin/polyrun`), coverage, and CI report formats—see [spec/README.md](spec/README.md).
 
+## Links
+
+- [GitHub](https://github.com/amkisko/active_version.rb)
+- [GitLab](https://gitlab.com/amkisko/active_version.rb)
+- [RubyGems](https://rubygems.org/gems/active_version)
+- [Versions Atom](https://rubygems.org/gems/active_version/versions.atom) (feed id `10668858017926`)
+- [libraries.io](https://libraries.io/rubygems/active_version)
+- [Deps.dev](https://deps.dev/rubygems/active_version)
+- [SonarCloud](https://sonarcloud.io/project/overview?id=amkisko_active_version.rb)
+- [Snyk](https://snyk.io/test/github/amkisko/active_version.rb)
+- [Codecov](https://app.codecov.io/github/amkisko/active_version.rb)
+- [OpenSSF Scorecard](https://scorecard.dev/viewer/?uri=github.com/amkisko/active_version.rb)
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Reporting a Vulnerability
 
-Do NOT open a public GitHub issue for security vulnerabilities.
+Do not open a public issue for security vulnerabilities.
 
 Email security details to: security@kiskolabs.com
 
@@ -23,7 +23,5 @@ Include: description, steps to reproduce, potential impact, and suggested fix (i
 
 ## Automation Security
 
-* Context Isolation: It is strictly forbidden to include production credentials, API keys, or Personally Identifiable Information (PII) in prompts sent to third-party LLMs or automation services.
-
-* Supply Chain: All automated dependencies must be verified.
-
+- Context Isolation: It is strictly forbidden to include production credentials, API keys, or Personally Identifiable Information (PII) in prompts sent to third-party LLMs or automation services.
+- Supply Chain: All automated dependencies must be verified.

data/lib/active_version/adapters/active_record/audits.rb

@@ -11,7 +11,7 @@ module ActiveVersion
         module ClassMethods
           # Declare that a model has audits
           def has_audits(options = {})
-            include ActiveVersion::Audits::HasAudits unless included_modules.include?(ActiveVersion::Audits::HasAudits)
+            include ActiveVersion::Audits::HasAudits unless include?(ActiveVersion::Audits::HasAudits)
 
             # Call the HasAudits implementation once included
             ActiveVersion::Audits::HasAudits::ClassMethods.instance_method(:has_audits)
@@ -30,7 +30,7 @@ end
 
 # If ActiveRecord::Base is already loaded, include immediately
 if defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:include)
-  unless ActiveRecord::Base.included_modules.include?(ActiveVersion::Adapters::ActiveRecord::Audits)
+  unless ActiveRecord::Base.include?(ActiveVersion::Adapters::ActiveRecord::Audits)
     ActiveSupport.on_load(:active_record) { include ActiveVersion::Adapters::ActiveRecord::Audits }
   end
 end

data/lib/active_version/adapters/active_record/revisions.rb

@@ -43,7 +43,7 @@ end
 
 # If ActiveRecord::Base is already loaded, include immediately
 if defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:include)
-  unless ActiveRecord::Base.included_modules.include?(ActiveVersion::Adapters::ActiveRecord::Revisions)
+  unless ActiveRecord::Base.include?(ActiveVersion::Adapters::ActiveRecord::Revisions)
     ActiveSupport.on_load(:active_record) { include ActiveVersion::Adapters::ActiveRecord::Revisions }
   end
 end

data/lib/active_version/adapters/active_record/translations.rb

@@ -39,7 +39,7 @@ end
 
 # If ActiveRecord::Base is already loaded, include immediately
 if defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:include)
-  unless ActiveRecord::Base.included_modules.include?(ActiveVersion::Adapters::ActiveRecord::Translations)
+  unless ActiveRecord::Base.include?(ActiveVersion::Adapters::ActiveRecord::Translations)
     ActiveSupport.on_load(:active_record) { include ActiveVersion::Adapters::ActiveRecord::Translations }
   end
 end

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

@@ -187,42 +187,46 @@ module ActiveVersion
                 return nil
               end
 
-              begin
-                audit_class.create!(insert_attrs)
-                combine_audits_if_needed if attrs[:action] != "create"
-                association(:audits).reset if association_cached?(:audits)
-                nil
-              rescue ActiveRecord::RecordNotUnique => e
-                # Handle unique constraint violation (likely version conflict)
-                # Retry once with recalculated version
-                if e.message.include?("version") && attrs[:action] != "create"
-                  # Recalculate version and retry
-                  # Use class_name from options if provided (for dynamically created classes)
-                  auditable_type_for_query = audited_options[:class_name] || self.class.name
-                  if auditable_type_for_query.nil?
-                    raise ConfigurationError, "Cannot determine class name for dynamically created class. Please specify class_name option in has_audits"
-                  end
-                  max_version = audit_class.where({"#{auditable_column}_type" => auditable_type_for_query}.merge(active_version_audit_identity_map))
-                    .maximum(version_column) || 0
-                  insert_attrs[version_column] = max_version + 1
-                  begin
-                    audit_class.create!(insert_attrs)
-                    combine_audits_if_needed if attrs[:action] != "create"
-                    association(:audits).reset if association_cached?(:audits)
-                    nil
-                  rescue => retry_error
-                    handle_audit_errors(retry_error, attrs[:action])
-                    nil
-                  end
-                else
-                  handle_audit_errors(e, attrs[:action])
-                  nil
-                end
-              rescue => e
-                handle_audit_errors(e, attrs[:action])
-                nil
-              end
+              create_audit_record_with_version_retry!(
+                insert_attrs,
+                version_column: version_column,
+                auditable_column: auditable_column,
+                action: attrs[:action]
+              )
+            end
+          end
+        end
+
+        # One retry on unique (version) collision. Each insert uses a savepoint so
+        # PostgreSQL can continue the outer update/lock transaction after a unique violation.
+        def create_audit_record_with_version_retry!(insert_attrs, version_column:, auditable_column:, action:)
+          attempt = 0
+          begin
+            attempt += 1
+            self.class.transaction(requires_new: true) do
+              audit_class.create!(insert_attrs)
+            end
+            combine_audits_if_needed if action != "create"
+            association(:audits).reset if association_cached?(:audits)
+            nil
+          rescue => error
+            unless ActiveVersion::UniqueVersionCollision.match?(error, version_column: version_column) &&
+                action != "create" && attempt < 2
+              handle_audit_errors(error, action)
+              return nil
+            end
+
+            auditable_type_for_query = audited_options[:class_name] || self.class.name
+            if auditable_type_for_query.nil?
+              raise ConfigurationError, "Cannot determine class name for dynamically created class. Please specify class_name option in has_audits"
+            end
+
+            max_version = audit_class.uncached do
+              audit_class.where({"#{auditable_column}_type" => auditable_type_for_query}.merge(active_version_audit_identity_map))
+                .maximum(version_column) || 0
             end
+            insert_attrs[version_column] = max_version + 1
+            retry
           end
         end
 

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

@@ -421,16 +421,20 @@ module ActiveVersion
           revisions.reset
         end
 
-        # One retry on unique (version) violation, matching audit_writer behavior when a DB unique index exists.
+        # One retry on unique (version) collision. Each insert uses a savepoint so
+        # PostgreSQL can continue the outer update/lock transaction after a unique violation.
         def create_revision_record_with_version_retry!(revision_attrs, version_column_sym)
           attempt = 0
           begin
             attempt += 1
-            revisions.create!(revision_attrs)
-          rescue ActiveRecord::RecordNotUnique => error
+            self.class.transaction(requires_new: true) do
+              revisions.create!(revision_attrs)
+            end
+          rescue => error
+            raise error unless ActiveVersion::UniqueVersionCollision.match?(error, version_column: version_column_sym)
             raise error if attempt >= 2
 
-            max_version = revisions_scope.maximum(version_column_sym) || 0
+            max_version = revisions_scope.uncached { revisions_scope.maximum(version_column_sym) } || 0
             revision_attrs[version_column_sym] = max_version + 1
             retry
           end

data/lib/active_version/unique_version_collision.rb

@@ -0,0 +1,38 @@
+module ActiveVersion
+  module UniqueVersionCollision
+    module_function
+
+    def match?(error, version_column: nil)
+      return true if version_uniqueness_invalid?(error, version_column)
+
+      unique_constraint_names_version?(error, version_column)
+    end
+
+    def version_uniqueness_invalid?(error, version_column)
+      return false unless error.is_a?(ActiveRecord::RecordInvalid)
+      return false if version_column.nil?
+
+      details = error.record&.errors&.details
+      return false unless details
+
+      Array(details[version_column.to_sym]).any? { |detail| detail[:error] == :taken }
+    end
+
+    def unique_constraint_names_version?(error, version_column)
+      needle = version_column.to_s
+      return false if needle.empty?
+      return false unless unique_constraint_error?(error)
+
+      [error.message, error.cause&.message].compact.any? { |text| text.include?(needle) }
+    end
+
+    def unique_constraint_error?(error)
+      return true if error.is_a?(ActiveRecord::RecordNotUnique)
+      return false unless defined?(PG)
+
+      error.is_a?(ActiveRecord::StatementInvalid) && error.cause.is_a?(PG::UniqueViolation)
+    end
+
+    private_class_method :version_uniqueness_invalid?, :unique_constraint_names_version?, :unique_constraint_error?
+  end
+end

data/lib/active_version/version.rb

@@ -1,3 +1,3 @@
 module ActiveVersion
-  VERSION = "1.4.0"
+  VERSION = "2.0.0"
 end

data/lib/active_version.rb

@@ -12,6 +12,7 @@ require "active_version/column_mapper"
 require "active_version/version_registry"
 require "active_version/instrumentation"
 require "active_version/runtime"
+require "active_version/unique_version_collision"
 
 # Main entry point for ActiveVersion
 module ActiveVersion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_version
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -15,14 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.2.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.2.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -43,14 +49,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.2.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.2.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +265,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop-thread_safety
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +329,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.26'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.26'
 description: 'ActiveVersion is a language-agnostic versioning library that unifies
   three core use cases: translations (locale-based), revisions/drafts (workflow snapshots),
   and audits (change tracking).'
@@ -373,6 +399,7 @@ files:
 - lib/active_version/translations.rb
 - lib/active_version/translations/has_translations.rb
 - lib/active_version/translations/translation_record.rb
+- lib/active_version/unique_version_collision.rb
 - lib/active_version/version.rb
 - lib/active_version/version_registry.rb
 - lib/generators/active_version/audits/audits_generator.rb