fastimage 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6abea8ea28cc54fca8532d1cc730485fc8622bb
-  data.tar.gz: 369b66ccf95b88f6e8d9c4083af564e83126c25d
+  metadata.gz: b0cc039d623dc912c65fb475ac7fcf40e6908075
+  data.tar.gz: d0904edca54dbb88a60dcfc3e38405c7133efcdf
 SHA512:
-  metadata.gz: c6129490390b33e6391c9070eaa8c741a893b8cb5b74f323170f0f52f34658f787b9bee7fd190e63d26fb12ca216aee3784769e349a59422739e2f77a0e4b5ac
-  data.tar.gz: 8a46074855d673b9135db336ab92b892cb3804fad494439b18ee64dc532e4e830eded7432d5b0aa19713e0808fd756bd400c43842c8dc0e45039ec5adca0e4aa
+  metadata.gz: 70886f6c9b00ee5a47af1beb69fdccaa6d1611ee264eba196c5773e2b0f6959b7cec9dc60c1540851788190d2e64c763094be8cd9ff44d0ca0ab52ea7461f6d7
+  data.tar.gz: 14f89c0602a5d7602d28d1e2fad44c47009afb004f4635f44fc7131ad2b2a49df4c9062041799556e04297ac8c214afe15b3608284763d53282dd93294d4edcf

data/README.textile

@@ -12,15 +12,16 @@ But the image is not locally stored - it's on another asset server, or in the cl
 
 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, 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).
+FastImage does this minimal fetch for image types GIF, JPEG, PNG, TIFF, BMP, ICO, CUR, PSD and WEBP.  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.
 
 h2. Features
 
-Fastimage can also read local (and other) files, and uses the Addressable library to do so.
+Fastimage can also read local (and other) files - anything that is not parseable as a URI will be
+interpreted as a filename, and FastImage will attempt to open it with File#open.
 
-FastImage will automatically read from any object that responds to :read - for
+FastImage will also automatically read from any object that responds to :read - for
 instance an IO object if that is passed instead of a URI.
 
 FastImage will follow up to 4 HTTP redirects to get the image.
@@ -31,6 +32,10 @@ You can add a timeout to the request which will limit the request time by passin
 
 FastImage normally replies will nil if it encounters an error, but you can pass :raise_on_failure => true to get an exception.
 
+h2. Security
+
+As of v1.6.7 FastImage no longer uses openuri to open files, but directly calls File.open. But take care to sanitise the strings passed to FastImage; it will try to read from whatever is passed.
+
 h2. Examples
 
 <pre lang="ruby"><code>
@@ -113,9 +118,15 @@ h2. References
 * "Pennysmalls - Find jpeg dimensions fast in pure Ruby, no image library needed":http://pennysmalls.wordpress.com/2008/08/19/find-jpeg-dimensions-fast-in-pure-ruby-no-ima/
 * "DZone - Determine Image Size":http://snippets.dzone.com/posts/show/805
 * "Antti Kupila - Getting JPG dimensions with AS3 without loading the entire file":http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
-* "imagesize gem documentation":http://imagesize.rubyforge.org/
+* "imagesize gem":https://rubygems.org/gems/imagesize
 * "EXIF Reader":https://github.com/remvee/exifr
 
+h2. FastImage in other languages
+
+* "Python by bmuller":https://github.com/bmuller/fastimage
+* "Swift by kaishin":https://github.com/kaishin/ImageScout
+* "Go by rubenfonseca":https://github.com/rubenfonseca/fastimage
+
 h2. Licence
 
 MIT, see file "MIT-LICENSE":MIT-LICENSE

data/lib/fastimage.rb

@@ -8,10 +8,10 @@
 # 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, ICO, CUR, PNG and PSD files.
+# FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD and WEBP 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
+# In this case FastImage reads the file in chunks of 256 bytes until
 # it has enough. This is possibly a useful bandwidth-saving feature if the file is on a network
 # attached disk rather than truly local.
 #
@@ -36,7 +36,7 @@
 # * http://snippets.dzone.com/posts/show/805
 # * http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
 # * http://pennysmalls.wordpress.com/2008/08/19/find-jpeg-dimensions-fast-in-pure-ruby-no-ima/
-# * http://imagesize.rubyforge.org/
+# * https://rubygems.org/gems/imagesize
 # * https://github.com/remvee/exifr
 #
 
@@ -76,7 +76,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, PSD, ICO and CUR files.
+  # FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD and WEBP files.
   #
   # === Example
   #
@@ -168,12 +168,12 @@ class FastImage
       begin
         @parsed_uri = Addressable::URI.parse(uri)
       rescue Addressable::URI::InvalidURIError
-        fetch_using_open_uri
+        fetch_using_file_open
       else
         if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
           fetch_using_http
         else
-          fetch_using_open_uri
+          fetch_using_file_open
         end
       end
     end
@@ -304,8 +304,8 @@ class FastImage
     parse_packets FiberStream.new(read_fiber)
   end
 
-  def fetch_using_open_uri
-    open(@uri) do |s|
+  def fetch_using_file_open
+    File.open(@uri) do |s|
       fetch_using_read(s)
     end
   end
@@ -399,6 +399,12 @@ class FastImage
       when 1 then :ico
       when 2 then :cur
       end
+    when "RI"
+      if @stream.peek(12)[8..11] == "WEBP"
+        :webp
+      else
+        raise UnknownImageType
+      end        
     else
       raise UnknownImageType
     end
@@ -473,6 +479,45 @@ class FastImage
     [result.first, result.last.abs]
   end
 
+  def parse_size_for_webp
+    vp8 = @stream.read(16)[12..15]
+    len = @stream.read(4).unpack("V")
+    case vp8
+    when "VP8 "
+      parse_size_vp8
+    when "VP8L"
+      parse_size_vp8l
+    when "VP8X"
+      parse_size_vp8x
+    else
+      nil
+    end
+  end
+  
+  def parse_size_vp8
+    w, h = @stream.read(10).unpack("@6vv")
+    [w & 0x3fff, h & 0x3fff]
+  end
+  
+  def parse_size_vp8l
+    @stream.read(1) # 0x2f
+    b1, b2, b3, b4 = @stream.read(4).bytes.to_a
+    [1 + (((b2 & 0x3f) << 8) | b1), 1 + (((b4 & 0xF) << 10) | (b3 << 2) | ((b2 & 0xC0) >> 6))]
+  end
+  
+  def parse_size_vp8x
+    flags = @stream.read(4).unpack("C")[0]
+    b1, b2, b3, b4, b5, b6 = @stream.read(6).unpack("CCCCCC")
+    width, height = 1 + b1 + (b2 << 8) + (b3 << 16), 1 + b4 + (b5 << 8) + (b6 << 16)
+
+    if flags & 8 > 0 # exif
+      # parse exif for orientation
+      # TODO: find or create test images for this
+    end
+    
+    return [width, height]
+  end
+
   class Exif # :nodoc:
     attr_reader :width, :height
     def initialize(stream)

data/test/test.rb

@@ -27,7 +27,10 @@ GoodFixtures = {
   "orient_2.jpg"=>[:jpeg, [230,408]],
   "favicon.ico" => [:ico, [16, 16]],
   "man.ico" => [:ico, [48, 48]],
-  "test.cur" => [:cur, [32, 32]]
+  "test.cur" => [:cur, [32, 32]],
+  "webp_vp8x.webp" => [:webp, [386, 395]],
+  "webp_vp8l.webp" => [:webp, [386, 395]],
+  "webp_vp8.webp" => [:webp, [550, 368]]
 }
 
 BadFixtures = [
@@ -276,4 +279,15 @@ class FastImageTest < Test::Unit::TestCase
       FastImage.size(url, :raise_on_failure => true)
     end
   end
+  
+  def test_cant_access_shell
+    url = "|echo>shell_test"
+    %x{rm -f shell_test}
+    FastImage.size(url)
+    assert_raises(Errno::ENOENT) do
+      File.open("shell_test")
+    end
+  ensure
+    %x{rm -f shell_test}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -105,6 +105,9 @@ files:
 - test/fixtures/test3.jpg
 - test/fixtures/test4.jpg
 - test/fixtures/truncated_gzipped.jpg
+- test/fixtures/webp_vp8.webp
+- test/fixtures/webp_vp8l.webp
+- test/fixtures/webp_vp8x.webp
 - test/test.rb
 homepage: http://github.com/sdsykes/fastimage
 licenses: