better_record 0.24.4 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ff455d6c0733bd00110232de599657c78892eabedfdd9b8e0d9635708827644
-  data.tar.gz: 644cc1599840f0aa5cc018bbb443284ee4af68043c542579a2fab948da6ef1ed
+  metadata.gz: 5e14508d1f965fba3627ea9c4449b9fa99aae6dc4888d50ca184e376e0bfd7f8
+  data.tar.gz: b7dc73ef64bf0a4493a04bccd48c87796d388fc1f1cc51dc0aed4e70fc697ab8
 SHA512:
-  metadata.gz: 393e7a7599b9c4807fb2f300fb37fd726f6a4fca9a9c9108a441dd9ce1d348c0a94282591a461c46b78744a9105f3bcafe475fe093326002506572b42ab0d728
-  data.tar.gz: 2624e8c6bb235930ecdd302bdc7446e58c57e9f39b9403bf17ea377dc114e20bc14e066fd6743099a55f67c2293621cae6bde5f8b7b92863b9a332d87ca62cf3
+  metadata.gz: aa140f70f9b6e173c9db0116c81e65a5981e7156ee1ac579a4bf49605652e7e23f4b81cc040fdf1664106d65db1195dcbdff10ccee4ba051b5d40d3936f899f5
+  data.tar.gz: 40f4fdc3cac02693a4336c6216f3e505f06e196aea1fdf53e081dea98307b7aed1dfd188c88e68f890c22ae72704a06ceea8e226657e532ce5d1d5e90e52f8be

data/app/models/better_record/base.rb

@@ -29,10 +29,14 @@ module BetterRecord
         connection.execute(%Q(SELECT 1 FROM #{t_name}_#{self.table_name_only} LIMIT 1))
 
         self.const_set(:LoggedAction, Class.new(ApplicationRecord))
+        self.const_get(:LoggedAction).include(ModelConcerns::LoggedActionBase)
         self.const_get(:LoggedAction).table_name = "#{t_name}_#{self.table_name_only}"
         self.const_get(:LoggedAction).primary_key = :event_id
+        self.const_get(:LoggedAction).first
+        self
       rescue ActiveRecord::StatementInvalid
         self.const_set(:LoggedAction, BetterRecord::LoggedAction)
+        self
       end
 
       self.has_many self.audit_relation_name,

data/app/models/better_record/logged_action.rb

@@ -3,27 +3,15 @@
 module BetterRecord
   class LoggedAction < Base
     # == Constants ============================================================
-    ACTIONS = {
-      D: 'DELETE',
-      I: 'INSERT',
-      U: 'UPDATE',
-      T: 'TRUNCATE',
-      A: 'ARCHIVE',
-    }.with_indifferent_access
 
     # == Attributes ===========================================================
     self.table_name = "#{BetterRecord.db_audit_schema}.logged_actions_view"
     self.primary_key = :event_id
 
     # == Extensions ===========================================================
+    include ModelConcerns::LoggedActionBase
 
     # == Relationships ========================================================
-    belongs_to :audited,
-      polymorphic: :true,
-      primary_type: :table_name,
-      foreign_key: :row_id,
-      foreign_type: :table_name,
-      optional: true
 
     # == Validations ==========================================================
 
@@ -34,37 +22,10 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
-    def self.default_print
-      [
-        :event_id,
-        :row_id,
-        :full_name,
-        :app_user_id,
-        :app_user_type,
-        :action_type,
-        :changed_columns
-      ]
-    end
-
-    # def self.set_audits_methods!
-    #   self.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
-    # end
 
     # == Boolean Methods ======================================================
 
     # == Instance Methods =====================================================
-    def changed_columns
-      (self.changed_fields || {}).keys.join(', ').presence || 'N/A'
-    end
-
-    def action_type
-      ACTIONS[action] || 'UNKNOWN'
-    end
 
   end
 end

data/app/models/better_record/model_concerns/logged_action_base.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module BetterRecord
+  module ModelConcerns
+    module LoggedActionBase
+      extend ActiveSupport::Concern
+
+      ACTIONS = {
+        D: 'DELETE',
+        I: 'INSERT',
+        U: 'UPDATE',
+        T: 'TRUNCATE',
+        A: 'ARCHIVE',
+      }.with_indifferent_access
+
+      included do
+        belongs_to :record,
+          polymorphic: :true,
+          primary_type: :table_name,
+          foreign_key: :row_id,
+          foreign_type: :table_name,
+          optional: true
+      end
+
+      class_methods do
+        def default_print
+          [
+            :event_id,
+            :row_id,
+            :full_name,
+            :app_user_id,
+            :app_user_type,
+            :action_type,
+            :changed_columns
+          ]
+        end
+      end
+
+      def changed_columns
+        (self.changed_fields || {}).keys.join(', ').presence || 'N/A'
+      end
+
+      def action_type
+        ACTIONS[action] || 'UNKNOWN'
+      end
+    end
+  end
+end

data/app/models/better_record/table_size.rb

@@ -85,12 +85,6 @@ module BetterRecord
     # == Boolean Methods ======================================================
 
     # == Instance Methods =====================================================
-    def changed_columns
-      (self.changed_fields || {}).keys.join(', ').presence || 'N/A'
-    end
 
-    def action_type
-      ACTIONS[action] || 'UNKNOWN'
-    end
   end
 end

data/lib/better_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.24.4
+  version: 0.25.0
 platform: ruby
 authors:
 - Sampson Crowley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -244,6 +244,7 @@ files:
 - app/models/better_record/logged_action.rb
 - app/models/better_record/model_concerns/has_protected_password.rb
 - app/models/better_record/model_concerns/has_validated_avatar.rb
+- app/models/better_record/model_concerns/logged_action_base.rb
 - app/models/better_record/table_size.rb
 - app/views/better_record/table_sizes/index.html.erb
 - app/views/better_record/table_sizes/show.html.erb
@@ -345,7 +346,7 @@ homepage: https://github.com/SampsonCrowley/multi_app_active_record
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -361,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fix functions that are lacking in Active record to be compatible with multi-app
   databases