administrate-field-active_storage 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e2931ef3866e05ff79f6580d2e82d9255bf32a
-  data.tar.gz: e756ee6745311cfc2fda588a222ec4f4ce5656a1
+  metadata.gz: 3cce01035ebb6d8d270b4703123e5da7d74d3dd7
+  data.tar.gz: 73e0994b8b94bd8951d83cb1f5e8f18b3da372dc
 SHA512:
-  metadata.gz: ec287997ada87ecba73e4aba1f812be8005fe2340c6b37a2edf7b7177cb15a0dccdfc91a46b0b530548e83258754d88837ec18ec873b19fda999fd8f82c14b9f
-  data.tar.gz: 9b43814703a5281d9de9a0f2a7a16878e5b75c995c9f33cd93816ea70414ffb3b68757d55ef191ea5aa819f6c2f374921ac06460223cb3ff428b0fdec4d990ff
+  metadata.gz: d6e1b6db8cf2ecf429006e34664ff801978150da69448abf772b2bcdaf88fa49778b1dc6819ae5108e03626271269820a60d9020634f1913fcba0c4b37eadb09
+  data.tar.gz: a1f3d6cdb212cd5b1c36999d890ac1cda80ae4eb3f1df31b9a9ff4887decd92ce10cdbfb2ae27b04e8fd83c10e68184af710edcb64baea8eb243dccfa5ab8510

data/README.md

@@ -1,11 +1,11 @@
 # Administrate::Field::ActiveStorage
 ![rails](https://img.shields.io/badge/rails-%3E%3D5.2.0-red.svg)
 ## Things To Know:
-- currently the gem only works for `has_one_attached` support for `has_many_attached` will be added in a future release.
 - to preview pdf files you need to install `mupdf` or `Poppler`.
 - to preview video files you need to install `ffmpeg`.
 
 ## How To Use:
+
 Add `administrate-field-active_storage` to your Gemfile:
 
 ```ruby
@@ -18,7 +18,7 @@ Install:
 $ bundle install
 ```
 
-Use:
+### `has_one_attached`:
 assuming your modelname is `Model` and field name is `attachment`
 ```ruby
 class ModelDashboard < Administrate::BaseDashboard
@@ -30,6 +30,29 @@ class ModelDashboard < Administrate::BaseDashboard
 Then add `:attachment` to `FORM_ATTRIBUTES` and `SHOW_PAGE_ATTRIBUTES`.
 currently adding `:attachment` `COLLECTION_ATTRIBUTES` will work but will probably look too big.
 
+### `has_many_attached`:
+assuming your modelname is `Model` and field name is `attachments`
+the processs is identical the only issue is that the form field isn't being permitted, in order to permit it we apply the following method to the dashboard:
+
+```ruby
+class ModelDashboard < Administrate::BaseDashboard
+  ATTRIBUTE_TYPES = {
+    attachments: Field::ActiveStorage,
+  }
+
+  # ...
+  FORM_ATTRIBUTES = {
+    #...
+    :attachments
+  }
+
+  # permitted for has_many_attached
+  def permitted_attributes
+    super + [:attachments => []]
+  end
+```
+i know it is not ideal, if you have a workaround please submit a PR
+
 ## Things To Do:
 
 - [x] upload single file
@@ -39,8 +62,9 @@ currently adding `:attachment` `COLLECTION_ATTRIBUTES` will work but will probab
 - [x] download link to other files
 - [x] preview videos
 - [x] preview pdfs
+- [x] upload multiple files
+- [ ] find a way to delete attachments
 - [ ] preview office files as pictures
-- [ ] upload multiple files
 
 ## Contribution guide:
 1. contributers are welcome (code, suggestions, and bugs).

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.0.2"
+  gem.version = "0.1.0"
   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/_form.html.erb

@@ -19,5 +19,5 @@ By default, the input is a text field for the image's URL.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.file_field field.attribute %>
+  <%= f.file_field field.attribute, multiple: field.many? %>
 </div>

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

@@ -14,18 +14,12 @@ By default, the attribute is rendered as an image tag.
 
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Image
 %>
-<% if field.image? %>
-  <%= image_tag(field.url) %>
-<% elsif field.video? and field.previewable?%> <%# if ffmpeg is installed %> 
-  <%= video_tag(field.url, poster: field.preview(resize: "1920x1080>"), controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
-<% elsif field.video? %>
-  <%= video_tag(field.url, controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
-<% elsif field.audio? %>
-  <%= audio_tag(field.url, autoplay: true, controls: true) %>
-<% elsif field.previewable? %>
-  <%= image_tag(field.preview(resize: "595x842>")) %>
-  <br/>
-  Download: <%= link_to(field.filename, field.blob_url) %>
-<% else %>
-  <%= link_to(field.filename, field.blob_url) %>
+<% if field.attached? %>
+  <% if field.many? %>
+    <% field.attachments.each do |attachment| %>
+      <%= render :partial => 'item', :field => field, :attachment => attachment %>
+    <% end %>
+  <% else %>
+    <%= render :partial => 'item', :field => field, :attachment => field.data %>
+  <% end %>
 <% end %>

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

@@ -0,0 +1,15 @@
+<% if attachment.image? %>
+  <%= image_tag(field.url(attachment)) %>
+<% elsif attachment.video? and attachment.previewable? %> <%# if ffmpeg is installed %> 
+  <%= video_tag(field.url(attachment), poster: field.preview(attachment, resize: "1920x1080>"), controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
+<% elsif attachment.video? %>
+  <%= video_tag(field.url(attachment), controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
+<% elsif attachment.audio? %>
+  <%= audio_tag(field.url(attachment), autoplay: true, controls: true) %>
+<% elsif attachment.previewable? %>
+  <%= image_tag(field.preview(attachment, resize: "595x842>")) %>
+  <br/>
+  Download: <%= link_to(attachment.filename, field.blob_url(attachment)) %>
+<% else %>
+  <%= link_to(attachment.filename, field.blob_url(attachment)) %>
+<% end %>

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

@@ -14,17 +14,12 @@ By default, the attribute is rendered as an image tag.
 
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Image
 %>
-
-<% if field.image? %>
-  <%= image_tag(field.url) %>
-<% elsif field.video? %>
-  <%= video_tag(field.url, poster: field.preview(resize: "1920x1080>"), controls: true, autobuffer: true, style: "width: 100%; height: auto;") %>
-<% elsif field.audio? %>
-  <%= audio_tag(field.url, autoplay: true, controls: true) %>
-<% elsif field.previewable? %>
-  <%= image_tag(field.preview(resize: "595x842>")) %>
-  <br/>
-  Download: <%= link_to(field.filename, field.blob_url) %>
-<% else %>
-  <%= link_to(field.filename, field.blob_url) %>
-<% end %>
+<% if field.attached? %>
+  <% if field.many? %>
+    <% field.attachments.each do |attachment| %>
+      <%= render :partial => 'fields/active_storage/item', locals: { field: field, attachment: attachment } %>
+    <% end %>
+  <% else %>
+    <%= render :partial => 'fields/active_storage/item', locals: { field: field, attachment: field.data } %>
+  <% end %>
+<% end %>

data/lib/administrate/field/active_storage.rb

@@ -9,29 +9,27 @@ module Administrate
       # currently we are using Rails.application.routes.url_helpers 
       # without including the namespace because it runs into an
       # exception
+      def many?
+        # find a way to use instance_of
+        data.class.name == "ActiveStorage::Attached::Many"
+      end
+      # work around since calling data.preview(options)
+      # returns "/images/<ActiveStorage::Preview>" which isnt the url
 
-      def url
-        Rails.application.routes.url_helpers.rails_blob_path(data, only_path: true)
+      def preview(attachment, options)
+        Rails.application.routes.url_helpers.rails_representation_path(attachment.preview(options), only_path: true)
       end
 
-      def blob_url
-        Rails.application.routes.url_helpers.rails_blob_path(data, disposition: :attachment, only_path: true)
+      def url(attachment)
+        Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true)
       end
       
-      # work around since calling data.preview(options)
-      # returns "/images/<ActiveStorage::Preview>" which isnt the url
-
-      def preview(options)
-        Rails.application.routes.url_helpers.rails_representation_path(data.preview(options), only_path: true)
+      def blob_url(attachment)
+        Rails.application.routes.url_helpers.rails_blob_path(attachment, disposition: :attachment, only_path: true)
       end
       
-      delegate :filename, to: :data
-      delegate :previewable?, to: :data
-      delegate :image?, to: :data
-      delegate :video?, to: :data
-      delegate :audio?, to: :data
-      delegate :audio?, to: :data
-
+      delegate :attached?, to: :data
+      delegate :attachments, to: :data
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-active_storage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Hamad AlGhanim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -60,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -68,6 +67,7 @@ files:
 - administrate-field-active_storage.gemspec
 - app/views/fields/active_storage/_form.html.erb
 - app/views/fields/active_storage/_index.html.erb
+- app/views/fields/active_storage/_item.html.erb
 - app/views/fields/active_storage/_show.html.erb
 - contribute.md
 - lib/administrate/field/active_storage.rb

data/CHANGELOG.md

@@ -1,18 +0,0 @@
-# CHANGELOG
-
-## 1.1.0 (2017-03-24)
-
-* Don't crash if image is nil/blank ([#9][])
-* Remove Explicit Dependency on Rails ([#11][])
-* Adds this CHANGELOG ([#12][])
-
-[#9]: https://github.com/thoughtbot/administrate-field-image/pull/9
-[#11]: https://github.com/thoughtbot/administrate-field-image/pull/11
-[#12]: https://github.com/thoughtbot/administrate-field-image/pull/12
-
-## 1.0.0 (2017-01-16)
-
-* Extraction from [administrate][].
-* Rails 5 support.
-
-[administrate]: https://github.com/thoughtbot/administrate