shrine 2.19.1 → 2.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0846af73d2a421712ff8e555dc2570115e8f7261'
-  data.tar.gz: b3a033fa950c7a55203c179e24aed2d72c40b3f2
+SHA256:
+  metadata.gz: 14cd1140359997859d3f25aa72f22d425e778f7cfec37af3570690a45985f9d3
+  data.tar.gz: 1e2b2f745d676377b6eaab0169290475feb1735583331c52f397e6adbe9d7a7b
 SHA512:
-  metadata.gz: 56d4630870e6dc0ee182828d30b4a0ac3f3f8c7f5e1b2df044931791091e82f66dd15eb14827914a5501600a30eb736d16aebf0980b438922c84a463bd62febc
-  data.tar.gz: ae223fef4115d4292d97eb7c19ff29c310fae3bffc63f9bb8e239281a629af571805a9e86eda02a332c91a15a3e8bd28bf92106a8ad3f546c4f5bc69a6a0f444
+  metadata.gz: 7e2c323641f065c9cca255dc4d036404ec3c0e18ec55632f2ce73351d166e08767720c77660090cd41f225028762f9af6b7559dc0ebc94355e3741dcd6f06a52
+  data.tar.gz: 8b1666efb1bdd5e4d4e06376398f2d82e60aab9e4a1113570bd72c790d51b0ee6d4370ee1465cea32ae43d8d7e62610408b45999fa504bd8cb817d34435bfd2d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.19.2 (2018-07-25)
+
+* `default_url_options` – Allow deleting passed options when using a block (@janko)
+
+* `activerecord` – Make it work with ActiveRecord 3 (@texpert)
+
+* `infer_extension` – Fix compatibility with `pretty_location` plugin (@janko)
+
 ## 2.19.1 (2018-07-20)
 
 * Bring back support for Ruby 2.3 (@janko)

data/doc/plugins/default_url_options.md

@@ -13,7 +13,7 @@ which will receive the UploadedFile object along with any options that were
 passed to `UploadedFile#url`.
 
 ```rb
-plugin :default_url_options, store: -> (io, **options) do
+plugin :default_url_options, store: -> (io, options) do
   { response_content_disposition: ContentDisposition.attachment(io.original_filename) }
 end
 ```

data/lib/shrine.rb

@@ -244,7 +244,7 @@ class Shrine
     # file extension. Can be overriden in uploaders for generating custom
     # location.
     def generate_location(io, context = {})
-      basic_location(io)
+      basic_location(io, metadata: context[:metadata] || {})
     end
 
     # Extracts filename, size and MIME type from the file, which is later
@@ -337,7 +337,7 @@ class Shrine
     end
 
     # Generates a basic location for an uploaded file
-    def basic_location(io)
+    def basic_location(io, metadata:)
       extension   = ".#{io.extension}" if io.is_a?(UploadedFile) && io.extension
       extension ||= File.extname(extract_filename(io).to_s).downcase
       basename    = generate_uid(io)

data/lib/shrine/plugins/activerecord.rb

@@ -35,12 +35,14 @@ class Shrine
               attacher.save if attacher.changed?
             end
 
-            model.after_commit on: [:create, :update] do
-              attacher = send("#{name}_attacher")
-              attacher.finalize if attacher.changed?
+            [:create, :update].each do |action|
+              model.after_commit on: action do
+                attacher = send("#{name}_attacher")
+                attacher.finalize if attacher.changed?
+              end
             end
 
-            model.after_commit on: [:destroy] do
+            model.after_commit on: :destroy do
               send("#{name}_attacher").destroy
             end
           end

data/lib/shrine/plugins/default_url_options.rb

@@ -14,7 +14,7 @@ class Shrine
       module FileMethods
         def url(**options)
           default_options   = default_url_options
-          default_options   = default_options.call(self, **options) if default_options.respond_to?(:call)
+          default_options   = default_options.call(self, options) if default_options.respond_to?(:call)
           default_options ||= {}
 
           super(default_options.merge(options))

data/lib/shrine/plugins/infer_extension.rb

@@ -53,14 +53,12 @@ class Shrine
       end
 
       module InstanceMethods
-        def generate_location(io, context = {})
-          mime_type = (context[:metadata] || {})["mime_type"]
-
+        def basic_location(io, metadata:)
           location = super
           current_extension = File.extname(location)
 
           if current_extension.empty? || opts[:infer_extension][:force]
-            inferred_extension = infer_extension(mime_type)
+            inferred_extension = infer_extension(metadata["mime_type"])
             location = location.chomp(current_extension) << inferred_extension unless inferred_extension.empty?
           end
 

data/lib/shrine/plugins/pretty_location.rb

@@ -16,13 +16,13 @@ class Shrine
           pretty_location(io, context)
         end
 
-        def pretty_location(io, name: nil, record: nil, version: nil, identifier: nil, **)
+        def pretty_location(io, name: nil, record: nil, version: nil, identifier: nil, metadata: {}, **)
           if record
             namespace    = record_namespace(record)
             identifier ||= record_identifier(record)
           end
 
-          basename = basic_location(io)
+          basename = basic_location(io, metadata: metadata)
           basename = "#{version}-#{basename}" if version
 
           [*namespace, *identifier, *name, basename].join("/")

data/lib/shrine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.19.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -566,8 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Toolkit for file attachments in Ruby applications