pauldix-typhoeus 0.0.19 → 0.0.20

data/lib/typhoeus/easy.rb

@@ -1,6 +1,8 @@
 module Typhoeus
   class Easy
     attr_reader :response_body, :response_header, :method, :headers, :url
+    attr_accessor :start_time
+
     CURLINFO_STRING = 1048576
     OPTION_VALUES = {
       :CURLOPT_URL            => 10002,

data/lib/typhoeus/multi.rb

@@ -1,10 +1,17 @@
 module Typhoeus
   class Multi
+    attr_reader :easy_handles
+
+    def initialize
+      reset_easy_handles
+    end
+
     def remove(easy)
       multi_remove_handle(easy)
     end
     
     def add(easy)
+      @easy_handles << easy
       multi_add_handle(easy)
     end
     
@@ -12,10 +19,16 @@ module Typhoeus
       while active_handle_count > 0 do
         multi_perform
       end
+      reset_easy_handles
     end
     
     def cleanup()
       multi_cleanup
     end
+
+    private
+    def reset_easy_handles
+      @easy_handles = []
+    end
   end
-end
+end

data/lib/typhoeus/remote.rb

@@ -65,7 +65,8 @@ module Typhoeus
       return nil unless @remote_mocks
       if @remote_mocks.has_key? method
         extra_response_args = { :requested_http_method => method,
-                                :requested_url => url }
+                                :requested_url => url,
+                                :start_time => Time.now }
         mock_key = mock_key_for(url, options[:params])
         if @remote_mocks[method].has_key? mock_key
           get_mock_and_run_handlers(method,

data/lib/typhoeus/remote_proxy_object.rb

@@ -26,7 +26,8 @@ module Typhoeus
                                   :body => @easy.response_body,
                                   :time => @easy.total_time_taken,
                                   :requested_url => @easy.url,
-                                  :requested_http_method => @easy.method)
+                                  :requested_http_method => @easy.method,
+                                  :start_time => @easy.start_time)
           if @easy.response_code >= 200 && @easy.response_code < 300
             Typhoeus.release_easy_object(@easy)
             @proxied_object = @success.nil? ? response : @success.call(response)

data/lib/typhoeus/response.rb

@@ -2,7 +2,7 @@ module Typhoeus
   class Response
     attr_reader :code, :headers, :body, :time,
                 :requested_url, :requested_remote_method,
-                :requested_http_method
+                :requested_http_method, :start_time
     
     def initialize(params = {})
       @code                     = params[:code]
@@ -11,6 +11,7 @@ module Typhoeus
       @time                     = params[:time]
       @requested_url            = params[:requested_url]
       @requested_http_method    = params[:requested_http_method]
+      @start_time               = params[:start_time]
     end
   end
 end

data/lib/typhoeus.rb

@@ -12,7 +12,7 @@ require 'typhoeus/remote_proxy_object'
 require 'typhoeus/response'
 
 module Typhoeus
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
   
   def self.easy_object_pool
     @easy_objects ||= []
@@ -43,6 +43,11 @@ module Typhoeus
   end
   
   def self.perform_easy_requests
-    Thread.current[:curl_multi].perform
+    multi = Thread.current[:curl_multi]
+    start_time = Time.now
+    multi.easy_handles.each do |easy|
+      easy.start_time = start_time
+    end
+    multi.perform
   end
 end

data/spec/typhoeus/easy_spec.rb

@@ -47,6 +47,16 @@ describe Typhoeus::Easy do
     end
   end
 
+  describe "start_time" do
+    it "should be get/settable" do
+      time = Time.now
+      easy = Typhoeus::Easy.new
+      easy.start_time.should be_nil
+      easy.start_time = time
+      easy.start_time.should == time
+    end
+  end
+
   describe "params=" do
     it "should handle arrays of params" do
       easy = Typhoeus::Easy.new

data/spec/typhoeus/multi_spec.rb

@@ -8,6 +8,18 @@ describe Typhoeus::Easy do
   after(:all) do
     stop_method_server(@pid)
   end
+
+  it "should save easy handles that get added" do
+    multi = Typhoeus::Multi.new
+    easy = Typhoeus::Easy.new
+    easy.url = "http://localhost:3002"
+    easy.method = :get
+
+    multi.add(easy)
+    multi.easy_handles.should == [easy]
+    multi.perform
+    multi.easy_handles.should == []
+  end
   
   it "should be reusable" do
     easy = Typhoeus::Easy.new
@@ -67,4 +79,4 @@ describe Typhoeus::Easy do
     # 
     # multi.perform
   # end
-end
+end

metadata

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