fastimage 1.2.9 → 1.2.10

data/README

@@ -16,6 +16,11 @@ You only need supply the uri, and FastImage will do the rest.
 
 Fastimage can also read local (and other) files, and uses the open-uri library to do so.
 
+And new in v1.2.9, FastImage will automatically read from any object that responds to :read - for 
+instance an IO object if that is passed instead of a URI.
+
+New in v1.2.10 FastImage will follow up to 4 HTTP redirects to get the image.
+
 Examples
 
   require 'fastimage'
@@ -65,7 +70,7 @@ You'll need to 'sudo gem install fakeweb' to be able to run the tests.
 
 
 References
-* "http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/":http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/
+* "http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima":http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima
 * "http://snippets.dzone.com/posts/show/805":http://snippets.dzone.com/posts/show/805
 * "http://www.anttikupila.com/flash/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/
 * "http://imagesize.rubyforge.org/":http://imagesize.rubyforge.org/

data/README.textile

@@ -19,6 +19,8 @@ Fastimage can also read local (and other) files, and uses the open-uri library t
 And new in v1.2.9, FastImage will automatically read from any object that responds to :read - for 
 instance an IO object if that is passed instead of a URI.
 
+New in v1.2.10 FastImage will follow up to 4 HTTP redirects to get the image.
+
 h2. Examples
 
 <pre>
@@ -82,7 +84,7 @@ Finished in 0.059392 seconds.
 
 
 h2. References
-* "http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/":http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/
+* "http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima":http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima
 * "http://snippets.dzone.com/posts/show/805":http://snippets.dzone.com/posts/show/805
 * "http://www.anttikupila.com/flash/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/
 * "http://imagesize.rubyforge.org/":http://imagesize.rubyforge.org/

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 9
+:patch: 10
 :major: 1
 :build: 
 :minor: 2

data/lib/fastimage.rb

@@ -16,6 +16,8 @@
 # New in v1.2.9, FastImage will automatically read from any object that responds to :read - for 
 # instance an IO object if that is passed instead of a URI.
 #
+# New in v1.2.10 FastImage will follow up to 4 HTTP redirects to get the image.
+#
 # === Examples
 #   require 'fastimage'
 #
@@ -31,7 +33,7 @@
 # === References
 # * http://snippets.dzone.com/posts/show/805
 # * http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
-# * http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/
+# * http://pennysmalls.com/find-jpeg-dimensions-fast-in-pure-ruby-no-ima
 # * http://imagesize.rubyforge.org/
 #
 require 'net/https'
@@ -143,7 +145,7 @@ class FastImage
     @property = options[:type_only] ? :type : :size
     @timeout = options[:timeout] || DefaultTimeout
     @uri = uri
-    
+
     if uri.respond_to?(:read)
       fetch_using_read(uri)
     else
@@ -172,9 +174,27 @@ class FastImage
   private
 
   def fetch_using_http
+    @redirect_count = 0
+
+    fetch_using_http_from_parsed_uri
+  end
+  
+  def fetch_using_http_from_parsed_uri
     setup_http
     @http.request_get(@parsed_uri.request_uri) do |res|
+      if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
+        @redirect_count += 1
+        begin
+          @parsed_uri = URI.parse(res['Location'])
+        rescue URI::InvalidURIError
+        else
+          fetch_using_http_from_parsed_uri
+          break
+        end
+      end
+
       raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
+
       res.read_body do |str|
         break if parse_packet(str)
       end

data/test/test.rb

@@ -139,4 +139,37 @@ class FastImageTest < Test::Unit::TestCase
       FastImage.size(File.join(FixturePath, "faulty.jpg"), :raise_on_failure=>true)
     end
   end
+  
+  def test_should_handle_permanent_redirect
+    url = "http://example.com/foo.jpeg"
+    register_redirect(url, TestUrl + GoodFixtures.keys.first)
+    assert_equal GoodFixtures[GoodFixtures.keys.first][1], FastImage.size(url, :raise_on_failure=>true)
+  end
+
+  def test_should_handle_permanent_redirect_4_times
+    first_url = "http://example.com/foo.jpeg"
+    register_redirect(first_url, "http://example.com/foo2.jpeg")
+    register_redirect("http://example.com/foo2.jpeg", "http://example.com/foo3.jpeg")
+    register_redirect("http://example.com/foo3.jpeg", "http://example.com/foo4.jpeg")
+    register_redirect("http://example.com/foo4.jpeg", TestUrl + GoodFixtures.keys.first)
+    assert_equal GoodFixtures[GoodFixtures.keys.first][1], FastImage.size(first_url, :raise_on_failure=>true)
+  end
+
+  def test_should_raise_on_permanent_redirect_5_times
+    first_url = "http://example.com/foo.jpeg"
+    register_redirect(first_url, "http://example.com/foo2.jpeg")
+    register_redirect("http://example.com/foo2.jpeg", "http://example.com/foo3.jpeg")
+    register_redirect("http://example.com/foo3.jpeg", "http://example.com/foo4.jpeg")
+    register_redirect("http://example.com/foo4.jpeg", "http://example.com/foo5.jpeg")
+    register_redirect("http://example.com/foo5.jpeg", TestUrl + GoodFixtures.keys.first)
+    assert_raises(FastImage::ImageFetchFailure) do
+      FastImage.size(first_url, :raise_on_failure=>true)
+    end
+  end
+  
+  def register_redirect(from, to)
+    resp = Net::HTTPMovedPermanently.new(1.0, 302, "Moved")
+    resp['Location'] = to
+    FakeWeb.register_uri(:get, from, :response=>resp)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fastimage
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 2
-  - 9
-  version: 1.2.9
+  - 10
+  version: 1.2.10
 platform: ruby
 authors: 
 - Stephen Sykes