shrine 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5820e9c06eec70c66a52ff3cc099847651076e2e
-  data.tar.gz: 6328bfb5edf7cb31a0e6b8ebb8a0815483451314
+  metadata.gz: 3ed9afc9d88a2781a07ccb93dabbcc8623149d58
+  data.tar.gz: b4f2759ea268ec45cd2d04221b5715bf27daf678
 SHA512:
-  metadata.gz: 41411c21937516fb928e686378c8b2d16a3a30ae9f1bf15c47010863a7d39c676c6a9ded87cad0a48f95108e1cc6dfc7e3cfab5363d79e73f3f14505fa05a9b9
-  data.tar.gz: 832a9a41216b0c2406b327bbb442aa0f82af69973afef87f7ee99abcc72ddde3d5634330f8b8cb9fc123589a171fd61cd2754079999d2e0d5d643f9ae493fe44
+  metadata.gz: 162a3fa939f7462da506c18abab20900fc5dc464cb59e9d200ad7d585e366255ac88f27235814e90e8ffbc660ce6e023ce49240fca755552133883e2a15adfc6
+  data.tar.gz: 51d52ca48da06898697bf4a3c2b35ce3c34518ad38a878b5aad9519b4c9755c14e2b90ffee188e6543b62bbf64f64f71bc6a6dbc2c6285d82605f033a826e4ac

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.10.1 (2018-04-02)
+
+* Correctly determine MIME type from extension of empty files (@janko-m)
+
 ## 2.10.0 (2018-03-28)
 
 * Add `:fastimage` analyzer to `determine_mime_type` plugin (@mokolabs)

data/lib/shrine/plugins/determine_mime_type.rb

@@ -155,8 +155,6 @@ class Shrine
         end
 
         def call(io)
-          return nil if io.eof? # empty file doesn't have a MIME type
-
           mime_type = send(:"extract_with_#{@tool}", io)
           io.rewind
 
@@ -180,7 +178,8 @@ class Shrine
             raise Error, stderr.read unless status.success?
             $stderr.print(stderr.read)
 
-            stdout.read.strip
+            mime_type = stdout.read.strip
+            mime_type unless mime_type == "application/x-empty"
           end
         rescue Errno::ENOENT
           raise Error, "The `file` command-line tool is not installed"
@@ -197,7 +196,8 @@ class Shrine
           require "filemagic"
 
           FileMagic.open(FileMagic::MAGIC_MIME_TYPE) do |filemagic|
-            filemagic.buffer(io.read(MAGIC_NUMBER))
+            mime_type = filemagic.buffer(io.read(MAGIC_NUMBER).to_s)
+            mime_type unless mime_type == "application/x-empty"
           end
         end
 
@@ -211,6 +211,8 @@ class Shrine
         def extract_with_marcel(io)
           require "marcel"
 
+          return nil if io.eof? # marcel returns "application/octet-stream" for empty files
+
           Marcel::MimeType.for(io)
         end
 

data/lib/shrine/version.rb

@@ -8,7 +8,7 @@ class Shrine
   module VERSION
     MAJOR = 2
     MINOR = 10
-    TINY  = 0
+    TINY  = 1
     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.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down