fastimage 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41430d6372593b80ee08688d0d5ba73e6b75afe7
-  data.tar.gz: 6c087874cf7dc4fbc330bdc57b07d7e2a8adec2c
+  metadata.gz: fc7eb99ff0f61cddf103ac901c5bda2d37f83752
+  data.tar.gz: fccb0a33cfccefc1400c4d7c3c27a1124d2b6400
 SHA512:
-  metadata.gz: 8c8a4315619a334e8de54d5162a7a96a1de1aadb272b7ad1bdb530559a4f465d4f821680c2ff06e9650c1f5b7130a803c0549a45086b9f6ef4d468269493b558
-  data.tar.gz: ad654e975fd54b5f7d3fd583d4d03bbae3d3b143622f292aa859f43c18d3d89279274bce3a271e2339da43b42a66c775557b4a6b4b3278c1bdd6f5e36f31d128
+  metadata.gz: 000bc8011c9da184973abc60e5b119fd5a8ef8b1d3657cd80dd26ae12c67298d1dcd73ad7d2ed60c783be8d4542f1f57228e6c0b888ebb313499739173c5ec7b
+  data.tar.gz: fa02a8dfdaf54cc85e94fa468839b2c2fb718f35c4199959859109925f20c3fa63fcf6574fcce83c22a13cda94ccc4caed6f05eb82a907a635d4bc7f59c9fe55

data/README.textile

@@ -10,7 +10,7 @@ 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 image types, 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 and BMP.  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 and BMP.  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.
 
@@ -70,13 +70,13 @@ h2. Tests
 
 You'll need to @gem install fakeweb@ to be able to run the tests.
 
-bc.. ruby ./test/test.rb
-Loaded suite test/test
-Started
-...............
-Finished in 0.059392 seconds.
+bc.. $ ruby test.rb 
+Run options: 
 
-15 tests, 27 assertions, 0 failures, 0 errors
+# Running tests:
+
+Finished tests in 1.033640s, 23.2189 tests/s, 82.2337 assertions/s.             
+24 tests, 85 assertions, 0 failures, 0 errors, 0 skips
 
 h2. References
 
@@ -84,6 +84,7 @@ h2. References
 * "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/
+* "EXIF Reader":https://github.com/remvee/exifr
 
 h2. Licence
 

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 and PNG files.
+# FastImage knows about GIF, JPEG, BMP, TIFF and PNG files.
 #
 # FastImage can also read files from the local filesystem by supplying the path instead of a uri.
 # In this case FastImage uses the open-uri library to read the file in chunks of 256 bytes until
@@ -37,13 +37,17 @@
 # * 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://github.com/remvee/exifr
 #
 
 require 'net/https'
 require 'open-uri'
+require 'fastimage/fbr.rb'
 
 class FastImage
   attr_reader :size, :type
+  
+  attr_reader :bytes_read
 
   class FastImageException < StandardError # :nodoc:
   end
@@ -55,6 +59,8 @@ class FastImage
   end
   class SizeNotFound < FastImageException # :nodoc:
   end
+  class CannotParseImage < FastImageException # :nodoc:
+  end
 
   DefaultTimeout = 2
   
@@ -69,7 +75,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 and PNG files.
+  # FastImage knows about GIF, JPEG, BMP, TIFF and PNG files.
   #
   # === Example
   #
@@ -133,6 +139,8 @@ class FastImage
   #   => nil
   #   File.open("/some/local/file.gif", "r") {|io| FastImage.type(io)}
   #   => :gif
+  #   FastImage.type("test/fixtures/test.tiff")
+  #   => :tiff
   #
   # === Supported options
   # [:timeout]
@@ -164,7 +172,9 @@ class FastImage
         end
       end
     end
+    
     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
     raise ImageFetchFailure if options[:raise_on_failure]
@@ -172,6 +182,15 @@ class FastImage
     raise ImageFetchFailure if options[:raise_on_failure]
   rescue UnknownImageType
     raise UnknownImageType if options[:raise_on_failure]
+  rescue CannotParseImage
+    if options[:raise_on_failure]
+      if @property == :size
+        raise SizeNotFound
+      else
+        raise ImageFetchFailure
+      end
+    end
+    
   end
 
   private
@@ -198,10 +217,14 @@ class FastImage
 
       raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
 
-      res.read_body do |str|
-        break if parse_packet(str)
+      @read_fiber = Fiber.new do
+        res.read_body do |str|
+          Fiber.yield str
+        end
       end
       
+      parse_packets
+      
       break  # needed to actively quit out of the fetch
     end
   end
@@ -231,9 +254,13 @@ class FastImage
   end
 
   def fetch_using_read(readable)
-    while str = readable.read(LocalFileChunkSize)
-      break if parse_packet(str)
+    @read_fiber = Fiber.new do
+      while str = readable.read(LocalFileChunkSize)
+        Fiber.yield str
+      end
     end
+    
+    parse_packets
   end
 
   def fetch_using_open_uri
@@ -242,20 +269,21 @@ class FastImage
     end
   end
 
-  # returns true once result is achieved
-  #
-  def parse_packet(str)
-    @str = (@unused_str || "") + str
+  def parse_packets
+    @str = ""
     @str.force_encoding("ASCII-8BIT") if has_encoding?
     @strpos = 0
+    @bytes_read = 0
+    
     begin
       result = send("parse_#{@property}")
       if result 
         instance_variable_set("@#{@property}", result)
-        true
+      else
+        raise CannotParseImage
       end
-    rescue MoreCharsNeeded
-      false
+    rescue FiberError
+      raise CannotParseImage
     end
   end
 
@@ -274,15 +302,25 @@ class FastImage
   end
 
   def get_chars(n)
-    if @strpos + n - 1 >= @str.size
-      @unused_str = @str[@strpos..-1]
-      raise MoreCharsNeeded
-    else
-      result = @str[@strpos..(@strpos + n - 1)]
-      @strpos += n
+    while @strpos + n - 1 >= @str.size
+      unused_str = @str[@strpos..-1]
+      new_string = @read_fiber.resume
+      raise CannotParseImage if !new_string
+
       # we are dealing with bytes here, so force the encoding
-      has_encoding? ? result.force_encoding("ASCII-8BIT") : result
+      if has_encoding?
+        new_string.force_encoding("ASCII-8BIT")
+      end
+
+      @bytes_read += new_string.size
+      
+      @str = unused_str + new_string
+      @strpos = 0
     end
+    
+    result = @str[@strpos..(@strpos + n - 1)]
+    @strpos += n
+    result
   end
 
   def get_byte
@@ -304,6 +342,10 @@ class FastImage
       :jpeg
     when 0x89.chr + "P"
       :png
+    when "II"
+      :tiff
+    when "MM"
+      :tiff
     else
       raise UnknownImageType
     end
@@ -353,4 +395,37 @@ class FastImage
     d = get_chars(29)[14..28]
     d.unpack("C")[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
   end
+
+  def parse_size_for_tiff
+    byte_order = get_chars(2)
+    case byte_order
+      when 'II'; short, long = 'v', 'V'
+      when 'MM'; short, long = 'n', 'N'
+    end
+    get_chars(2) # 42
+
+    offset = get_chars(4).unpack(long)[0]
+    get_chars(offset - 8)
+
+    width = height = nil
+
+    tag_count = get_chars(2).unpack(short)[0]
+    tag_count.downto(1) do
+      type = get_chars(2).unpack(short)[0]
+      get_chars(6)
+      data = get_chars(2).unpack(short)[0]
+      case type
+      when 0x0100 # image width
+        width = data
+      when 0x0101 # image height
+        height = data
+      end
+      if width && height
+        return [width, height]
+      end
+      get_chars(2)
+    end
+    
+    raise CannotParseImage
+  end
 end

data/lib/fastimage/fbr.rb

@@ -0,0 +1,67 @@
+# Poor Man's Fiber (API compatible Thread based Fiber implementation for Ruby 1.8)
+# (c) 2008 Aman Gupta (tmm1)
+
+unless defined? Fiber
+  require 'thread'
+
+  class FiberError < StandardError; # :nodoc:
+  end
+
+  class Fiber # :nodoc:
+    def initialize
+      raise ArgumentError, 'new Fiber requires a block' unless block_given?
+
+      @yield = Queue.new
+      @resume = Queue.new
+
+      @thread = Thread.new{ @yield.push [yield(*@resume.pop)] }
+      @thread.abort_on_exception = true
+      @thread[:fiber] = self
+    end
+    attr_reader :thread
+
+    def resume *args
+      raise FiberError, 'dead fiber called' unless @thread.alive?
+      @resume.push(args)
+      result = @yield.pop
+      result.size > 1 ? result : result.first
+    end
+
+    def yield *args
+      @yield.push(args)
+      result = @resume.pop
+      result.size > 1 ? result : result.first
+    end
+
+    def self.yield *args
+      if fiber = Thread.current[:fiber]
+        fiber.yield(*args)
+      else
+        raise FiberError, 'not inside a fiber'
+      end
+    end
+
+    def self.current
+      if Thread.current == Thread.main
+        return Thread.main[:fiber] ||= RootFiber.new
+      end
+
+      Thread.current[:fiber] or raise FiberError, 'not inside a fiber'
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{self.object_id.to_s(16)}>"
+    end
+  end
+
+  class RootFiber < Fiber # :nodoc:
+    def initialize
+      # XXX: what is a root fiber anyway?
+    end
+
+    def self.yield *args
+      raise FiberError, "can't yield from root fiber"
+    end
+  end
+end
+

data/test/test.rb

@@ -3,9 +3,9 @@ require 'rubygems'
 require 'test/unit'
 
 PathHere = File.dirname(__FILE__)
+$LOAD_PATH.unshift File.join(PathHere, "..", "lib")
 
-require File.join(PathHere, "..", "lib", 'fastimage')
-
+require 'fastimage'
 require 'fakeweb'
 
 FixturePath = File.join(PathHere, "fixtures")
@@ -16,7 +16,9 @@ GoodFixtures = {
   "test.jpg"=>[:jpeg, [882, 470]],
   "test.png"=>[:png, [30, 20]],
   "test2.jpg"=>[:jpeg, [250, 188]],
-  "test3.jpg"=>[:jpeg, [630,367]]
+  "test3.jpg"=>[:jpeg, [630, 367]],
+  "test.tiff"=>[:tiff, [85, 67]],
+  "test2.tiff"=>[:tiff, [333, 225]]
   }
 
 BadFixtures = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Stephen Sykes
@@ -21,6 +21,7 @@ files:
 - MIT-LICENSE
 - README.textile
 - lib/fastimage.rb
+- lib/fastimage/fbr.rb
 - test/fixtures/faulty.jpg
 - test/fixtures/test.bmp
 - test/fixtures/test.gif
@@ -29,6 +30,8 @@ files:
 - test/fixtures/test.png
 - test/fixtures/test2.jpg
 - test/fixtures/test3.jpg
+- test/fixtures/test.tiff
+- test/fixtures/test2.tiff
 - test/fixtures/folder with spaces/test.bmp
 - test/test.rb
 homepage: http://github.com/sdsykes/fastimage