motor-admin 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0cc50d998434c23dbb9e9722a600b694b9177d7734d2abf347123c97e668cd
-  data.tar.gz: c6f7837f40d9490d694d1491e691aa4154e8649fa6c9d890683a9bb607fdb1d4
+  metadata.gz: 8f591c0e7f8d6230fb49aa0ca7ae5a2f960f2d5a117182d8123e7f86e9e1f102
+  data.tar.gz: 8181680a758dc7d7e150036979e22c64df911fd528985b4858a93b86e6f051bc
 SHA512:
-  metadata.gz: b11ed6e3233d6e92c95cf2981236f806d91a985544d83872a20a8bcd9cf2f06e17814ca2dfa1dfdb7031e639950afa97822079ba9b68dc36d76426cbfd6065b5
-  data.tar.gz: dfa730ff66075b589c2a67fb6513fad839a6f60b01335b4eaff67599149822a2071467f1302ec4798235510a3baae77212f75cf02307543fbb3346839f7e0bb0
+  metadata.gz: 1659c1b5df414a6b6a0f28a18a734caf8cc0302023f82885c5b8ed0e844e46420512bac822a7baa73efb13b823d9aec29a2261a084191d0aaa67d9172c5e9cb1
+  data.tar.gz: 7bb52dad21ef7d941aa8a366ceee190e4ae463cd465fe8a4789e37dea046e30dc88efe9ade3e1f2e5228e523465262ebdfaea6732053af45e01a4f931ca877a6

data/app/controllers/concerns/motor/load_and_authorize_dynamic_resource.rb

@@ -4,6 +4,8 @@ module Motor
   module LoadAndAuthorizeDynamicResource
     extend ActiveSupport::Concern
 
+    MUTEX = Mutex.new
+
     INSTANCE_VARIABLE_NAME = 'resource'
     ASSOCIATION_INSTANCE_VARIABLE_NAME = 'associated_resource'
 
@@ -13,11 +15,12 @@ module Motor
     end
 
     def resource_class
-      @resource_class ||=
+      @resource_class ||= MUTEX.synchronize do
         Motor::Resources::FetchConfiguredModel.call(
           Motor::BuildSchema::Utils.classify_slug(resource_name_prefix + params[:resource]),
           cache_key: Motor::Resource.maximum(:updated_at)
         )
+      end
     end
 
     def resource_name_prefix

data/app/models/motor/query.rb

@@ -24,3 +24,5 @@ module Motor
     alias run result
   end
 end
+
+ActiveSupport.run_load_hooks(:motor_query, Motor::Query)

data/config/locales/el.yml

@@ -29,7 +29,6 @@ el:
     all: Όλα
     all_resources: Όλοι οι πόροι
     and: Και
-    api: API
     api_path: Διαδρομή API
     api_request: Αίτημα API
     apply: Εφαρμογή
@@ -317,8 +316,6 @@ el:
     updated: ενημερωμένο
     created: δημιουργήθηκε
     deleted: διαγράφηκε
-    sign_out: Αποσυνδεθείτε
-    user_dropdown: Χρήστης dropdown
     add_condition: Προσθήκη συνθήκης
     remove_condition: Αφαίρεση συνθήκης
     unable_to_send_alert: Αδυναμία αποστολής ειδοποίησης

data/config/locales/en.yml

@@ -29,7 +29,6 @@ en:
     all: All
     all_resources: All Resources
     and: And
-    api: API
     api_path: API path
     api_request: API request
     apply: Apply
@@ -266,14 +265,6 @@ en:
     video: Video
     display_column: Display column
     not_authorized_to_perform_action: You are not authorized to perform this action.
-    download: Download
-    alert: Alert
-    downloading: Downloading
-    display_id: Display ID
-    display_settings: Display settings
-    sign_out: Sign out
-    header: Header
-    user_dropdown: User dropdown
     upload: Upload
     there_is_nothing_here_yet: There is nothing here yet 🤷‍♂️
     is_null: Is null

data/config/locales/es.yml

@@ -315,20 +315,11 @@ es:
     updated: updated
     created: created
     deleted: deleted
-    sign_out: Sign out
-    header: Header
-    user_dropdown: User dropdown
     add_condition: Add Condition
     remove_condition: Remove Condition
     unable_to_send_alert: Unable to send alert
     send_via: Send via
-    download: Descargar
-    alert: Alerta
-    downloading: Descargando
-    display_id: Visualizar ID
-    display_settings: Configuración de la pantalla
     sql: SQL
-    api: API
     variable_name: Nombre de la variable
     add_variable: Añadir variable
     notes: Notes

data/config/locales/pt.yml

@@ -311,20 +311,11 @@ pt:
     updated: updated
     created: created
     deleted: deleted
-    sign_out: Sign out
-    header: Header
-    user_dropdown: User dropdown
     add_condition: Add Condition
     remove_condition: Remove Condition
     unable_to_send_alert: Unable to send alert
     send_via: Send via
-    download: Descarregar
-    alert: Alerta
-    downloading: Descarregamento
-    display_id: Mostrar ID
-    display_settings: Definições de visualização
     sql: SQL
-    api: API
     variable_name: Nome da variável
     add_variable: Adicionar variável
     notes: Notes

data/lib/motor/admin.rb

@@ -4,6 +4,16 @@ module Motor
   class Admin < ::Rails::Engine
     config.custom_html = ''
 
+    if !Motor.development? && !Rails.env.production?
+      config.eager_load_paths.delete(File.expand_path('../../app/controllers', __dir__))
+      config.eager_load_paths.delete(File.expand_path('../../app/controllers/concerns', __dir__))
+      config.eager_load_paths.delete(File.expand_path('../../app/models', __dir__))
+
+      config.autoload_once_paths << File.expand_path('../../app/models', __dir__)
+      config.autoload_once_paths << File.expand_path('../../app/controllers', __dir__)
+      config.autoload_once_paths << File.expand_path('../../app/controllers/concerns', __dir__)
+    end
+
     initializer 'motor.startup_message' do
       config.after_initialize do
         next unless Motor.server?
@@ -108,15 +118,13 @@ module Motor
     end
 
     initializer 'motor.upgrade' do
-      config.after_initialize do
+      ActiveSupport.on_load(:motor_query) do
         next unless Motor.server?
 
         unless Motor::Query.table_exists?
           puts
           puts '  => Run `rails g motor:install && rake db:migrate` in order to create Motor Admin configuration tables'
           puts
-
-          raise
         end
 
         if !Motor::ApiConfig.table_exists? || !Motor::Note.table_exists?
@@ -124,8 +132,6 @@ module Motor
           puts '  => Run `rails g motor:upgrade && rake db:migrate` ' \
                'to perform data migration and enable the latest features'
           puts
-
-          raise
         end
       end
     end

data/lib/motor/api_query/search.rb

@@ -30,7 +30,9 @@ module Motor
         arel_table = model.arel_table
 
         column_names.map do |name|
-          column_type = model.columns_hash[name].type
+          column_type = model.columns_hash[name]&.type
+
+          next unless column_type
 
           if STRING_COLUMN_TYPES.include?(column_type)
             arel_table[name].matches("%#{keyword}%")

data/lib/motor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload