formstrap 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f3e1c17b291e264dbe5dc51b0b478c6ca4b92d33a0ecc1f758cc4a9d48510a
-  data.tar.gz: 271fd64f522260f1845475094be4a6abf4c7a8e527dc36cbf43ffe1e8f00007b
+  metadata.gz: a7107b5857d9ac041c0adfb899049c93cbda09ecb46b0740a848cc3d7ebb881e
+  data.tar.gz: 56f553925e6d00e5ca9e2c22ea02596a64023739304eef1af6f1a35e058046a3
 SHA512:
-  metadata.gz: a164e51245520da0e05bb9c6ddb899791f113f00b5b76a50e48e4c1e4ebc4a551c35586814c3697e087ae0050b2d5f2b2ed104b2ce340368fb5ddb7c2d845e66
-  data.tar.gz: 801723b921f1f07c8de24799b75532fa9a3cc591e8d98f13c116b4dea4013cf6fc4795d0859d64f34546fd771943190880a1cb8537b2934c79829e4e300a81bb
+  metadata.gz: 30d0714a40e7de9ea0572ba8892c53d909d9f627e09a4a1eee04bc938ed6cf35423312186f0803dd2d04170209ac3dbc9c494d87f94fdb2ce801488bf90687aa
+  data.tar.gz: da87804184cae4b9234232b37750c9f6e21ab87e9426320ae78bdeeac583b944cfe30fd23f045e10474c43b194736f8cdf6591ab6627d29f35b66b782778cbe8

data/app/controllers/formstrap/media_controller.rb

@@ -3,14 +3,11 @@ class Formstrap::MediaController < FormstrapController
   layout false
 
   def index
-    @blobs =
-      ActiveStorage::Blob
-        .not_attached_to_variant
-        .by_mimetypes_string(media_params[:mimetype])
-        .order(created_at: :desc)
-        .group(:id)
-        .all
-    @blobs = paginate(@blobs)
+    blobs = ActiveStorage::Blob
+    blobs = filter(blobs)
+    blobs = sort(blobs)
+    blobs = blobs.group(:id)
+    @blobs = paginate(blobs)
     @mimetypes = media_params[:mimetype]
 
     respond_to do |format|
@@ -51,14 +48,41 @@ class Formstrap::MediaController < FormstrapController
 
   private
 
+  def filter(blobs)
+    blobs = filter_unattached(blobs)
+    blobs = filter_by_mimetype(blobs, media_params[:mimetype]) if media_params[:mimetype].present?
+    blobs = filter_excluded_models(blobs, media_params[:exclude_models]) if media_params[:exclude_models].present?
+    blobs
+  end
+
+  def filter_unattached(blobs)
+    blobs.not_attached_to_variant
+  end
+
+  def filter_by_mimetype(blobs, mimetype)
+    blobs.by_mimetypes_string(mimetype)
+  end
+
+  def filter_excluded_models(blobs, model_names = [])
+    blobs.not_attached_to(model_names)
+  end
+
+  def sort(blobs)
+    blobs.order(created_at: :desc)
+  end
+
   def media_params
     params.permit(
-      :min,
       :max,
-      :name,
       :mimetype,
+      :min,
+      :name,
+      :page,
+      :page_start,
+      :per_page,
       ids: [],
-      files: []
+      files: [],
+      exclude_models: []
     )
   end
 

data/app/views/formstrap/_media.html.erb

@@ -15,6 +15,7 @@
   # * +wrapper+ - Hash with all options for the surrounding html tag
   # * +width+ - Width of the thumbnail
   # * +height+ - Height of the thumbnail
+  # * +exclude_models+ - Array of model names to exclude from selection (e.g. ["User", "Company"])
   #
   # ==== References
   # https://headmin.dev/docs/forms/media
@@ -35,12 +36,12 @@
 
     <!-- Render previews for attachments -->
     <%= form.fields_for(media.nested_attribute, media.association_object) do |ff| %>
-      <%= render "formstrap/media/item", media.item_options.merge(form: ff, url: formstrap_media_path(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept)) %>
+      <%= render "formstrap/media/item", media.item_options.merge(form: ff, url: formstrap_media_path(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept, exclude_models: media.exclude_models)) %>
     <% end %>
 
     <!-- Placeholder -->
     <div class="<%= "d-none" if media.attachments.any? %>" data-media-target="placeholder">
-      <a href="<%= formstrap_media_path(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept) %>" data-turbo-frame="remote_modal" data-media-target="modalButton">
+      <a href="<%= formstrap_media_path(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept, exclude_models: media.exclude_models) %>" data-turbo-frame="remote_modal" data-media-target="modalButton">
         <%= render "formstrap/shared/thumbnail", media.thumbnail_options %>
       </a>
     </div>
@@ -50,7 +51,7 @@
   <% association_object = ActiveStorage::Attachment.new %>
   <template data-media-target="template" data-template-id-regex="<%= association_object.object_id %>">
     <%= form.fields_for(media.nested_attribute, ActiveStorage::Attachment.new, child_index: association_object.object_id) do |ff| %>
-      <%= render "formstrap/media/item", media.item_options.merge(form: ff, url: formstrap_media_path(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept)) %>
+      <%= render "formstrap/media/item", media.item_options.merge(form: ff, url: formstrap_media_path(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept, exclude_models: media.exclude_models)) %>
     <% end %>
   </template>
 

data/lib/formstrap/version.rb

@@ -1,3 +1,3 @@
 module Formstrap
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies: []
 description: An extensive Bootstrap form library to power your Ruby On Rails application.
 email:
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Bootstrap-powered Form Helpers