fastimage 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286c430f0c94ceafdbcbe884ae9bee4252e549c0
-  data.tar.gz: c006bb076bdefba5bfdea4f024c8f327189b0b83
+  metadata.gz: 74fc8be5d9ead8961a52aa89c0df0ff8a007f0c7
+  data.tar.gz: caad48d5e5120cb0e4ee877b0511cb62e4ec3b95
 SHA512:
-  metadata.gz: cb7f192a5d7c2909c9b5275305608ed3c2e9c97e6d7fc9d0bd1386b08e3ccc29621a8cff9ba3b83eae4651fdbf8c27b2aa0cd70c5dea50efcd0912c7d82fcdc2
-  data.tar.gz: 72a91dbf2da909e0ebadbbd902fb7ffbbd3d7718073726fed3b23044bbc67134892008d227607d0f27e4b89ba464a451526a95c3bb047ed353c9addb98485a63
+  metadata.gz: 5e72700677ce5ae10030abb6a8083025437997f44cb1c854ec6d9ca951363e5dd324e0d7c80eae0b35fbafe55592d30e7fad78aae6acf7a90496f11b903ed5a8
+  data.tar.gz: 97fdb59e67a882064d5989e0d0c17ee87ef35b133c0fb93183e733c487fb766fc7cb9411421a5fc5165edb616516ff70b98ea627c7887b261b16384077c03bee

data/lib/fastimage.rb

@@ -214,7 +214,7 @@ class FastImage
     raise SizeNotFound if @options[:raise_on_failure] && @property == :size && !@size
 
   rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET,
-    ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT
+    ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT, OpenSSL::SSL::SSLError
     raise ImageFetchFailure if @options[:raise_on_failure]
   rescue NoMethodError  # 1.8.7p248 can raise this due to a net/http bug
     raise ImageFetchFailure if @options[:raise_on_failure]
@@ -250,15 +250,7 @@ class FastImage
       if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
         @redirect_count += 1
         begin
-          newly_parsed_uri = URI.parse(res['Location'])
-          # The new location may be relative - check for that
-          if protocol_relative_url?(res['Location'])
-            @parsed_uri = URI.parse("#{@parsed_uri.scheme}:#{res['Location']}")
-          elsif newly_parsed_uri.scheme != "http" && newly_parsed_uri.scheme != "https"
-            @parsed_uri.path = res['Location']
-          else
-            @parsed_uri = newly_parsed_uri
-          end
+          @parsed_uri = URI.join(@parsed_uri, res['Location'])
         rescue URI::InvalidURIError
         else
           fetch_using_http_from_parsed_uri
@@ -539,7 +531,8 @@ class FastImage
           io = StringIO.new(data)
           if io.read(4) == "Exif"
             io.read(2)
-            exif = Exif.new(IOStream.new(io)) rescue nil
+            new_exif = Exif.new(IOStream.new(io)) rescue nil
+            exif ||= new_exif # only use the first APP1 segment
           end
           :started
         when 0xe0..0xef

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb