shrine 3.6.0 → 3.7.0

data/lib/shrine.rb

@@ -68,9 +68,9 @@ class Shrine
     #
     #     Shrine.plugin MyPlugin
     #     Shrine.plugin :my_plugin
-    def plugin(plugin, *args, **kwargs, &block)
+    def plugin(plugin, ...)
       plugin = Plugins.load_plugin(plugin) if plugin.is_a?(Symbol)
-      Plugins.load_dependencies(plugin, self, *args, **kwargs, &block)
+      Plugins.load_dependencies(plugin, self, ...)
       self.include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
       self.extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
       self::UploadedFile.include(plugin::FileMethods) if defined?(plugin::FileMethods)
@@ -79,7 +79,7 @@ class Shrine
       self::Attachment.extend(plugin::AttachmentClassMethods) if defined?(plugin::AttachmentClassMethods)
       self::Attacher.include(plugin::AttacherMethods) if defined?(plugin::AttacherMethods)
       self::Attacher.extend(plugin::AttacherClassMethods) if defined?(plugin::AttacherClassMethods)
-      Plugins.configure(plugin, self, *args, **kwargs, &block)
+      Plugins.configure(plugin, self, ...)
       plugin
     end
 
@@ -95,8 +95,8 @@ class Shrine
     #     class Photo
     #       include Shrine::Attachment(:image) # creates a Shrine::Attachment object
     #     end
-    def Attachment(name, **args)
-      self::Attachment.new(name, **args)
+    def Attachment(name, **)
+      self::Attachment.new(name, **)
     end
     alias attachment Attachment
     alias [] Attachment
@@ -104,8 +104,8 @@ class Shrine
     # Uploads the file to the specified storage. It delegates to `Shrine#upload`.
     #
     #     Shrine.upload(io, :store) #=> #<Shrine::UploadedFile>
-    def upload(io, storage, **options)
-      new(storage).upload(io, **options)
+    def upload(io, storage, **)
+      new(storage).upload(io, **)
     end
 
     # Instantiates a Shrine::UploadedFile from a hash, and optionally
@@ -201,13 +201,13 @@ class Shrine
     #   uploader.upload(io, metadata: { "foo" => "bar" })           # add metadata
     #   uploader.upload(io, location: "path/to/file")               # specify location
     #   uploader.upload(io, upload_options: { acl: "public-read" }) # add upload options
-    def upload(io, **options)
+    def upload(io, **)
       _enforce_io(io)
 
-      metadata = get_metadata(io, **options)
-      location = get_location(io, **options, metadata: metadata)
+      metadata = get_metadata(io, **)
+      location = get_location(io, **, metadata:)
 
-      _upload(io, **options, location: location, metadata: metadata)
+      _upload(io, **, location:, metadata:)
 
       self.class::UploadedFile.new(
         id:       location,
@@ -219,13 +219,13 @@ class Shrine
     # Generates a unique location for the uploaded file, preserving the
     # file extension. Can be overriden in uploaders for generating custom
     # location.
-    def generate_location(io, metadata: {}, **options)
-      basic_location(io, metadata: metadata)
+    def generate_location(io, metadata: {}, **)
+      basic_location(io, metadata:)
     end
 
     # Extracts filename, size and MIME type from the file, which is later
     # accessible through UploadedFile#metadata.
-    def extract_metadata(io, **options)
+    def extract_metadata(io, **)
       {
         "filename"  => extract_filename(io),
         "size"      => extract_size(io),
@@ -281,11 +281,11 @@ class Shrine
 
     # If the IO object is a Shrine::UploadedFile, it simply copies over its
     # metadata, otherwise it calls #extract_metadata.
-    def get_metadata(io, metadata: nil, **options)
+    def get_metadata(io, metadata: nil, **)
       if io.is_a?(UploadedFile) && metadata != true
         result = io.metadata.dup
       elsif metadata != false
-        result = extract_metadata(io, **options)
+        result = extract_metadata(io, **)
       else
         result = {}
       end
@@ -296,8 +296,8 @@ class Shrine
 
     # Retrieves the location for the given IO and context. First it looks
     # for the `:location` option, otherwise it calls #generate_location.
-    def get_location(io, location: nil, **options)
-      location ||= generate_location(io, **options)
+    def get_location(io, location: nil, **)
+      location ||= generate_location(io, **)
       location or fail Error, "location generated for #{io.inspect} was nil"
     end
 

data/shrine.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |gem|
   gem.name         = "shrine"
   gem.version      = Shrine.version
 
-  gem.required_ruby_version = ">= 2.3"
+  gem.required_ruby_version = ">= 3.2"
 
   gem.summary      = "Toolkit for file attachments in Ruby applications"
   gem.description  = <<-END
@@ -38,7 +38,7 @@ direct uploads for fully asynchronous user experience.
 
   # general testing helpers
   gem.add_development_dependency "rake", ">= 11.1"
-  gem.add_development_dependency "minitest", "~> 5.8"
+  gem.add_development_dependency "minitest", "~> 6.0"
   gem.add_development_dependency "mocha", "~> 1.11"
 
   # for endpoint plugins
@@ -57,7 +57,7 @@ direct uploads for fully asynchronous user experience.
 
   # for store_dimensions plugin
   gem.add_development_dependency "fastimage"
-  gem.add_development_dependency "mini_magick", "~> 4.0" unless ENV["CI"]
+  gem.add_development_dependency "mini_magick", "~> 5.0" unless ENV["CI"]
   gem.add_development_dependency "ruby-vips", "~> 2.0" unless ENV["CI"]
 
   # for S3 storage
@@ -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_VERSION >= "2.7" ? "~> 7.0" : RUBY_VERSION >= "2.5" ? "~> 6.0" : "~> 5.2"
+  gem.add_development_dependency "activesupport", RUBY_ENGINE == "jruby" ? "~> 7.0.0" : "~> 8.1"
 
   # for ORM plugins
   gem.add_development_dependency "sequel"
-  gem.add_development_dependency "activerecord", RUBY_ENGINE == "jruby" ? "~> 7.0.0" : RUBY_VERSION >= "2.7" ? "~> 7.0" : RUBY_VERSION >= "2.5" ? "~> 6.0" : "~> 5.2"
-  gem.add_development_dependency "sqlite3", "~> 1.4" unless RUBY_ENGINE == "jruby"
+  gem.add_development_dependency "activerecord", RUBY_ENGINE == "jruby" ? "~> 7.0.0" : "~> 8.1"
+  gem.add_development_dependency "sqlite3", "~> 2.1" unless RUBY_ENGINE == "jruby"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +217,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
@@ -302,14 +301,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -330,28 +329,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
 description: |
   Shrine is a toolkit for file attachments in Ruby applications. It supports
   uploading, downloading, processing and deleting IO objects, backed by various
@@ -482,6 +481,7 @@ files:
 - doc/release_notes/3.4.0.md
 - doc/release_notes/3.5.0.md
 - doc/release_notes/3.6.0.md
+- doc/release_notes/3.7.0.md
 - doc/retrieving_uploads.md
 - doc/securing_uploads.md
 - doc/storage/file_system.md
@@ -561,7 +561,6 @@ metadata:
   documentation_uri: https://shrinerb.com
   mailing_list_uri: https://discourse.shrinerb.com
   source_code_uri: https://github.com/shrinerb/shrine
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -569,15 +568,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Toolkit for file attachments in Ruby applications
 test_files: []