Permalink
Browse files

Merge pull request #70 from abdollar/master

net http timeout can be a float
  • Loading branch information...
jnunemaker committed Jun 6, 2011
2 parents 2d4c1bd + c1ea5fc commit adb9553c7ba508fae00917ee2692f6ffb8379c08
Showing with 7 additions and 2 deletions.
  1. +1 −1 lib/httparty.rb
  2. +1 −1 lib/httparty/request.rb
  3. +5 −0 spec/httparty_spec.rb
View
@@ -148,7 +148,7 @@ def default_params(h={})
# default_timeout 10
# end
def default_timeout(t)
- raise ArgumentError, 'Timeout must be an integer' unless t && t.is_a?(Integer)
+ raise ArgumentError, 'Timeout must be an integer or float' unless t && (t.is_a?(Integer) || t.is_a?(Float))
default_options[:timeout] = t
end
View
@@ -101,7 +101,7 @@ def http
http = Net::HTTP.new(uri.host, uri.port, options[:http_proxyaddr], options[:http_proxyport])
http.use_ssl = ssl_implied?
- if options[:timeout] && options[:timeout].is_a?(Integer)
+ if options[:timeout] && (options[:timeout].is_a?(Integer) || options[:timeout].is_a?(Float))
http.open_timeout = options[:timeout]
http.read_timeout = options[:timeout]
end
View
@@ -232,6 +232,11 @@ def second_method
@klass.default_timeout 10
@klass.default_options[:timeout].should == 10
end
+
+ it "should support floats" do
+ @klass.default_timeout 0.5
+ @klass.default_options[:timeout].should == 0.5
+ end
end
describe "debug_output" do

0 comments on commit adb9553

Please sign in to comment.