@@ -107,6 +107,7 @@ module Typhoeus def get_easy_object(request) easy = @easy_pool.pop || Easy.new easy.url = request.url + easy.params = request.params if request.method == :post easy.method = request.method easy.headers = request.headers if request.headers easy.request_body = request.body if request.body lib/typhoeus/hydra.rb @@ -11,7 +11,11 @@ module Typhoeus @headers = options[:headers] || {} @user_agent = options[:user_agent] || Typhoeus::USER_AGENT @cache_timeout = options[:cache_timeout] - @url = @params ? "#{url}?#{params_string}" : url + if @method == :post + @url = url + else + @url = @params ? "#{url}?#{params_string}" : url + end @on_complete = nil @after_complete = nil @handled_response = nil lib/typhoeus/request.rb @@ -27,6 +27,7 @@ describe Typhoeus::Hydra do it "has a setter for the singleton" do Typhoeus::Hydra.hydra = :foo Typhoeus::Hydra.hydra.should == :foo + Typhoeus::Hydra.hydra = Typhoeus::Hydra.new end context "#stub" do @@ -224,12 +225,12 @@ describe Typhoeus::Hydra do it "should fire and forget" do hydra = Typhoeus::Hydra.new - first = Typhoeus::Request.new("http://localhost:3000/first?delay=5") - second = Typhoeus::Request.new("http://localhost:3001/second?delay=10") + first = Typhoeus::Request.new("http://localhost:3000/first?delay=1") + second = Typhoeus::Request.new("http://localhost:3001/second?delay=2") hydra.queue first hydra.queue second hydra.fire_and_forget - third = Typhoeus::Request.new("http://localhost:3002/third?delay=15") + third = Typhoeus::Request.new("http://localhost:3002/third?delay=3") hydra.queue third hydra.fire_and_forget end spec/typhoeus/hydra_spec.rb @@ -11,7 +11,9 @@ describe "request" do it "can run a POST synchronously" do response = Typhoeus::Request.post("http://localhost:3000", :params => {:q => "hi"}, :headers => {:foo => "bar"}) response.code.should == 200 - JSON.parse(response.body)["REQUEST_METHOD"].should == "POST" + json = JSON.parse(response.body) + json["REQUEST_METHOD"].should == "POST" + json["QUERY_STRING"].should == "q=hi" end it "can run a PUT synchronously" do spec/typhoeus/request_spec.rb 6845d5c37f3518ae88e930726088fa960015e4de Paul Dix paul@pauldix.net http://github.com/pauldix/typhoeus/commit/9cb64ec6d945e07c208aa507941ade77119f86f2 9cb64ec6d945e07c208aa507941ade77119f86f2 2009-11-02T08:42:23-08:00 2009-11-02T08:42:23-08:00 modified behavior of POST to put params into the post_data (body) instead of the URL. 0b0f8a7575e9f5d8cdedea7b2a66777029d63414 Paul Dix paul@pauldix.net