fastimage 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53b20cff044a6f154f24155070dc9146cd70ff7
-  data.tar.gz: c3e80b5e1bb01f18f73149a19c6772244f7fead1
+  metadata.gz: 0c3ac7db254b241861f6b263dec85059a91802a6
+  data.tar.gz: 12ab9b17386c9d8cc62dff0924e273f3bd5da81c
 SHA512:
-  metadata.gz: 1d99e7827d87d3cc564d67130e54c5a7716259796ea1c5bd3513023824e8251af2d80426294577ddd8d58691908e5679d032ec19559f922f86d7890a8a85a104
-  data.tar.gz: 758414866ee9b5e278e997afb4954641d27961fbfe4876f96ec6b25db6cb5021f57fd0ab10b68d5be4beb108cbd3fe3491a85a8e25e8138b2e294e06323d957e
+  metadata.gz: f0593a2af86dc99f70711b94a8950d0e58716dc7849592dfcd54be3cd19fff5f9d217961db54b774b33d6ec5241ff0789896f2130b474a74736b2d6def43825d
+  data.tar.gz: c813c61137248cf2005c406c1ce9d0d3e860929b4dd3c6ecc80bba2dbe4d010dbb14d939e5e049269c35ed6d6ebb0d451107e0b1022a048762fe02f5dcb86be4

data/README.textile

@@ -10,9 +10,9 @@ Your app needs to find the size or type of an image.  This could be for adding w
 
 But the image is not locally stored - it's on another asset server, or in the cloud - at Amazon S3 for example.
 
-You don't want to download the entire image to your app server - it could be many tens of kilobytes, or even megabytes just to get this information.  For most common image types (GIF, PNG, BMP), the size of the image is simply stored at the start of the file.  For JPEG files it's a little bit more complex, but even so you do not need to fetch much of the image to find the size.
+You don't want to download the entire image to your app server - it could be many tens of kilobytes, or even megabytes just to get this information.  For most common image types (GIF, PNG, BMP etc.), the size of the image is simply stored at the start of the file.  For JPEG files it's a little bit more complex, but even so you do not need to fetch much of the image to find the size.
 
-FastImage does this minimal fetch for image types GIF, JPEG, PNG, TIFF, BMP and PSD.  And it doesn't rely on installing external libraries such as RMagick (which relies on ImageMagick or GraphicsMagick) or ImageScience (which relies on FreeImage).
+FastImage does this minimal fetch for image types GIF, JPEG, PNG, TIFF, BMP, ICO, CUR and PSD.  And it doesn't rely on installing external libraries such as RMagick (which relies on ImageMagick or GraphicsMagick) or ImageScience (which relies on FreeImage).
 
 You only need supply the uri, and FastImage will do the rest.
 
@@ -98,7 +98,7 @@ irb> puts Benchmark.measure {p FastImage.size(uri)}
 
 h2. Tests
 
-You'll need to @gem install fakeweb@ to be able to run the tests.
+You'll need to @gem install fakeweb@ and possibly also  @gem install test-unit@ to be able to run the tests.
 
 bc.. $ ruby test.rb 
 Run options: 
@@ -130,3 +130,5 @@ Pull requests and suggestions are always welcome. Thanks to all the contributors
 * @benjaminjackson
 * @muffinista
 * @marcandre
+* @apanzerj
+

data/lib/fastimage.rb

@@ -8,7 +8,7 @@
 # No external libraries such as ImageMagick are used here, this is a very lightweight solution to
 # finding image information.
 #
-# FastImage knows about GIF, JPEG, BMP, TIFF, PNG and PSD files.
+# FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG and PSD files.
 #
 # FastImage can also read files from the local filesystem by supplying the path instead of a uri.
 # In this case FastImage uses the Addressable library to read the file in chunks of 256 bytes until
@@ -77,7 +77,7 @@ class FastImage
   # If you wish FastImage to raise if it cannot size the image for any reason, then pass
   # :raise_on_failure => true in the options.
   #
-  # FastImage knows about GIF, JPEG, BMP, TIFF, PNG and PSD files.
+  # FastImage knows about GIF, JPEG, BMP, TIFF, PNG, PSD, ICO and CUR files.
   #
   # === Example
   #
@@ -98,6 +98,8 @@ class FastImage
   #   FastImage.size("http://pennysmalls.com/does_not_exist", :raise_on_failure=>true)
   #   => raises FastImage::ImageFetchFailure
   #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true)
+  #   => [16, 16]
+  #   FastImage.size("http://stephensykes.com/images/squareBlue.icns", :raise_on_failure=>true)
   #   => raises FastImage::UnknownImageType
   #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
   #   => raises FastImage::ImageFetchFailure
@@ -137,7 +139,7 @@ class FastImage
   #   => :bmp
   #   FastImage.type("test/fixtures/test.jpg")
   #   => :jpeg
-  #   FastImage.type("http://pennysmalls.com/does_not_exist")
+  #   FastImage.type("http://stephensykes.com/does_not_exist")
   #   => nil
   #   File.open("/some/local/file.gif", "r") {|io| FastImage.type(io)}
   #   => :gif
@@ -377,11 +379,22 @@ class FastImage
       :tiff
     when '8B'
       :psd
+    when "\0\0"
+      # ico has either a 1 (for ico format) or 2 (for cursor) at offset 3
+      case @stream.peek(3).bytes.to_a.last
+      when 1 then :ico
+      when 2 then :cur
+      end
     else
       raise UnknownImageType
     end
   end
 
+  def parse_size_for_ico
+    @stream.read(8)[6..7].unpack('CC').map{|byte| byte == 0 ? 256 : byte }
+  end
+  alias_method :parse_size_for_cur, :parse_size_for_ico
+
   def parse_size_for_gif
     @stream.read(11)[6..10].unpack('SS')
   end

data/test/test.rb

@@ -24,13 +24,19 @@ GoodFixtures = {
   "test.psd"=>[:psd, [17, 32]],
   "exif_orientation.jpg"=>[:jpeg, [600, 450]],
   "infinite.jpg"=>[:jpeg, [160,240]],
-  "orient_2.jpg"=>[:jpeg, [230,408]]
+  "orient_2.jpg"=>[:jpeg, [230,408]],
+  "favicon.ico" => [:ico, [16, 16]],
+  "man.ico" => [:ico, [48, 48]],
+  "test.cur" => [:cur, [32, 32]]
 }
 
 BadFixtures = [
   "faulty.jpg",
-  "test.ico"
+  "test_rgb.ct"
 ]
+# man.ico courtesy of http://www.iconseeker.com/search-icon/artists-valley-sample/business-man-blue.html
+# test_rgb.ct courtesy of http://fileformats.archiveteam.org/wiki/Scitex_CT
+# test.cur courtesy of http://mimidestino.deviantart.com/art/Clash-Of-Clans-Dragon-Cursor-s-Punteros-489070897
 
 TestUrl = "http://example.nowhere/"
 
@@ -74,7 +80,7 @@ class FastImageTest < Test::Unit::TestCase
   end
 
   def test_should_return_nil_when_image_type_not_known
-    assert_nil FastImage.size(TestUrl + "test.ico")
+    assert_nil FastImage.size(TestUrl + "test_rgb.ct")
   end
 
   def test_should_return_nil_if_timeout_occurs
@@ -101,7 +107,7 @@ class FastImageTest < Test::Unit::TestCase
 
   def test_should_raise_when_asked_when_image_type_not_known
     assert_raises(FastImage::UnknownImageType) do
-      FastImage.size(TestUrl + "test.ico", :raise_on_failure=>true)
+      FastImage.size(TestUrl + "test_rgb.ct", :raise_on_failure=>true)
     end
   end
 
@@ -157,7 +163,7 @@ class FastImageTest < Test::Unit::TestCase
   end
 
   def test_should_return_nil_when_image_type_not_known_for_local_file
-    assert_nil FastImage.size(File.join(FixturePath, "test.ico"))
+    assert_nil FastImage.size(File.join(FixturePath, "test_rgb.ct"))
   end
 
   def test_should_raise_when_asked_to_when_size_cannot_be_found_for_local_file
@@ -243,4 +249,13 @@ class FastImageTest < Test::Unit::TestCase
     path = Pathname.new(File.join(FixturePath, "bad.jpg"))
     assert_equal([500,500], FastImage.size(path))
   end
+  
+  def test_should_report_type_and_size_correctly_for_stringios
+    GoodFixtures.each do |fn, info|
+      string = File.read(File.join(FixturePath, fn))
+      stringio = StringIO.new(string)
+      assert_equal info[0], FastImage.type(stringio)
+      assert_equal info[1], FastImage.size(stringio)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -89,14 +89,16 @@ files:
 - test/fixtures/faulty.jpg
 - test/fixtures/folder with spaces/test.bmp
 - test/fixtures/infinite.jpg
+- test/fixtures/man.ico
 - test/fixtures/orient_2.jpg
 - test/fixtures/test.bmp
+- test/fixtures/test.cur
 - test/fixtures/test.gif
-- test/fixtures/test.ico
 - test/fixtures/test.jpg
 - test/fixtures/test.png
 - test/fixtures/test.psd
 - test/fixtures/test.tiff
+- test/fixtures/test2.bmp
 - test/fixtures/test2.jpg
 - test/fixtures/test2.tiff
 - test/fixtures/test3.jpg