shrine 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c012576836f3a56efa91be436999395123342c4650f76f152ef64808ce82ddb
-  data.tar.gz: 5be0e63b923ba28f838b4f692758af3eb975c937c4b63453acc629aab0240eac
+  metadata.gz: 46e9fa07aa69797777e3072eed12a4b901b357ae840c71f4facd5b0be2d79929
+  data.tar.gz: 0714e663dd130b9af96b195e5a3d87c128a0e6dd0b0598a7b2d4286e97223008
 SHA512:
-  metadata.gz: da5eb6be96c3cacb0575e124b4238c038709d44f33085a5bfb4ae6cb1702d079ba0c7f1ca775828812c6d8cacd1b75aa5979c564dbe0e1ea52fea0036c0f577e
-  data.tar.gz: fe12c86f5d826581e4ecb1b5e1951ca1330c8d6d288d19001badd79dab646013a2e57faf51d6cf7369669515636dda3058bf42a2128ea04934f7b611a53e97dd
+  metadata.gz: 87b70c2bd15dd044eacc1b2089b65bb0538728fd56dea5cce8e6e191b3bf07e63e2af45b877bfd317bcf38c98279c49d07f5d18db28d106cb08360478f1bcb76
+  data.tar.gz: 57703469c6efa1e724113944815dc9fb5e2a3506cf261810c07d0e40c7849bc79d2184bb576222ca7a21c56fe3f496602e93d7b60696cee763aabdaaed71cf23

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 3.5.0 (2023-07-06)
+
+* Migrate website to Docusaurus v2 (@janko)
+
+* `download_endpoint` – Return `400 Bad Request` response when serialized file component is invalid (@janko)
+
+* `base` – Stop using obsolete `URI.regexp` in `UploadedFile#extension` (@y-yagi)
+
+* `s3` – Add `:encoding` option to `S3#open` to be passed to `Down::ChunkedIO#initialize` (@pond)
+
+* `s3` – Add `:max_multipart_parts` option for changing default limit of 10,000 parts (@jpl)
+
+* `s3` – Don't inherit S3 object tags when copying from temporary to permanent storage (@jrochkind)
+
+* `infer_extension` – Add `infer_extension` instance method to the uploader for convenience (@aried3r)
+
+* `derivation_endpoint` – Add `:signer` plugin option for providing a custom URL signer (@thibaudgg)
+
+* `derivatives` – Don't leak `versions_compatibility: true` setting into other uploaders (@janko)
+
+* `derivatives` – Add `:mutex` plugin option for skipping mutex and making attacher marshallable (@janko)
+
+* `remove_attachment` – Fix passing boolean values being broken in Ruby 3.2 (@janko)
+
+* `model` – When duplicating a record, make the duplicated attacher reference the duplicated record (@janko)
+
 ## 3.4.0 (2021-06-14)
 
 * `base` – Fix passing options to `Shrine.Attachment` on Ruby 3.0 (@lucianghinda)

data/README.md

@@ -20,20 +20,20 @@ guide]**.
 
 ## Links
 
-| Resource                | URL                                                                            |
-| :----------------       | :----------------------------------------------------------------------------- |
-| Website & Documentation | [shrinerb.com](https://shrinerb.com)                                           |
-| Demo code               | [Roda][roda demo] / [Rails][rails demo]                                        |
-| Wiki                    | [github.com/shrinerb/shrine/wiki](https://github.com/shrinerb/shrine/wiki)     |
-| Help & Discussion       | [discourse.shrinerb.com](https://discourse.shrinerb.com)                       |
+| Resource                   | URL                                                                                      |
+| :----------------          | :-----------------------------------------------------------------------------           |
+| Website & Documentation    | [shrinerb.com](https://shrinerb.com)                                                     |
+| Demo code                  | [Roda][roda demo] / [Rails][rails demo]                                                  |
+| Wiki                       | [github.com/shrinerb/shrine/wiki](https://github.com/shrinerb/shrine/wiki)               |
+| Discussion forum           | [github.com/shrinerb/shrine/discussions](https://github.com/shrinerb/shrine/discussions) |
+| Alternate Discussion forum | [discourse.shrinerb.com](https://discourse.shrinerb.com)                                 |
 
 ## Setup
 
-Add the gem to your Gemfile:
+Run:
 
-```rb
-# Gemfile
-gem "shrine", "~> 3.0"
+```sh
+bundle add shrine
 ```
 
 Then add `config/initializers/shrine.rb` which sets up the storage and loads
@@ -80,7 +80,7 @@ allow users to upload files:
 
 ```erb
 <%= form_for @photo do |f| %>
-  <%= f.hidden_field :image, value: @photo.cached_image_data %>
+  <%= f.hidden_field :image, value: @photo.cached_image_data, id: nil %>
   <%= f.file_field :image %>
   <%= f.submit %>
 <% end %>

data/doc/carrierwave.md

@@ -368,7 +368,7 @@ Now you should be able to rewrite your application so that it uses Shrine
 instead of CarrierWave (you can consult the reference in the next section). You
 can remove the `CarrierwaveShrineSynchronization` module as well.
 
-### 5. Backill metadata
+### 5. Backfill metadata
 
 You'll notice that Shrine metadata will be absent from the migrated files'
 data. You can run a script that will fill in any missing metadata defined in
@@ -646,7 +646,7 @@ Shrine.plugin :cached_attachment_data
 ```
 ```rb
 form_for @photo do |f|
-  f.hidden_field :image, value: @photo.cached_image_data
+  f.hidden_field :image, value: @photo.cached_image_data, id: nil
   f.file_field :image
 end
 ```

data/doc/changing_location.md

@@ -99,11 +99,12 @@ class MoveFilesJob
 
     attacher     = attacher_class.retrieve(model: record, name: name, file: file_data)
     old_attacher = attacher.dup
+    current_file = old_attacher.file
 
     attacher.set             attacher.upload(attacher.file)
     attacher.set_derivatives attacher.upload_derivatives(attacher.derivatives)
 
-    attacher.atomic_persist
+    attacher.atomic_persist(current_file)
     old_attacher.destroy_attached
   rescue Shrine::AttachmentChanged, ActiveRecord::RecordNotFound
     attacher&.destroy_attached

data/doc/external/articles.md

@@ -4,22 +4,22 @@ title: Articles
 
 ## Official articles
 
-| Article                                                                                                                      | Published             |
-| :-------                                                                                                                     | --------:             |
-| [Better File Uploads with Shrine: Eager Processing](https://twin.github.io/better-file-uploads-with-shrine-eager-processing) | 12 Dec 2019 |
-| [Shrine 3.0 Released](https://twin.github.io/shrine-3-0-released/)                                                           | 14 Oct 2019 |
-| [Upcoming Features in Shrine 3.0](https://twin.github.io/upcoming-features-in-shrine-3-0/)                                   | 29 Aug 2019 |
-| [Better File Uploads with Shrine: Direct Uploads](https://twin.github.io/better-file-uploads-with-shrine-direct-uploads/)    | 08 Jan 2018 |
-| [Better File Uploads with Shrine: Metadata](https://twin.github.io/better-file-uploads-with-shrine-metadata/)                | 07 Nov 2016 |
-| [Better File Uploads with Shrine: Processing](https://twin.github.io/better-file-uploads-with-shrine-processing/)            | 31 Oct 2016 |
-| [Better File Uploads with Shrine: Attachment](https://twin.github.io/better-file-uploads-with-shrine-attachment/)            | 17 Sep 2016 |
-| [Better File Uploads with Shrine: Uploader](https://twin.github.io/better-file-uploads-with-shrine-uploader/)                | 16 Sep 2016 |
-| [Better File Uploads with Shrine: Motivation](https://twin.github.io/better-file-uploads-with-shrine-motivation/)            | 11 Sep 2016 |
-| [Resumable File Uploads in Ruby](https://twin.github.io/resumable-file-uploads-in-ruby/)                                     | 04 Sep 2016 |
-| [Shrine meets Transloadit](https://twin.github.io/shrine-meets-transloadit/)                                                 | 11 Jul 2016 |
-| [Shrine 2.0 Released](https://twin.github.io/shrine-2-0-released/)                                                           | 20 May 2016 |
-| [Asynchronous File Uploads](http://twin.github.io/file-uploads-asynchronous-world)                                           | 18 Jan 2016 |
-| [Introducing Shrine](http://twin.github.io/introducing-shrine)                                                               | 04 Oct 2015 |
+| Article                                                                                                                 | Published             |
+| :-------                                                                                                                | --------:             |
+| [Better File Uploads with Shrine: Eager Processing](https://janko.io/better-file-uploads-with-shrine-eager-processing/) | 12 Dec 2019 |
+| [Shrine 3.0 Released](https://janko.io/shrine-3-0-released/)                                                            | 14 Oct 2019 |
+| [Upcoming Features in Shrine 3.0](https://janko.io/upcoming-features-in-shrine-3-0/)                                    | 29 Aug 2019 |
+| [Better File Uploads with Shrine: Direct Uploads](https://janko.io/better-file-uploads-with-shrine-direct-uploads/)     | 08 Jan 2018 |
+| [Better File Uploads with Shrine: Metadata](https://janko.io/better-file-uploads-with-shrine-metadata/)                 | 07 Nov 2016 |
+| [Better File Uploads with Shrine: Processing](https://janko.io/better-file-uploads-with-shrine-processing/)             | 31 Oct 2016 |
+| [Better File Uploads with Shrine: Attachment](https://janko.io/better-file-uploads-with-shrine-attachment/)             | 17 Sep 2016 |
+| [Better File Uploads with Shrine: Uploader](https://janko.io/better-file-uploads-with-shrine-uploader/)                 | 16 Sep 2016 |
+| [Better File Uploads with Shrine: Motivation](https://janko.io/better-file-uploads-with-shrine-motivation/)             | 11 Sep 2016 |
+| [Resumable File Uploads in Ruby](https://janko.io/resumable-file-uploads-in-ruby/)                                      | 04 Sep 2016 |
+| [Shrine meets Transloadit](https://janko.io/shrine-meets-transloadit/)                                                  | 11 Jul 2016 |
+| [Shrine 2.0 Released](https://janko.io/shrine-2-0-released/)                                                            | 20 May 2016 |
+| [Asynchronous File Uploads](http://janko.io/file-uploads-asynchronous-world)                                            | 18 Jan 2016 |
+| [Introducing Shrine](http://janko.io/introducing-shrine)                                                                | 04 Oct 2015 |
 
 ## Community articles
 

data/doc/external/extensions.md

@@ -35,7 +35,7 @@ title: Extensions
 | [shrine-content_addressable](https://github.com/SleeplessByte/shrine-content_addressable)   | Plugin for generating content addressable locations                   |
 | [shrine-imgix](https://github.com/shrinerb/shrine-imgix)                                    | Plugin for [Imgix](https://www.imgix.com/)                            |
 | [shrine-transloadit](https://github.com/shrinerb/shrine-transloadit)                        | Plugin for [Transloadit](https://transloadit.com/)                    |
-| [shrine-lambda](https://github.com/texpert/shrine-lambda)                                   | Plugin for [AWS Lambda](https://aws.amazon.com/lambda/)               |
+| [shrine-aws-lambda](https://github.com/texpert/shrine-aws-lambda)                           | Plugin for [AWS Lambda](https://aws.amazon.com/lambda/)               |
 | [hanami-shrine](https://github.com/katafrakt/hanami-shrine)                                 | Plugin for [Hanami](https://hanamirb.org/)                            |
 | [shrine-mongoid](https://github.com/shrinerb/shrine-mongoid)                                | Plugin for [Mongoid](https://mongoid.org)                             |
 | [shrine-rails](https://github.com/abepetrillo/shrine-rails)                                 | Plugin for [Rails](https://rubyonrails.org/)                          |

data/doc/getting_started.md

@@ -3,6 +3,9 @@ id: getting-started
 title: Getting Started
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 ## Quick start
 
 Add Shrine to the Gemfile and write an initializer which sets up the storage
@@ -32,32 +35,39 @@ Next decide how you will name the attachment attribute on your model, and run a
 migration that adds an `<attachment>_data` text or JSON column, which Shrine
 will use to store all information about the attachment:
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Sequel-->
+<Tabs>
+<TabItem value="sequel" label="Sequel">
+
 ```rb
 Sequel.migration do
   change do
-    add_column :photos, :image_data, :text # or :jsonb   
+    add_column :photos, :image_data, :text # or :jsonb
   end
 end
 ```
 
-<!--ActiveRecord-->
+</TabItem>
+<TabItem value="activerecord" label="Active Record">
+
 ```rb
 class AddImageDataToPhotos < ActiveRecord::Migration
   def change
-    add_column :photos, :image_data, :text # or :jsonb   
+    add_column :photos, :image_data, :text # or :jsonb
   end
 end
 ```
 
-<!--Rails-->
+</TabItem>
+<TabItem value="rails" label="Rails">
+
 ```rb
-$ rails generate migration add_image_data_to_photos image_data:text  # or image_data:jsonb 
+$ rails generate migration add_image_data_to_photos image_data:text # or image_data:jsonb
 ```
-If using `jsonb` consider adding a [gin index] for fast key-value pair searchability within `image_data`.
 
-<!--END_DOCUSAURUS_CODE_TABS-->
+</TabItem>
+</Tabs>
+
+If using `jsonb` consider adding a [gin index] for fast key-value pair searchability within `image_data`.
 
 Now you can create an uploader class for the type of files you want to upload,
 and add a virtual attribute for handling attachments using this uploader to
@@ -69,36 +79,47 @@ class ImageUploader < Shrine
   # plugins and uploading logic
 end
 ```
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Sequel-->
+
+<Tabs>
+<TabItem value="sequel" label="Sequel">
+
 ```rb
 class Photo < Sequel::Model
   include ImageUploader::Attachment(:image) # adds an `image` virtual attribute
 end
 ```
-<!--ActiveRecord-->
+
+</TabItem>
+<TabItem value="activerecord" label="Active Record">
+
 ```rb
 class Photo < ActiveRecord::Base
   include ImageUploader::Attachment(:image) # adds an `image` virtual attribute
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 Let's now add the form fields which will use this virtual attribute (NOT the
 `<attachment>_data` column attribute). We need (1) a file field for choosing
 files, and (2) a hidden field for retaining the uploaded file in case of
 validation errors and for potential [direct uploads].
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Rails form builder-->
+<Tabs>
+<TabItem value="rails" label="Rails form builder">
+
 ```rb
 form_for @photo do |f|
-  f.hidden_field :image, value: @photo.cached_image_data
+  f.hidden_field :image, value: @photo.cached_image_data, id: nil
   f.file_field :image
   f.submit
 end
 ```
-<!--Simple Form-->
+
+</TabItem>
+<TabItem value="simple_form" label="Simple Form">
+
 ```rb
 simple_form_for @photo do |f|
   f.input :image, as: :hidden, input_html: { value: @photo.cached_image_data }
@@ -106,7 +127,10 @@ simple_form_for @photo do |f|
   f.button :submit
 end
 ```
-<!--Forme-->
+
+</TabItem>
+<TabItem value="form" label="Forme">
+
 ```rb
 form @photo, action: "/photos", enctype: "multipart/form-data" do |f|
   f.input :image, type: :hidden, value: @photo.cached_image_data
@@ -114,7 +138,10 @@ form @photo, action: "/photos", enctype: "multipart/form-data" do |f|
   f.button "Create"
 end
 ```
-<!--HTML-->
+
+</TabItem>
+<TabItem value="html" label="HTML">
+
 ```erb
 <form action="/photos" method="post" enctype="multipart/form-data">
   <input name="photo[image]" type="hidden" value="<%= @photo.cached_image_data %>" />
@@ -122,7 +149,9 @@ end
   <input type="submit" value="Create" />
 </form>
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 Note that the file field needs to go *after* the hidden field, so that
 selecting a new file can always override the cached file in the hidden field.
@@ -133,8 +162,9 @@ will automatically generate this for you).
 When the form is submitted, in your router/controller you can assign the file
 from request params to the attachment attribute on the model.
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Rails-->
+<Tabs>
+<TabItem value="rails" label="Rails">
+
 ```rb
 class PhotosController < ApplicationController
   def create
@@ -149,28 +179,39 @@ class PhotosController < ApplicationController
   end
 end
 ```
-<!--Sinatra-->
+
+</TabItem>
+<TabItem value="sinatra" label="Sinatra">
+
 ```rb
 post "/photos" do
   Photo.create(params[:photo])
   # ...
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 Once a file is uploaded and attached to the record, you can retrieve a URL to
 the uploaded file with `#<attachment>_url` and display it on the page:
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Rails-->
+<Tabs>
+<TabItem value="rails" label="Rails">
+
 ```erb
 <%= image_tag @photo.image_url %>
 ```
-<!--HTML-->
+
+</TabItem>
+<TabItem value="html" label="HTML">
+
 ```erb
 <img src="<%= @photo.image_url %>" />
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 ## Storage
 

data/doc/multiple_files.md

@@ -3,6 +3,9 @@ id: multiple-files
 title: Multiple Files
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 There are times when you want to allow users to attach multiple files to a
 single resource, like an album having many photos or a playlist having many
 songs. Some file attachment libraries provide a special interface for multiple
@@ -67,8 +70,9 @@ files (or attachments) table will be the photos table.
 Let's create a table for the main resource and attachments, and add a foreign
 key in the attachment table for the main table:
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Sequel-->
+<Tabs>
+<TabItem value="sequel" label="Sequel">
+
 ```rb
 Sequel.migration do
   change do
@@ -87,7 +91,10 @@ Sequel.migration do
   end
 end
 ```
-<!--ActiveRecord-->
+
+</TabItem>
+<TabItem value="activerecord" label="Active Record">
+
 ```rb
 class CreateAlbumsAndPhotos < ActiveRecord::Migration
   def change
@@ -104,25 +111,33 @@ class CreateAlbumsAndPhotos < ActiveRecord::Migration
   end
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 In the Photo model, create a Shrine attachment attribute named `image`
 (`:image` matches the `_data` column prefix above):
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Sequel-->
+<Tabs>
+<TabItem value="sequel" label="Sequel">
+
 ```rb
 class Photo < Sequel::Model
   include ImageUploader::Attachment(:image)
 end
 ```
-<!--ActiveRecord-->
+
+</TabItem>
+<TabItem value="activerecord" label="Active Record">
+
 ```rb
 class Photo < ActiveRecord::Base
   include ImageUploader::Attachment(:image)
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 ### 2. Declare nested attributes
 
@@ -131,8 +146,9 @@ Using nested attributes is the easiest way to implement any dynamic
 relationship to the photos table, and allow it to directly accept attributes
 for the associated photo records by enabling nested attributes:
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Sequel-->
+<Tabs>
+<TabItem value="sequel" label="Sequel">
+
 ```rb
 class Album < Sequel::Model
   one_to_many :photos
@@ -142,14 +158,20 @@ class Album < Sequel::Model
   nested_attributes :photos, destroy: true
 end
 ```
-<!--ActiveRecord-->
+
+</TabItem>
+<TabItem value="activerecord" label="Active Record">
+
 ```rb
 class Album < ActiveRecord::Base
   has_many :photos, dependent: :destroy
   accepts_nested_attributes_for :photos, allow_destroy: true
 end
 ```
-<!--Mongoid-->
+
+</TabItem>
+<TabItem value="mongoid" label="Mongoid">
+
 ```rb
 class Album
   include Mongoid::Document
@@ -157,7 +179,9 @@ class Album
   accepts_nested_attributes_for :photos
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 Documentation on nested attributes:
 
@@ -174,13 +198,14 @@ already created photos, so that the same form can be used for updating the
 album/photos as well (they will be submitted under the
 `album[photos_attributes]` parameter).
 
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Rails form builder-->
+<Tabs>
+<TabItem value="rails" label="Rails form builder">
+
 ```rb
 form_for @album, html: { enctype: "multipart/form-data" } do |f|
   f.text_field :title
   f.fields_for :photos do |p| # adds new `album[photos_attributes]` parameter
-    p.hidden_field :image, value: p.object.cached_image_data
+    p.hidden_field :image, value: p.object.cached_image_data, id: nil
     p.file_field   :image
     p.check_box    :_destroy unless p.object.new_record?
   end
@@ -188,7 +213,10 @@ form_for @album, html: { enctype: "multipart/form-data" } do |f|
   f.submit "Create"
 end
 ```
-<!--Forme-->
+
+</TabItem>
+<TabItem value="forme" label="Forme">
+
 ```rb
 form @album, action: "/photos", enctype: "multipart/form-data" do |f|
   f.input :title
@@ -201,7 +229,9 @@ form @album, action: "/photos", enctype: "multipart/form-data" do |f|
   f.button "Create"
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+
+</TabItem>
+</Tabs>
 
 In your controller you should still be able to assign all the attributes to the
 album, just remember to whitelist the new parameter for the nested attributes,
@@ -286,21 +316,26 @@ class ImageUploader < Shrine
   end
 end
 ```
-<!--DOCUSAURUS_CODE_TABS-->
-<!--Sequel-->
+<Tabs>
+<TabItem value="sequel" label="Sequel">
+
 ```rb
 class Album < Sequel::Model
   # ... (nested_attributes already enables validating associated photos) ...
 end
 ```
-<!--ActiveRecord-->
+
+</TabItem>
+<TabItem value="activerecord" label="Active Record">
+
 ```rb
 class Album < ActiveRecord::Base
   # ...
   validates_associated :photos
 end
 ```
-<!--END_DOCUSAURUS_CODE_TABS-->
+</TabItem>
+</Tabs>
 
 Note that by default only metadata set on the client side will be available for
 validations. Shrine will not automatically run metadata extraction for directly

data/doc/plugins/backgrounding.md

@@ -46,7 +46,7 @@ Then, in your initializer, you can configure all uploaders to use these jobs:
 
 ```rb
 Shrine::Attacher.promote_block do
-  PromoteJob.perform_async(self.class.name, record.class.name, record.id, name, file_data)
+  PromoteJob.perform_async(self.class.name, record.class.name, record.id, name.to_s, file_data)
 end
 Shrine::Attacher.destroy_block do
   DestroyJob.perform_async(self.class.name, data)
@@ -58,7 +58,7 @@ Alternatively, you can setup backgrounding only for specific uploaders:
 ```rb
 class MyUploader < Shrine
   Attacher.promote_block do
-    PromoteJob.perform_async(self.class.name, record.class.name, record.id, name, file_data)
+    PromoteJob.perform_async(self.class.name, record.class.name, record.id, name.to_s, file_data)
   end
   Attacher.destroy_block do
     DestroyJob.perform_async(self.class.name, data)
@@ -121,7 +121,7 @@ Shrine::Attacher.promote_block do |attacher|
     attacher.class.name,
     attacher.record.class.name,
     attacher.record.id,
-    attacher.name,
+    attacher.name.to_s,
     attacher.file_data,
   )
 end
@@ -143,7 +143,7 @@ photo.image_attacher.promote_block do |attacher|
     attacher.class.name,
     attacher.record.class.name,
     attacher.record.id,
-    attacher.name,
+    attacher.name.to_s,
     attacher.file_data,
     current_user.id, # pass arguments known at the controller level
   )

data/doc/plugins/derivation_endpoint.md

@@ -331,6 +331,29 @@ uploaded_file.derivation_url(:thumbnail, expires_in: 90)
 #=> ".../thumbnail/eyJpZCI6ImZvbyIsInN?expires_at=1547843568&signature=..."
 ```
 
+## Custom signer
+
+The derivation URLs are signed by default, and the signature is checked when
+the URLs are requested, which prevents tampering. If you have URL expiration
+turned on, this may prevent your CDN from caching the response.
+
+In this case, you may need to do custom CDN-specific URL signing. You can
+bypass Shrine's default signing by passing a custom signer:
+
+```rb
+require "aws-sdk-cloudfront"
+signer = Aws::CloudFront::UrlSigner.new(key_pair_id: "...", private_key: "...")
+
+plugin :derivation_endpoint,
+  expires_in: 90,
+  signer: -> (url, expires_in:) do
+    signer.signed_url(url, expires: Time.now.to_i + expires_in)
+  end
+```
+
+When `:signer` option is used, the `:secret_key` option is not required, as
+that secret is only used for default signing.
+
 ## Response headers
 
 ### Content Type
@@ -796,6 +819,7 @@ derivation.option(:upload_location)
 | `:metadata`                    | List of metadata keys the source uploaded file should include in the derivation block                                                 | `[]`                                                 |
 | `:prefix`                      | Path prefix added to the URLs                                                                                                         | `nil`                                                |
 | `:secret_key`                  | Key used to sign derivation URLs in order to prevent tampering                                                                        | required                                             |
+| `:signer`                      | Proc accepting URL and query params used for custom signing of URLs.                                                                  | `nil`                                                |
 | `:type`                        | Media type returned in the `Content-Type` response header in the derivation response                                                  | determined from derivative's extension when possible |
 | `:upload`                      | Whether the generated derivatives will be cached on the storage                                                                       | `false`                                              |
 | `:upload_location`             | Location to which the derivatives will be uploaded on the storage                                                                     | `<source id>/<name>-<args>`                          |

data/doc/plugins/derivatives.md

@@ -133,7 +133,7 @@ Attacher.default_url do |derivative: nil, **|
 end
 ```
 ```rb
-photo.image_url(:medium) #=> "https://example.com/fallbacks.com/medium.jpg"
+photo.image_url(:medium) #=> "https://example.com/fallbacks/medium.jpg"
 ```
 
 Any additional URL options passed to `#<name>_url` will be forwarded to the
@@ -778,6 +778,16 @@ derivatives #=>
 Like `Shrine.uploaded_file`, the `Shrine.derivatives` method accepts data as a
 hash (stringified or symbolized) or a JSON string.
 
+### Marshalling
+
+The `Attacher` instance uses a mutex to make `Attacher#merge_derivatives`
+thread-safe, which is not marshallable. If you want to be able to marshal the
+attacher instance, you can skip mutex usage:
+
+```rb
+plugin :derivatives, mutex: false
+```
+
 ## Instrumentation
 
 If the `instrumentation` plugin has been loaded, the `derivatives` plugin adds