hoardable 0.19.0 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ee4c5fbbd0b35bda5c9b7427015a1d60ca9cc919ac992caca386d4c3664163
-  data.tar.gz: 0020d7f28b85fb70efc3a1b80695f1e9c69f60c954b6aeccb71cedadccb97e0c
+  metadata.gz: affe4a55357ac085a712046c50d2742c7f1887947dee2a7e4d221cf5c7fd7086
+  data.tar.gz: 7b2112637801d32e5f18a93d3aa54077e631d25fd9ef6a85639770910d87024b
 SHA512:
-  metadata.gz: 2fe01feb0e5260d8072f4a45640517a5041a83c566db15b45cc32d141fa8883cf84a1bec16b8ec043a6b914b28e0e824d1e2820454756501941831613efe95a7
-  data.tar.gz: ceef85ede42a50189fb41de31fe0d4ab6882c2139d825569cd674fdf9611f89fd96721156cad5dee347359f67ecba68d8e9a794c2c6513710a39c2e599975668
+  metadata.gz: dfdf425df919edd8abce1942108881469c3c29b4e3e0ac9641ab56c221a6c0496f73ae7b6c657aa3edf33ae31b265e15d245e1e4d6e41fedbcbc7983af0657f9
+  data.tar.gz: 04b2495a301dd95bdd8d7f4af56ea6cf6dac682d7da59e59dee6d40ed031451410344a34f9580551047985009fc17e5ce1ac0e6d83c0a6f531ec071e932788d7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.19.2
+
+- Consult `inheritance_column` when constructing default scope
+
+## 0.19.1
+
+- Thread-safety support added for `with_hoardable_config`.
+
 ## 0.19.0
 
 - Ensure that stateful Hoardable class methods `with`, `travel_to` and `at` are thread-safe.

data/Gemfile

@@ -2,7 +2,12 @@
 
 source "https://rubygems.org"
 
+gem "bigdecimal"
 gem "debug"
+gem "drb"
+gem "logger"
+gem "mutex_m"
+gem "ostruct"
 if (rails_version = ENV["RAILS_VERSION"])
   gem "rails", "~> #{rails_version}"
 else

data/lib/hoardable/database_client.rb

@@ -28,9 +28,7 @@ module Hoardable
     end
 
     def find_or_initialize_hoardable_event_uuid
-      Thread.current[:hoardable_event_uuid] ||= (
-        ActiveRecord::Base.connection.query("SELECT gen_random_uuid();")[0][0]
-      )
+      Thread.current[:hoardable_event_uuid] ||= SecureRandom.uuid
     end
 
     def initialize_version_attributes(operation)

data/lib/hoardable/engine.rb

@@ -6,7 +6,7 @@ module Hoardable
 
   # Symbols for use with setting contextual data, when creating versions. See
   # {file:README.md#tracking-contextual-data README} for more.
-  DATA_KEYS = %i[meta whodunit event_uuid].freeze
+  DATA_KEYS = %i[meta whodunit].freeze
 
   # Symbols for use with setting {Hoardable} configuration. See {file:README.md#configuration
   # README} for more.
@@ -44,19 +44,13 @@ module Hoardable
 
   class << self
     CONFIG_KEYS.each do |key|
-      define_method(key) do
-        local_config = Thread.current[:hoardable_config] || @config
-        local_config[key]
-      end
+      define_method(key) { hoardable_config[key] }
 
       define_method("#{key}=") { |value| @config[key] = value }
     end
 
     DATA_KEYS.each do |key|
-      define_method(key) do
-        local_context = Thread.current[:hoardable_context] || @context
-        local_context[key]
-      end
+      define_method(key) { hoardable_context[key] }
 
       define_method("#{key}=") { |value| @context[key] = value }
     end
@@ -67,12 +61,22 @@ module Hoardable
     # @param hash [Hash] config and contextual data to set within a block
     def with(hash)
       thread = Thread.current
-      thread[:hoardable_config] = @config.merge(hash.slice(*CONFIG_KEYS))
-      thread[:hoardable_context] = @context.merge(hash.slice(*DATA_KEYS))
+      current_thread_config = thread[:hoardable_config]
+      current_thread_context = thread[:hoardable_context]
+      thread[:hoardable_config] = hoardable_config.merge(hash.slice(*CONFIG_KEYS))
+      thread[:hoardable_context] = hoardable_context.merge(hash.slice(*DATA_KEYS))
       yield
     ensure
-      thread[:hoardable_config] = nil
-      thread[:hoardable_context] = nil
+      thread[:hoardable_config] = current_thread_config
+      thread[:hoardable_context] = current_thread_context
+    end
+
+    private def hoardable_config
+      @config.merge(Thread.current[:hoardable_config] ||= {})
+    end
+
+    private def hoardable_context
+      @context.merge(Thread.current[:hoardable_context] ||= {})
     end
 
     # Allows performing a query for record states at a certain time. Returned {SourceModel}

data/lib/hoardable/model.rb

@@ -9,9 +9,6 @@ module Hoardable
     extend ActiveSupport::Concern
 
     class_methods do
-      # @!visibility private
-      attr_reader :_hoardable_config
-
       # If called with a hash, this will set the model-level +Hoardable+ configuration variables. If
       # called without an argument it will return the computed +Hoardable+ configuration considering
       # both model-level and global values.
@@ -23,10 +20,7 @@ module Hoardable
         if hash
           @_hoardable_config = hash.slice(*CONFIG_KEYS)
         else
-          @_hoardable_config ||= {}
-          CONFIG_KEYS.to_h do |key|
-            [key, @_hoardable_config.key?(key) ? @_hoardable_config[key] : Hoardable.send(key)]
-          end
+          CONFIG_KEYS.to_h { |key| [key, _hoardable_config.fetch(key) { Hoardable.send(key) }] }
         end
       end
 
@@ -36,11 +30,20 @@ module Hoardable
       # @param hash [Hash] The +Hoardable+ configuration for the model. Keys must be present in
       #   {CONFIG_KEYS}
       def with_hoardable_config(hash)
-        current_config = @_hoardable_config
-        @_hoardable_config = hash.slice(*CONFIG_KEYS)
+        thread = Thread.current
+        current_thread_config = thread[hoardable_current_config_key]
+        thread[hoardable_current_config_key] = _hoardable_config.merge(hash.slice(*CONFIG_KEYS))
         yield
       ensure
-        @_hoardable_config = current_config
+        thread[hoardable_current_config_key] = current_thread_config
+      end
+
+      private def _hoardable_config
+        (@_hoardable_config ||= {}).merge(Thread.current[hoardable_current_config_key] ||= {})
+      end
+
+      private def hoardable_current_config_key
+        "hoardable_#{name}_config".to_sym
       end
     end
 

data/lib/hoardable/scopes.rb

@@ -20,9 +20,9 @@ module Hoardable
               exclude_versions
             end
           )
-        next scope unless klass == version_class && "type".in?(column_names)
+        next scope unless klass == version_class && superclass.inheritance_column.in?(column_names)
 
-        scope.where(type: superclass.sti_name)
+        scope.where(superclass.inheritance_column => superclass.sti_name)
       end
 
       # @!scope class

data/lib/hoardable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hoardable
-  VERSION = "0.19.0"
+  VERSION = "0.19.2"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hoardable
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.2
 platform: ruby
 authors:
 - justin talbott
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -162,7 +161,6 @@ metadata:
   homepage_uri: https://github.com/waymondo/hoardable
   source_code_uri: https://github.com/waymondo/hoardable
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An ActiveRecord extension for versioning and soft-deletion of records in
   Postgres