itrigga-net_helper 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/itrigga/net_helper.rb

@@ -11,7 +11,11 @@ module Itrigga
     module_function
     
     def typhoeus_present?
-      defined?(Typhoeus)
+      if defined?(Typhoeus)
+        true
+      else
+        false
+      end
     end
   
     def do_get(url, time_out=5, retries_on_timeout=5, max_redirects = 3)
@@ -34,7 +38,8 @@ module Itrigga
     end
     
     def typhoeus_request( opts={} )
-      opts[:timeout] ||= 30000 # ms
+      opts[:timeout] ||= 30
+      opts[:timeout] *= 1000 # Typhoeus does its timeouts in ms
       opts[:follow_location] ||= true
       opts[:disable_ssl_peer_verification] = true if opts[:disable_ssl_peer_verification].nil?
       
@@ -45,21 +50,24 @@ module Itrigga
           return response.body
         elsif response.timed_out?
           # aw hell no
-          log("got a time out")
+          raise IOError.new("Timed out request to #{opts[:url]} after #{opts[:timeout]}ms") 
         elsif response.code == 0
           # Could not get an http response, something's wrong.
-          log(response.curl_error_message)
+          raise IOError.new(response.curl_error_message)
         else
           # Received a non-successful http response.
-          log("HTTP request failed: " + response.code.to_s)
+          raise IOError.new("HTTP request failed: " + response.code.to_s)
         end
       end
       
+      hydra = Typhoeus::Hydra.new
+      hydra.queue(request)
+      hydra.run
     end
     
-    def get_response( url )
+    def get_response( url, timeout=nil )
       if typhoeus_present?
-        typhoeus_request( url )
+        typhoeus_request( :url=>url, :timeout=>timeout )
       else
         Net::HTTP.get_response(URI.parse(url))
       end        
@@ -69,25 +77,21 @@ module Itrigga
       resp = nil
       if defined?(SystemTimer)
         resp = SystemTimer.timeout_after(time_out) do
-          get_response(url)
+          get_response(url, time_out)
         end
       else
         resp = timeout(time_out) do
-          get_response(url)
+          get_response(url, time_out)
         end
       end
       resp
     end
       
-      resp = timeout(time_out) do
-            
-      end
-      resp
-    end
   
   
     def handle_response( url, resp, retries_on_timeout=5, max_redirects = 3 )
       if resp.is_a? Net::HTTPSuccess then resp.body
+      elsif resp.is_a? String then resp
       elsif resp.is_a? Net::HTTPRedirection
           if max_redirects > 0
             do_get( URI.parse(url).merge(resp['location']).to_s, retries_on_timeout, max_redirects - 1 )
@@ -110,8 +114,14 @@ module Itrigga
       
         retrycount = 0
         resp = begin
-          timeout( opts[:timeout] ) do
-            raw_get(opts)
+          if defined?(SystemTimer)
+            SystemTimer.timeout_after(opts[:timeout]) do
+              raw_get(opts)
+            end
+          else
+            timeout( opts[:timeout] ) do
+              raw_get(opts)
+            end
           end
         rescue TimeoutError
           if(retrycount < opts[:retries_on_timeout])
@@ -126,6 +136,11 @@ module Itrigga
     end
   
     def raw_get(opts) 
+      
+      if typhoeus_present?
+        return typhoeus_request(opts)  
+      end
+      
       resp = nil
       establish_session_if_needed(opts)
     

data/spec/net_helper_spec.rb

@@ -9,8 +9,7 @@ describe "Itrigga::NetHelper" do
   describe "typhoeus_present?" do
     context "when Typhoeus is loaded" do
       before(:each) do
-        class Typhoeus
-        end
+        Itrigga::NetHelper.send(:const_set, "Typhoeus", Proc.new {})
       end
       
       it "should return true" do
@@ -19,6 +18,10 @@ describe "Itrigga::NetHelper" do
     end
     
     context "when Typhoeus is not loaded" do
+      before(:each) do
+        Itrigga::NetHelper.send(:remove_const, "Typhoeus")
+      end
+      
       it "should return false" do
         Itrigga::NetHelper.typhoeus_present?.should == false
       end
@@ -27,6 +30,11 @@ describe "Itrigga::NetHelper" do
   end
 
   describe "do_get" do
+    before(:each) do
+      Itrigga::NetHelper.stub!(:typhoeus_present?).and_return(false)
+    end
+    
+      
     it "should get the HTTP response" do
       Itrigga::NetHelper.stub!(:handle_response).and_return("")
       Net::HTTP.should_receive( :get_response ).with( URI.parse("http://some.com") ).and_return(@mock_response)
@@ -70,6 +78,7 @@ describe "Itrigga::NetHelper" do
     
     describe "when the response is OK" do
       before(:each) do
+        @mock_response.stub!(:is_a?).with(String).and_return false
         @mock_response.stub!(:is_a?).with(Net::HTTPSuccess).and_return true
       end
       
@@ -80,6 +89,7 @@ describe "Itrigga::NetHelper" do
     
     describe "when the response is a redirect" do
       before(:each) do
+        @mock_response.stub!(:is_a?).with(String).and_return false
         @mock_response.stub!(:is_a?).with(Net::HTTPSuccess).and_return false
         @mock_response.stub!(:is_a?).with(Net::HTTPRedirection).and_return true
         @mock_response.stub!(:[]).with('location').and_return("http://some.redirect")
@@ -246,6 +256,7 @@ describe "Itrigga::NetHelper" do
     before(:each) do
       Itrigga::NetHelper.stub!(:get_with_auth).and_return( 'body' )
       Itrigga::NetHelper.stub!(:establish_session_if_needed)
+      Itrigga::NetHelper.stub!(:typhoeus_present?).and_return(false)
       @mock_session = mock("http session")
       @mock_session.stub!(:request_get).and_return( @mock_response = mock('request_get response') )
       @mock_response.stub!(:body).and_return('response body')
@@ -306,6 +317,7 @@ describe "Itrigga::NetHelper" do
   describe "get_with_auth" do
     before(:each) do
       Itrigga::NetHelper.stub!(:establish_session_if_needed)
+      Itrigga::NetHelper.stub!(:typhoeus_present).and_return(false)
       @mock_get = mock('get')
       @mock_get.stub!(:basic_auth)
       Net::HTTP::Get.stub!(:new).and_return(@mock_get)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-net_helper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Al Davidson