hoardable 0.12.2 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eec6cda69bb2bbb1aeec6a0c460881c33abbe1de123ef9178d2c16378374b2bd
-  data.tar.gz: f3f57007e08f958017483dfffd0275b5b70c0ef1522984ea78da4c595a9e5506
+  metadata.gz: 931223031ac56883e27e5f11da07eae3b59793ca8a2c77ce4e20f67cdb730174
+  data.tar.gz: 452472091834577883a5d56ea8b1af4375120648eaff066119edc2459c2cf035
 SHA512:
-  metadata.gz: 04a13fec8198d4c4fda05b5364a7925755e7f2708004e15a564f243b64836577f4393cb502e7dd7d88ea123df29909ccb36a1d603cae8b2e711958250dc45763
-  data.tar.gz: 34a59cb91ed643784e4aa6ab88abac2d3e7a59a59945bcdce6e849aa441bc1490a6870c2661f65c31d246e4cb87bb39c4502e6cb8ce05cb3c42a6ad0e56f1140
+  metadata.gz: 414a407c30d2aa0f504cd89773a83dd0b775bbbed51c8f7dbaa4225141aa34d301aac6167b6ce3553af02f03e8e2d1a053b58b4f9946814d5fb1b17282f86817
+  data.tar.gz: 995256175f51743332171ec32e232bdf01abb7288df8987d75b4e164499cf99610dc8605a9956fed3eb0edbb736b46ae24906fdf00cf5c14fa9ec99d752647d2

data/lib/generators/hoardable/templates/install.rb.erb

@@ -13,6 +13,7 @@ class InstallHoardable < ActiveRecord::Migration[<%= ActiveRecord::Migration.cur
           END IF;
         END
         $$;
+
         CREATE OR REPLACE FUNCTION hoardable_source_set_id() RETURNS trigger
           LANGUAGE plpgsql AS
         $$
@@ -31,6 +32,16 @@ class InstallHoardable < ActiveRecord::Migration[<%= ActiveRecord::Migration.cur
           NEW.hoardable_id = _id;
           RETURN NEW;
         END;$$;
+
+        CREATE OR REPLACE FUNCTION hoardable_prevent_update_id() RETURNS trigger
+          LANGUAGE plpgsql AS
+        $$BEGIN
+          IF NEW.hoardable_id <> OLD.hoardable_id THEN
+            RAISE EXCEPTION 'hoardable id cannot be updated';
+          END IF;
+          RETURN NEW;
+        END;$$;
+
         CREATE OR REPLACE FUNCTION hoardable_version_prevent_update() RETURNS trigger
           LANGUAGE plpgsql AS
         $$BEGIN
@@ -46,6 +57,7 @@ class InstallHoardable < ActiveRecord::Migration[<%= ActiveRecord::Migration.cur
         DROP TYPE IF EXISTS hoardable_operation;
         DROP FUNCTION IF EXISTS hoardable_version_prevent_update();
         DROP FUNCTION IF EXISTS hoardable_source_set_id();
+        DROP FUNCTION IF EXISTS hoardable_prevent_update_id();
       SQL
     )
   end

data/lib/generators/hoardable/templates/migration.rb.erb

@@ -21,6 +21,9 @@ class Create<%= class_name.singularize.delete(':') %>Versions < ActiveRecord::Mi
             CREATE TRIGGER <%= table_name %>_set_hoardable_id
               BEFORE INSERT ON <%= table_name %> FOR EACH ROW
               EXECUTE PROCEDURE hoardable_source_set_id();
+            CREATE TRIGGER <%= table_name %>_prevent_update_hoardable_id
+              BEFORE UPDATE ON <%= table_name %> FOR EACH ROW
+              EXECUTE PROCEDURE hoardable_prevent_update_id();
           SQL
         )
       end
@@ -31,16 +34,15 @@ class Create<%= class_name.singularize.delete(':') %>Versions < ActiveRecord::Mi
               ON <%= singularized_table_name %>_versions;
             DROP TRIGGER <%= table_name %>_set_hoardable_id
               ON <%= table_name %>;
+            DROP TRIGGER <%= table_name %>_prevent_update_hoardable_id
+              ON <%= table_name %>;
           SQL
         )
       end
     end
     change_column_null :<%= table_name %>, :hoardable_id, false
-    add_index(:<%= singularized_table_name %>_versions, :<%= primary_key %>, unique: true)
-    add_index(
-      :<%= singularized_table_name %>_versions,
-      %i[_during hoardable_id],
-      name: 'idx_<%= singularized_table_name %>_versions_temporally'
-    )
+    add_index :<%= singularized_table_name %>_versions, :<%= primary_key %>, unique: true
+    add_index :<%= singularized_table_name %>_versions, :hoardable_id
+    add_index :<%= singularized_table_name %>_versions, :_during
   end
 end

data/lib/hoardable/error.rb

@@ -15,4 +15,16 @@ module Hoardable
       )
     end
   end
+
+  # An error to be raised when 'updated_at' columns are missing for {Hoardable::Model}s.
+  class UpdatedAtColumnMissingError < Error
+    def initialize(source_table_name)
+      super(
+        <<~LOG
+          '#{source_table_name}' does not have an 'updated_at' column, so Hoardable cannot look up
+          associated record versions with it. Add an 'updated_at' column to '#{source_table_name}'.
+        LOG
+      )
+    end
+  end
 end

data/lib/hoardable/has_one.rb

@@ -15,14 +15,30 @@ module Hoardable
 
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{name}
-            return super unless (at = Hoardable.instance_variable_get('@at'))
+            reflection = _reflections['#{name}']
+            return super if reflection.klass.name.match?(/^ActionText/)
 
-            super&.version_at(at) ||
-              _reflections['profile'].klass.where(_reflections['profile'].foreign_key => id).first
+            super&.at(hoardable_at_timestamp) ||
+              reflection.klass.at(hoardable_at_timestamp).find_by(
+                {
+                  reflection.type => self.class.name.sub(/Version$/, ''),
+                  reflection.foreign_key => hoardable_id
+                }.reject { |key, _| key.blank? }
+              )
           end
         RUBY
       end
     end
+
+    included do
+      private
+
+      def hoardable_at_timestamp
+        Hoardable.instance_variable_get('@at') || updated_at
+      rescue NameError
+        raise(UpdatedAtColumnMissingError, self.class.table_name)
+      end
+    end
   end
   private_constant :HasOne
 end

data/lib/hoardable/has_rich_text.rb

@@ -14,6 +14,7 @@ module Hoardable
         end
         return unless hoardable
 
+        'ActionText::RichText'.constantize # forces ActionText::RichText to load if it has not
         reflection_options = reflections["rich_text_#{name}"].options
         reflection_options[:class_name] = reflection_options[:class_name].sub(/ActionText/, 'Hoardable')
       end

data/lib/hoardable/model.rb

@@ -46,6 +46,7 @@ module Hoardable
 
     included do
       include Associations
+      attr_readonly :hoardable_id
       define_model_callbacks :versioned, only: :after
       define_model_callbacks :reverted, only: :after
       define_model_callbacks :untrashed, only: :after

data/lib/hoardable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hoardable
-  VERSION = '0.12.2'
+  VERSION = '0.12.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoardable
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.5
 platform: ruby
 authors:
 - justin talbott
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord