em-http-request 0.2.10 → 0.2.11

data/spec/spec.opts

@@ -0,0 +1,7 @@
+--colour
+--format
+specdoc
+--loadby
+mtime
+--reverse
+--backtrace

data/spec/stallion.rb

@@ -78,6 +78,8 @@ Stallion.saddle :spec do |stable|
       stable.response.write 'test'
 
     elsif stable.request.path_info == '/echo_query'
+      stable.response["ETag"] = "abcdefg"
+      stable.response["Last-Modified"] = "Fri, 13 Aug 2010 17:31:21 GMT"
       stable.response.write stable.request.query_string
 
     elsif stable.request.path_info == '/echo_content_length'
@@ -113,6 +115,19 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.path_info == '/redirect'
       stable.response.status = 301
       stable.response["Location"] = "/gzip"
+      stable.response.write 'redirect'
+
+    elsif stable.request.path_info == '/redirect/bad'
+      stable.response.status = 301
+      stable.response["Location"] = "http://127.0.0.1:8080"
+
+    elsif stable.request.path_info == '/redirect/nohost'
+      stable.response.status = 301
+      stable.response["Location"] = "http:/"
+
+    elsif stable.request.path_info == '/redirect/badhost'
+      stable.response.status = 301
+      stable.response["Location"] = "http://$$$@$!%&^"
 
     elsif stable.request.path_info == '/gzip'
       io = StringIO.new
@@ -164,7 +179,7 @@ Thread.new do
 end
 
 #
-# HTTP Proxy server
+# Tunneling HTTP Proxy server
 #
 Thread.new do
   server = TCPServer.new('127.0.0.1', 8082)
@@ -220,4 +235,46 @@ Thread.new do
   end
 end
 
-sleep(1)
+#
+# CONNECT-less HTTP Proxy server
+#
+Thread.new do
+  server = TCPServer.new('127.0.0.1', 8083)
+  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 destination =~ /^http:/
+      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"
+      end
+
+      client.write "\r\n"
+      client.flush
+      client.close_write
+
+      # Take the initial line from the upstream response
+      session.write client.gets
+
+      # What (absolute) uri was requested?  Send it back in a header
+      session.write "X-The-Requested-URI: #{destination}\r\n"
+
+      while data = client.gets
+        session.write data
+      end
+      session.flush
+      client.close
+    end
+    session.close
+  end
+end
+
+sleep(1)

data/spec/stub_server.rb

@@ -1,22 +1,22 @@
-class StubServer
-  module Server
-    def receive_data(data)
-      send_data @response
-      close_connection_after_writing
-    end
-
-    def response=(response)
-      @response = response
-    end
-  end
-
-  def initialize(response, port=8081)
-    @sig = EventMachine::start_server("127.0.0.1", port, Server) { |s|
-      s.response = response
-    }
-  end
-
-  def stop
-    EventMachine.stop_server @sig
-  end
-end
+class StubServer
+  module Server
+    def receive_data(data)
+      send_data @response
+      close_connection_after_writing
+    end
+
+    def response=(response)
+      @response = response
+    end
+  end
+
+  def initialize(response, port=8081)
+    @sig = EventMachine::start_server("127.0.0.1", port, Server) { |s|
+      s.response = response
+    }
+  end
+
+  def stop
+    EventMachine.stop_server @sig
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -04:00
+date: 2010-08-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,11 +54,11 @@ extensions:
 - ext/http11_client/extconf.rb
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - em-http-request.gemspec
@@ -91,6 +91,7 @@ files:
 - spec/mock_spec.rb
 - spec/multi_spec.rb
 - spec/request_spec.rb
+- spec/spec.opts
 - spec/stallion.rb
 - spec/stub_server.rb
 has_rdoc: true

data/README.rdoc

@@ -1,138 +0,0 @@
-= EM-HTTP-Client
-
-EventMachine based HTTP Request interface. Supports streaming response processing, uses Ragel HTTP parser.
-- Simple interface for single & parallel requests via deferred callbacks
-- Automatic gzip & deflate decoding
-- Basic-Auth & OAuth support
-- Custom timeouts
-- Proxy support (with SSL Tunneling)
-- Auto-follow 3xx redirects with max depth
-- Bi-directional communication with web-socket services
-
-Screencast / Demo of using EM-HTTP-Request:
-- http://everburning.com/news/eventmachine-screencast-em-http-request/
-
-== Getting started
-
-  # install & configure gemcutter repos
-  gem update --system
-  gem install gemcutter
-  gem tumble
-
-  gem install em-http-request
-
-  irb:0> require 'em-http'
-
-== Simple client example
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://127.0.0.1/').get :query => {'keyname' => 'value'}, :timeout => 10
-
-    http.callback {
-      p http.response_header.status
-      p http.response_header
-      p http.response
-
-      EventMachine.stop
-    }
-  }
-
-== Multi request example
-Fire and wait for multiple requess to complete via the MultiRequest interface.
-
-  EventMachine.run {
-    multi = EventMachine::MultiRequest.new
-
-    # add multiple requests to the multi-handler
-    multi.add(EventMachine::HttpRequest.new('http://www.google.com/').get)
-    multi.add(EventMachine::HttpRequest.new('http://www.yahoo.com/').get)
-
-    multi.callback  {
-      p multi.responses[:succeeded]
-      p multi.responses[:failed]
-
-      EventMachine.stop
-    }
-  }
-
-== Basic-Auth example
-Full basic author support. For OAuth, check examples/oauth-tweet.rb file.
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://www.website.com/').get :head => {'authorization' => ['user', 'pass']}
-
-    http.errback { failed }
-    http.callback {
-      p http.response_header
-      EventMachine.stop
-    }
-  }
-
-
-== POST example
-  EventMachine.run {
-    http1 = EventMachine::HttpRequest.new('http://www.website.com/').post :body => {"key1" => 1, "key2" => [2,3]}
-    http2 = EventMachine::HttpRequest.new('http://www.website.com/').post :body => "some data"
-
-    # ...
-  }
-
-== Streaming body processing
-Allows you to consume an HTTP stream of content in real-time. Each time a new piece of conent is pushed
-to the client, it is passed to the stream callback for you to operate on.
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://www.website.com/').get
-    http.stream { |chunk| print chunk }
-  }
-
-== Streaming file from disk
-Allows you to efficiently stream a (large) file from disk via EventMachine's FileStream interface.
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://www.website.com/').post :file => 'largefile.txt'
-    http.callback { |chunk| puts "Upload finished!" }
-  }
-
-== Proxy example
-Full transparent proxy support with support for SSL tunneling.
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://www.website.com/').get :proxy => {
-      :host => 'www.myproxy.com',
-      :port => 8080,
-      :authorization => ['username', 'password'] # authorization is optional
-  }
-
-== Auto-follow 3xx redirects
-Specify the max depth of redirects to follow, default is 0.
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new('http://www.google.com/').get :redirects => 1
-    http.callback { p http.last_effective_url }
-  }
-
-
-== WebSocket example
-Bi-directional communication with WebSockets: simply pass in a ws:// resource and the client will
-negotiate the connection upgrade for you. On successfull handshake the callback is invoked, and
-any incoming messages will be passed to the stream callback. The client can also send data to the
-server at will by calling the "send" method!
-- http://www.igvita.com/2009/12/22/ruby-websockets-tcp-for-the-browser/
-
-  EventMachine.run {
-    http = EventMachine::HttpRequest.new("ws://yourservice.com/websocket").get :timeout => 0
-
-    http.errback { puts "oops" }
-    http.callback {
-      puts "WebSocket connected!"
-      http.send("Hello client")
-    }
-
-    http.stream { |msg|
-      puts "Recieved: #{msg}"
-      http.send "Pong: #{msg}"
-    }
-
-    http.disconnect { puts "oops, dropped connection?" }
-  }