motor-admin 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e0174dc9b889d34d1cff62947e5f330d04c37a8eea6a1036b88a5735edc3b9c
-  data.tar.gz: 84136e87872e4bd988055090e602e831f85516286f4dc39b9c15cd635feb5c03
+  metadata.gz: c003af4059ae5bd3a60d30031526c1ed2aefd267c7e1f93f33e5bac94eaff5c7
+  data.tar.gz: aa7403bca65f0d936b86bcc58f1fe88b4081439d74843f1ca1c3d25fd4da8a81
 SHA512:
-  metadata.gz: 8d637a2d8b014e7c57c6e77b92c9c62c96ccb3a6201173e455122ab1c9f0d0cfe5070380712ce5618bf9975a225d5622336bd4e16ed1f33d689d9f340dcaf9e4
-  data.tar.gz: 241c173529982aa8403691eb0818f8cf5357a61ae1b7820caca288a7d91faf9f1aa00485c1a716df266777de9bac37b2da36700ed04d0463b98f05299dff8cb9
+  metadata.gz: a195dd04aceadc74e1d7fa89dc0100c15fc045c0fad238230567069801698d341d6a9e598b861ae9e802e61dd5a48915d15c74b88a1228deae5a985fad283762
+  data.tar.gz: 7d6dc23a2750dc941b20d83170dc3f2eb3018d02897b2500b99831285ac139fcde46ebfa7ae044be856504bac6f09e1d11e70c02a443eba6d70278b959784f74

data/app/models/motor/alert.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Alert < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     belongs_to :query
     belongs_to :author, polymorphic: true, optional: true

data/app/models/motor/application_record.rb

@@ -4,5 +4,15 @@ module Motor
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
     self.table_name_prefix = 'motor_'
+
+    def self.audited(*args)
+      default_class = Audited.audit_class
+
+      Audited.audit_class = Motor::Audit
+
+      super
+    ensure
+      Audited.audit_class = default_class
+    end
   end
 end

data/app/models/motor/config.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Config < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     serialize :value, HashSerializer
   end

data/app/models/motor/dashboard.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Dashboard < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     belongs_to :author, polymorphic: true, optional: true
 

data/app/models/motor/form.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Form < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     belongs_to :author, polymorphic: true, optional: true
 

data/app/models/motor/query.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Query < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     belongs_to :author, polymorphic: true, optional: true
 

data/app/models/motor/resource.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Resource < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     serialize :preferences, HashSerializer
   end

data/lib/generators/motor/templates/install.rb

@@ -138,9 +138,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.column :created_at, :datetime
     end
 
-    add_index :motor_audits, %i[auditable_type auditable_id version], name: 'auditable_index'
-    add_index :motor_audits, %i[associated_type associated_id], name: 'associated_index'
-    add_index :motor_audits, %i[user_id user_type], name: 'user_index'
+    add_index :motor_audits, %i[auditable_type auditable_id version], name: 'motor_auditable_index'
+    add_index :motor_audits, %i[associated_type associated_id], name: 'motor_auditable_associated_index'
+    add_index :motor_audits, %i[user_id user_type], name: 'motor_auditable_user_index'
     add_index :motor_audits, :request_uuid
     add_index :motor_audits, :created_at
   end

data/lib/motor.rb

@@ -46,7 +46,6 @@ end
 
 require 'motor/version'
 require 'motor/admin'
-require 'motor/audited_utils'
 require 'motor/assets'
 require 'motor/build_schema'
 require 'motor/api_query'

data/lib/motor/api_query/sort.rb

@@ -13,7 +13,7 @@ module Motor
         arel_order = build_arel_order(rel.klass, param)
         join_params = build_join_params(rel.klass, param)
 
-        rel.order(arel_order).left_joins(join_params)
+        rel.reorder(arel_order).left_joins(join_params)
       end
 
       def build_join_params(_model, param)

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.36'
+  VERSION = '0.1.37'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - Pete Matsyburka
@@ -209,7 +209,6 @@ files:
 - lib/motor/api_query/search.rb
 - lib/motor/api_query/sort.rb
 - lib/motor/assets.rb
-- lib/motor/audited_utils.rb
 - lib/motor/build_schema.rb
 - lib/motor/build_schema/active_storage_attachment_schema.rb
 - lib/motor/build_schema/find_display_column.rb

data/lib/motor/audited_utils.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module AuditedUtils
-  module_function
-
-  def with_audit_class(new_class)
-    old_class = Audited.audit_class
-
-    Audited.audit_class = new_class
-
-    yield
-  ensure
-    Audited.audit_class = old_class
-  end
-end