better_record 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07da71971172205aecfda94df6fb1ca1213d32569053fcd8892dda8a91076fa
-  data.tar.gz: a64508bffff376045804d34726d45bfa6a0ab80948f45198dac6a6c1a8a57d5f
+  metadata.gz: 6aaabec32e93503cc3280479fb33a4b4e56ec33887ce430592730c6a42f61389
+  data.tar.gz: a02c353a6fa6a392c15cb8bed0710d5a49ee79c617db866e69c46974d4b23074
 SHA512:
-  metadata.gz: b47ff7753e4775cd1d95f4741833e4719e51d0c4624d5139b68828c84c51e40eaeece53dcd60ac5052b288f83d3f6ca8689c3a7b0ca7fcdbcf0cd8ee8259d5b9
-  data.tar.gz: 0ccc0c6aab836bba068ba45d014555b4bb08d8cf88b27a9d673489d0c36fcd6d3f5fa016525797e6ee57c3da2b150c36663f5a2b5b450410ecb06749b11a02fb
+  metadata.gz: 96baad4e4a3813d71771bec10b5432f6bdb0bdea299c77a137ceae5cebe2ddb1ac64f1535e0cd8a3a756841b3ce57700d2e88a0cb9fe1de8c27bd31f7dbff3ef
+  data.tar.gz: a173fe808cacd7ccc6ee502a8cc8e05a156bf40001071e867a668948a976891177fd49ff47a24edd302d4221443106400451c1cc22e8d6a8a2659710ba048631

data/app/models/better_record/base.rb

@@ -13,50 +13,7 @@ module BetterRecord
     # == Extensions ===========================================================
 
     # == Relationships ========================================================
-    if (ha = BetterRecord.has_auditing_relation_by_default)
-      class << self
-        define_method BetterRecord.audit_relation_name do |*args, &block|
-          @logger_model ||=
-            begin
-              connection.execute(%Q(SELECT 1 FROM #{BetterRecord::LoggedAction.table_name}_#{self.table_name} LIMIT 1))
-
-              class self.to_s.constantize::LoggedAction < BetterRecord::LoggedAction
-                self.table_name = "#{BetterRecord::LoggedAction.table_name}_#{self.to_s.deconstantize.constantize.table_name}"
-                self
-              end
-            rescue ActiveRecord::StatementInvalid
-              class self.to_s.constantize::LoggedAction < BetterRecord::LoggedAction
-                self
-              end
-            end
-
-          return @logger_model if args.present? && args.first == 'SETTING_INHERITANCE'
 
-          base_q = @logger_model.where(table_name: self.table_name)
-          base_q = base_q.where(*args) if args.present?
-
-          if block
-            base_q.split_batches do |b|
-              b.each do |r|
-                block.call(r)
-              end
-            end
-          else
-            base_q
-          end
-        end
-      end
-
-      def self.inherited(child)
-        super
-        TracePoint.trace(:end) do |t|
-          if child == t.self
-            child.set_audits_methods!
-            t.disable
-          end
-        end
-      end
-    end
     # == Validations ==========================================================
 
     # == Scopes ===============================================================
@@ -66,7 +23,7 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
-    def self.set_audits_methods!
+    def self.set_audit_methods!
       m = __send__ BetterRecord.audit_relation_name, 'SETTING_INHERITANCE'
       self.has_many self.audit_relation_name,
         class_name: m.to_s,
@@ -108,5 +65,47 @@ module BetterRecord
     end
 
 
+    if (ha = BetterRecord.has_auditing_relation_by_default)
+      has_many self.audit_relation_name,
+        class_name: 'BetterRecord::LoggedAction',
+        primary_type: :table_name,
+        foreign_key: :row_id,
+        foreign_type: :table_name,
+        as: self.audit_relation_name
+
+      class << self
+        define_method BetterRecord.audit_relation_name do |*args, &block|
+          @logger_model ||=
+            begin
+              connection.execute(%Q(SELECT 1 FROM #{BetterRecord::LoggedAction.table_name}_#{self.table_name} LIMIT 1))
+
+              class self.to_s.constantize::LoggedAction < BetterRecord::LoggedAction
+                self.table_name = "#{BetterRecord::LoggedAction.table_name}_#{self.to_s.deconstantize.constantize.table_name}"
+                self
+              end
+            rescue ActiveRecord::StatementInvalid
+              class self.to_s.constantize::LoggedAction < BetterRecord::LoggedAction
+                self
+              end
+            end
+
+          return @logger_model if args.present? && args.first == 'SETTING_INHERITANCE'
+
+          base_q = @logger_model.where(table_name: self.table_name)
+          base_q = base_q.where(*args) if args.present?
+
+          if block
+            base_q.split_batches do |b|
+              b.each do |r|
+                block.call(r)
+              end
+            end
+          else
+            base_q
+          end
+        end
+      end
+    end
+
   end
 end

data/app/models/better_record/logged_action.rb

@@ -21,7 +21,8 @@ module BetterRecord
       polymorphic: :true,
       primary_type: :table_name,
       foreign_key: :row_id,
-      foreign_type: :table_name
+      foreign_type: :table_name,
+      optional: true
 
     # == Validations ==========================================================
 

data/db/migrate/20190209033946_update_better_record_audit_functions.rb

@@ -90,7 +90,10 @@ class UpdateBetterRecordAuditFunctions < ActiveRecord::Migration[5.2]
 
             klass = Class.new(BetterRecord::LoggedAction)
             klass.table_name = "#{BetterRecord.db_audit_schema}.logged_actions_#\{r.table_name}"
+            BetterRecord.const_set(:NewLoggedAction, klass)
+            BetterRecord::NewLoggedAction
           rescue ActiveRecord::StatementInvalid
+            BetterRecord.const_set(:NewLoggedAction, nil)
             klass = BetterRecord::LoggedAction
           end
           klass.create!(r.attributes)

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.18.0'
+  VERSION = '0.18.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Sampson Crowley