dragonfly 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 785986a8487e1cb1e971e16b2eb88dc51794d490
-  data.tar.gz: e76af75be5d2f6a224a042ab4f6b53dd8de93e5d
+  metadata.gz: 318cb26946caa19202dc1c572f4b64014a35e08a
+  data.tar.gz: 5ef7ed322415297775465630d3ae4bc65cfefdf9
 SHA512:
-  metadata.gz: 528e4445092921b2c590cf787c6a23aa1a0c3f912ae9bea19416f60672605693735d33d0c6f709334c68555b087afeb7b72bfd7666187c3745eecc9fb891d27f
-  data.tar.gz: c814aa4308afd5bb698c3e2f61605ffe6650d244fe8fbe3d84b843cf266c4e5ad9ea062d0bf0195b0856f758b213331e1d5ee9f4f1349fcd9dcd63710dcf0e8d
+  metadata.gz: fa6361437c7a1e6e9b0d963d989d171f3fe3518d224b91666ca61a93729f0147bfad254e898231b86215e280125850ad9bcda2dc2c60b17bf6387274a29967fa
+  data.tar.gz: 541b9b2ac910788a66af52937abb7d6674798dfdbd6de385fe5095e7fa8db6c82c5588ff6e1fe2a11bed8dcb7e00158b378fb9585aab723d39ad5d8fed764cc7

data/History.md

@@ -1,3 +1,9 @@
+1.1.3 (2017-06-02)
+===================
+Fixes
+-----
+- Make sure imagemagick convert processor updates mime_type correctly when format is changed
+
 1.1.2 (2017-05-06)
 ===================
 Fixes

data/README.md

@@ -44,7 +44,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.1.2'
+gem 'dragonfly', '~> 1.1.3'
 ```
 
 Require with

data/lib/dragonfly/image_magick/processors/convert.rb

@@ -18,6 +18,7 @@ module Dragonfly
           if format
             content.meta['format'] = format.to_s
             content.ext = format
+            content.meta['mime_type'] = nil # don't need it as we have ext now
           end
         end
 

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/dragonfly/image_magick/processors/convert_spec.rb

@@ -67,4 +67,22 @@ describe Dragonfly::ImageMagick::Processors::Convert do
       processor.call(image, '', 'format' => 'jpg', 'delegate' => 'png')
     }.to call_command(app.shell, %r{'convert' 'png:/[^']+?/beach\.png' '/[^']+?\.jpg'})
   end
+
+  it "maintains the mime_type meta if it exists already" do
+    processor.call(image, '-resize 10x')
+    image.meta['mime_type'].should be_nil
+
+    image.add_meta('mime_type' => 'image/png')
+    processor.call(image, '-resize 5x')
+    image.meta['mime_type'].should == 'image/png'
+    image.mime_type.should == 'image/png' # sanity check
+  end
+
+  it "doesn't maintain the mime_type meta on format change" do
+    image.add_meta('mime_type' => 'image/png')
+    processor.call(image, '', 'format' => 'gif')
+    image.meta['mime_type'].should be_nil
+    image.mime_type.should == 'image/gif' # sanity check
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack