motor-admin 0.4.17 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fead38bea90bb3f975513b142fd66abdb12ee4900c5db52264d594417a71a2ea
-  data.tar.gz: a284c91e0601aef4c52b2f71cdf4589400ee04590ba9580fce3f5966b6944dd8
+  metadata.gz: a88b2fd0cde6191cd9f88b1df8063d996e8532b309e290f0e963859fbc7faabd
+  data.tar.gz: fd40adb2042a35f79781fdc501563031da2d104dc40c87da49a11335083b98d9
 SHA512:
-  metadata.gz: 05fb1e4900d0bb7697f6671da25429cbd8010afe7049da941443b685fc8e91df2edffe3f7d052e0f2901fbc2e05b4d3342e9686206a40274883455624664d7ad
-  data.tar.gz: 35e6ec7a211d6e98ec171c47223903dbdaf41d0c94a19022c98c9a3a434d8ad2069d28912fa2bd29f90fd510767a82cb2908ac93996b0dd5529ddd743863d624
+  metadata.gz: 6f7782f4087685b746e3c8974b5dcb60feeeb201b848e1816a017e4e825c6efb32170165647e85212346331daaff357e0ab00b68ff8e0aceebd85021ad2b9fd7
+  data.tar.gz: da3509a503cbcf673a4ee41c129f3bd51b7a4a6b4247f5c3f07aeabe0ef8ff92d068495d03469cbc29edc111d9f61f721260f8879be86a1002d51cdb4ab5efe9

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -9,7 +9,13 @@ module Motor
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
 
     def create
-      @attachment.assign_attributes(blob: ActiveStorage::Blob.create_and_upload!(file_params), record: record)
+      blob = if file_params[:key]
+               ActiveStorage::Blob.create!(file_params)
+             else
+               ActiveStorage::Blob.create_and_upload!(file_params)
+             end
+
+      @attachment.assign_attributes(blob: blob, record: record)
       @attachment.assign_attributes(record_type: '', record_id: 0) unless record
 
       if @attachment.save(validate: false)
@@ -36,12 +42,20 @@ module Motor
     end
 
     def file_params
-      params.require(:data).require(:file).permit(:io, :filename).to_h.symbolize_keys
+      attrs = params.require(:data).require(:file).permit(:io, :filename, :key,
+                                                          :checksum, :byte_size,
+                                                          :content_type).to_h.symbolize_keys
+
+      return attrs if params.dig(:data, :file, :base64).blank?
+
+      attrs[:io] = StringIO.new(Base64.urlsafe_decode64(params[:data][:file][:base64]))
+
+      attrs
     end
 
     def attachment_params
       if params[:data].present?
-        params.require(:data).except(:file).permit!
+        params.require(:data).except(:file).permit(:name, :record_type, :record_id)
       else
         {}
       end

data/lib/motor/admin.rb

@@ -4,7 +4,7 @@ module Motor
   class Admin < ::Rails::Engine
     config.custom_html = ''
 
-    if !Motor.development? && !Rails.env.production?
+    if !Motor.development? && Rails.env.development?
       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__))

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -3964,9 +3964,9 @@
   "images/layers-2x.png": "images/layers-2x.png",
   "images/layers.png": "images/layers.png",
   "images/marker-icon.png": "images/marker-icon.png",
-  "main-17b6af8c481786f31cc4.css.gz": "main-17b6af8c481786f31cc4.css.gz",
-  "main-17b6af8c481786f31cc4.js.LICENSE.txt": "main-17b6af8c481786f31cc4.js.LICENSE.txt",
-  "main-17b6af8c481786f31cc4.js.gz": "main-17b6af8c481786f31cc4.js.gz",
-  "main.css": "main-17b6af8c481786f31cc4.css",
-  "main.js": "main-17b6af8c481786f31cc4.js"
+  "main-ef1da0e0e37f4ff4c0bd.css.gz": "main-ef1da0e0e37f4ff4c0bd.css.gz",
+  "main-ef1da0e0e37f4ff4c0bd.js.LICENSE.txt": "main-ef1da0e0e37f4ff4c0bd.js.LICENSE.txt",
+  "main-ef1da0e0e37f4ff4c0bd.js.gz": "main-ef1da0e0e37f4ff4c0bd.js.gz",
+  "main.css": "main-ef1da0e0e37f4ff4c0bd.css",
+  "main.js": "main-ef1da0e0e37f4ff4c0bd.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.19
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2023-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
@@ -2235,8 +2235,8 @@ files:
 - ui/dist/images/layers-2x.png
 - ui/dist/images/layers.png
 - ui/dist/images/marker-icon.png
-- ui/dist/main-17b6af8c481786f31cc4.css.gz
-- ui/dist/main-17b6af8c481786f31cc4.js.gz
+- ui/dist/main-ef1da0e0e37f4ff4c0bd.css.gz
+- ui/dist/main-ef1da0e0e37f4ff4c0bd.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: