formstrap 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5afd41f3d2d060b685fc6357bca9761bf8c48e4a1b84d7749ea74ead04ebe31a
-  data.tar.gz: 103a7f552523b866e29460eb42ba1007e0ab558a1818eba5a6728500b07ac820
+  metadata.gz: a7107b5857d9ac041c0adfb899049c93cbda09ecb46b0740a848cc3d7ebb881e
+  data.tar.gz: 56f553925e6d00e5ca9e2c22ea02596a64023739304eef1af6f1a35e058046a3
 SHA512:
-  metadata.gz: 5e90e2f3c3e5589459b4f48c1c8ee73a5720a0dbbb00fc543e70ef59d8045111b41b20c973fd80708404b05a074b4ef81d3a9d7e8206b3c1bd3c358b8b4e531b
-  data.tar.gz: debe1ba9cefa1bfd484bb50df731c0b0fe555fe89e06140ec311e0e722ab93771fae0c1d9220aded9810b83c14e3869cf2336686c9169333262526aa295227ec
+  metadata.gz: 30d0714a40e7de9ea0572ba8892c53d909d9f627e09a4a1eee04bc938ed6cf35423312186f0803dd2d04170209ac3dbc9c494d87f94fdb2ce801488bf90687aa
+  data.tar.gz: da87804184cae4b9234232b37750c9f6e21ab87e9426320ae78bdeeac583b944cfe30fd23f045e10474c43b194736f8cdf6591ab6627d29f35b66b782778cbe8

data/app/assets/javascripts/formstrap/controllers/media_controller.js

@@ -31,7 +31,7 @@ export default class extends Controller {
     const ids = this.activeIds()
 
     this.modalButtonTargets.forEach((button) => {
-      const sourceLocation = location.protocol + '//' + location.host
+      const sourceLocation = window.location.protocol + '//' + window.location.host
       const url = new URL(button.getAttribute('href'), sourceLocation)
 
       // Remove all ids[]

data/app/assets/javascripts/formstrap.js

@@ -10974,7 +10974,7 @@ var media_controller_default = class extends Controller {
   syncIds() {
     const ids = this.activeIds();
     this.modalButtonTargets.forEach((button) => {
-      const sourceLocation = location.protocol + "//" + location.host;
+      const sourceLocation = window.location.protocol + "//" + window.location.host;
       const url = new URL(button.getAttribute("href"), sourceLocation);
       url.searchParams.delete("ids[]");
       ids.forEach((id) => {

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/form_builder.rb

@@ -152,13 +152,7 @@ module Formstrap
     end
 
     def render_input(name, attribute, options)
-      # ToDo: Find a way to import the host of the application
-      renderer = ApplicationController.renderer.new(
-        http_host: "headmin.test",
-        https: true
-      )
-
-      renderer.render(template: "formstrap/_#{name}", locals: {form: self, attribute: attribute, **options})
+      @template.render("formstrap/#{name}", form: self, attribute: attribute, **options)
     end
 
     def method_missing(name, *args, &block)

data/lib/formstrap/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontierdotbe/formstrap",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Bootstrap-powered Form Helpers",
   "module": "app/assets/javascripts/formstrap.js",
   "main": "app/assets/javascripts/formstrap.js",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  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