typhoeus 0.1.11 → 0.1.12

data/lib/typhoeus.rb

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

data/lib/typhoeus/hydra.rb

@@ -122,6 +122,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.follow_location = request.follow_location if request.follow_location
       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
+    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout, :follow_location
     attr_reader   :url
     
     def initialize(url, options = {})
@@ -11,6 +11,7 @@ module Typhoeus
       @headers          = options[:headers] || {}
       @user_agent       = options[:user_agent] || Typhoeus::USER_AGENT
       @cache_timeout    = options[:cache_timeout]
+      @follow_location  = options[:follow_location]
       if @method == :post
         @url = url
       else
@@ -112,4 +113,4 @@ module Typhoeus
       run(url, params.merge(:method => :delete))
     end
   end
-end
+end

data/spec/servers/app.rb

@@ -17,6 +17,10 @@ get '/fail_forever' do
   error 500, "oh noes!"
 end
 
+get '/redirect' do
+  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

@@ -2,8 +2,34 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Typhoeus::Easy do  
   describe "options" do
-    it "should allow for following redirects"
-    it "should allow you to set the user agent"
+    it "should not follow redirects if not instructed to" do
+      e = Typhoeus::Easy.new
+      e.url = "http://localhost:3001/redirect"
+      e.method = :get
+      e.perform
+      e.response_code.should == 302
+    end
+
+    it "should allow for following redirects" do
+      e = Typhoeus::Easy.new
+      e.url = "http://localhost:3001/redirect"
+      e.method = :get
+      e.follow_location = true
+      e.perform
+      e.response_code.should == 200
+      JSON.parse(e.response_body)["REQUEST_METHOD"].should == "GET"
+    end
+
+    it "should allow you to set the user agent" do
+      easy = Typhoeus::Easy.new
+      easy.url    = "http://localhost:3002"
+      easy.method = :get
+      easy.user_agent = "myapp"
+      easy.perform
+      easy.response_code.should == 200
+      JSON.parse(easy.response_body)["HTTP_USER_AGENT"].should == "myapp"
+    end
+
     it "should provide a timeout in milliseconds" do
       e = Typhoeus::Easy.new
       e.url = "http://localhost:3001"

metadata

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