em-http-request 0.3.0 → 1.0.0.beta.1

data/spec/pipelining_spec.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+requires_connection do
+
+  describe EventMachine::HttpRequest do
+
+    it "should perform successful pipelined GETs" do
+      EventMachine.run do
+
+        # Mongrel doesn't support pipelined requests - bah!
+        conn = EventMachine::HttpRequest.new('http://www.igvita.com/')
+
+        pipe1 = conn.get :keepalive => true
+        pipe2 = conn.get :path => '/about/', :keepalive => true
+
+        processed = 0
+        stop = proc { EM.stop if processed == 2}
+
+        pipe1.errback { failed(conn) }
+        pipe1.callback {
+          processed += 1
+          pipe1.response_header.status.should == 200
+          stop.call
+        }
+
+        pipe2.errback { p pipe2; failed(conn) }
+        pipe2.callback {
+          processed += 1
+          pipe2.response_header.status.should == 200
+          pipe2.response.should match('biography')
+          stop.call
+        }
+
+      end
+    end
+  end
+
+end

data/spec/redirect_spec.rb

@@ -0,0 +1,114 @@
+require 'helper'
+
+describe EventMachine::HttpRequest do
+
+  it "should follow location redirects" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect').get :redirects => 1
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response_header["CONTENT_ENCODING"].should == "gzip"
+        http.response.should == "compressed"
+        http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
+        http.redirects.should == 1
+
+        EM.stop
+      }
+    }
+  end
+
+  it "should redirect with missing content-length" do
+    EventMachine.run {
+      @s = StubServer.new("HTTP/1.0 301 MOVED PERMANENTLY\r\nlocation: http://127.0.0.1:8090/redirect\r\n\r\n")
+
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get :redirects => 3
+      http.errback { failed(http) }
+
+      http.callback {
+        http.response_header.status.should == 200
+        http.response_header["CONTENT_ENCODING"].should == "gzip"
+        http.response.should == "compressed"
+        http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
+        http.redirects.should == 3
+
+        @s.stop
+        EM.stop
+      }
+    }
+  end
+
+  it "should follow redirects on HEAD method" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/head').head :redirects => 1
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/'
+        EM.stop
+      }
+    }
+  end
+
+  it "should report last_effective_url" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/').get
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/'
+
+        EM.stop
+      }
+    }
+  end
+
+  it "should default to 0 redirects" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect').get
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 301
+        http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/redirect'
+        http.redirects.should == 0
+
+        EM.stop
+      }
+    }
+  end
+
+  it "should not invoke redirect logic on failed(http) connections" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/', :connect_timeout => 0.1).get :redirects => 5
+      http.callback { failed(http) }
+      http.errback {
+        http.redirects.should == 0
+        EM.stop
+      }
+    }
+  end
+
+  it "should normalize redirect urls" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/bad').get :redirects => 1
+      http.errback { failed(http) }
+      http.callback {
+        http.last_effective_url.to_s.should match('http://127.0.0.1:8090/')
+        http.response.should match('Hello, World!')
+        EM.stop
+      }
+    }
+  end
+
+  it "should fail gracefully on a missing host in absolute Location header" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/nohost').get :redirects => 1
+      http.callback { failed(http) }
+      http.errback {
+        http.error.should == 'Location header format error'
+        EM.stop
+      }
+    }
+  end
+
+end

data/spec/socksify_proxy_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+
+requires_connection do
+
+  describe EventMachine::HttpRequest do
+
+    # ssh -D 8080 igvita
+    let(:proxy) { {:proxy => { :host => '127.0.0.1', :port => 8080, :type => :socks5 }} }
+
+    it "should use SOCKS5 proxy" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://whatismyip.everdot.org/', proxy).get
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should match('72.52.131')
+          EventMachine.stop
+        }
+      }
+    end
+  end
+
+end

data/spec/ssl_spec.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+requires_connection do
+
+  describe EventMachine::HttpRequest do
+
+    it "should initiate SSL/TLS on HTTPS connections" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('https://mail.google.com:443/mail/').get
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 302
+          EventMachine.stop
+        }
+      }
+    end
+  end
+
+end

data/spec/stallion.rb

@@ -52,7 +52,7 @@ module Stallion
   end
 
   def self.run(options = {})
-    options = {:Host => "127.0.0.1", :Port => 8080}.merge(options)
+    options = {:Host => "127.0.0.1", :Port => 8090}.merge(options)
     Rack::Handler::Mongrel.run(Rack::Lint.new(self), options)
   end
 
@@ -120,7 +120,7 @@ Stallion.saddle :spec do |stable|
 
     elsif stable.request.path_info == '/redirect/bad'
       stable.response.status = 301
-      stable.response["Location"] = "http://127.0.0.1:8080"
+      stable.response["Location"] = "http://127.0.0.1:8090"
 
     elsif stable.request.path_info == '/redirect/head'
       stable.response.status = 301
@@ -151,11 +151,11 @@ Stallion.saddle :spec do |stable|
       stable.response.status = 304
 
     elsif stable.request.env["HTTP_AUTHORIZATION"]
-      if stable.request.path_info == '/oauth_auth'
+      if stable.request.path_info == '/auth'
         stable.response.status = 200
         stable.response.write stable.request.env["HTTP_AUTHORIZATION"]
       else
-        auth = "Basic %s" % Base64.encode64(['user', 'pass'].join(':')).chomp
+        auth = "Basic %s" % Base64.encode64(['user', 'pass'].join(':')).split.join
 
         if auth == stable.request.env["HTTP_AUTHORIZATION"]
           stable.response.status = 200
@@ -177,71 +177,14 @@ end
 
 Thread.new do
   begin
-    Stallion.run :Host => '127.0.0.1', :Port => 8080
+    Stallion.run :Host => '127.0.0.1', :Port => 8090
   rescue Exception => e
     print e
   end
 end
 
 #
-# Tunneling HTTP Proxy server
-#
-Thread.new do
-  server = TCPServer.new('127.0.0.1', 8082)
-  loop do
-    session = server.accept
-    request = ""
-    while (data = session.gets) != "\r\n"
-      request << data
-    end
-    parts = request.split("\r\n")
-    method, destination, http_version = parts.first.split(' ')
-    if method == 'CONNECT'
-      target_host, target_port = destination.split(':')
-      client = TCPSocket.open(target_host, target_port)
-      session.write "HTTP/1.1 200 Connection established\r\nProxy-agent: Whatever\r\n\r\n"
-      session.flush
-
-      content_length = -1
-      verb = ""
-      req = ""
-
-      while data = session.gets
-        if request = data.match(/(\w+).*HTTP\/1\.1/)
-          verb = request[1]
-        end
-
-        if post = data.match(/Content-Length: (\d+)/)
-          content_length = post[1].to_i
-        end
-
-        req += data
-
-        # read POST data
-        if data == "\r\n" and verb == "POST"
-          req += session.read(content_length)
-        end
-
-        if data == "\r\n"
-          client.write req
-          client.flush
-          client.close_write
-          break
-        end
-      end
-
-      while data = client.gets
-        session.write data
-      end
-      session.flush
-      client.close
-    end
-    session.close
-  end
-end
-
-#
-# CONNECT-less HTTP Proxy server
+# Simple HTTP Proxy server
 #
 Thread.new do
   server = TCPServer.new('127.0.0.1', 8083)
@@ -257,6 +200,7 @@ Thread.new do
       uri = Addressable::URI.parse(destination)
       absolute_path = uri.path + (uri.query ? "?#{uri.query}" : "")
       client = TCPSocket.open(uri.host, uri.port || 80)
+
       client.write "#{method} #{absolute_path} #{http_version}\r\n"
       parts[1..-1].each do |part|
         client.write "#{part}\r\n"

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: em-http-request
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
   - 0
-  - 3
   - 0
-  version: 0.3.0
+  - beta
+  - 1
+  version: 1.0.0.beta.1
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-02-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 12
-        - 9
-        version: 0.12.9
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,13 +42,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 2
+        - 3
+        version: 2.2.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: escape_utils
+  name: http_parser.rb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,11 +57,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: em-socksify
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -71,10 +73,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -87,7 +89,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: em-websocket
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -113,9 +115,22 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: yajl-ruby
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,15 +142,14 @@ dependencies:
         - pre2
         version: 1.2.0.pre2
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: EventMachine based, async HTTP Request client
 email: 
 - ilya@igvita.com
 executables: []
 
-extensions: 
-- ext/buffer/extconf.rb
-- ext/http11_client/extconf.rb
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
@@ -150,34 +164,31 @@ files:
 - examples/fibered-http.rb
 - examples/oauth-tweet.rb
 - examples/socks5.rb
-- examples/websocket-handler.rb
-- examples/websocket-server.rb
-- ext/buffer/em_buffer.c
-- ext/buffer/extconf.rb
-- ext/http11_client/ext_help.h
-- ext/http11_client/extconf.rb
-- ext/http11_client/http11_client.c
-- ext/http11_client/http11_parser.c
-- ext/http11_client/http11_parser.h
-- ext/http11_client/http11_parser.rl
 - lib/em-http-request.rb
 - lib/em-http.rb
 - lib/em-http/client.rb
 - lib/em-http/core_ext/bytesize.rb
 - lib/em-http/decoders.rb
+- lib/em-http/http_connection.rb
 - lib/em-http/http_encoding.rb
 - lib/em-http/http_header.rb
 - lib/em-http/http_options.rb
-- lib/em-http/mock.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
 - lib/em-http/version.rb
+- spec/client_spec.rb
+- spec/dns_spec.rb
 - spec/encoding_spec.rb
+- spec/external_spec.rb
 - spec/fixtures/google.ca
 - spec/helper.rb
-- spec/mock_spec.rb
+- spec/http_proxy_spec.rb
+- spec/middleware_spec.rb
 - spec/multi_spec.rb
-- spec/request_spec.rb
+- spec/pipelining_spec.rb
+- spec/redirect_spec.rb
+- spec/socksify_proxy_spec.rb
+- spec/ssl_spec.rb
 - spec/stallion.rb
 - spec/stub_server.rb
 has_rdoc: true
@@ -200,11 +211,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: em-http-request
@@ -213,11 +226,18 @@ signing_key:
 specification_version: 3
 summary: EventMachine based, async HTTP Request client
 test_files: 
+- spec/client_spec.rb
+- spec/dns_spec.rb
 - spec/encoding_spec.rb
+- spec/external_spec.rb
 - spec/fixtures/google.ca
 - spec/helper.rb
-- spec/mock_spec.rb
+- spec/http_proxy_spec.rb
+- spec/middleware_spec.rb
 - spec/multi_spec.rb
-- spec/request_spec.rb
+- spec/pipelining_spec.rb
+- spec/redirect_spec.rb
+- spec/socksify_proxy_spec.rb
+- spec/ssl_spec.rb
 - spec/stallion.rb
 - spec/stub_server.rb