motor-admin 0.4.18 → 0.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3a3043b22c41b8cecc31db194e525ececd4f1120b684caac290840262d03abf
-  data.tar.gz: 2a33a058ea4b2384b78afc0fb0aab1b00f18a19547a8611bd3dad2620faa4e4d
+  metadata.gz: 2b796ea06cac239bc9bbdb96dc4c55360f0ea1f10ef231138b97f45a12922110
+  data.tar.gz: 9178090c51a6b08d9a393e9c4b0f3c09733ac96ce9e9bce9c8fb07c1c0ed8c7c
 SHA512:
-  metadata.gz: 2ab80a1ad495344ce5125d5f7bb065d6b93995463d3174ccdf1045ef6a6f6900f21c05b0b1abff63e4a67f4f9e1d038d1b63884a638516c2a309ff7f8f52683f
-  data.tar.gz: ea69c3f11a524028fee52cdb7d4902196ee5297a47fdada16e90f26f06b33b80ae12d8dd0c6598023cf599f39b8d8137769adb53e4f2eb9f39e574bc4aa72ec9
+  metadata.gz: 545907a15250c164e46a1fdb9b9da76cfbaf181e1013521ebca2db73c38a63b4490e486929d064e7e5de4a05fa8ed4dfb3664bcd819cfd25af01adabc9b72045
+  data.tar.gz: 139ac86931034ee3f93826bd869eb2bb3f4a00c52d3e017875ac8ee512dda47cd8a8c892d703668b205dcd9f730e650041f60cc820d95376ddce024aa0584786

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.4.18'
+  VERSION = '0.4.20'
 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-7b8275fb2ab269bb5f11.css.gz": "main-7b8275fb2ab269bb5f11.css.gz",
+  "main-7b8275fb2ab269bb5f11.js.LICENSE.txt": "main-7b8275fb2ab269bb5f11.js.LICENSE.txt",
+  "main-7b8275fb2ab269bb5f11.js.gz": "main-7b8275fb2ab269bb5f11.js.gz",
+  "main.css": "main-7b8275fb2ab269bb5f11.css",
+  "main.js": "main-7b8275fb2ab269bb5f11.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.20
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-07-02 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-7b8275fb2ab269bb5f11.css.gz
+- ui/dist/main-7b8275fb2ab269bb5f11.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: