typhoeus 0.1.29 → 0.1.30

data/CHANGELOG.markdown

@@ -1,5 +1,6 @@
-In-Progress
+0.1.30
 -----------
+* Exposed CURLOPT_CONNECTTIMEOUT_MS to Requests [balexis]
 
 0.1.29
 ------

data/VERSION

@@ -1 +1 @@
-0.1.29
+0.1.30

data/examples/twitter.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../lib/typhoeus.rb'
 require 'rubygems'
+require File.dirname(__FILE__) + '/../lib/typhoeus.rb'
 require 'json'
 
 class Twitter

data/lib/typhoeus/easy.rb

@@ -16,6 +16,10 @@ module Typhoeus
       :CURLOPT_POSTFIELDSIZE  => 60,
       :CURLOPT_USERAGENT      => 10018,
       :CURLOPT_TIMEOUT_MS     => 155,
+      # Time-out connect operations after this amount of milliseconds.
+      # [Only works on unix-style/SIGALRM operating systems. IOW, does
+      # not work on Windows.
+      :CURLOPT_CONNECTTIMEOUT_MS  => 156,
       :CURLOPT_NOSIGNAL       => 99,
       :CURLOPT_HTTPHEADER     => 10023,
       :CURLOPT_FOLLOWLOCATION => 52,
@@ -100,6 +104,12 @@ module Typhoeus
     def max_redirects=(redirects)
       set_option(OPTION_VALUES[:CURLOPT_MAXREDIRS], redirects)
     end
+    
+    def connect_timeout=(milliseconds)
+      @connect_timeout = milliseconds
+      set_option(OPTION_VALUES[:CURLOPT_NOSIGNAL], 1)
+      set_option(OPTION_VALUES[:CURLOPT_CONNECTTIMEOUT_MS], milliseconds)
+    end
 
     def timeout=(milliseconds)
       @timeout = milliseconds

data/lib/typhoeus/hydra.rb

@@ -138,6 +138,7 @@ module Typhoeus
       easy.headers      = request.headers if request.headers
       easy.request_body = request.body    if request.body
       easy.timeout      = request.timeout if request.timeout
+      easy.connect_timeout = request.connect_timeout if request.connect_timeout
       easy.follow_location = request.follow_location if request.follow_location
       easy.max_redirects = request.max_redirects if request.max_redirects
       easy.proxy = request.proxy if request.proxy

data/lib/typhoeus/request.rb

@@ -1,7 +1,6 @@
 module Typhoeus
   class Request
-    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout, :follow_location, :max_redirects, :proxy, :disable_ssl_peer_verification, :ssl_cert, :ssl_cert_type, :ssl_key, :ssl_key_type, :ssl_key_password, :ssl_cacert, :ssl_capath, :verbose
-
+    attr_accessor :method, :params, :body, :headers, :connect_timeout, :timeout, :user_agent, :response, :cache_timeout, :follow_location, :max_redirects, :proxy, :disable_ssl_peer_verification, :ssl_cert, :ssl_cert_type, :ssl_key, :ssl_key_type, :ssl_key_password, :ssl_cacert, :ssl_capath, :verbose
 
     attr_reader   :url
 
@@ -14,6 +13,7 @@ module Typhoeus
     # ** +:params+  : params as a Hash
     # ** +:body+
     # ** +:timeout+ : timeout (ms)
+    # ** +:connect_timeout+ : connect timeout (ms)
     # ** +:headers+  : headers as Hash
     # ** +:user_agent+ : user agent (string)
     # ** +:cache_timeout+ : cache timeout (ms)
@@ -35,6 +35,7 @@ module Typhoeus
       @params           = options[:params]
       @body             = options[:body]
       @timeout          = options[:timeout]
+      @connect_timeout  = options[:connect_timeout]
       @headers          = options[:headers] || {}
       @user_agent       = options[:user_agent] || Typhoeus::USER_AGENT
       @cache_timeout    = options[:cache_timeout]

data/typhoeus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typhoeus}
-  s.version = "0.1.29"
+  s.version = "0.1.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Dix"]
-  s.date = %q{2010-07-05}
+  s.date = %q{2010-07-15}
   s.description = %q{Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.}
   s.email = %q{paul@pauldix.net}
   s.extensions = ["ext/typhoeus/extconf.rb"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 29
-  version: 0.1.29
+  - 30
+  version: 0.1.30
 platform: ruby
 authors: 
 - Paul Dix
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 -07:00
+date: 2010-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency