administrate-field-active_storage 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12fb995471a84f218352f4c630c6de6088c1eec7b975671f42125a1f91fe05d5
-  data.tar.gz: 797c67a7742599097b761314a457f1f53f3153aeb5c6aa72c4556cfd0a86d449
+  metadata.gz: 5ed83e5ceb2aa2fe19f46b3ee5d944ea23e63c407f909e1af479ce947b5badfc
+  data.tar.gz: 1af7048cc72231e962b07e5e28735e75d62e032dceafc822ea18322f023c9d8a
 SHA512:
-  metadata.gz: 3d285fd017385d5ce56a18a2ef464b5ec5d981fa065fe8a59706db2b7716676d81fbff44909a4b1543cfb70821c2368057184d0095bf6aaaafcf3e9139ad1b8e
-  data.tar.gz: 6ccbf0a5119607bda9110ace878002ba9a8fd40ae39573c112c96f14cc69c0fa54855ddf28bc5ce7e437776532a85f2d3f5c44cea8373b4a695176cd78000493
+  metadata.gz: f8b1f9adb9dcedea95e4a4040d709f1c5c4e3b41c4033fa795e76d79d4b933283754db3036bf5d1834fe7aed8d1acf1be4caa555818f8852a3f95a350638032f
+  data.tar.gz: 44d81ee32eef75648670329620b6dc7c3041b9eeb27030bac261a1abd1569d366945da7206b48496004331c0c0e07bf0ef25a7277a371a05fd8c42acd87e35d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administrate-field-active_storage (1.0.2)
+    administrate-field-active_storage (1.0.5)
       administrate (>= 0.2.2)
       rails (>= 7.0)
 
@@ -76,12 +76,13 @@ GEM
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
     ast (2.4.2)
+    base64 (0.2.0)
     builder (3.2.4)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    date (3.3.4)
+    date (3.4.1)
     erubi (1.10.0)
-    ffi (1.16.3)
+    ffi (1.17.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
     highline (2.0.3)
@@ -125,16 +126,16 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.15.0)
-    net-imap (0.4.11)
+    net-imap (0.4.19)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.3)
+    nio4r (2.7.4)
     nokogiri (1.13.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
@@ -190,9 +191,9 @@ GEM
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-darwin)
@@ -200,12 +201,13 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.1.0)
-    tilt (2.3.0)
-    timeout (0.4.1)
+    tilt (2.6.0)
+    timeout (0.4.3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.5.2)

data/README.md

@@ -1,13 +1,16 @@
 # Administrate::Field::ActiveStorage
+
 ![rails](https://img.shields.io/badge/rails-%3E%3D5.2.0-red.svg)
 ![CI](https://github.com/Dreamersoul/administrate-field-active_storage/workflows/CI/badge.svg)
 
 ## 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` and `image_processing` to your Gemfile (Rails 6+):
 
 ```ruby
@@ -16,6 +19,7 @@ gem "image_processing"
 ```
 
 for Rails 5.x use the following
+
 ```ruby
 gem "administrate-field-active_storage", "0.1.8"
 ```
@@ -27,7 +31,9 @@ $ bundle install
 ```
 
 ### `has_one_attached`:
+
 Assuming your model name is `Model` and field name is `attachment`
+
 ```ruby
 class ModelDashboard < Administrate::BaseDashboard
   ATTRIBUTE_TYPES = {
@@ -35,10 +41,12 @@ class ModelDashboard < Administrate::BaseDashboard
   }
 # ...
 ```
+
 Then add `:attachment` to `FORM_ATTRIBUTES` and `SHOW_PAGE_ATTRIBUTES`.
 Adding `:attachment` `COLLECTION_ATTRIBUTES` will work but will probably look too big.
 
 ### `has_many_attached`:
+
 Assuming your model name is `Model` and field name is `attachments` the process 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
@@ -54,18 +62,60 @@ class ModelDashboard < Administrate::BaseDashboard
   }
 
   # permitted for has_many_attached
-  def permitted_attributes
+  def permitted_attributes(_action = nil)
     super + [:attachments => []]
   end
 ```
+
 I know it is not ideal, if you have a workaround please submit a PR.
 
-Note: Rails 6 introduced a new config to determine the behavior on updates to `has_many_attached`.  Setting `Rails.application.config.active_storage.replace_on_assign_to_many` to `true` will overwrite any existing values (purging the old ones), and setting it to `false` will append the new values. Please note that this configuation was [deprecated with Rails 7.1](https://github.com/rails/rails/blob/v7.0.2.3/activestorage/lib/active_storage/attached/model.rb#L150)
->config.active_storage.replace_on_assign_to_many is deprecated and will be removed in Rails 7.1. Make sure that your code works well with config.active_storage.replace_on_assign_to_many set to true before upgrading. To append new attachables to the Active Storage association, prefer using attach. Using association setter would result in purging the existing attached attachments and replacing them with new ones.
+Note: Rails 6 introduced a new config to determine the behavior on updates to `has_many_attached`. Setting `Rails.application.config.active_storage.replace_on_assign_to_many` to `true` will overwrite any existing values (purging the old ones), and setting it to `false` will append the new values. Please note that this configuation was [deprecated with Rails 7.1](https://github.com/rails/rails/blob/v7.0.2.3/activestorage/lib/active_storage/attached/model.rb#L150)
+
+> config.active_storage.replace_on_assign_to_many is deprecated and will be removed in Rails 7.1. Make sure that your code works well with config.active_storage.replace_on_assign_to_many set to true before upgrading. To append new attachables to the Active Storage association, prefer using attach. Using association setter would result in purging the existing attached attachments and replacing them with new ones.
+
+This means that in Rails 7 for `has_many_attached`, whenever a form is submitted, all associations to existing attachments are being removed without the ActiveStorage objects being deleted. This is undesired behavior because you have to re attach every time you update an object and it will result in orphaned ActiveStorage objects. To fix this and to add the ability to add more attachments to an existing set of attachments, follow this [workaround](https://stackoverflow.com/a/74207496). In short, you can create a concern:
+
+```ruby
+# app/models/concerns/append_to_has_many_attached.rb
+module AppendToHasManyAttached
+  def self.[](fields)
+    Module.new do
+      extend ActiveSupport::Concern
+
+      fields = Array(fields).compact_blank # will always return an array ( worst case is an empty array)
+
+      fields.each do |field|
+        field = field.to_s # We need the string version
+        define_method :"#{field}=" do |attachables|
+          attachables = Array(attachables).compact_blank
+
+          if attachables.any?
+            attachment_changes[field] =
+              ActiveStorage::Attached::Changes::CreateMany.new(field, self, public_send(field).public_send(:blobs) + attachables)
+          end
+        end
+      end
+    end
+  end
+end
+```
+
+And then load this concern in your model:
+
+```ruby
+class Model < ApplicationModel
+  include AppendToHasManyAttached['files'] # you can include it before or after, order does not matter, explanation below
 
+  has_many_attached :files
+end
+```
+
+Please note, it does not matter if you prepend or include the module, see [original post](https://stackoverflow.com/a/74207496) for details.
 
 ### Prevent N+1 queries
+
 In order to prevent N+1 queries from active storage you have to modify your admin model controller, below an example for a model called `User` and with attached avatars
+
 ```ruby
 module Admin
   class UsersController < ApplicationController
@@ -107,6 +157,7 @@ module Admin
   end
 end
 ```
+
 For `has_one_attached` cases, you will use:
 
 ```rb
@@ -134,6 +185,7 @@ module Admin
   end
 end
 ```
+
 This route can be customized with `destroy_url`. The option expects a `proc` receiving 3 arguments:
 the Administrate `namespace`, the `resource`, and the `attachment`. The proc can return anything
 accepted by `link_to`:
@@ -202,9 +254,11 @@ Use a named variant for image preview for the `index` and `show` actions, respec
 Named image variants were [added in Rails 7](https://guides.rubyonrails.org/v7.0/active_storage_overview.html#has-one-attached).
 
 It might be necessary to add to app/assets/config/manifest.js:
+
 ```rb
  //= link 'administrate-field-active_storage/application.css'
 ```
+
 When set, this takes precedence over `index_preview_size` and `show_preview_size`.
 
 Setting this to `false` displays original images instead of variants.
@@ -217,7 +271,14 @@ Displays the number of attachments in the `index` action.
 
 Defaults to `true` if number of attachments is not 1.
 
-### direct_upload
+### file_field_options
+
+The `file_field_options` is a configuration option that allows you to customize the behavior and appearance of the file input field used for uploading attachments. You can pass various options to `file_field` to control its functionality.
+
+The `multiple` HTML attribute for file input fields is set by default based on `::ActiveStorage::Attached::Many`, but can be overridden through this option.
+The `direct` attribute to enable direct uploads is set to read from the field options, but can be overridden through this option.
+
+#### direct
 
 Enables direct upload from the browser to the cloud.
 
@@ -230,6 +291,7 @@ Don't forget to include [ActiveStorage JavaScript](https://edgeguides.rubyonrail
 You can see translation example [here](https://github.com/Dreamersoul/administrate-field-active_storage/blob/master/config/locales/administrate-field-active_storage.en.yml).
 
 ## Things To Do:
+
 - [x] upload single file
 - [x] adding image support through url_for to support 3rd party cloud storage
 - [x] use html 5 video element for video files
@@ -242,10 +304,12 @@ You can see translation example [here](https://github.com/Dreamersoul/administra
 - [x] preview office files as pictures
 
 ## Contribution Guide:
-1. contributers are welcome (code, suggestions, and bugs).
+
+1. contributors are welcome (code, suggestions, and bugs).
 2. please test your code: `cd test_app && bundle && bundle exec rails test`.
 3. please document your code.
 4. add your name to the `contribute.md`.
 
 ---
+
 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/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 = "1.0.3"
+  gem.version = "1.0.6"
   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

@@ -29,6 +29,6 @@ By default, the input is a text field for the image's URL.
           I18n.t("administrate.fields.active_storage.add", default: 'Add') :
           I18n.t("administrate.fields.active_storage.replace", default: 'Replace')
     %>
-    <%= f.file_field field.attribute, multiple: field.many?, direct_upload: field.direct? %>
+    <%= f.file_field field.attribute, field.file_field_options %>
   </div>
 </div>

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

@@ -41,8 +41,8 @@ controlled via a boolean local variable.
   <% destroy_url = field.destroy_url.call(namespace, field.data.record, attachment) %>
   <div>
     <%= link_to I18n.t("administrate.fields.active_storage.remove", default: 'Remove'),
-                destroy_url, method: :delete, class: 'remove-attachment-link', data: { confirm: t("administrate.actions.confirm") } %>
+                destroy_url, method: :delete, class: 'remove-attachment-link', data: { confirm: t("administrate.actions.confirm"), turbo_method: :delete, turbo_confirm: t("administrate.actions.confirm") } %>
   </div>
   <hr>
 <% end %>
-<% end %>
+<% end %>

data/lib/administrate/field/active_storage.rb

@@ -40,6 +40,13 @@ module Administrate
         options.fetch(:show_preview_variant, nil)
       end
 
+      def file_field_options
+        {
+          direct_upload: direct?,
+          multiple: many?,
+        }.merge options.fetch(:file_field_options, {})
+      end
+
       def many?
         data.is_a? ::ActiveStorage::Attached::Many
       end

data/test_app/Gemfile

@@ -8,7 +8,7 @@ gem 'rails', '7.1.2'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 5.6'
+gem 'puma', '~> 6.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
 # Use Active Model has_secure_password

data/test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    administrate-field-active_storage (1.0.2)
+    administrate-field-active_storage (1.0.5)
       administrate (>= 0.2.2)
       rails (>= 7.0)
 
@@ -82,8 +82,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     administrate (0.20.1)
       actionpack (>= 6.0, < 8.0)
       actionview (>= 6.0, < 8.0)
@@ -93,36 +93,37 @@ GEM
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
-    capybara (3.36.0)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (4.1.0)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    date (3.3.4)
+    date (3.4.1)
     drb (2.2.1)
-    erubi (1.12.0)
-    ffi (1.16.3)
+    erubi (1.13.1)
+    ffi (1.17.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.7.2)
-    irb (1.13.1)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jquery-rails (4.6.0)
@@ -141,7 +142,8 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.22.0)
+    logger (1.6.6)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -149,44 +151,50 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    mini_magick (4.12.0)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
-    minitest (5.23.0)
-    mutex_m (0.2.0)
-    net-imap (0.4.5)
+    minitest (5.25.4)
+    mutex_m (0.3.0)
+    net-imap (0.4.19)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.6.0)
-    nokogiri (1.16.5-arm64-darwin)
+    nio4r (2.7.4)
+    nokogiri (1.17.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.17.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.17.2-x86_64-linux)
       racc (~> 1.4)
-    psych (5.1.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.3)
+      date
       stringio
-    public_suffix (4.0.6)
-    puma (5.6.4)
+    public_suffix (6.0.1)
+    puma (6.6.0)
       nio4r (~> 2.0)
-    racc (1.7.3)
-    rack (3.0.11)
-    rack-mini-profiler (2.3.3)
+    racc (1.8.1)
+    rack (3.1.10)
+    rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
     rails (7.1.2)
       actioncable (= 7.1.2)
       actionmailbox (= 7.1.2)
@@ -205,9 +213,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (7.1.2)
       actionpack (= 7.1.2)
       activesupport (= 7.1.2)
@@ -217,15 +225,16 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
-    regexp_parser (2.2.0)
-    reline (0.5.7)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    ruby-vips (2.2.0)
+    rexml (3.4.1)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
-    rubyzip (2.3.2)
+      logger
+    rubyzip (2.4.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -237,40 +246,44 @@ GEM
       sprockets-rails
       tilt
     selectize-rails (0.12.6)
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.26.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
-    stringio (3.1.0)
-    thor (1.3.1)
-    tilt (2.3.0)
-    timeout (0.4.1)
+    stringio (3.1.3)
+    thor (1.3.2)
+    tilt (2.6.0)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    web-console (4.2.0)
+    web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webrick (1.8.1)
-    websocket-driver (0.7.6)
+    websocket (1.2.11)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.18)
 
 PLATFORMS
+  arm64-darwin-22
   arm64-darwin-23
   x86_64-darwin-20
   x86_64-darwin-21
@@ -282,7 +295,7 @@ DEPENDENCIES
   byebug
   capybara (>= 3.26)
   image_processing (~> 1.2)
-  puma (~> 5.6)
+  puma (~> 6.0)
   rack-mini-profiler (~> 2.0)
   rails (= 7.1.2)
   sass-rails (>= 6)

data/test_app/test/controllers/admin/posts_controller_test.rb

@@ -44,7 +44,7 @@ module Admin
         }
       end
 
-      assert_response :unprocessable_entity
+      assert_response 422
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-active_storage
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Hamad AlGhanim
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2025-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate