itrigga-net_helper 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/itrigga/net_helper.rb

@@ -9,6 +9,10 @@ module Itrigga
   module NetHelper
   
     module_function
+    
+    def typhoeus_present?
+      defined?(Typhoeus)
+    end
   
     def do_get(url, time_out=5, retries_on_timeout=5, max_redirects = 3)
       retrycount = 0
@@ -28,10 +32,55 @@ module Itrigga
       end
     
     end
+    
+    def typhoeus_request( opts={} )
+      opts[:timeout] ||= 30000 # ms
+      opts[:follow_location] ||= true
+      opts[:disable_ssl_peer_verification] = true if opts[:disable_ssl_peer_verification].nil?
+      
+      request = Typhoeus::Request.new(opts[:url], opts)
+      
+      request.on_complete do |response|
+        if response.success?
+          return response.body
+        elsif response.timed_out?
+          # aw hell no
+          log("got a time out")
+        elsif response.code == 0
+          # Could not get an http response, something's wrong.
+          log(response.curl_error_message)
+        else
+          # Received a non-successful http response.
+          log("HTTP request failed: " + response.code.to_s)
+        end
+      end
+      
+    end
+    
+    def get_response( url )
+      if typhoeus_present?
+        typhoeus_request( url )
+      else
+        Net::HTTP.get_response(URI.parse(url))
+      end        
+    end
   
     def get_with_timeout( url, time_out)
+      resp = nil
+      if defined?(SystemTimer)
+        resp = SystemTimer.timeout_after(time_out) do
+          get_response(url)
+        end
+      else
+        resp = timeout(time_out) do
+          get_response(url)
+        end
+      end
+      resp
+    end
+      
       resp = timeout(time_out) do
-        Net::HTTP.get_response(URI.parse(url))    
+            
       end
       resp
     end

data/spec/net_helper_spec.rb

@@ -1,10 +1,30 @@
-require 'spec_helper'
+require File.join(File.dirname(__FILE__), 'spec_helper' )
 
 describe "Itrigga::NetHelper" do
   before(:each) do
     @mock_response = mock("response")
     @mock_response.stub!(:body).and_return("body")
   end
+  
+  describe "typhoeus_present?" do
+    context "when Typhoeus is loaded" do
+      before(:each) do
+        class Typhoeus
+        end
+      end
+      
+      it "should return true" do
+        Itrigga::NetHelper.typhoeus_present?.should == true
+      end
+    end
+    
+    context "when Typhoeus is not loaded" do
+      it "should return false" do
+        Itrigga::NetHelper.typhoeus_present?.should == false
+      end
+    end
+    
+  end
 
   describe "do_get" do
     it "should get the HTTP response" do

data/spec/spec_helper.rb

@@ -16,6 +16,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'itrigga/core_ext'
 require 'itrigga/net_helper'
 
+Dir.chdir(File.join(File.dirname(__FILE__), '..'))
+
 RSpec.configure do |config|
   # some (optional) config here
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-net_helper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Al Davidson
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 +01:00
+date: 2011-08-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   name: hpricot
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -32,8 +31,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -48,8 +47,8 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -64,8 +63,8 @@ dependencies:
         - 4
         version: 1.6.4
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -78,8 +77,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: rspec
   version_requirements: &id005 !ruby/object:Gem::Requirement 
@@ -92,8 +91,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: json_pure
   version_requirements: &id006 !ruby/object:Gem::Requirement 
@@ -106,8 +105,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: itrigga-core_ext
   version_requirements: &id007 !ruby/object:Gem::Requirement 
@@ -120,8 +119,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: fastercsv
   version_requirements: &id008 !ruby/object:Gem::Requirement 
@@ -136,6 +135,7 @@ dependencies:
         - 4
         version: 1.5.4
   requirement: *id008
+  type: :development
 description: Provides various more convenient wrappers around Net::HTTP methods
 email: aldavidson@trigga.com
 executables: []