@@ -18,6 +18,14 @@ module ActiveResource end end + # Raised when a Timeout::Error occurs. + class TimeoutError < ConnectionError + def initialize(message) + @message = message + end + def to_s; @message ;end + end + # 3xx Redirection class Redirection < ConnectionError # :nodoc: def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end @@ -134,6 +142,8 @@ module ActiveResource time = Benchmark.realtime { result = http.send(method, path, *arguments) } logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body : 0}b %.2fs)" % time if logger handle_response(result) + rescue Timeout::Error => e + raise TimeoutError.new(e.message) end # Handles response and error codes from remote service. activeresource/lib/active_resource/connection.rb @@ -7,4 +7,16 @@ require 'active_resource/http_mock' $:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' -ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log") \ No newline at end of file +ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log") + +# Wrap tests that use Mocha and skip if unavailable. +def uses_mocha(test_name) + unless Object.const_defined?(:Mocha) + require 'mocha' + require 'stubba' + end + yield +rescue LoadError => load_error + raise unless load_error.message =~ /mocha/i + $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again." +end \ No newline at end of file activeresource/test/abstract_unit.rb @@ -168,6 +168,15 @@ class ConnectionTest < Test::Unit::TestCase assert_equal 200, response.code end + uses_mocha('test_timeout') do + def test_timeout + @http = mock('new Net::HTTP') + @conn.expects(:http).returns(@http) + @http.expects(:get).raises(Timeout::Error, 'execution expired') + assert_raises(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') } + end + end + protected def assert_response_raises(klass, code) assert_raise(klass, "Expected response code #{code} to raise #{klass}") do activeresource/test/connection_test.rb 105910429d5873dce677ef32eef5f705e0625d86 Cheah Chu Yeow chuyeow chuyeow@gmail.com http://github.com/rails/rails/commit/cf32baf915442ffe153ec0e4d8148f147776c30a cf32baf915442ffe153ec0e4d8148f147776c30a 2008-04-21T14:30:56-07:00 2008-04-16T03:39:19-07:00 Rescue from Timeout::Error in ActiveResource::Connection. Signed-off-by: Michael Koziarski <michael@koziarski.com> 9405205f0ab6ddfceb49043206aa034f33a53cc1 Michael Koziarski NZKoz michael@koziarski.com