active_version 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89fbcf4b5aebb3bd2fcbbedfafb3f6575edd6f22571080ce310005f3e6f27a28
-  data.tar.gz: 4a90af0cfcee066886ce989f11b8347303db945036ea57cc0a3f6d7b00bcfeee
+  metadata.gz: c3b099b1522fb5b1d087683cf7003c5f1156f7f0da8703691f89075b347183d5
+  data.tar.gz: 0d49734313021a4ef263a807361fbf1b5b1f5d564b693162ddfe0d17b2439768
 SHA512:
-  metadata.gz: 965f5ffcea61f3d8024d9ba0aaa7a0e3c514b1ce7b48a6f01f89bec05469ab481e82d894e3527a6b35c5f0830fa2cbf8b1947a7936b96e187ad31a228848d333
-  data.tar.gz: d8a5bc8d85a017998917086917d3a88c731cdc9bff9cab6ccf4cfe89d78c53d7b2bcd192ee31b4570a8fcbc532c67287e3399ebf89dd172806acd440fb1283b9
+  metadata.gz: 27d139f5b16f533cdf00e11ab4ce7f9b12830574eb4e1cd49c900ed7885447a22c6ea2507cdacdcbcdd1d32577bed4e369a950c8c3a588bb35584157290bfbde
+  data.tar.gz: 87808c1b4380abaf00d72f223a27d0010fc178c6433fa52acfe356c00a9461b7e870c31320b102faaddf20d0f37cbccd8368f7c3516117bea48c89cdb45906d8

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 2.1.1 (2026-11-07)
+
+- Use a single shallow `dup` of the merged global context when audit instance context is empty, instead of `dup.merge({})`.
+- Encode audit/revision SQL and serializer JSON through `ActiveVersion.json_encode` (`JSON.generate`); use the same encoder in `with_transactional_context`.
+- Cache `Query` `column_mapper` lookups per `(model, kind, field)`; share identity-map helpers; return the model class `none` when the version class is missing.
+- Memoize `ActiveSupport::Notifications.listening?` per instrumentation event name (reset in specs).
+- Merge audit batch context with `merge!` when the existing context is already a Hash; skip `stringify_keys` when keys are already strings.
+- Remove `AV_PRESSURE_BUILD` / `pressure_build_phase_enabled?` from lib; drop the pressure-cooker harness and its episode docs.
+- Maintainer load harness: `benchmarks/load.rb` and `benchmarks/pressure_probe.rb` with `make bench-load` / `make bench-fiber`.
+
 ## 2.1.0 (2026-10-29)
 
 - Record PostgreSQL audit updates as changed-field pairs and support quoted table and column names.

data/lib/active_version/audits/audit_record/serializers.rb

@@ -26,7 +26,7 @@ module ActiveVersion
           def dump(value)
             return value unless value.is_a?(Hash) || value.is_a?(Array)
 
-            JSON.generate(value)
+            ActiveVersion.json_encode(value)
           end
         end
 

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

@@ -175,9 +175,11 @@ module ActiveVersion
           conn = audit_class.connection
           table_name = audit_class.table_name
           updates = []
-          updates << "#{conn.quote_column_name(changes_column)} = #{conn.quote(JSON.generate(combined_changes))}"
+          enc_changes = ActiveVersion.json_encode(combined_changes)
+          updates << "#{conn.quote_column_name(changes_column)} = #{conn.quote(enc_changes)}"
           if combined_context.any?
-            updates << "#{conn.quote_column_name(context_column)} = #{conn.quote(JSON.generate(combined_context))}"
+            enc_ctx = ActiveVersion.json_encode(combined_context)
+            updates << "#{conn.quote_column_name(context_column)} = #{conn.quote(enc_ctx)}"
           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}"
@@ -195,7 +197,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 = JSON.generate({})
+              empty_json_str = ActiveVersion.json_encode({})
               empty_json = conn.quote(empty_json_str)
               quoted_comment = conn.quote(combined_comment)
 

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

@@ -41,8 +41,13 @@ module ActiveVersion
           else
             {}
           end
-          # Merge: global context first, then instance context (instance takes precedence)
-          captured_context = global_context.dup.merge(instance_context)
+          # Merge: global context first, then instance context (instance takes precedence).
+          # `dup.merge({})` allocates twice; shallow `dup` alone matches semantics when instance is empty.
+          captured_context = if instance_context.empty?
+            global_context.dup
+          else
+            global_context.dup.merge!(instance_context)
+          end
 
           self.audit_comment = nil
           self.audit_context = nil
@@ -102,8 +107,16 @@ module ActiveVersion
                 batch_context = batch_state.dig(:options, :context)
                 if batch_context.is_a?(Hash)
                   merged_context = insert_attrs[context_column]
-                  merged_context = {} unless merged_context.is_a?(Hash)
-                  insert_attrs[context_column] = merged_context.merge(batch_context.stringify_keys)
+                  batch_keys = if batch_context.keys.all? { |k| k.is_a?(String) }
+                    batch_context
+                  else
+                    batch_context.stringify_keys
+                  end
+                  if merged_context.is_a?(Hash)
+                    merged_context.merge!(batch_keys)
+                  else
+                    insert_attrs[context_column] = batch_keys
+                  end
                 end
               end
 

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

@@ -107,7 +107,9 @@ module ActiveVersion
           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)
+            if acc[k].is_a?(Hash) || acc[k].is_a?(Array)
+              acc[k] = ActiveVersion.json_encode(acc[k])
+            end
           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

data/lib/active_version/audits/sql_builder.rb

@@ -250,7 +250,7 @@ module ActiveVersion
         def prepare_sql_value(value)
           case value
           when Hash, Array
-            JSON.generate(value)
+            ActiveVersion.json_encode(value)
           when Time, DateTime
             value.utc
           when Date

data/lib/active_version/instrumentation.rb

@@ -16,6 +16,11 @@ module ActiveVersion
     }.freeze
 
     class << self
+      # Clear memoized `listening?` probes (tests stub the notifier between examples).
+      def reset_listening_cache!
+        @listening_cache = nil
+      end
+
       # Instrument a translation creation
       def instrument_translation_created(translation, source)
         instrument_event(:translation_created) do
@@ -201,7 +206,10 @@ module ActiveVersion
       end
 
       def listening?(event_name)
-        ActiveSupport::Notifications.notifier.listening?(event_name)
+        @listening_cache ||= {}
+        return @listening_cache[event_name] if @listening_cache.key?(event_name)
+
+        @listening_cache[event_name] = ActiveSupport::Notifications.notifier.listening?(event_name)
       rescue => e
         log_debug("listener probe failed for #{event_name}: #{e.class}: #{e.message}; assuming listeners may exist")
         true

data/lib/active_version/query.rb

@@ -2,6 +2,12 @@ module ActiveVersion
   # Unified query builder for version records
   module Query
     class << self
+      def column_for_cached(record_class, kind, field)
+        @column_for_query ||= {}
+        key = [record_class.name, kind, field]
+        @column_for_query[key] ||= ActiveVersion.column_mapper.column_for(record_class, kind, field)
+      end
+
       # Query audits for a record
       # @param record [ActiveRecord::Base] The record to query audits for
       # @param opts [Hash] Query options
@@ -10,18 +16,13 @@ module ActiveVersion
       # @return [ActiveRecord::Relation] Audit relation
       def audits(record, opts = {})
         audit_class = record.class.audit_class
-        return audit_class.none unless audit_class
+        return record.class.none unless audit_class
 
-        auditable_column = ActiveVersion.column_mapper.column_for(record.class, :audits, :auditable)
+        auditable_column = column_for_cached(record.class, :audits, :auditable)
         identity_map = if record.respond_to?(:active_version_audit_identity_map)
           record.active_version_audit_identity_map
         else
-          primary_keys = Array(record.class.primary_key).map(&:to_s)
-          if primary_keys.one?
-            {"#{auditable_column}_id" => record.id}
-          else
-            primary_keys.zip(primary_keys.map { |column| record[column] }).to_h
-          end
+          identity_map_for_auditable_column(record, auditable_column)
         end
 
         query = audit_class.where({"#{auditable_column}_type" => record.class.name}.merge(identity_map))
@@ -39,23 +40,18 @@ module ActiveVersion
       # @return [ActiveRecord::Relation] Translation relation
       def translations(record, opts = {})
         translation_class = record.class.translation_class
-        return translation_class.none unless translation_class
+        return record.class.none unless translation_class
 
         identity_map = if record.respond_to?(:active_version_translation_identity_map)
           record.active_version_translation_identity_map
         else
           keys = Array(translation_class.source_foreign_key).map(&:to_s)
-          if keys.one?
-            {keys.first => record.id}
-          else
-            values = Array(record.class.primary_key).map { |column| record[column] }
-            keys.zip(values).to_h
-          end
+          identity_map_for_foreign_keys(record, keys)
         end
         query = translation_class.where(identity_map)
 
         if opts[:locale]
-          locale_column = ActiveVersion.column_mapper.column_for(record.class, :translations, :locale)
+          locale_column = column_for_cached(record.class, :translations, :locale)
           query = query.where(locale_column => opts[:locale])
         end
 
@@ -69,29 +65,44 @@ module ActiveVersion
       # @return [ActiveRecord::Relation] Revision relation
       def revisions(record, opts = {})
         revision_class = record.class.revision_class
-        return revision_class.none unless revision_class
+        return record.class.none unless revision_class
 
         identity_map = if record.respond_to?(:active_version_revision_identity_map)
           record.active_version_revision_identity_map
         else
           keys = Array(revision_class.source_foreign_key).map(&:to_s)
-          if keys.one?
-            {keys.first => record.id}
-          else
-            values = Array(record.class.primary_key).map { |column| record[column] }
-            keys.zip(values).to_h
-          end
+          identity_map_for_foreign_keys(record, keys)
         end
         query = revision_class.where(identity_map)
 
         if opts[:version]
-          version_column = ActiveVersion.column_mapper.column_for(record.class, :revisions, :version)
+          version_column = column_for_cached(record.class, :revisions, :version)
           query = query.where(version_column => opts[:version])
         end
 
-        version_column = ActiveVersion.column_mapper.column_for(record.class, :revisions, :version)
+        version_column = column_for_cached(record.class, :revisions, :version)
         query.order(version_column => :asc)
       end
+
+      private
+
+      def identity_map_for_foreign_keys(record, foreign_keys)
+        if foreign_keys.one?
+          {foreign_keys.first => record.id}
+        else
+          values = Array(record.class.primary_key).map { |column| record[column] }
+          foreign_keys.zip(values).to_h
+        end
+      end
+
+      def identity_map_for_auditable_column(record, auditable_column)
+        primary_keys = Array(record.class.primary_key).map(&:to_s)
+        if primary_keys.one?
+          {"#{auditable_column}_id" => record.id}
+        else
+          primary_keys.zip(primary_keys.map { |column| record[column] }).to_h
+        end
+      end
     end
   end
 end

data/lib/active_version/revisions/has_revisions.rb

@@ -334,7 +334,7 @@ module ActiveVersion
       def revision_sql_value(value)
         case value
         when Hash, Array
-          JSON.generate(value)
+          ActiveVersion.json_encode(value)
         when Time, DateTime
           value.utc
         when Date

data/lib/active_version/revisions/sql_builder.rb

@@ -253,7 +253,7 @@ module ActiveVersion
         def prepare_sql_value(value)
           case value
           when Hash, Array
-            JSON.generate(value)
+            ActiveVersion.json_encode(value)
           when Time, DateTime
             value.utc
           when Date

data/lib/active_version/version.rb

@@ -1,3 +1,3 @@
 module ActiveVersion
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/active_version.rb

@@ -1,4 +1,5 @@
 require "logger"
+require "json"
 require "active_support"
 begin
   require "active_record"
@@ -17,6 +18,12 @@ require "active_version/unique_version_collision"
 # Main entry point for ActiveVersion
 module ActiveVersion
   class Error < StandardError; end
+
+  # Stdlib JSON encoding helper (hot paths share this entry point).
+  def self.json_encode(value)
+    JSON.generate(value)
+  end
+
   class ConfigurationError < Error; end
   class VersionNotFoundError < Error; end
   class ReadonlyVersionError < Error; end
@@ -229,7 +236,8 @@ module ActiveVersion
 
     # Set PostgreSQL session variable
     if connection.open_transactions.positive?
-      encoded_context = connection.quote(ActiveSupport::JSON.encode(context))
+      payload = json_encode(context)
+      encoded_context = connection.quote(payload)
       connection.execute("SET LOCAL active_version.context = #{encoded_context}")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_version
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andrei Makarov
@@ -153,14 +153,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.9
 - !ruby/object:Gem::Dependency
   name: prosopite
   requirement: !ruby/object:Gem::Requirement