typhoeus 1.0.0 → 1.4.0

data/lib/typhoeus/request/cacheable.rb

@@ -2,16 +2,16 @@ module Typhoeus
   class Request
     module Cacheable
       def response=(response)
-        Typhoeus::Config.cache.set(self, response) if cacheable? && !response.cached?
+        cache.set(self, response) if cacheable? && !response.cached?
         super
       end
 
       def cacheable?
-        Typhoeus::Config.cache
+        cache
       end
 
       def run
-        if cacheable? && response = Typhoeus::Config.cache.get(self)
+        if response = cached_response
           response.cached = true
           finish(response)
         else
@@ -19,9 +19,20 @@ module Typhoeus
         end
       end
 
+      def cached_response
+        cacheable? && cache.get(self)
+      end
+
       def cache_ttl
         options[:cache_ttl]
       end
+
+      private
+
+      def cache
+        return nil if options[:cache] === false
+        options[:cache] || Typhoeus::Config.cache
+      end
     end
   end
 end

data/lib/typhoeus/request/callbacks.rb

@@ -89,6 +89,24 @@ module Typhoeus
           @on_headers << block if block_given?
           @on_headers
         end
+
+        # Set on_progress callback.
+        #
+        # @example Set on_progress.
+        #   request.on_progress do |dltotal, dlnow, ultotal, ulnow|
+        #     puts "dltotal (#{dltotal}), dlnow (#{dlnow}), ultotal (#{ultotal}), ulnow (#{ulnow})"
+        #   end
+        #
+        # @param [ Block ] block The block to execute.
+        #
+        # @yield [ Typhoeus::Response ]
+        #
+        # @return [ Array<Block> ] All on_progress blocks.
+        def on_progress(&block)
+          @on_progress ||= []
+          @on_progress << block if block_given?
+          @on_progress
+        end
       end
 
       # Execute the headers callbacks and yields response.
@@ -106,8 +124,8 @@ module Typhoeus
       end
 
       # Execute necessary callback and yields response. This
-      # include in every case on_complete, on_success if
-      # successful and on_failure if not.
+      # include in every case on_complete and on_progress, on_success
+      # if successful and on_failure if not.
       #
       # @example Execute callbacks.
       #   request.execute_callbacks
@@ -116,7 +134,7 @@ module Typhoeus
       #
       # @api private
       def execute_callbacks
-        callbacks = Typhoeus.on_complete + on_complete
+        callbacks = Typhoeus.on_complete + Typhoeus.on_progress + on_complete + on_progress
 
         if response && response.success?
           callbacks += Typhoeus.on_success + on_success

data/lib/typhoeus/request/marshal.rb

@@ -5,9 +5,9 @@ module Typhoeus
     module Marshal
 
       # Return the important data needed to serialize this Request, except the
-      # `on_complete`, `on_success`, `on_failure`, and `hydra`, since they cannot be marshalled.
+      # request callbacks and `hydra`, since they cannot be marshalled.
       def marshal_dump
-        unmarshallable = %w(@on_complete @on_success @on_failure @on_headers @on_body @hydra)
+        unmarshallable = %w(@on_complete @on_success @on_failure @on_progress @on_headers @on_body @hydra)
         (instance_variables - unmarshallable - unmarshallable.map(&:to_sym)).map do |name|
           [name, instance_variable_get(name)]
         end

data/lib/typhoeus/request/streamable.rb

@@ -10,7 +10,7 @@ module Typhoeus
       # Setting an on_body callback will cause the response body to be empty.
       #
       # @example Set on_body.
-      #   request.on_body { |response, body_chunk| puts "Got #{body_chunk.bytesize} bytes" }
+      #   request.on_body { |body_chunk, response| puts "Got #{body_chunk.bytesize} bytes" }
       #
       # @param [ Block ] block The block to execute.
       #

data/lib/typhoeus/request.rb

@@ -212,8 +212,10 @@ module Typhoeus
       default_user_agent = Config.user_agent || Typhoeus::USER_AGENT
 
       options[:headers] = {'User-Agent' => default_user_agent}.merge(options[:headers] || {})
+      options[:headers]['Expect'] ||= ''
       options[:verbose] = Typhoeus::Config.verbose if options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
       options[:maxredirs] ||= 50
+      options[:proxy] = Typhoeus::Config.proxy unless options.has_key?(:proxy) || Typhoeus::Config.proxy.nil?
     end
   end
 end

data/lib/typhoeus/response/header.rb

@@ -1,11 +1,14 @@
+require 'delegate'
+
 module Typhoeus
   class Response
 
     # This class represents the response header.
     # It can be accessed like a hash.
+    # Values can be strings (normal case) or arrays of strings (for duplicates headers)
     #
     # @api private
-    class Header < Hash
+    class Header < DelegateClass(Hash)
 
       # Create a new header.
       #
@@ -14,10 +17,14 @@ module Typhoeus
       #
       # @param [ String ] raw The raw header.
       def initialize(raw)
+        super({})
         @raw = raw
         @sanitized = {}
         parse
-        set_default_proc_on(self, lambda { |h, k| @sanitized[k.to_s.downcase] })
+      end
+
+      def [](key)
+        fetch(key) { @sanitized[key.to_s.downcase] }
       end
 
       # Parses the raw header.
@@ -31,8 +38,9 @@ module Typhoeus
             process_pair(k, v)
           end
         when String
-          raw.lines.each do |header|
-            next if header.empty? || header.start_with?( 'HTTP/1.' )
+          raw.split(/\r?\n(?!\s)/).each do |header|
+            header.strip!
+            next if header.empty? || header.start_with?( 'HTTP/' )
             process_line(header)
           end
         end
@@ -45,7 +53,7 @@ module Typhoeus
       # @return [ void ]
       def process_line(header)
         key, value = header.split(':', 2)
-        process_pair(key.strip, value.strip)
+        process_pair(key.strip, (value ? value.strip.gsub(/\r?\n\s*/, ' ') : ''))
       end
 
       # Sets key value pair for self and @sanitized.

data/lib/typhoeus/response/informations.rb

@@ -47,9 +47,13 @@ module Typhoeus
       def response_headers
         return options[:response_headers] if options[:response_headers]
         if mock? && h = options[:headers]
-            h.map{ |k,v| [k, v.respond_to?(:join) ? v.join : v] }.
-              map{ |e| "#{e.first}: #{e.last}" }.
-              join("\r\n")
+            status_code = return_code || "200"
+            reason_phrase = status_code == "200" ? "OK" : "Mock Reason Phrase"
+            status_line = "HTTP/1.1 #{status_code} #{reason_phrase}"
+            actual_headers = h.map{ |k,v| [k, v.respond_to?(:join) ? v.join(',') : v] }.
+              map{ |e| "#{e.first}: #{e.last}" }
+
+            [status_line, *actual_headers].join("\r\n")
         end
       end
 

data/lib/typhoeus/response/status.rb

@@ -39,14 +39,24 @@ module Typhoeus
         @http_version ||= first_header_line ? first_header_line[/HTTP\/(\S+)/, 1] : nil
       end
 
-      # Return wether the response is a success.
+      # Return whether the response is a success.
       #
       # @example Return if the response was successful.
       #  response.success?
       #
       # @return [ Boolean ] Return true if successful, false else.
       def success?
-        (mock || return_code == :ok) && response_code && response_code >= 200 && response_code < 300
+        (mock || return_code == :ok) && response_code && has_good_response_code?
+      end
+
+      # Return whether the response is a failure.
+      #
+      # @example Return if the response was failed.
+      #  response.failure?
+      #
+      # @return [ Boolean ] Return true if failure, false else.
+      def failure?
+        (mock || return_code == :internal_server_error) && response_code && has_bad_response_code?
       end
 
       # Return wether the response is modified.
@@ -81,6 +91,16 @@ module Typhoeus
           end
         end
       end
+
+      # :nodoc:
+      def has_good_response_code?
+        response_code >= 200 && response_code < 300
+      end
+
+      # :nodoc:
+      def has_bad_response_code?
+        !has_good_response_code?
+      end
     end
   end
 end

data/lib/typhoeus/response.rb

@@ -14,7 +14,7 @@ module Typhoeus
     # Remembers the corresponding request.
     #
     # @example Get request.
-    #   request = Typhoeus::Request.get("www.example.com")
+    #   request = Typhoeus::Request.new("www.example.com")
     #   response = request.run
     #   request == response.request
     #   #=> true

data/lib/typhoeus/version.rb

@@ -1,5 +1,5 @@
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '1.0.0'
+  VERSION = '1.4.0'
 end

data/lib/typhoeus.rb

@@ -17,6 +17,21 @@ if defined?(Rack)
   require "rack/typhoeus"
 end
 
+# If the Redis gem is available, load the redis cache adapter
+if defined?(Redis)
+  require "typhoeus/cache/redis"
+end
+
+# If the Dalli gem is available, load the Dalli cache adapter
+if defined?(Dalli)
+  require "typhoeus/cache/dalli"
+end
+
+# If we are using Rails, load the Rails cache adapter
+if defined?(Rails)
+  require "typhoeus/cache/rails"
+end
+
 # If we are using Rails, then we will include the Typhoeus railtie.
 # if defined?(Rails)
 #   require "typhoeus/railtie"
@@ -112,11 +127,12 @@ module Typhoeus
   #     #=> :ok
   #   end
   #
-  # @param [ Block ] block The block to execute.
-  #
+  # @yield Yields control to the block after disabling block_connection.
+  #        Afterwards, the block_connection is set to its original
+  #        value.
   # @return [ Object ] Returns the return value of the block.
   #
-  # @see Typhoeus::Config#block_connection
+  # @see Typhoeus::Config.block_connection
   def self.with_connection
     old = Config.block_connection
     Config.block_connection = false

data/spec/support/server.rb

@@ -23,6 +23,14 @@ TESTSERVER = Sinatra.new do
     [200, { 'Set-Cookie' => %w[ foo bar ], 'Content-Type' => 'text/plain' }, ['']]
   end
 
+  get '/cookies-test' do
+    [200, { 'Set-Cookie' => %w(foo=bar bar=foo), 'Content-Type' => 'text/plain' }, ['']]
+  end
+
+  get '/cookies-test2' do
+    [200, { 'Set-Cookie' => %w(foo2=bar bar2=foo), 'Content-Type' => 'text/plain' }, ['']]
+  end
+
   get '/fail/:number' do
     if fail_count >= params[:number].to_i
       "ok"