typhoeus 0.1.17 → 0.1.18

data/lib/typhoeus.rb

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

data/lib/typhoeus/easy.rb

@@ -21,7 +21,8 @@ module Typhoeus
       :CURLOPT_HTTPAUTH       => 107,
       :CURLOPT_USERPWD        => 10000 + 5,
       :CURLOPT_VERBOSE        => 41,
-      :CURLOPT_PROXY          => 10004
+      :CURLOPT_PROXY          => 10004,
+      :CURLOPT_VERIFYPEER     => 64
     }
     INFO_VALUES = {
       :CURLINFO_RESPONSE_CODE => 2097154,
@@ -35,42 +36,42 @@ module Typhoeus
       :CURLAUTH_NTLM          => 8,
       :CURLAUTH_DIGEST_IE     => 16
     }
-    
+
     def initialize
       @method = :get
       @post_dat_set = nil
       @headers = {}
     end
-    
+
     def headers=(hash)
       @headers = hash
     end
-    
+
     def proxy=(proxy)
       set_option(OPTION_VALUES[:CURLOPT_PROXY], proxy)
     end
-    
+
     def auth=(authinfo)
       set_option(OPTION_VALUES[:CURLOPT_USERPWD], "#{authinfo[:username]}:#{authinfo[:password]}")
       set_option(OPTION_VALUES[:CURLOPT_HTTPAUTH], authinfo[:method]) if authinfo[:method]
     end
-    
+
     def auth_methods
       get_info_long(INFO_VALUES[:CURLINFO_HTTPAUTH_AVAIL])
     end
-    
+
     def verbose=(boolean)
       set_option(OPTION_VALUES[:CURLOPT_VERBOSE], !!boolean ? 1 : 0)
     end
-    
+
     def total_time_taken
       get_info_double(INFO_VALUES[:CURLINFO_TOTAL_TIME])
     end
-    
+
     def response_code
       get_info_long(INFO_VALUES[:CURLINFO_RESPONSE_CODE])
     end
-    
+
     def follow_location=(boolean)
       if boolean
         set_option(OPTION_VALUES[:CURLOPT_FOLLOWLOCATION], 1)
@@ -82,17 +83,17 @@ module Typhoeus
     def max_redirects=(redirects)
       set_option(OPTION_VALUES[:CURLOPT_MAXREDIRS], redirects)
     end
-    
+
     def timeout=(milliseconds)
       @timeout = milliseconds
       set_option(OPTION_VALUES[:CURLOPT_NOSIGNAL], 1)
       set_option(OPTION_VALUES[:CURLOPT_TIMEOUT_MS], milliseconds)
     end
-    
+
     def timed_out?
       @timeout && total_time_taken > @timeout && response_code == 0
     end
-    
+
     def request_body=(request_body)
       @request_body = request_body
       if @method == :put
@@ -103,16 +104,20 @@ module Typhoeus
         self.post_data = request_body
       end
     end
-    
+
     def user_agent=(user_agent)
       set_option(OPTION_VALUES[:CURLOPT_USERAGENT], user_agent)
     end
-          
+
     def url=(url)
       @url = url
       set_option(OPTION_VALUES[:CURLOPT_URL], url)
     end
-    
+
+    def disable_ssl_peer_verification
+      set_option(OPTION_VALUES[:CURLOPT_VERIFYPEER], 0)
+    end
+
     def method=(method)
       @method = method
       if method == :get
@@ -127,13 +132,13 @@ module Typhoeus
         set_option(OPTION_VALUES[:CURLOPT_CUSTOMREQUEST], "DELETE")
       end
     end
-    
+
     def post_data=(data)
       @post_data_set = true
       set_option(OPTION_VALUES[:CURLOPT_POSTFIELDS], data)
       set_option(OPTION_VALUES[:CURLOPT_POSTFIELDSIZE], data.length)
     end
-    
+
     def params=(params)
       params_string = params.keys.collect do |k|
         value = params[k]
@@ -146,14 +151,14 @@ module Typhoeus
           "#{Rack::Utils.escape(k.to_s)}=#{Rack::Utils.escape(params[k].to_s)}"
         end
       end.flatten.join("&")
-      
+
       if method == :post
         self.post_data = params_string
       else
         self.url = "#{url}?#{params_string}"
       end
     end
-    
+
     def set_option(option, value)
       if value.class == String
         easy_setopt_string(option, value)
@@ -161,42 +166,42 @@ module Typhoeus
         easy_setopt_long(option, value)
       end
     end
-    
+
     def perform
       set_headers()
       easy_perform()
       response_code()
     end
-    
+
     def set_headers
       headers.each_pair do |key, value|
         easy_add_header("#{key}: #{value}")
       end
       easy_set_headers() unless headers.empty?
     end
-    
+
     # gets called when finished and response code is 200-299
     def success
       @success.call(self) if @success
     end
-    
+
     def on_success(&block)
       @success = block
     end
-    
+
     def on_success=(block)
       @success = block
     end
-    
+
     # gets called when finished and response code is 300-599
     def failure
       @failure.call(self) if @failure
     end
-    
+
     def on_failure(&block)
       @failure = block
     end
-    
+
     def on_failure=(block)
       @failure = block
     end
@@ -204,20 +209,20 @@ module Typhoeus
     def retries
       @retries ||= 0
     end
-    
+
     def increment_retries
       @retries ||= 0
       @retries += 1
     end
-    
+
     def max_retries
       @max_retries ||= 40
     end
-    
+
     def max_retries?
       retries >= max_retries
     end
-    
+
     def reset
       @retries = 0
       @response_code = 0
@@ -225,19 +230,19 @@ module Typhoeus
       @response_body = ""
       easy_reset()
     end
-    
+
     def get_info_string(option)
       easy_getinfo_string(option)
     end
-    
+
     def get_info_long(option)
       easy_getinfo_long(option)
     end
-    
+
     def get_info_double(option)
       easy_getinfo_double(option)
     end
-    
+
     def curl_version
       version
     end

data/lib/typhoeus/hydra.rb

@@ -125,7 +125,8 @@ module Typhoeus
       easy.follow_location = request.follow_location if request.follow_location
       easy.max_redirects = request.max_redirects if request.max_redirects
       easy.proxy = request.proxy if request.proxy
-      
+      easy.disable_ssl_peer_verification if request.disable_ssl_peer_verification
+
       easy.on_success do |easy|
         queue_next
         handle_request(request, response_from_easy(easy, request))

data/lib/typhoeus/request.rb

@@ -1,8 +1,8 @@
 module Typhoeus
   class Request
-    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout, :follow_location, :max_redirects, :proxy
+    attr_accessor :method, :params, :body, :headers, :timeout, :user_agent, :response, :cache_timeout, :follow_location, :max_redirects, :proxy, :disable_ssl_peer_verification
     attr_reader   :url
-    
+
     def initialize(url, options = {})
       @method           = options[:method] || :get
       @params           = options[:params]
@@ -14,6 +14,7 @@ module Typhoeus
       @follow_location  = options[:follow_location]
       @max_redirects    = options[:max_redirects]
       @proxy            = options[:proxy]
+      @disable_ssl_peer_verification = options[:disable_ssl_peer_verification]
 
       if @method == :post
         @url = url
@@ -24,7 +25,7 @@ module Typhoeus
       @after_complete   = nil
       @handled_response = nil
     end
-    
+
     def host
       slash_location = @url.index('/', 8)
       if slash_location
@@ -34,12 +35,12 @@ module Typhoeus
         return query_string_location ? @url.slice(0, query_string_location) : @url
       end
     end
-    
+
     def headers
       @headers["User-Agent"] = @user_agent
       @headers
     end
-    
+
     def params_string
       params.keys.sort.collect do |k|
         value = params[k]
@@ -53,65 +54,65 @@ module Typhoeus
         end
       end.flatten.join("&")
     end
-    
+
     def on_complete(&block)
       @on_complete = block
     end
-    
+
     def on_complete=(proc)
       @on_complete = proc
     end
-    
+
     def after_complete(&block)
       @after_complete = block
     end
-    
+
     def after_complete=(proc)
       @after_complete = proc
     end
-    
+
     def call_handlers
       if @on_complete
         @handled_response = @on_complete.call(response)
         call_after_complete
       end
     end
-    
+
     def call_after_complete
        @after_complete.call(@handled_response) if @after_complete
     end
-    
+
     def handled_response=(val)
       @handled_response = val
     end
-    
+
     def handled_response
       @handled_response || response
     end
-    
+
     def cache_key
       Digest::SHA1.hexdigest(url)
     end
-    
+
     def self.run(url, params)
       r = new(url, params)
       Typhoeus::Hydra.hydra.queue r
       Typhoeus::Hydra.hydra.run
       r.response
     end
-    
+
     def self.get(url, params = {})
       run(url, params.merge(:method => :get))
     end
-    
+
     def self.post(url, params = {})
       run(url, params.merge(:method => :post))
     end
-    
+
     def self.put(url, params = {})
       run(url, params.merge(:method => :put))
     end
-    
+
     def self.delete(url, params = {})
       run(url, params.merge(:method => :delete))
     end

metadata

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