shrine 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c1404cab9882d16a6795c41467591b4083cbef76b5d42b91626a4306b33584
-  data.tar.gz: bec484b8594573db2056eabeda97ae5c22fb170a35f984802cd200085611e556
+  metadata.gz: 29a02d25cd1180c4f0170434edd185b3b1ab0bd2be060fa53e58fcd32c50d4ae
+  data.tar.gz: 56e50d961ef88e0d3cae4d295b6996c52cd2021b923d9b453f401f10b04021b3
 SHA512:
-  metadata.gz: 298e5065ba40638cee54dc4b74be98e466974502f56b5bff956fb2d7cc4d73028ec8a9d79dae7c073306c4512145cfef082ec4beeeb60a0eddef5497bbcf8174
-  data.tar.gz: 3413b070afe6315133342ab3faf7c41d97bb9767a3aa13f62bf4ba339246fb4f1b3d1ebc91036b37942b8893c20b652edf4603f2b710bd66647caed6b9cddc48
+  metadata.gz: cb06f261af63f09ba767556d65f8b99e5204c1162ce7d8e28e5355148539a02c486fa088819884cf38dee4bf0683e8167b6582c4a028271a5145bd8661f64765
+  data.tar.gz: ec5cd4f04fe90ada87cd594bf78e61c2de9fcbebe8d51cb9e49b0bec566614be5ea5826382a8f25608888c84a951f25ad80442a6af2d641a37bae0e8fe184d7e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
+## 3.7.1 (2026-06-03)
+
+* Update method signatures of some plugins to work around a Bootsnap bug causing a `wrong number of arguments` error.
+
 ## 3.7.0 (2026-05-27)
 
+* `rack_response` - Add `:etag` option for setting a custom `ETag` header (@janko)
+
 * `download_endpoint` - Add support for expiring URLs (@davidwessman)
 
 * `s3` - Use `TransferManager` where available instead of deprecated `upload_steam` (@danieldevlewis)

data/doc/plugins/derivation_endpoint.md

@@ -309,6 +309,19 @@ uploaded_file.derivation_url(:thumbnail, prefix: "transformations/image")
 #=> ".../transformations/image/thumbnail/eyJpZCI6ImZvbyIsInN?signature=..."
 ```
 
+## Format
+
+Some HTTP clients and CDNs use the URL path extension to determine the content
+type of the response. You can append a file extension to the derivation URL
+path with the `:format` option:
+
+```rb
+uploaded_file.derivation_url(:thumbnail, format: "jpg")
+#=> ".../thumbnail/eyJpZCI6ImZvbyIsInN.jpg?signature=..."
+```
+
+The extension is included in the URL signature, so it cannot be tampered with.
+
 ## Expiration
 
 By default derivation URLs are valid indefinitely. If you want URLs to expire

data/doc/plugins/rack_response.md

@@ -95,6 +95,15 @@ headers["Content-Range"]  #=> "bytes 100-200/1000"
 body                      # partial content
 ```
 
+## ETag
+
+A custom ETag value can be provided via the `:etag` option:
+
+```rb
+response = uploaded_file.to_rack_response(etag: "my-custom-etag")
+response[1]["ETag"] #=> "my-custom-etag"
+```
+
 ## Download options
 
 The `#to_rack_response` method will automatically open the `UploadedFile` if it

data/doc/release_notes/3.7.1.md

@@ -0,0 +1,13 @@
+---
+title: Shrine 3.7.1
+---
+
+## Bug fixes
+
+* When initializing Shrine with the `activerecord` plugin, under Bootsnap 1.24.5 and Ruby 3.4.5 this would raise an error:
+
+  ```
+  ArgumentError: wrong number of arguments (given 2, expected 1; required keyword: plugin)
+  ```
+
+  The seems to be triggered by a special combination of method signatures, where keyword arguments get converted into positional arguments under Bootsnap. To work around this issue, method signatures of some plugin methods have been updated.

data/lib/shrine/plugins/_persistence.rb

@@ -7,7 +7,7 @@ class Shrine
     #
     #     plugin :_persistence, plugin: MyPlugin
     module Persistence
-      def self.load_dependencies(uploader, *)
+      def self.load_dependencies(uploader, **)
         uploader.plugin :atomic_helpers
         uploader.plugin :entity
       end

data/lib/shrine/plugins/data_uri.rb

@@ -24,7 +24,7 @@ class Shrine
         }.inspect}"
       end
 
-      def self.load_dependencies(uploader, *)
+      def self.load_dependencies(uploader, **)
         uploader.plugin :validation
       end
 

data/lib/shrine/plugins/derivation_endpoint.rb

@@ -303,9 +303,9 @@ class Shrine
   class Derivation::Url < Derivation::Command
     delegate :name, :args, :source, :secret_key, :signer
 
-    def call(host: nil, prefix: nil, metadata: [], **)
+    def call(host: nil, prefix: nil, metadata: [], format: nil, **)
       base_url = [host, *prefix].join("/")
-      path = path_identifier(metadata:)
+      path = path_identifier(metadata:, format:)
 
       if signer
         url = [base_url, path].join("/")
@@ -318,12 +318,13 @@ class Shrine
 
     private
 
-    def path_identifier(metadata: [])
-      [
+    def path_identifier(metadata: [], format: nil)
+      path = [
         name,
         *args,
         source.urlsafe_dump(metadata:)
       ].map{|component| Rack::Utils.escape_path(component.to_s)}.join('/')
+      format ? "#{path}.#{format}" : path
     end
 
     def query(expires_in: nil,
@@ -386,6 +387,7 @@ class Shrine
       check_expiry!(request)
 
       name, *args, serialized_file = request.path_info.split("/")[1..-1]
+      serialized_file = serialized_file.sub(/\.\w+$/, "")
 
       name          = name.to_sym
       uploaded_file = shrine_class::UploadedFile.urlsafe_load(serialized_file)

data/lib/shrine/plugins/metadata_attributes.rb

@@ -4,7 +4,7 @@ class Shrine
   module Plugins
     # Documentation can be found on https://shrinerb.com/docs/plugins/metadata_attributes
     module MetadataAttributes
-      def self.load_dependencies(uploader, *)
+      def self.load_dependencies(uploader, **)
         uploader.plugin :entity
       end
 

data/lib/shrine/plugins/rack_response.rb

@@ -49,14 +49,14 @@ class Shrine
         # "Content-Disposition" headers, whose values are extracted from
         # metadata. Also returns the correct "Content-Range" header on ranged
         # requests.
-        def rack_headers(filename: nil, type: nil, disposition: "inline", range: false)
+        def rack_headers(filename: nil, type: nil, disposition: "inline", range: false, etag: nil)
           {
             "Content-Length"      => content_length(range),
             "Content-Type"        => content_type(type),
             "Content-Disposition" => content_disposition(disposition, filename),
             "Content-Range"       => content_range(range),
             "Accept-Ranges"       => accept_ranges(range),
-            "ETag"                => etag,
+            "ETag"                => etag || self.etag,
           }.compact
         end
 

data/lib/shrine/plugins/remote_url.rb

@@ -18,7 +18,7 @@ class Shrine
 
       DOWNLOADER = -> (url, **options) { Down.download(url, **options) }
 
-      def self.load_dependencies(uploader, *)
+      def self.load_dependencies(uploader, **)
         uploader.plugin :validation
       end
 

data/lib/shrine/plugins/validation_helpers.rb

@@ -32,7 +32,7 @@ class Shrine
         "%.1f %s" % [bytes.to_f / 1024 ** exp, FILESIZE_UNITS[exp]]
       end
 
-      def self.load_dependencies(uploader, *)
+      def self.load_dependencies(uploader, **)
         uploader.plugin :validation
       end
 

data/lib/shrine/version.rb

@@ -8,7 +8,7 @@ class Shrine
   module VERSION
     MAJOR = 3
     MINOR = 7
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/shrine.gemspec

@@ -67,10 +67,10 @@ direct uploads for fully asynchronous user experience.
 
   # for instrumentation plugin
   gem.add_development_dependency "dry-monitor"
-  gem.add_development_dependency "activesupport", RUBY_ENGINE == "jruby" ? "~> 7.0.0" : "~> 8.1"
+  gem.add_development_dependency "activesupport", RUBY_ENGINE == "jruby" ? "~> 7.2" : "~> 8.1"
 
   # for ORM plugins
   gem.add_development_dependency "sequel"
-  gem.add_development_dependency "activerecord", RUBY_ENGINE == "jruby" ? "~> 7.0.0" : "~> 8.1"
+  gem.add_development_dependency "activerecord", RUBY_ENGINE == "jruby" ? "~> 7.2" : "~> 8.1"
   gem.add_development_dependency "sqlite3", "~> 2.1" unless RUBY_ENGINE == "jruby"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Janko Marohnić
@@ -482,6 +482,7 @@ files:
 - doc/release_notes/3.5.0.md
 - doc/release_notes/3.6.0.md
 - doc/release_notes/3.7.0.md
+- doc/release_notes/3.7.1.md
 - doc/retrieving_uploads.md
 - doc/securing_uploads.md
 - doc/storage/file_system.md
@@ -575,7 +576,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Toolkit for file attachments in Ruby applications
 test_files: []