em-http-request 0.2.10 → 0.2.11

data/lib/em-http/core_ext/bytesize.rb

@@ -1,6 +1,6 @@
-# bytesize was introduced in 1.8.7+
-if RUBY_VERSION <= "1.8.6"
-  class String
-    def bytesize; self.size; end
-  end
+# bytesize was introduced in 1.8.7+
+if RUBY_VERSION <= "1.8.6"
+  class String
+    def bytesize; self.size; end
+  end
 end

data/lib/em-http/core_ext/hash.rb

@@ -1,53 +1,53 @@
-class Hash
-  # Stolen partially from Merb : http://noobkit.com/show/ruby/gems/development/merb/hash/to_params.html
-  # Convert this hash to a query string:
-  #   
-  #   { :name => "Bob",
-  #     :address => {
-  #       :street => '111 Ruby Ave.',
-  #       :city => 'Ruby Central',
-  #       :phones => ['111-111-1111', '222-222-2222']
-  #     }
-  #   }.to_params
-  #   #=> "name=Bob&address[city]=Ruby Central&address[phones]=111-111-1111222-222-2222&address[street]=111 Ruby Ave."
-  # 
-  def to_params
-    params = ''
-    stack = []
-    
-    each do |k, v|
-      if v.is_a?(Hash)
-        stack << [k,v]
-      elsif v.is_a?(Array)
-        stack << [k,Hash.from_array(v)]
-      else
-        params << "#{k}=#{v}&"
-      end
-    end
-    
-    stack.each do |parent, hash|
-      hash.each do |k, v|
-        if v.is_a?(Hash)
-          stack << ["#{parent}[#{k}]", v]
-        else
-          params << "#{parent}[#{k}]=#{v}&"
-        end
-      end
-    end
-    
-    params.chop! # trailing &
-    params
-  end
-  
-  ##
-  # Builds a hash from an array with keys as array indices.
-  def self.from_array(array = [])
-    h = Hash.new
-    array.size.times do |t|
-      h[t] = array[t]
-    end
-    h
-  end
-
-end
-
+class Hash
+  # Stolen partially from Merb : http://noobkit.com/show/ruby/gems/development/merb/hash/to_params.html
+  # Convert this hash to a query string:
+  #   
+  #   { :name => "Bob",
+  #     :address => {
+  #       :street => '111 Ruby Ave.',
+  #       :city => 'Ruby Central',
+  #       :phones => ['111-111-1111', '222-222-2222']
+  #     }
+  #   }.to_params
+  #   #=> "name=Bob&address[city]=Ruby Central&address[phones]=111-111-1111222-222-2222&address[street]=111 Ruby Ave."
+  # 
+  def to_params
+    params = ''
+    stack = []
+    
+    each do |k, v|
+      if v.is_a?(Hash)
+        stack << [k,v]
+      elsif v.is_a?(Array)
+        stack << [k,Hash.from_array(v)]
+      else
+        params << "#{k}=#{v}&"
+      end
+    end
+    
+    stack.each do |parent, hash|
+      hash.each do |k, v|
+        if v.is_a?(Hash)
+          stack << ["#{parent}[#{k}]", v]
+        else
+          params << "#{parent}[#{k}]=#{v}&"
+        end
+      end
+    end
+    
+    params.chop! # trailing &
+    params
+  end
+  
+  ##
+  # Builds a hash from an array with keys as array indices.
+  def self.from_array(array = [])
+    h = Hash.new
+    array.size.times do |t|
+      h[t] = array[t]
+    end
+    h
+  end
+
+end
+

data/lib/em-http/decoders.rb

@@ -1,122 +1,122 @@
-require 'zlib'
-require 'stringio'
-
-##
-# Provides a unified callback interface to decompression libraries.
-module EventMachine::HttpDecoders
-
-  class DecoderError < StandardError
-  end
-
-  class << self
-    def accepted_encodings
-      DECODERS.inject([]) { |r,d| r + d.encoding_names }
-    end
-
-    def decoder_for_encoding(encoding)
-      DECODERS.each { |d|
-        return d if d.encoding_names.include? encoding
-      }
-      nil
-    end
-  end
-
-  class Base
-    def self.encoding_names
-      name = to_s.split('::').last.downcase
-      [name]
-    end
-
-    ##
-    # chunk_callback:: [Block] To handle a decompressed chunk
-    def initialize(&chunk_callback)
-      @chunk_callback = chunk_callback
-    end
-
-    def <<(compressed)
-      return unless compressed && compressed.size > 0
-
-      decompressed = decompress(compressed)
-      receive_decompressed decompressed
-    end
-
-    def finalize!
-      decompressed = finalize
-      receive_decompressed decompressed
-    end
-    
-    private
-
-    def receive_decompressed(decompressed)
-      if decompressed && decompressed.size > 0
-        @chunk_callback.call(decompressed)
-      end
-    end
-
-    protected
-
-    ##
-    # Must return a part of decompressed
-    def decompress(compressed)
-      nil
-    end
-
-    ##
-    # May return last part
-    def finalize
-      nil
-    end
-  end
-
-  class Deflate < Base
-    def decompress(compressed)
-      begin
-        @zstream ||= Zlib::Inflate.new(nil)
-        @zstream.inflate(compressed)
-      rescue Zlib::Error
-        raise DecoderError
-      end
-    end
-
-    def finalize
-      return nil unless @zstream
-
-      begin
-        r = @zstream.inflate(nil)
-        @zstream.close
-        r
-      rescue Zlib::Error
-        raise DecoderError
-      end
-    end
-  end
-
-  ##
-  # Oneshot decompressor, due to lack of a streaming Gzip reader
-  # implementation. We may steal code from Zliby to improve this.
-  #
-  # For now, do not put `gzip' or `compressed' in your accept-encoding
-  # header if you expect much data through the :on_response interface.
-  class GZip < Base
-    def self.encoding_names
-      %w(gzip compressed)
-    end
-
-    def decompress(compressed)
-      @buf ||= ''
-      @buf += compressed
-      nil
-    end
-
-    def finalize
-      begin
-        Zlib::GzipReader.new(StringIO.new(@buf.to_s)).read
-      rescue Zlib::Error
-        raise DecoderError
-      end
-    end
-  end
-
-  DECODERS = [Deflate, GZip]
-
-end
+require 'zlib'
+require 'stringio'
+
+##
+# Provides a unified callback interface to decompression libraries.
+module EventMachine::HttpDecoders
+
+  class DecoderError < StandardError
+  end
+
+  class << self
+    def accepted_encodings
+      DECODERS.inject([]) { |r,d| r + d.encoding_names }
+    end
+
+    def decoder_for_encoding(encoding)
+      DECODERS.each { |d|
+        return d if d.encoding_names.include? encoding
+      }
+      nil
+    end
+  end
+
+  class Base
+    def self.encoding_names
+      name = to_s.split('::').last.downcase
+      [name]
+    end
+
+    ##
+    # chunk_callback:: [Block] To handle a decompressed chunk
+    def initialize(&chunk_callback)
+      @chunk_callback = chunk_callback
+    end
+
+    def <<(compressed)
+      return unless compressed && compressed.size > 0
+
+      decompressed = decompress(compressed)
+      receive_decompressed decompressed
+    end
+
+    def finalize!
+      decompressed = finalize
+      receive_decompressed decompressed
+    end
+    
+    private
+
+    def receive_decompressed(decompressed)
+      if decompressed && decompressed.size > 0
+        @chunk_callback.call(decompressed)
+      end
+    end
+
+    protected
+
+    ##
+    # Must return a part of decompressed
+    def decompress(compressed)
+      nil
+    end
+
+    ##
+    # May return last part
+    def finalize
+      nil
+    end
+  end
+
+  class Deflate < Base
+    def decompress(compressed)
+      begin
+        @zstream ||= Zlib::Inflate.new(nil)
+        @zstream.inflate(compressed)
+      rescue Zlib::Error
+        raise DecoderError
+      end
+    end
+
+    def finalize
+      return nil unless @zstream
+
+      begin
+        r = @zstream.inflate(nil)
+        @zstream.close
+        r
+      rescue Zlib::Error
+        raise DecoderError
+      end
+    end
+  end
+
+  ##
+  # Oneshot decompressor, due to lack of a streaming Gzip reader
+  # implementation. We may steal code from Zliby to improve this.
+  #
+  # For now, do not put `gzip' or `compressed' in your accept-encoding
+  # header if you expect much data through the :on_response interface.
+  class GZip < Base
+    def self.encoding_names
+      %w(gzip compressed)
+    end
+
+    def decompress(compressed)
+      @buf ||= ''
+      @buf += compressed
+      nil
+    end
+
+    def finalize
+      begin
+        Zlib::GzipReader.new(StringIO.new(@buf.to_s)).read
+      rescue Zlib::Error
+        raise DecoderError
+      end
+    end
+  end
+
+  DECODERS = [Deflate, GZip]
+
+end

data/lib/em-http/http_options.rb

@@ -1,32 +1,34 @@
-class HttpOptions
-  attr_reader :uri, :method, :host, :port, :options
-
-  def initialize(method, uri, options)
-    raise ArgumentError, "invalid request path" unless /^\// === uri.path
-
-    @options = options
-    @method = method.to_s.upcase
-    @uri = uri
-
-    if proxy = options[:proxy]
-      @host = proxy[:host]
-      @port = proxy[:port]
-    else
-      @host = uri.host
-      @port = uri.port
-    end
-
-    @options[:timeout]    ||= 10  # default connect & inactivity timeouts
-    @options[:redirects]  ||= 0   # default number of redirects to follow
-
-    # Make sure the ports are set as Addressable::URI doesn't
-    # set the port if it isn't there
-    if uri.scheme == "https"
-      @uri.port ||= 443
-      @port     ||= 443
-    else
-      @uri.port ||= 80
-      @port     ||= 80
-    end
-  end
+class HttpOptions
+  attr_reader :uri, :method, :host, :port, :options
+
+  def initialize(method, uri, options)
+    uri.normalize!
+
+    @options = options
+    @method = method.to_s.upcase
+    @uri = uri
+
+    if proxy = options[:proxy]
+      @host = proxy[:host]
+      @port = proxy[:port]
+    else
+      # optional host for cases where you may have
+      # pre-resolved the host, or you need an override
+      @host = options[:host] || uri.host
+      @port = uri.port
+    end
+
+    @options[:timeout]    ||= 10  # default connect & inactivity timeouts
+    @options[:redirects]  ||= 0   # default number of redirects to follow
+
+    # Make sure the ports are set as Addressable::URI doesn't
+    # set the port if it isn't there
+    if uri.scheme == "https"
+      @uri.port ||= 443
+      @port     ||= 443
+    else
+      @uri.port ||= 80
+      @port     ||= 80
+    end
+  end
 end

data/lib/em-http/mock.rb

@@ -1,91 +1,131 @@
 module EventMachine
+  OriginalHttpRequest = HttpRequest unless const_defined?(:OriginalHttpRequest)
+
   class MockHttpRequest < EventMachine::HttpRequest
-    
+
     include HttpEncoding
-    
-    class FakeHttpClient < EventMachine::HttpClient
 
+    class RegisteredRequest < Struct.new(:uri, :method, :headers)
+      def self.build(uri, method, headers)
+        new(uri, method.to_s.upcase, headers || {})
+      end
+    end
+
+    class FakeHttpClient < EventMachine::HttpClient
+      attr_writer :response
+      attr_reader :data
       def setup(response, uri)
         @uri = uri
         if response == :fail
           fail(self)
         else
-          receive_data(response)
-          succeed(self)
+          if response.respond_to?(:call)
+            response.call(self)
+            @state = :body
+          else
+            receive_data(response)
+          end
+          @state == :body ? succeed(self) : fail(self)
         end
       end
-      
+
       def unbind
       end
-      
     end
-    
-    @@registry = nil
-    @@registry_count = nil
-    
+
+    @@registry = Hash.new
+    @@registry_count = Hash.new{|h,k| h[k] = 0}
+
+    def self.use
+      activate!
+      yield
+    ensure
+      deactivate!
+    end
+
+    def self.activate!
+      EventMachine.send(:remove_const, :HttpRequest)
+      EventMachine.send(:const_set, :HttpRequest, MockHttpRequest)
+    end
+
+    def self.deactivate!
+      EventMachine.send(:remove_const, :HttpRequest)
+      EventMachine.send(:const_set, :HttpRequest, OriginalHttpRequest)
+    end
+
     def self.reset_counts!
-      @@registry_count = Hash.new do |registry,query| 
-        registry[query] = Hash.new{|h,k| h[k] = Hash.new(0)}
-      end
+      @@registry_count.clear
     end
-    
+
     def self.reset_registry!
-      @@registry = Hash.new do |registry,query| 
-        registry[query] = Hash.new{|h,k| h[k] = {}}
-      end
+      @@registry.clear
     end
-    
-    reset_counts!
-    reset_registry!
-    
+
     @@pass_through_requests = true
 
     def self.pass_through_requests=(pass_through_requests)
       @@pass_through_requests = pass_through_requests
     end
-    
+
     def self.pass_through_requests
       @@pass_through_requests
     end
-    
-    def self.register(uri, method, headers, data)
-      method = method.to_s.upcase
-      headers = headers.to_s
-      @@registry[uri][method][headers] = data
+
+    def self.parse_register_args(args, &proc)
+      args << proc{|client| proc.call(client); ''} if proc
+      headers, data = case args.size
+      when 3
+        args[2].is_a?(Hash) ?
+          [args[2][:headers], args[2][:data]] :
+          [{}, args[2]]
+      when 4
+        [args[2], args[3]]
+      else
+        raise
+      end
+
+      url = args[0]
+      method = args[1]
+      [headers, url, method, data]
     end
-    
-    def self.register_file(uri, method, headers, file)
-      register(uri, method, headers, File.read(file))
+
+    def self.register(*args, &proc)
+      headers, url, method, data = parse_register_args(args, &proc)
+      @@registry[RegisteredRequest.build(url, method, headers)] = data
     end
-    
-    def self.count(uri, method, headers)
-      method = method.to_s.upcase
-      headers = headers.to_s
-      @@registry_count[uri][method][headers] rescue 0
+
+    def self.register_file(*args)
+      headers, url, method, data = parse_register_args(args)
+      @@registry[RegisteredRequest.build(url, method, headers)] = File.read(data)
+    end
+
+    def self.count(url, method, headers = {})
+      @@registry_count[RegisteredRequest.build(url, method, headers)]
     end
-    
-    def self.registered?(query, method, headers)
-      @@registry[query] and @@registry[query][method] and @@registry[query][method][headers]
+
+    def self.registered?(url, method, headers = {})
+      @@registry.key?(RegisteredRequest.build(url, method, headers))
     end
-    
-    def self.registered_content(query, method, headers)
-      @@registry[query][method][headers]
+
+    def self.registered_content(url, method, headers = {})
+      @@registry[RegisteredRequest.build(url, method, headers)]
     end
-    
-    def self.increment_access(query, method, headers)
-      @@registry_count[query][method][headers] += 1
+
+    def self.increment_access(url, method, headers = {})
+      @@registry_count[RegisteredRequest.build(url, method, headers)] += 1
     end
-    
+
     alias_method :real_send_request, :send_request
-    
+
     protected
     def send_request(&blk)
-      query = "#{@req.uri.scheme}://#{@req.uri.host}:#{@req.uri.port}#{encode_query(@req.uri.path, @req.options[:query], @req.uri.query)}"
-      headers = @req.options[:head].to_s
+      query = "#{@req.uri.scheme}://#{@req.uri.host}:#{@req.uri.port}#{encode_query(@req.uri, @req.options[:query])}"
+      headers = @req.options[:head]
       if self.class.registered?(query, @req.method, headers)
         self.class.increment_access(query, @req.method, headers)
         client = FakeHttpClient.new(nil)
-        client.setup(self.class.registered_content(query, @req.method, headers), @req.uri)
+        content = self.class.registered_content(query, @req.method, headers)
+        client.setup(content, @req.uri)
         client
       elsif @@pass_through_requests
         real_send_request