acts_as_trackable 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5dcf466157b6080823983d36783bc68f768fa08afe770d11e21ed44fa1630d1
-  data.tar.gz: fc89947a092edebbaf87946982bbb0ba3d14fd94d049a5bdc40e129090ceada6
+  metadata.gz: abcff87c3d8646138656b6e6c3cd3a2b77bbaa06220471cab325ce565fc7af96
+  data.tar.gz: 0fb60a5c6686eb0d3be23957a482184bd9fd801099ce790593c2f40e543a1e72
 SHA512:
-  metadata.gz: b7615fe8831346f427f3dd4031cfa0c389928cc6a4bab7bc97fbdf1ab318b8488b448e48b07457b5693808d66f1cdb2e3284cde618e1ead46f7e994f8fd64962
-  data.tar.gz: 974e2c171bb8bed79c6164d169c4b14918dde382cdc3db46029abf6dc885ff034a858ef0f4c96b5fce574cb156c83e1ec68003423bb431515ff455a03a9e2c44
+  metadata.gz: 14717aee75f590338e196dd0982f60e44458ff5822280271c546f0040f79a56d7b5251e0ae8b4e5c89992e35e58b2f83c8c0008d64b64755ac8df28f6b42811f
+  data.tar.gz: befc693a18e30fd2ac1b7e82512d539cd193a99d9c8236706ae87790c1915456e9b7c66c09eaf59d5d820a28e6f9293f833affa5440a124930b1b7205e0c7074

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acts_as_trackable (0.2.4)
+    acts_as_trackable (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -65,10 +65,10 @@ GEM
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.25.4)
-    nokogiri (1.18.3-arm64-darwin)
+    minitest (5.25.5)
+    nokogiri (1.18.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.18.5-x86_64-darwin)
       racc (~> 1.4)
     pp (0.6.2)
       prettyprint
@@ -77,7 +77,7 @@ GEM
       date
       stringio
     racc (1.8.1)
-    rack (3.1.10)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

data/changelog.md

@@ -1,4 +1,11 @@
 # acts_as_trackable Changelog
+## Version: 0.3.0
+  ### Patch
+    - Added support to treat STI models as one model
+    - Upgraded dependencies to patch CVE-2025-24855 and CVE-2024-55549
+## Version: 0.2.5
+  ### Patch
+    - Upgraded dependencies to patch CVE-2025-27111 and CVE-2025-27610
 ## Version: 0.2.4
   ### Patch
     - Upgraded dependencies to patch CVE-2025-24928 and CVE-2024-56171

data/lib/acts_as_trackable/trackable.rb

@@ -8,6 +8,10 @@ module Trackable
 
     has_one :object_activity, as: :object, dependent: :destroy
 
+    define_method :object_activity do
+      ObjectActivity.find_by('object_id = ? AND (object_type = ? OR object_type = ?)', id, self.class.name, self.class.base_class.name)
+    end
+
     delegate :created_by, :updated_by, to: :object_activity, allow_nil: true
 
     after_commit :log_object_activity, on: %i[create update], if: -> { modifier.present? }
@@ -44,7 +48,13 @@ module Trackable
     end
 
     def trackable_object
-      { object_id: send(self.class.trackable_column), object_type: self.class.name }
+      class_name = if self.class.fallback_to_base_class
+                     self.class.base_class.name
+                   else
+                     self.class.name
+                   end
+
+      { object_id: send(self.class.trackable_column), object_type: class_name }
     end
   end
 end

data/lib/acts_as_trackable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTrackable
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/acts_as_trackable.rb

@@ -8,13 +8,14 @@ module ActsAsTrackable
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :trackable_column
+    class_attribute :trackable_column, :fallback_to_base_class
   end
 
   class_methods do
-    def acts_as_trackable(column_name = :id)
-      self.trackable_column = column_name
-      validate_trackable_column
+    def acts_as_trackable(column_name = :id, fallback_to_base_class: false)
+      self.trackable_column       = column_name
+      self.fallback_to_base_class = fallback_to_base_class
+      validate_attributes
       include Trackable
     end
 
@@ -24,11 +25,22 @@ module ActsAsTrackable
 
     private
 
+    def validate_attributes
+      validate_trackable_column
+      validate_fallback_to_base_class
+    end
+
     def validate_trackable_column
       return if column_names.include?(trackable_column.to_s)
 
       raise ArgumentError, "Column '#{trackable_column}' does not exist in the table"
     end
+
+    def validate_fallback_to_base_class
+      return if fallback_to_base_class.nil? || [true, false].include?(fallback_to_base_class)
+
+      raise ArgumentError, 'fallback_to_base_class must be a boolean'
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_trackable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ahmad Keewan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec