shrine 2.8.0 → 2.9.0

data/lib/shrine/storage/s3.rb

@@ -1,13 +1,19 @@
+# frozen_string_literal: true
+
 require "shrine"
 begin
   require "aws-sdk-s3"
   if Gem::Version.new(Aws::S3::GEM_VERSION) < Gem::Version.new("1.2.0")
     raise "Shrine::Storage::S3 requires aws-sdk-s3 version 1.2.0 or above"
   end
-rescue LoadError
-  Shrine.deprecation("Using aws-sdk 2.x is deprecated and support for it will be removed in Shrine 3, use the new aws-sdk-s3 gem instead.")
-  require "aws-sdk"
-  Aws.eager_autoload!(services: ["S3"])
+rescue LoadError => exception
+  begin
+    require "aws-sdk"
+    Shrine.deprecation("Using aws-sdk 2.x is deprecated and support for it will be removed in Shrine 3, use the new aws-sdk-s3 gem instead.")
+    Aws.eager_autoload!(services: ["S3"])
+  rescue LoadError
+    raise exception
+  end
 end
 require "down/chunked_io"
 require "uri"
@@ -256,6 +262,9 @@ class Shrine
         tempfile.singleton_class.instance_eval { attr_accessor :content_type }
         tempfile.content_type = object.content_type
         tempfile.tap(&:open)
+      rescue
+        tempfile.close! if tempfile
+        raise
       end
 
       # Returns a `Down::ChunkedIO` object representing the S3 object. Any
@@ -332,12 +341,6 @@ class Shrine
         object(id).delete
       end
 
-      # Deletes multiple files at once from the storage.
-      def multi_delete(ids)
-        objects_to_delete = ids.map { |id| object(id) }
-        delete_objects(objects_to_delete)
-      end
-
       # If block is given, deletes all objects from the storage for which the
       # block evaluates to true. Otherwise deletes all objects from the storage.
       #
@@ -377,7 +380,7 @@ class Shrine
       # large files.
       def copy(io, id, **options)
         # pass :content_length on multipart copy to avoid an additional HEAD request
-        options = {multipart_copy: true, content_length: io.size}.update(options) if io.size && io.size >= @multipart_threshold[:copy]
+        options = { multipart_copy: true, content_length: io.size }.merge!(options) if io.size && io.size >= @multipart_threshold[:copy]
         object(id).copy_from(io.storage.object(io.id), **options)
       end
 
@@ -391,7 +394,7 @@ class Shrine
 
         if path
           # use `upload_file` for files because it can do multipart upload
-          options = {multipart_threshold: @multipart_threshold[:upload]}.update(options)
+          options = { multipart_threshold: @multipart_threshold[:upload] }.merge!(options)
           object(id).upload_file(path, **options)
         else
           object(id).put(body: io, **options)
@@ -419,7 +422,7 @@ class Shrine
       # should automatically URI-decode filenames when downloading.
       def encode_content_disposition(content_disposition)
         content_disposition.sub(/(?<=filename=").+(?=")/) do |filename|
-          CGI.escape(filename).sub("+", " ")
+          CGI.escape(filename).gsub("+", " ")
         end
       end
     end

data/lib/shrine/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Shrine
   def self.version
     Gem::Version.new VERSION::STRING
@@ -5,7 +7,7 @@ class Shrine
 
   module VERSION
     MAJOR = 2
-    MINOR = 8
+    MINOR = 9
     TINY  = 0
     PRE   = nil
 

data/shrine.gemspec

@@ -23,23 +23,24 @@ direct uploads for fully asynchronous user experience.
   gem.email        = ["janko.marohnic@gmail.com"]
   gem.license      = "MIT"
 
-  gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine.gemspec", "doc/*.md"]
+  gem.files        = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*.rb", "shrine.gemspec", "doc/*.md"]
   gem.require_path = "lib"
 
   gem.add_dependency "down", "~> 4.1"
 
-  gem.add_development_dependency "rake", "~> 11.1"
+  gem.add_development_dependency "rake", ">= 11.1"
   gem.add_development_dependency "minitest", "~> 5.8"
-  gem.add_development_dependency "minitest-hooks", "~> 1.3.0"
+  gem.add_development_dependency "minitest-hooks", "~> 1.3"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "rack-test_app"
   gem.add_development_dependency "shrine-memory", ">= 0.2.2"
 
   gem.add_development_dependency "roda"
   gem.add_development_dependency "rack"
-  gem.add_development_dependency "mimemagic"
+  gem.add_development_dependency "mimemagic", ">= 0.3.2"
+  gem.add_development_dependency "marcel" if RUBY_VERSION >= "2.2.0"
   gem.add_development_dependency "mime-types"
-  gem.add_development_dependency "mini_mime"
+  gem.add_development_dependency "mini_mime", "~> 1.0"
   gem.add_development_dependency "fastimage"
   gem.add_development_dependency "aws-sdk-s3", "~> 1.2"
 
@@ -51,7 +52,7 @@ direct uploads for fully asynchronous user experience.
   gem.add_development_dependency "activerecord", "~> 4.2"
 
   if RUBY_ENGINE == "jruby"
-    gem.add_development_dependency "activerecord-jdbcsqlite3-adapter"
+    gem.add_development_dependency "activerecord-jdbcsqlite3-adapter", "1.3.24"
   else
     gem.add_development_dependency "sqlite3"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.1'
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -142,16 +142,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_mime
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_mime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +291,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - doc/attacher.md
@@ -313,6 +328,7 @@ files:
 - lib/shrine/plugins/dynamic_storage.rb
 - lib/shrine/plugins/hooks.rb
 - lib/shrine/plugins/included.rb
+- lib/shrine/plugins/infer_extension.rb
 - lib/shrine/plugins/keep_files.rb
 - lib/shrine/plugins/logging.rb
 - lib/shrine/plugins/metadata_attributes.rb