shrine 3.4.0 → 3.5.0

data/lib/shrine/storage/s3.rb

@@ -47,6 +47,10 @@ class Shrine
       #   `{upload: 15*1024*1024, copy: 100*1024*1024}` (15MB for upload
       #   requests, 100MB for copy requests).
       #
+      # :max_multipart_parts
+      # : Limits the number of parts if parellized multipart upload/copy is used.
+      # Defaults to 10_000.
+      #
       # In addition to specifying the `:bucket`, you'll also need to provide
       # AWS credentials. The most common way is to provide them directly via
       # `:access_key_id`, `:secret_access_key`, and `:region` options. But you
@@ -58,7 +62,7 @@ class Shrine
       # [`Aws::S3::Bucket#presigned_post`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_post-instance_method
       # [`Aws::S3::Client#initialize`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Client.html#initialize-instance_method
       # [configuring AWS SDK]: https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/setup-config.html
-      def initialize(bucket:, client: nil, prefix: nil, upload_options: {}, multipart_threshold: {}, signer: nil, public: nil, **s3_options)
+      def initialize(bucket:, client: nil, prefix: nil, upload_options: {}, multipart_threshold: {}, max_multipart_parts: nil, signer: nil, public: nil, **s3_options)
         raise ArgumentError, "the :bucket option is nil" unless bucket
 
         @client = client || Aws::S3::Client.new(**s3_options)
@@ -66,6 +70,7 @@ class Shrine
         @prefix = prefix
         @upload_options = upload_options
         @multipart_threshold = MULTIPART_THRESHOLD.merge(multipart_threshold)
+        @max_multipart_parts = max_multipart_parts || MAX_MULTIPART_PARTS
         @signer = signer
         @public = public
       end
@@ -98,15 +103,16 @@ class Shrine
       # Returns a `Down::ChunkedIO` object that downloads S3 object content
       # on-demand. By default, read content will be cached onto disk so that
       # it can be rewinded, but if you don't need that you can pass
-      # `rewindable: false`.
+      # `rewindable: false`. A required character encoding can be passed in
+      # `encoding`; the default is `Encoding::BINARY` via `Down::ChunkedIO`.
       #
       # Any additional options are forwarded to [`Aws::S3::Object#get`].
       #
       # [`Aws::S3::Object#get`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#get-instance_method
-      def open(id, rewindable: true, **options)
+      def open(id, rewindable: true, encoding: nil, **options)
         chunks, length = get(id, **options)
 
-        Down::ChunkedIO.new(chunks: chunks, rewindable: rewindable, size: length)
+        Down::ChunkedIO.new(chunks: chunks, rewindable: rewindable, size: length, encoding: encoding)
       rescue Aws::S3::Errors::NoSuchKey
         raise Shrine::FileNotFound, "file #{id.inspect} not found on storage"
       end
@@ -232,7 +238,11 @@ class Shrine
       # Copies an existing S3 object to a new location. Uses multipart copy for
       # large files.
       def copy(io, id, **copy_options)
-        options = { metadata_directive: "REPLACE" } # don't inherit source object metadata
+        # don't inherit source object metadata or AWS tags
+        options = {
+          metadata_directive: "REPLACE",
+          tagging_directive: "REPLACE"
+        }
 
         if io.size && io.size >= @multipart_threshold[:copy]
           # pass :content_length on multipart copy to avoid an additional HEAD request
@@ -273,10 +283,10 @@ class Shrine
       def part_size(io)
         return unless io.respond_to?(:size) && io.size
 
-        if io.size <= MIN_PART_SIZE * MAX_MULTIPART_PARTS # <= 50 GB
+        if io.size <= MIN_PART_SIZE * @max_multipart_parts # <= 50 GB
           MIN_PART_SIZE
         else # > 50 GB
-          (io.size.to_f / MAX_MULTIPART_PARTS).ceil
+          (io.size.to_f / @max_multipart_parts).ceil
         end
       end
 

data/lib/shrine/uploaded_file.rb

@@ -50,8 +50,9 @@ class Shrine
       # The extension derived from #id if present, otherwise it's derived
       # from #original_filename.
       def extension
-        result = File.extname(id)[1..-1] || File.extname(original_filename.to_s)[1..-1]
-        result.sub!(/\?.+$/, "") if result && id =~ URI::regexp # strip query params for shrine-url
+        identifier = id =~ URI::DEFAULT_PARSER.make_regexp ? id.sub(/\?.+$/, "") : id # strip query params for shrine-url
+        result = File.extname(identifier)[1..-1]
+        result ||= File.extname(original_filename.to_s)[1..-1]
         result.downcase if result
       end
 

data/lib/shrine/version.rb

@@ -7,7 +7,7 @@ class Shrine
 
   module VERSION
     MAJOR = 3
-    MINOR = 4
+    MINOR = 5
     TINY  = 0
     PRE   = nil
 

data/lib/shrine.rb

@@ -252,7 +252,7 @@ class Shrine
     def extract_filename(io)
       if io.respond_to?(:original_filename)
         io.original_filename
-      elsif io.respond_to?(:path)
+      elsif io.respond_to?(:path) && io.path
         File.basename(io.path)
       end
     end

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_VERSION >= "2.5" ? "~> 6.0" : "~> 5.2"
+  gem.add_development_dependency "activesupport", RUBY_VERSION >= "2.7" ? "~> 7.0" : RUBY_VERSION >= "2.5" ? "~> 6.0" : "~> 5.2"
 
   # for ORM plugins
   gem.add_development_dependency "sequel"
-  gem.add_development_dependency "activerecord", RUBY_VERSION >= "2.5" ? "~> 6.0" : "~> 5.2"
+  gem.add_development_dependency "activerecord", 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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -474,6 +474,7 @@ files:
 - doc/release_notes/3.2.2.md
 - doc/release_notes/3.3.0.md
 - doc/release_notes/3.4.0.md
+- doc/release_notes/3.5.0.md
 - doc/retrieving_uploads.md
 - doc/securing_uploads.md
 - doc/storage/file_system.md
@@ -568,7 +569,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Toolkit for file attachments in Ruby applications