@@ -80,7 +80,7 @@ module Flickr begin response = Hpricot.XML( open(url).read ).at('rsp') - rescue Timeout::Error, OpenURI::HTTPError, Errno::ECONNRESET, SocketError, Errno::ECONNREFUSED => e + rescue Errno::ETIMEDOUT, Timeout::Error, OpenURI::HTTPError, Errno::ECONNRESET, SocketError, Errno::ECONNREFUSED => e raise RequestError.new(0, e) end raise RequestError.new(response.at('err')['code'], response.at('err')['msg']) unless response['stat'] == 'ok' lib/simple-flickr/client.rb @@ -15,7 +15,7 @@ describe Flickr::Client do @flickr.request( 'favorites.getList', :user_id => '123456789N00', :per_page => 4 ) end - [Timeout::Error.new(nil), OpenURI::HTTPError.new(nil,nil), Errno::ECONNRESET, SocketError, Errno::ECONNREFUSED].each do |e| + [Errno::ETIMEDOUT,Timeout::Error.new(nil), OpenURI::HTTPError.new(nil,nil), Errno::ECONNRESET, SocketError, Errno::ECONNREFUSED].each do |e| it "should raise an appropriate error if open-uri raises #{e}" do @flickr.should_receive( :open ).and_raise( e ) proc { @flickr.request( 'test.echo' ) }.should raise_error( Flickr::RequestError ) spec/client_spec.rb ef7ec25cf384d2c1028151f713a2261510244a1b Jerrett Taylor jerrett@viviti.com http://github.com/jerrett/simple-flickr/commit/da21cfe282c8d00be750c3e034b353c382405db1 da21cfe282c8d00be750c3e034b353c382405db1 2009-06-10T17:03:28-07:00 2009-06-10T17:03:28-07:00 handling Errno::ETIMEDOUT a8978be2d040cbbd66aaab90119a63830a9ff047 Jerrett Taylor jerrett@viviti.com