motor-admin 0.1.51 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e36dd42cf57e4b17340faac8ac91874566a5920dda51cd113b7e8ccb62c82756
-  data.tar.gz: d72fddef3740647b12ac5723e3512290b0bee08ebbba4448f2b214d6c0dffb2d
+  metadata.gz: 8798474d7c7dc20d6410dd00f13950997be5e3f5d67e1d2585a57af92cd8db10
+  data.tar.gz: 90fcc0b1835fe56b78ecfcc28de03f9d4397b213f6e499afc626c3f4d13b1ef9
 SHA512:
-  metadata.gz: 0efa0fd91dff6a962b367acba95a56335231f11331ba37170ded4324bc370cf85fc239c2a816a48fc293bd742de60d36d4cf5e4947627578530d8776e0e71bca
-  data.tar.gz: f106c14a7453c8db2d5754ef1ad9f6e99ec1fef33a58dea6779bdb031eabf3e6adce90ca6f2227ac222e0603b982aa06532d97520351afe42f45a913f0fb3d22
+  metadata.gz: c3a34e36e74e5004508e420ba4cdf95e2784d52647dfefccb64fc078b2785cbdd42a7aad84ca41f4c86e2c680b76516f219a41739b7d19601798dda4c9319e06
+  data.tar.gz: 727c31fafba431b69e3206d0fb2cff568171760cd43b36b9a42e97a356d5e344c7cacb069c5e9e79899e0fa804f39fd122ae14e30aece4cb77ca64de31620c5f

data/app/controllers/motor/api_base_controller.rb

@@ -12,10 +12,12 @@ module Motor
       end
     end
 
-    rescue_from StandardError do |e|
-      Rails.logger.error(e)
+    unless Rails.env.test?
+      rescue_from StandardError do |e|
+        Rails.logger.error(e)
 
-      render json: { errors: [e.message] }, status: :internal_server_error
+        render json: { errors: [e.message] }, status: :internal_server_error
+      end
     end
 
     def current_ability

data/app/controllers/motor/assets_controller.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class AssetsController < ActionController::Metal
-    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(coder: ActiveSupport::Cache::NullCoder)
+    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
     GZIP_TYPES = [
       'application/javascript',

data/app/controllers/motor/icons_controller.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class IconsController < ApiBaseController
-    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(coder: ActiveSupport::Cache::NullCoder)
+    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
     def index
       data = CACHE_STORE.fetch('icons') do

data/lib/motor/active_record_utils/active_storage_blob_patch.rb

@@ -13,6 +13,10 @@ module Motor
         super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
       end
 
+      def create_after_upload!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
       def create_after_unfurling!(hash)
         super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
       end

data/lib/motor/admin.rb

@@ -66,13 +66,12 @@ module Motor
     end
 
     initializer 'motor.active_storage.extensions' do
-      ActiveSupport.on_load(:active_storage_attachment) do
-        ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
-      end
+      next unless defined?(ActiveStorage::Engine)
 
-      ActiveSupport.on_load(:active_storage_blob) do
-        ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
-      end
+      ActiveStorage::Engine.eager_load!
+
+      ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
+      ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
     end
   end
 end

data/lib/motor/alerts/scheduled_alerts_cache.rb

@@ -3,8 +3,7 @@
 module Motor
   module Alerts
     module ScheduledAlertsCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes,
-                                                          coder: ActiveSupport::Cache::NullCoder)
+      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
 
       module_function
 

data/lib/motor/api_query/sort.rb

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

data/lib/motor/configs/build_ui_app_tag.rb

@@ -7,8 +7,7 @@ module Motor
         if Motor.development?
           ActiveSupport::Cache::NullStore.new
         else
-          ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes,
-                                                coder: ActiveSupport::Cache::NullCoder)
+          ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
         end
 
       module_function

data/lib/motor/configs/load_from_cache.rb

@@ -3,8 +3,7 @@
 module Motor
   module Configs
     module LoadFromCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 10.megabytes,
-                                                          coder: ActiveSupport::Cache::NullCoder)
+      CACHE_HASH = HashWithIndifferentAccess.new
 
       module_function
 
@@ -57,10 +56,18 @@ module Motor
         end
       end
 
-      def maybe_fetch_from_cache(type, cache_key, &block)
+      def maybe_fetch_from_cache(type, cache_key)
         return yield unless cache_key
 
-        CACHE_STORE.fetch(type + cache_key.to_s, &block)
+        if CACHE_HASH[type] && CACHE_HASH[type][:key] == cache_key
+          CACHE_HASH[type][:value]
+        else
+          result = yield
+
+          CACHE_HASH[type] = { key: cache_key, value: result }
+
+          result
+        end
       end
 
       def load_cache_keys

data/lib/motor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
 platform: ruby
 authors:
 - Pete Matsyburka