historiographer 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378dc2b078459333c3c0510904c394f27aab51358bec13097cdefdf84627e618
-  data.tar.gz: cc27a0afe8050aef01bbada81657f481277b21fcdc94fa5f32976d3f06c01969
+  metadata.gz: ec4560a7984db99bb67a91f6ed46ffd5e0e0b68b208b9f5c56079d5d0c967c06
+  data.tar.gz: 558f4f69363da666c55ad58bdf4aa1108e405c96d54e2ae4d96f4d7baa87e4a0
 SHA512:
-  metadata.gz: 28489a6de7ec69e1856f45d8336b0ce4f3de6ccdfcf6f9d3fa1e974cfc85dfbf5badc25a06fd121889c363d466dac8cb11ce2c2e836660ff629d594fe01ccb7c
-  data.tar.gz: 60082b9549d0b682e06760eb1af6491c14b0f6081ffbf92586ec70a030edc6021276344eef1ca66917f8e20fcddb50d3dbd67ff74bfc6f275041af001f20a184
+  metadata.gz: 803285240c47f720ae89ba027d1143e7b0e63ed765bb26399b7d126e2c04449664604a7488553f8996f89c3736d86909ed52702fcc5fb4bf7df2cb2fa5de4a44
+  data.tar.gz: 263c7cd005f3cd3589a1ed47c62d7127844686c5b945e1835995b99151b0bbceb6b72c86bac80e09b17efde796e3eeef2b34a0d9f33fb99945915e14b1c9aef8

data/lib/historiographer/history.rb

@@ -180,7 +180,7 @@ module Historiographer
       def history_foreign_key
         return @history_foreign_key if @history_foreign_key
 
-        @history_foreign_key = sti_base_class.name.underscore.foreign_key
+        @history_foreign_key = sti_base_class.table_name.singularize.foreign_key
       end
 
       def sti_base_class

data/lib/historiographer/version.rb

@@ -1,3 +1,3 @@
 module Historiographer
-  VERSION = "4.1.3"
+  VERSION = "4.1.4"
 end

data/lib/historiographer.rb

@@ -185,12 +185,30 @@ module Historiographer
     begin
       class_name.constantize
     rescue StandardError
+      # Get the base table name without _histories suffix
+      base_table = base.table_name.sub(/_histories$/, '')
+      
       history_class_initializer = Class.new(base) do
-        self.table_name = "#{base.table_name}_histories"
-        self.inheritance_column = nil
+        self.table_name = "#{base_table}_histories"
+        
+        # Handle STI properly
+        self.inheritance_column = base.inheritance_column if base.respond_to?(:inheritance_column)
       end
 
-      Object.const_set(class_name, history_class_initializer)
+      # Split the class name into module parts and the actual class name
+      module_parts = class_name.split('::')
+      final_class_name = module_parts.pop
+
+      # Navigate through module hierarchy
+      target_module = module_parts.inject(Object) do |mod, module_name|
+        mod.const_defined?(module_name) ? mod.const_get(module_name) : mod.const_set(module_name, Module.new)
+      end
+
+      # Set the constant in the correct module
+      history_class = target_module.const_set(final_class_name, history_class_initializer)
+      
+      # Now that the class is named, include the History module and extend class methods
+      history_class.send(:include, Historiographer::History)
     end
 
     klass = class_name.constantize
@@ -259,21 +277,13 @@ module Historiographer
       end
     end)
 
-    if base.respond_to?(:histories)
-      raise "#{base} already has histories. Talk to Brett if this is a legit use case."
-    else
-      opts = { class_name: class_name }
-      opts[:foreign_key] = klass.history_foreign_key if klass.respond_to?(:history_foreign_key)
-      if RUBY_VERSION.to_i >= 3
-        has_many :histories, **opts
-        has_one :current_history, -> { current }, **opts
-      else
-        has_many :histories, opts
-        has_one :current_history, -> { current }, opts
-      end
+    def histories
+      history_class.where(history_class.history_foreign_key => self.send(self.class.primary_key))
     end
 
-    klass.send(:include, Historiographer::History) unless klass.ancestors.include?(Historiographer::History)
+    def current_history
+      history_class.where(history_class.history_foreign_key => self.send(self.class.primary_key)).current&.first
+    end
 
     #
     # The acts_as_paranoid gem, which we tend to use with our History classes,
@@ -364,7 +374,8 @@ module Historiographer
 
       # For STI, ensure we use the correct history class type
       if self.class.sti_enabled?
-        attrs[self.class.inheritance_column] = history_class.name
+        type_column = self.class.inheritance_column
+        attrs[type_column] = "#{self.class.name}History"
       end
 
       attrs = attrs.except('id')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historiographer
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - brettshollenberger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord