administrate-field-active_storage 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1843a0c5df0b671282ec4c77f631d13449509a6cec6cf045080969a020b5eb
-  data.tar.gz: acbc64571121abbf5da1f154e7c104a657aa21c1ecee607f9c183616fa4723c4
+  metadata.gz: 6840d701a76b3fa5a311bb907ae5d4d78be0d16614b90d77ab7a43ad9e7dad62
+  data.tar.gz: ae7ad5a5636a73896296e1e5a1568aab403005e669b9f4f5a862ae3b27de20bd
 SHA512:
-  metadata.gz: 35d06be4c51b39db656b97560c9a4b62fb058927f376c44bc8eb931d2ba23d9e309342c358905f34aa0a45617bece357376f7d076bc84386068afa396e337b9a
-  data.tar.gz: f99b2d49769516204e9ce38a290abcfb50365a59f3a1df00a33b3753cbd9853894458fc58dac3991e10377c6bf26eb1ba2917d7d063847fc2cb9106ddbf2f525
+  metadata.gz: 87639eb9518a224dd5d23b500fd6372fdf96f30288ae93e4c8ffdfad0e4605eae0f02877febc85be1e79a89f7213572cf78b2f0612e560fcfe4ffdc387a676a4
+  data.tar.gz: 790bae3270fda0dc76594ee80414a9de7b84633aef1aca19ee60a759d272ed3f5762ff7e5b2a336fe5509e547d45f3e8345002ef2f0d99b4d2ebe56715205374

data/README.md

@@ -4,12 +4,14 @@
 ## Things To Know:
 - To preview pdf files you need to install `mupdf` or `Poppler`.
 - To preview video files you need to install `ffmpeg`.
+- To preview Office files as pictures you need to install [activestorage-office-previewer](https://github.com/basecamp/activestorage-office-previewer) by basecamp
 
 ## How To Use:
-Add `administrate-field-active_storage` to your Gemfile (rails 6):
+Add `administrate-field-active_storage` and `mini_magick` to your Gemfile (rails 6):
 
 ```ruby
 gem 'administrate-field-active_storage'
+gem 'mini_magick'
 ```
 
 for rails 5.x use the following
@@ -62,11 +64,8 @@ In order to prevent N+1 queries from active storage you have to modify your admi
 ```ruby
 module Admin
   class UsersController < Admin::ApplicationController
-    def index
-      super
-      @resources = User.with_attached_avatars.
-        page(params[:page]).
-        per(10)
+    def scoped_resource
+      resource_class.with_attached_avatars
     end
   end
 end
@@ -121,11 +120,11 @@ end
 ```
 
 ### show_preview_size
-Supply the size of the image preview inside the show page check out the mini_magic documentation for resize
+Supply the size of the image preview inside the show page.  Check out the [mini_magic#resize_to_limit](https://github.com/janko/image_processing/blob/master/doc/minimagick.md#methods) documentation
 ```ruby
 class ModelDashboard < Administrate::BaseDashboard
   ATTRIBUTE_TYPES = {
-    attachments: Field::ActiveStorage.with_options({show_preview_size:  '150x200>'}),
+    attachments: Field::ActiveStorage.with_options({show_preview_size:  [150, 200]}),
     # ...
   }
   # ...
@@ -156,14 +155,12 @@ Don't forget to include [ActiveStorage JavaScript](https://edgeguides.rubyonrail
 - [x] preview pdfs
 - [x] upload multiple files
 - [x] find a way to delete attachments
-- [ ] preview office files as pictures
+- [x] preview office files as pictures
 
 ## Contribution Guide:
 1. contributers are welcome (code, suggestions, and bugs).
 2. please document your code.
 3. add your name to the `contribute.md`.
 
-Please note that this is my first gem :) i might have gotten some stuff wrong PR's are always welcome.
-
 ---
 Based on the [Administrate::Field::Image](https://github.com/thoughtbot/administrate-field-image) template, and inspired by [Administrate::Field::Paperclip](https://github.com/picandocodigo/administrate-field-paperclip).

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

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.2.1"
+  gem.version = "0.2.2"
   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/_item.html.erb

@@ -27,20 +27,28 @@ controlled via a boolean local variable.
   image_size = local_assigns.fetch(:image_size, [1920, 1080])
 %>
 
-<% if attachment.image? and !field.url_only? %>
-  <%= image_tag(field.variant(attachment, resize_to_limit: image_size)) %>
+<% if attachment.image? and attachment.variable? and !field.url_only? %>
+  <%= link_to(field.blob_url(attachment), title: attachment.filename) do %>
+    <%= image_tag(field.variant(attachment, resize_to_limit: image_size)) %>
+  <% end %>
+<% elsif attachment.image? and !field.url_only? %>
+  <%= link_to(field.blob_url(attachment), title: attachment.filename) do %>
+    <%= image_tag(field.url(attachment)) %>
+  <% end %>
 <% elsif attachment.video? and attachment.previewable? and !field.url_only? %> <%# if ffmpeg is installed %>
   <%= video_tag(field.url(attachment), poster: field.preview(attachment, resize_to_limit: image_size), controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
 <% elsif attachment.video? and !field.url_only? %>
   <%= video_tag(field.url(attachment), controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
 <% elsif attachment.audio? and !field.url_only? %>
   <%= audio_tag(field.url(attachment), autoplay: false, controls: true) %>
-<% elsif attachment.previewable? and !field.url_only? %>
-  <%= image_tag(field.preview(attachment, resize_to_limit: [595, 842])) %>
-  <br/>
-  Download: <%= link_to(attachment.filename, field.blob_url(attachment)) %>
 <% else %>
-  <%= link_to(attachment.filename, field.blob_url(attachment)) %>
+  <%= link_to(field.blob_url(attachment), title: attachment.filename) do %>
+    <% if attachment.previewable? and !field.url_only? %>
+      <%= image_tag(field.preview(attachment, resize_to_limit: [595, 842])) %>
+    <% else %>
+      <%= attachment.filename %>
+    <% end %>
+  <% end %>
 <% end %>
 
 <% if removable %>

data/contribute.md

@@ -9,3 +9,5 @@
 - Joé Dupuis [@twistedjoe](https://github.com/twistedjoe)
 - Eugeny Khlopin [@evgeniy-khlopin](https://github.com/evgeniy-khlopin)
 - Daniel Tinoco [@0urobor0s](https://github.com/0urobor0s)
+- Matthew Hui [@mhui](https://github.com/mhui)
+- Sébastien Dubois [@sedubois](https://github.com/sedubois)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-active_storage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hamad AlGhanim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -65,6 +65,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- _config.yml
 - administrate-field-active_storage.gemspec
 - app/views/fields/active_storage/_form.html.erb
 - app/views/fields/active_storage/_index.html.erb