viniBaxter-field-active_storage 300.0.2 → 300.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeec2adaa96685889247d3ec1a4531685b4e6f910c41c783d45c577201077f8d
-  data.tar.gz: 46e1ffab1845ec17e94d6d2d379f1beb6a6125f1f38a294d8b20359e1c9fca25
+  metadata.gz: e63d258f0c53f550669d2af609eea38905f5af1dfca2999dd71897e8b6b8d34a
+  data.tar.gz: a6bcec3a78f1d85cfc26d8402dbacf4eba40be0309de8866d61c93654ca7a63e
 SHA512:
-  metadata.gz: 24561fb338e84ec00885006f1347c87979aef60217b93891cc756afb169dc97fea06284f855aa6749ca405c6fe670860d684d08168973171de7ef172306ea831
-  data.tar.gz: 84a7d1e8bb41d62aab24b5c03c333602bcbfde61a41ae9c768fd7a6d6d57f849a4670e740ce4f810e62ed98d7112f1676d82168505afe67b87d53303e5600a9a
+  metadata.gz: 32516db1d0223677ad4e8d11dfd832de9c043b41babe102afac8cfe2cf3846a6805b9f02e04203b65983a2074f9d3187f02791836013a9aeab7e75a74d844bdd
+  data.tar.gz: bbacb43a6930195174c7908530155461d6d9cdf66cf71e45b038cc189f7bb240f850af8ddbbed48ccb4f3ae8e6eadd5077e89bb690ce6cfaf0bd0a1be92a9ad6

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

@@ -1,19 +1,3 @@
-<%#
-# Image Form Partial
-
-This partial renders an input element for image attributes.
-By default, the input is a text field for the image's URL.
-
-## Local variables:
-
-- `f`:
-  A Rails form generator, used to help create the appropriate input fields.
-- `field`:
-  An instance of [Administrate::Field::Image][1].
-  A wrapper around the image url pulled from the database.
-
-[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Image
-%>
 <div class="field-unit__label">
   <%= f.label field.attribute %>
 </div>

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

@@ -1,42 +1,34 @@
-<%#
-# Image Index Partial
-
-This partial renders an image attribute
-to be displayed on a resource's index page.
-
-By default, the attribute is rendered as an image tag.
-
-## Local variables:
-
-- `field`:
-  An instance of [Administrate::Field::Image][1].
-  A wrapper around the image url pulled from the database.
-
-[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Image
-%>
-<style>
-  <%# figure out a way to remove this %>
-   td img {
-       max-height: unset !important;
-   }
-</style>
-<%
-  attachments = Array(field.many? ? field.attachments : field.data)
-%>
 <% if field.attached? %>
-  <% if field.show_in_index? %>
-    <%= render partial: 'fields/active_storage/normal/item', 
-              locals: { 
-                field: field, 
-                attachment: field.data, 
-                image_size: [200, 200] 
-              } %>
+  <style type="text/css" nonce="<%= content_security_policy_nonce %>">
+    <%# figure out a way to remove this %>
+     td img {
+       max-height: unset !important;
+     }
+  </style>
+  <% if field.index_display_preview? %>
+    <% if field.many? %>
+      <%= render partial: 'fields/active_storage/normal/items',
+                 locals: {
+                     many: true,
+                     field: field,
+                     size: field.index_preview_size
+                 } %>
+    <% else %>
+      <%= render partial: 'fields/active_storage/normal/item',
+                 locals: {
+                     many: false,
+                     field: field,
+                     attachment: field.data,
+                     size: field.index_preview_size
+                 } %>
+    <% end %>
   <% end %>
   <% if field.index_display_count? %>
     <div class="attachments-count">
-      <%= pluralize(field.attachments.count, 'Attachment') %>
+      <%= pluralize(field.attachments.count,
+                    I18n.t("administrate.fields.active_storage.attachment", default: 'Attachment')
+          )
+      %>
     </div>
   <% end %>
-<% else %>
-  0 Attached files
 <% end %>

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

@@ -1,23 +1,9 @@
-<%#
-# Image Show Partial
-
-This partial renders an image attribute,
-to be displayed on a resource's show page.
-
-By default, the attribute is rendered as an image tag.
-
-## Local variables:
-
-- `field`:
-  An instance of [Administrate::Field::Image][1].
-  A wrapper around the image url pulled from the database.
-
-[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Image
-%>
 <% if field.attached? %>
-  <% if field.show_drop_js_on_show? %>
+  <% if field.show_drop_js_on_show? && field.sweety_show_drop_js_on_show? %>
+    <%= render partial: 'fields/active_storage/drop_js/drop_js_items_if_sweety', locals: { field: field, removable: field.destroyable? } %>
+  <% elsif field.show_drop_js_on_show?%>
     <%= render partial: 'fields/active_storage/drop_js/drop_js_items_on_show', locals: { field: field } %>
-  <%else %>
+  <% else %>
     <%= render partial: 'fields/active_storage/normal/items_on_show', locals: { field: field } %>
   <% end %>
 <% end %>

data/app/views/fields/active_storage/drop_js/_drop_js_items_if_sweety.html.erb

@@ -0,0 +1,57 @@
+<% 
+  attachments = Array(field.many? ? field.attachments : field.data)
+  removable = local_assigns.fetch(:removable, false)
+%>
+<div class="mt-5 col-12 ">
+  <div class="row">
+    <div class="col-12">
+      <div class="">
+        <div class="card-body">
+          <div class="already-downloaded dropzone">
+            <div class="list-group list-group-flush">
+              <div class="list-group-item">
+                <div class="row align-items-center">
+                  <% attachments.each do |attachment| %>
+                    <div>
+                      <div class="" id="<%= @page.class %>_picture_<%= attachment.id %>">
+                        <%= render partial: 'fields/active_storage/drop_js/dropjs_list_edit', locals: { 
+                      field: field, 
+                      attachment: attachment, 
+                      removable: removable, 
+                      image_size: field.show_preview_size 
+                      }%>
+                      </div>
+                      <div class="col ml-n2">
+                        <small class="text-muted">
+                          <div class="mb-1 dz-size" data-dz-size="">
+                            <strong>
+                              SEO: <%= alt_method(attachment) %>
+                            </strong>
+                          </div>
+                        </small>
+                        <div class="dz-error-message"><span data-dz-errormessage=""></span></div>
+                        <!-- Text -->
+                        <small class="text-muted">
+                          <div class="mb-1 dz-size" data-dz-size="">
+                            <strong>
+                              full name : <%= attachment.filename %> | 
+                            </strong></div>
+                        </small>
+                        <small class="text-muted">
+                          <div class="mb-1 dz-size" data-dz-size="">
+                            <strong>
+                              <%= attachment.byte_size.fdiv(1000).round(1)  %>
+                            </strong> KB</div>
+                        </small>
+                      </div>
+                    </div>
+                  <% end %>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/fields/active_storage/drop_js/_dropjs_items.html.erb

@@ -13,8 +13,8 @@
         <%= field.drop_max_file_size? %>
         MB par fichier. Les fichiers autorisés :
         <%= field.drop_accepted_files? %>. <br>
-        Un maximum de
-        <%= field.drop_max_file? %> fichiers autorisés.
+        A maximum of <%= field.drop_max_file? %> files allowed when creating or updating. <br>
+        Want more assets? Save it and edit it again and add <%= field.drop_max_file? %> extras assets.
       </span>
     </div>
     <div id="tpl" style='display:none'>

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

@@ -1,35 +1,33 @@
-<% removable = local_assigns.fetch(:removable, false)
-  image_size = local_assigns.fetch(:image_size, [200, 200]) %>
-<% if attachment.image? and attachment.variable? and !field.url_only? %>
-  <div class="avatar avatar-lg">
-    <%= image_tag attachment.variant(resize_to_limit: image_size), class:"avatar-img rounded"%>
+<%#
+# Item Partial
+
+This partial renders attached items.
+
+Attachments of type image, video and audio are emedded.  For all other types
+we try use it's preview.  If all else fails we simply link to the attached file.
+
+This partial will optionally show a `remove` link next to each attachment which is
+controlled via a boolean local variable.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Image].
+  A wrapper around the image url pulled from the database.
+- `attachment`:
+  Reference to the file
+- `removable`:
+  A boolean used to control the display of a `Remove` link which
+  is used to destroy a single attachment.  Defaults to `false`
+- `size`:
+  [x, y]
+  Maximum size of the ActiveStorage preview.
+%>
+<% if field.show_display_preview? %>
+  <div>
+    <%= render partial: 'fields/active_storage/normal/preview', locals: local_assigns %>
   </div>
-<% 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) %>
-<% else %>
-  <%= 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 %>
-  <%#= link_to 'Remove', field.destroy_path(field, attachment), method: :delete, class: 'remove-attachment-link' %>
-  <%= link_to 'Remove', destroy_url, 
-      method: :delete, 
-      # data: { confirm: t("administrate.actions.confirm") },
-      remote: true, 
-      class: 'remove-attachment-link'
-       %>
-  <hr>
 <% end %>
+<div>
+  <%#= link_to attachment.filename, field.blob_url(attachment), title: attachment.filename %>
+</div>

data/app/views/fields/active_storage/normal/_items.html.erb

@@ -0,0 +1,35 @@
+<%#
+# Items Partial
+
+This partial renders one or more attachments
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Image].
+  A wrapper around the image url pulled from the database.
+- `removable`:
+  A boolean used to control the display of a `Remove` link which
+  is used to destroy a single attachment.  Defaults to `false`
+- `size`:
+  [x, y]
+  Maximum size of the ActiveStorage preview.
+  Defaults to `field.show_preview_size`.
+%>
+<%
+  removable = local_assigns.fetch(:removable, false)
+  size = local_assigns.fetch(:size, field.show_preview_size)
+%>
+<div class="d-flex" style="flex-wrap: wrap;">
+  <% field.attachments.each do |attachment| %>
+    <div class="attachments-listing m-1">
+      <%= render partial: 'fields/active_storage/normal/item',
+               locals: {
+                   field: field,
+                   attachment: attachment,
+                   removable: removable,
+                   size: size
+               } %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,35 @@
+<div id="as-field-<%= attachment.id %>">
+  <% if attachment.image? %>
+    <% if attachment.variable? %>
+      <div class="avatar">
+        <%#= image_tag attachment.variant(resize_to_limit: image_size)%>
+        <%= image_tag(field.variant(attachment, resize_to_limit: size), class:"avatar-img rounded") %>
+      </div>
+    <% else %>
+      <%= image_tag(field.url(attachment)) %>
+    <% end %>
+  <% elsif attachment.video? %>
+    <style type="text/css" nonce="<%= content_security_policy_nonce %>">
+      #as-field-video-<%= attachment.id %> {
+        object-fit: contain;
+        width: 100%;
+        height: 100%;
+      }
+    </style>
+    <% if attachment.previewable? %>
+      <%= video_tag(field.url(attachment),
+                    poster: field.preview(attachment, resize_to_limit: size),
+                    controls: true,
+                    autobuffer: true,
+                    id: "as-field-video-#{attachment.id}") %>
+    <% else %>
+      <%= video_tag(field.url(attachment), controls: true, autobuffer: true, id: "as-field-video-#{attachment.id}") %>
+    <% end %>
+  <% elsif attachment.audio? %>
+    <%= audio_tag(field.url(attachment), autoplay: false, controls: true) %>
+  <% elsif attachment.previewable? %>
+    <%= image_tag(field.preview(attachment, resize_to_limit: size)) %>
+  <% else %>
+    <%= attachment.filename %>
+  <% end %>
+</div>

data/lib/viniBaxter/field/active_storage.rb

@@ -17,6 +17,22 @@ module Administrate
       #   theVariant.service.send(:path_for, theVariant.key) # Absolute path to variant file
       # end
 
+      def index_display_preview?
+        options.fetch(:index_display_preview, true)
+      end
+
+      def index_preview_size
+        options.fetch(:index_preview_size, [10, 10])
+      end
+
+      def show_display_preview?
+        options.fetch(:show_display_preview, true)
+      end
+
+      def show_preview_size
+        options.fetch(:show_preview_size, [200, 200])
+      end
+
       def url_only?
         options.fetch(:url_only, false)
       end
@@ -33,10 +49,6 @@ module Administrate
         options.fetch(:index_display_count) { attached? && attachments.count != 1 }
       end
 
-      def show_preview_size
-        options.fetch(:show_preview_size, [1080, 1920])
-      end
-
       def many?
         # find a way to use instance_of
         # data.class.name == 'ActiveStorage::Attached::Many'
@@ -47,46 +59,23 @@ module Administrate
         options.fetch(:direct_upload, false)
       end
 
-      def drop_js?
-        options.fetch(:drop_js, false)
-      end
-
-      def show_drop_js_on_show?
-        options.fetch(:show_drop_js_on_show, false)
-      end
-
-      def drop_max_file?
-        options.fetch(:drop_max_file, many? == true ? 10 : 1)
-      end
-
-      def drop_max_file_size?
-        options.fetch(:drop_max_file_size, 10)
-      end
-
-      def drop_accepted_files?
-        options.fetch(:drop_accepted_files, ".jpeg,.jpg,.png,.gif,.svg")
-      end
-
       def destroy_url
         options.fetch(:destroy_url, nil)
       end
 
-      # def destroy_path?
-      #   options.fetch(:destroy_path, false).present?
-      # end
-
       # currently we are using Rails.application.routes.url_helpers
       # without including the namespace because it runs into an
       # exception
 
       # work around since calling data.preview(options)
       # returns "/images/<ActiveStorage::Preview>" which isnt the url
+
       def preview(attachment, options)
         Rails.application.routes.url_helpers.rails_representation_path(attachment.preview(options), only_path: true)
       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)
@@ -118,6 +107,35 @@ module Administrate
       def attachments
         data.attachments if attached?
       end
+
+      # drop js
+
+      def drop_js?
+        options.fetch(:drop_js, false)
+      end
+
+      def show_drop_js_on_show?
+        options.fetch(:show_drop_js_on_show, false)
+      end
+
+      def sweety_show_drop_js_on_show?
+        options.fetch(:sweety_show_drop_js_on_show, false)
+      end
+
+      def drop_max_file?
+        options.fetch(:drop_max_file, many? == true ? 20 : 1)
+      end
+
+      def drop_max_file_size?
+        options.fetch(:drop_max_file_size, 50)
+      end
+
+      def drop_accepted_files?
+        options.fetch(:drop_accepted_files, ".jpeg,.jpg,.png,.svg,.gif,.pdf,.mov")
+      end
+
+      # end of drop js
+
     end
   end
 end

data/lib/viniBaxter/version.rb

@@ -5,7 +5,7 @@ module ViniBaxter
   module ViniBaxterFieldActiveStorage
     MAJOR = 300
     MINOR = 0
-    TINY = 2
+    TINY = 10
     PRE = "STUDIO"
 
     VERSION = [MAJOR, MINOR, TINY].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viniBaxter-field-active_storage
 version: !ruby/object:Gem::Version
-  version: 300.0.2
+  version: 300.0.10
 platform: ruby
 authors:
 - viny baxter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -69,6 +69,7 @@ files:
 - app/views/fields/active_storage/_form.html.erb
 - app/views/fields/active_storage/_index.html.erb
 - app/views/fields/active_storage/_show.html.erb
+- app/views/fields/active_storage/drop_js/_drop_js_items_if_sweety.html.erb
 - app/views/fields/active_storage/drop_js/_drop_js_items_on_edit.html.erb
 - app/views/fields/active_storage/drop_js/_drop_js_items_on_show.html.erb
 - app/views/fields/active_storage/drop_js/_dropjs_items.html.erb
@@ -76,7 +77,9 @@ files:
 - app/views/fields/active_storage/drop_js/_dropjs_list_show.html.erb
 - app/views/fields/active_storage/drop_js/_dropjs_template.html.erb
 - app/views/fields/active_storage/normal/_item.html.erb
+- app/views/fields/active_storage/normal/_items.html.erb
 - app/views/fields/active_storage/normal/_items_on_show.html.erb
+- app/views/fields/active_storage/normal/_preview.html.erb
 - contribute.md
 - lib/viniBaxter/field/active_storage.rb
 - lib/viniBaxter/version.rb