typhoeus 0.1.12 → 0.1.13

data/lib/typhoeus.rb

@@ -14,7 +14,7 @@ require 'typhoeus/request'
 require 'typhoeus/hydra'
 
 module Typhoeus
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 
   def self.easy_object_pool
     @easy_objects ||= []

data/lib/typhoeus/easy.rb

@@ -16,7 +16,8 @@ module Typhoeus
       :CURLOPT_TIMEOUT_MS     => 155,
       :CURLOPT_NOSIGNAL       => 99,
       :CURLOPT_HTTPHEADER     => 10023,
-      :CURLOPT_FOLLOWLOCATION => 52
+      :CURLOPT_FOLLOWLOCATION => 52,
+      :CURLOPT_MAXREDIRS      => 68
     }
     INFO_VALUES = {
       :CURLINFO_RESPONSE_CODE => 2097154,
@@ -48,6 +49,10 @@ module Typhoeus
         set_option(OPTION_VALUES[:CURLOPT_FOLLOWLOCATION], 0)
       end
     end
+
+    def max_redirects=(redirects)
+      set_option(OPTION_VALUES[:CURLOPT_MAXREDIRS], redirects)
+    end
     
     def timeout=(milliseconds)
       @timeout = milliseconds

data/lib/typhoeus/hydra.rb

@@ -123,6 +123,7 @@ module Typhoeus
       easy.request_body = request.body    if request.body
       easy.timeout      = request.timeout if request.timeout
       easy.follow_location = request.follow_location if request.follow_location
+      easy.max_redirects = request.max_redirects if request.max_redirects
       easy.on_success do |easy|
         queue_next
         handle_request(request, response_from_easy(easy, request))

data/lib/typhoeus/request.rb

@@ -1,6 +1,6 @@
 module Typhoeus
   class Request
-    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout, :follow_location
+    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout, :follow_location, :max_redirects
     attr_reader   :url
     
     def initialize(url, options = {})
@@ -12,6 +12,7 @@ module Typhoeus
       @user_agent       = options[:user_agent] || Typhoeus::USER_AGENT
       @cache_timeout    = options[:cache_timeout]
       @follow_location  = options[:follow_location]
+      @max_redirects    = options[:max_redirects]
       if @method == :post
         @url = url
       else

data/spec/servers/app.rb

@@ -21,6 +21,10 @@ get '/redirect' do
   redirect '/'
 end
 
+get '/bad_redirect' do
+  redirect '/bad_redirect'
+end
+
 get '/**' do
   sleep params["delay"].to_i if params.has_key?("delay")
   request.env.merge!(:body => request.body.read).to_json

data/spec/typhoeus/easy_spec.rb

@@ -39,6 +39,26 @@ describe Typhoeus::Easy do
       # this doesn't work on a mac for some reason
 #      e.timed_out?.should == true
     end
+
+    it "should allow the setting of the max redirects to follow" do
+      e = Typhoeus::Easy.new
+      e.url = "http://localhost:3001/redirect"
+      e.method = :get
+      e.follow_location = true
+      e.max_redirects = 5
+      e.perform
+      e.response_code.should == 200
+    end
+
+    it "should handle our bad redirect action, provided we've set max_redirects properly" do
+      e = Typhoeus::Easy.new
+      e.url = "http://localhost:3001/bad_redirect"
+      e.method = :get
+      e.follow_location = true
+      e.max_redirects = 5
+      e.perform
+      e.response_code.should == 302
+    end
   end
   
   describe "get" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Paul Dix