fastimage 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3ac7db254b241861f6b263dec85059a91802a6
-  data.tar.gz: 12ab9b17386c9d8cc62dff0924e273f3bd5da81c
+  metadata.gz: 3ee43e5740dcf6818e5c8d1125fad36e1bda9f57
+  data.tar.gz: 8b86b676562492da1da645cf7f94210aa0c71666
 SHA512:
-  metadata.gz: f0593a2af86dc99f70711b94a8950d0e58716dc7849592dfcd54be3cd19fff5f9d217961db54b774b33d6ec5241ff0789896f2130b474a74736b2d6def43825d
-  data.tar.gz: c813c61137248cf2005c406c1ce9d0d3e860929b4dd3c6ecc80bba2dbe4d010dbb14d939e5e049269c35ed6d6ebb0d451107e0b1022a048762fe02f5dcb86be4
+  metadata.gz: 7dea06d67cd7f9de2b06581cd130e52da3e2cca037214ca481326dc6340006e288186b734d392ea26c13a6a8a0ebd41d8dda0d7c9ada19448f5de6d4758a00b3
+  data.tar.gz: 9082130cc32246bd4fed77d9f6012029f5660f66049aa07b940eb56f5ecac14c7688e0d962a8343fcc3cb75eab44cb871ea9617fb586a2a6c5b85ed053f52f32

data/lib/fastimage.rb

@@ -53,8 +53,6 @@ class FastImage
 
   class FastImageException < StandardError # :nodoc:
   end
-  class MoreCharsNeeded < FastImageException # :nodoc:
-  end
   class UnknownImageType < FastImageException # :nodoc:
   end
   class ImageFetchFailure < FastImageException # :nodoc:
@@ -237,6 +235,21 @@ class FastImage
         end
       end
 
+      case res['content-encoding']
+      when 'deflate', 'gzip', 'x-gzip'
+        begin
+          gzip = Zlib::GzipReader.new(FiberStream.new(read_fiber))
+        rescue FiberError, Zlib::GzipFile::Error
+          raise CannotParseImage
+        end
+
+        read_fiber = Fiber.new do
+          while data = gzip.readline
+            Fiber.yield data
+          end
+        end
+      end
+      
       parse_packets FiberStream.new(read_fiber)
 
       break  # needed to actively quit out of the fetch

data/test/test.rb

@@ -56,6 +56,12 @@ BadFixtures.each do |fn|
   FakeWeb.register_uri(:get, "#{TestUrl}#{fn}", :body => File.join(FixturePath, fn))
 end
 
+GzipTestImg = "gzipped.jpg"
+FakeWeb.register_uri(:get, "#{TestUrl}#{GzipTestImg}", :body => File.join(FixturePath, GzipTestImg), :content_encoding => "gzip") 
+GzipTestImgTruncated = "truncated_gzipped.jpg"
+FakeWeb.register_uri(:get, "#{TestUrl}#{GzipTestImgTruncated}", :body => File.join(FixturePath, GzipTestImgTruncated), :content_encoding => "gzip") 
+GzipTestImgSize = [970, 450]
+
 class FastImageTest < Test::Unit::TestCase
   def test_should_report_type_correctly
     GoodFixtures.each do |fn, info|
@@ -258,4 +264,16 @@ class FastImageTest < Test::Unit::TestCase
       assert_equal info[1], FastImage.size(stringio)
     end
   end
+  
+  def test_gzipped_file
+    url = "http://example.nowhere/#{GzipTestImg}"
+    assert_equal([970, 450], FastImage.size(url))
+  end
+
+  def test_truncated_gzipped_file
+    url = "http://example.nowhere/#{GzipTestImgTruncated}"
+    assert_raises(FastImage::SizeNotFound) do
+      FastImage.size(url, :raise_on_failure => true)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -88,6 +88,7 @@ files:
 - test/fixtures/exif_orientation.jpg
 - test/fixtures/faulty.jpg
 - test/fixtures/folder with spaces/test.bmp
+- test/fixtures/gzipped.jpg
 - test/fixtures/infinite.jpg
 - test/fixtures/man.ico
 - test/fixtures/orient_2.jpg
@@ -103,6 +104,7 @@ files:
 - test/fixtures/test2.tiff
 - test/fixtures/test3.jpg
 - test/fixtures/test4.jpg
+- test/fixtures/truncated_gzipped.jpg
 - test/test.rb
 homepage: http://github.com/sdsykes/fastimage
 licenses: