hoardable 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931223031ac56883e27e5f11da07eae3b59793ca8a2c77ce4e20f67cdb730174
-  data.tar.gz: 452472091834577883a5d56ea8b1af4375120648eaff066119edc2459c2cf035
+  metadata.gz: 6f7aee7a5af21b6cb079385ea2e49eb243b420c797eb8044f14af18f14abdd23
+  data.tar.gz: c92fc3a0adc3c253856f393c6478514e6f1fe83237b75a37b89dd01325e94773
 SHA512:
-  metadata.gz: 414a407c30d2aa0f504cd89773a83dd0b775bbbed51c8f7dbaa4225141aa34d301aac6167b6ce3553af02f03e8e2d1a053b58b4f9946814d5fb1b17282f86817
-  data.tar.gz: 995256175f51743332171ec32e232bdf01abb7288df8987d75b4e164499cf99610dc8605a9956fed3eb0edbb736b46ae24906fdf00cf5c14fa9ec99d752647d2
+  metadata.gz: c24c3d1f3a985c0169a9c5d89335ef322fb86d45b8492e81197c089bf30f7431d94340d2b9d1805f42fd381bf52fcc4991ceb7fb66429ee87c5cf7025fc29c99
+  data.tar.gz: 171dc6db5742a1bde4f78aa9c9990325cf9658884e147888d938e02f79e0d739dd145d266c8ede202d0ee859e8a4daa323b9c8c9d12af173d002f5535577dadb

data/lib/hoardable/database_client.rb

@@ -40,6 +40,20 @@ module Hoardable
       )
     end
 
+    def has_one_find_conditions(reflection)
+      {
+        reflection.type => source_record.class.name.sub(/Version$/, ''),
+        reflection.foreign_key => source_record.hoardable_id,
+        'name' => (reflection.name.to_s.sub(/^rich_text_/, '') if reflection.class_name.match?(/RichText$/))
+      }.reject { |k, v| k.nil? || v.nil? }
+    end
+
+    def has_one_at_timestamp
+      Hoardable.instance_variable_get('@at') || source_record.updated_at
+    rescue NameError
+      raise(UpdatedAtColumnMissingError, source_record.class.table_name)
+    end
+
     def source_attributes_without_primary_key
       source_record.attributes_before_type_cast.without(source_primary_key)
     end

data/lib/hoardable/has_one.rb

@@ -18,27 +18,14 @@ module Hoardable
             reflection = _reflections['#{name}']
             return super if reflection.klass.name.match?(/^ActionText/)
 
-            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? }
+            super&.at(hoardable_client.has_one_at_timestamp) ||
+              reflection.klass.at(hoardable_client.has_one_at_timestamp).find_by(
+                hoardable_client.has_one_find_conditions(reflection)
               )
           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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoardable
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - justin talbott