em-http-request 0.2.9 → 0.3.0

data/spec/stallion.rb

@@ -78,12 +78,14 @@ 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'
       stable.response.write stable.request.content_length
 
-    elsif stable.request.head?
+    elsif stable.request.head? && stable.request.path_info == '/'
       stable.response.status = 200
 
     elsif stable.request.delete?
@@ -94,6 +96,7 @@ Stallion.saddle :spec do |stable|
 
     elsif stable.request.post?
       if stable.request.path_info == '/echo_content_type'
+        stable.response["Content-Type"] = stable.request.env["CONTENT_TYPE"] || 'text/html'
         stable.response.write stable.request.env["CONTENT_TYPE"]
       else
         stable.response.write stable.request.body.read
@@ -113,6 +116,23 @@ 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/head'
+      stable.response.status = 301
+      stable.response["Location"] = "/"
+
+    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 +184,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 +240,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)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -04:00
+date: 2011-01-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: addressable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -45,26 +47,109 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id002
-description: EventMachine based, async HTTP Request interface
-email: ilya@igvita.com
+- !ruby/object:Gem::Dependency 
+  name: escape_utils
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: em-websocket
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        - pre2
+        version: 1.2.0.pre2
+  type: :development
+  version_requirements: *id008
+description: EventMachine based, async HTTP Request client
+email: 
+- ilya@igvita.com
 executables: []
 
 extensions: 
 - ext/buffer/extconf.rb
 - ext/http11_client/extconf.rb
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- LICENSE
-- README.rdoc
+- .rspec
+- Changelog.md
+- Gemfile
+- README.md
 - Rakefile
-- VERSION
 - em-http-request.gemspec
 - examples/fetch.rb
 - examples/fibered-http.rb
 - examples/oauth-tweet.rb
+- examples/socks5.rb
 - examples/websocket-handler.rb
 - examples/websocket-server.rb
 - ext/buffer/em_buffer.c
@@ -79,14 +164,16 @@ files:
 - lib/em-http.rb
 - lib/em-http/client.rb
 - lib/em-http/core_ext/bytesize.rb
-- lib/em-http/core_ext/hash.rb
 - lib/em-http/decoders.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/encoding_spec.rb
 - spec/fixtures/google.ca
-- spec/hash_spec.rb
 - spec/helper.rb
 - spec/mock_spec.rb
 - spec/multi_spec.rb
@@ -98,20 +185,20 @@ homepage: http://github.com/igrigorik/em-http-request
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 8
-      - 6
-      version: 1.8.6
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -121,20 +208,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: em-http-request
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: EventMachine based, async HTTP Request interface
+summary: EventMachine based, async HTTP Request client
 test_files: 
-- spec/hash_spec.rb
+- spec/encoding_spec.rb
+- spec/fixtures/google.ca
 - spec/helper.rb
 - spec/mock_spec.rb
 - spec/multi_spec.rb
 - spec/request_spec.rb
 - spec/stallion.rb
 - spec/stub_server.rb
-- examples/fetch.rb
-- examples/fibered-http.rb
-- examples/oauth-tweet.rb
-- examples/websocket-handler.rb
-- examples/websocket-server.rb

data/LICENSE

@@ -1,58 +0,0 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING.txt file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-

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 :redirect => 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?" }
-  }

data/VERSION

@@ -1 +0,0 @@
-0.2.9

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

@@ -1,53 +0,0 @@
-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/spec/hash_spec.rb

@@ -1,24 +0,0 @@
-require 'spec/helper'
-
-describe Hash do
-  
-  describe ".to_params" do
-    it "should transform a basic hash into HTTP POST Params" do
-      {:a => "alpha", :b => "beta"}.to_params.split("&").should include "a=alpha"
-      {:a => "alpha", :b => "beta"}.to_params.split("&").should include "b=beta"
-    end
-    
-    it "should transform a more complex hash into HTTP POST Params" do
-      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "a=a"
-      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "b[0]=c"
-      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "b[1]=d"
-      {:a => "a", :b => ["c", "d", "e"]}.to_params.split("&").should include "b[2]=e"
-    end
-
-    it "should transform a very complex hash into HTTP POST Params" do
-      params = {:a => "a", :b => [{:c => "c", :d => "d"}, {:e => "e", :f => "f"}]}.to_params.split("&")
-      params.should include "a=a"
-      params.should include "b[0][d]=d"
-    end
-  end
-end