administrate-field-active_storage 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea48021b9c4480f394cc61655e5e0a51c8ee6f9723f97902902642668a9ea88
-  data.tar.gz: b9691a2f4b65e00a559dbd5ec52e73b1bac589e98403a6f135fdcd0f09953bff
+  metadata.gz: e3930e26efcb0aa795b6606100a6dd6e8da523f80e7f201def1aa5ab79219217
+  data.tar.gz: '0286fd8dcca57e38402f283fef4971b62cb88d909d4a6d00255aaffa3581286e'
 SHA512:
-  metadata.gz: c5409c4400e684e023b287144b7415f51a77d6800df33c17eeb6f805de5381900e1d4947413e3d64939e85fd2009c8ff6ebeecbcde864017fc2c99f11c668650
-  data.tar.gz: cf96c0b3b886a87fbe4774c2b2e3658d56c64375b34eebcb1d2ff3240dafb9ccf0a96debab40b3ce675b7869b6dd5cc6d0cc114f11368bcea27da35f5e8e3c23
+  metadata.gz: 2942162811a236a3adc02f9607a2d941f002e40b422b3a39c83a148666390542eb15235ae3a6f65d906b3a2075b19e7946e4278091af55ce254ad423886ae923
+  data.tar.gz: 4e7800b780d17f2bf6ee6faa0d0b11a1e22e1456397d46d8e38a04d619be800ae7fc2778364c23f1041ef1e42c34276b11db8ca58fd34906db5822d42a99ccb1

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 *.gem
 .DS_Store
+.vscode/settings.json

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.6.5

data/README.md

@@ -11,7 +11,7 @@ Add `administrate-field-active_storage` and `mini_magick` to your Gemfile (rails
 
 ```ruby
 gem 'administrate-field-active_storage'
-gem 'mini_magick'
+gem "image_processing"
 ```
 
 for rails 5.x use the following
@@ -102,7 +102,33 @@ module Admin
   end
 end
 ```
+For `has_one_attached` cases, you will use:
 
+```rb
+# routes.rb
+...
+namespace :admin do
+  ...
+  resources :users do
+    delete :avatar, on: :member, action: :destroy_avatar
+  end
+end
+
+# app/controllers/admin/users_controller.rb
+module Admin
+  class UsersController < ApplicationController
+
+    # For illustrative purposes only.
+    #
+    # **SECURITY NOTICE**: first verify whether current user is authorized to perform the action.
+    def destroy_avatar
+      avatar = requested_resource.avatar
+      avatar.purge
+      redirect_back(fallback_location: requested_resource)
+    end
+  end
+end
+```
 This route can be customized with `destroy_url`. The option expects a `proc` receiving 3 arguments:
 the Administrate `namespace`, the `resource`, and the `attachment`. The proc can return anything
 accepted by `link_to`:
@@ -125,8 +151,6 @@ class UserDashboard < Administrate::BaseDashboard
 end
 ```
 
-To disable this feature, set `destroy_url` to `nil`.
-
 ## Options
 
 Various options can be passed to `Administrate::Field::ActiveStorage#with_options`

data/administrate-field-active_storage.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = "administrate-field-active_storage"
-  gem.version = "0.3.1"
+  gem.version = "0.3.6"
   gem.authors = ["Hamad AlGhanim"]
   gem.email = ["hamadyalghanim@gmail.com"]
   gem.homepage = "https://github.com/Dreamersoul/administrate-field-active_storage"

data/app/views/fields/active_storage/_index.html.erb

@@ -25,7 +25,7 @@ By default, the attribute is rendered as an image tag.
     <%= render partial: 'fields/active_storage/preview',
                locals: {
                    field: field,
-                   attachment: field.attachments[0],
+                   attachment: field.data,
                    size: field.index_preview_size
                } %>
   <% end %>

data/app/views/fields/active_storage/_item.html.erb

@@ -23,19 +23,20 @@ controlled via a boolean local variable.
   [x, y]
   Maximum size of the ActiveStorage preview.
 %>
+<% if field.show_display_preview? %>
+  <div>
+    <%= render partial: 'fields/active_storage/preview', locals: local_assigns %>
+  </div>
+<% end %>
 
 <div>
-  <%= render partial: 'fields/active_storage/preview', locals: local_assigns %>
-</div>
-
-<div>
-  <%= link_to 'Download', field.blob_url(attachment), title: attachment.filename %>
+  <%= link_to attachment.filename, field.blob_url(attachment), title: attachment.filename %>
 </div>
 
 <% if field.destroy_url.present? %>
   <% destroy_url = field.destroy_url.call(namespace, field.data.record, attachment) %>
   <div>
-    <%= link_to 'Remove', destroy_url, method: :delete, class: 'remove-attachment-link' %>
+    <%= link_to 'Remove', destroy_url, method: :delete, class: 'remove-attachment-link', data: { confirm: t("administrate.actions.confirm") } %>
   </div>
   <hr>
 <% end %>

data/app/views/fields/active_storage/_preview.html.erb

@@ -13,7 +13,7 @@
                     autobuffer: true,
                     style: "object-fit: contain; width: 100%; height: 100%;") %>
     <% else %>
-      <%= video_tag(field.url(attachment), controls: true, autobuffer: true, style: style) %>
+      <%= video_tag(field.url(attachment), controls: true, autobuffer: true, style: "object-fit: contain; width: 100%; height: 100%;") %>
     <% end %>
   <% elsif attachment.audio? %>
     <%= audio_tag(field.url(attachment), autoplay: false, controls: true) %>

data/contribute.md

@@ -11,3 +11,5 @@
 - Daniel Tinoco [@0urobor0s](https://github.com/0urobor0s)
 - Matthew Hui [@mhui](https://github.com/mhui)
 - Sébastien Dubois [@sedubois](https://github.com/sedubois)
+- Jazzy Gasper [@jazzygasper](https://github.com/jazzygasper)
+- David Ma [@taikon](https://github.com/taikon)

data/lib/administrate/field/active_storage.rb

@@ -16,7 +16,7 @@ module Administrate
       end
 
       def index_display_count?
-        options.fetch(:index_display_count) { attachments.present? && attachments.count != 1 }
+        options.fetch(:index_display_count) { attached? && attachments.count != 1 }
       end
 
       def show_display_preview?
@@ -36,13 +36,7 @@ module Administrate
       end
 
       def destroy_url
-        options.fetch(:destroy_url) do
-          proc do |namespace, record, attachment|
-            options = [attachment.name, namespace, record]
-            options << { attachment_id: attachment.id } if many?
-            options
-          end
-        end
+        options.fetch(:destroy_url, nil)
       end
 
       # currently we are using Rails.application.routes.url_helpers
@@ -56,7 +50,7 @@ module Administrate
       end
 
       def variant(attachment, options)
-        Rails.application.routes.url_helpers.rails_representation_path(attachment.variant(combine_options: options), only_path: true)
+        Rails.application.routes.url_helpers.rails_representation_path(attachment.variant(options), only_path: true)
       end
 
       def url(attachment)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-active_storage
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Hamad AlGhanim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate