better_record 0.23.6 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b45df8f4a0a4367670af21f83f6fb0f81772f5fc074efdb5b110819874fca57
-  data.tar.gz: 5721f69ea4d6734a80b4168ba9084970f6ec10e4169d47ae7c84d2cf680855b4
+  metadata.gz: ad1c5b656bfbdc9dc2c7271768e7083440dc0cc9a97163ddb0c91e91f6526d95
+  data.tar.gz: eafd3cb9a6b73c444534bcc7bea157eed7805ac8477b6d328e9e6decb7b8c61a
 SHA512:
-  metadata.gz: 7d7c5716e06a0ee5db4ad84c87f043d785f94867f694d0f99cb2561ffa8a58a4ba6060aa72603839a3285669319638507b94d7bd5732c8c101b667999ad77b69
-  data.tar.gz: eb4dc88a3370f9c5ae6b1084ac704e9efeedd92f72db3c205b275f127ea91418f898bd34692d46851ca1fea3aa2d9bcd83f1abfc4d7ad71e3bea2f3142bf7029
+  metadata.gz: f37d95287b66c9bc96ee863e10edb4708ce60d6a320190a9e1e7b82141fe0d233eb1dd0c5576c4ec62483cb91ea1838532ed5ad3cb595c5edfe7868b7a05d5ce
+  data.tar.gz: bf5003d83eceb84b19d9491615bda612b95dbe29a0454f084b5493201fc55d597d670a463a477ae78a0773347626e453aa78d1d49cddce040568b93cfb63716e

data/app/models/better_record/base.rb

@@ -29,10 +29,13 @@ 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
       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/fake_redis.rb

@@ -85,6 +85,7 @@ module BetterRecord
     end
 
     def del(*keys)
+      keys.flatten!
       i = 0
       keys.map {|k| data.delete(k) && (i += 1) }
       i

data/lib/better_record/polymorphic_override.rb

@@ -23,7 +23,7 @@ module BetterRecord
           $!.message, $!.backtrace if debug
 
         if type_val == :table_name_without_schema
-          type_val = klass.table_name.to_s.split('.').first
+          type_val = klass.table_name.to_s.split('.').last
         else
           type_val = klass.polymorphic_name
         end
@@ -50,7 +50,7 @@ module BetterRecord
         end
       end
       p "Present Polymorphic Values:", values if debug
-      values
+      values.uniq
     end
   end
 end

data/lib/better_record/version.rb

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

data/lib/core_ext/array.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Array
-  def to_enum
+  def to_db_enum
     hashed = {}
     each {|v| hashed[v] = v.to_s}
     hashed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.25.1
 platform: ruby
 authors:
 - Sampson Crowley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -154,42 +154,42 @@ dependencies:
   name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -360,8 +361,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Fix functions that are lacking in Active record to be compatible with multi-app
   databases