em-http-request 1.0.0.beta.4 → 1.0.0

data/README.md

@@ -46,11 +46,13 @@ Several higher-order Ruby projects have incorporated em-http and other Ruby HTTP
 
 ## Other libraries & applications using EM-HTTP
 
-- [chirpstream](http://github.com/joshbuddy/chirpstream) - EM client for Twitters Chirpstream API
-- [rsolr-async](http://github.com/mwmitchell/rsolr-async) - An asynchronus connection adapter for RSolr
-- [PubSubHubbub](http://github.com/igrigorik/PubSubHubbub) - Asynchronous PubSubHubbub ruby client
-- [Firering](http://github.com/EmmanuelOga/firering) - Eventmachine powered Campfire API
-- [RDaneel](http://github.com/hasmanydevelopers/RDaneel) - Ruby crawler which respects robots.txt
+- [chirpstream](https://github.com/joshbuddy/chirpstream) - EM client for Twitters Chirpstream API
+- [rsolr-async](https://github.com/mwmitchell/rsolr-async) - An asynchronus connection adapter for RSolr
+- [PubSubHubbub](https://github.com/igrigorik/PubSubHubbub) - Asynchronous PubSubHubbub ruby client
+- [Firering](https://github.com/EmmanuelOga/firering) - Eventmachine powered Campfire API
+- [RDaneel](https://github.com/hasmanydevelopers/RDaneel) - Ruby crawler which respects robots.txt
+- [em-eventsource](https://github.com/AF83/em-eventsource) - EventSource client for EventMachine
+- [sinatra-synchrony](https://github.com/kyledrake/sinatra-synchrony) - Sinatra plugin for synchronous use of EM
 - and many others.. drop me a link if you want yours included!
 
 ### License

data/em-http-request.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "eventmachine", ">= 1.0.0.beta.3"
   s.add_dependency "addressable", ">= 2.2.3"
-  s.add_dependency "http_parser.rb", ">= 0.5.1"
+  s.add_dependency "http_parser.rb", ">= 0.5.2"
   s.add_dependency "em-socksify"
 
   s.add_development_dependency "rspec"

data/examples/fibered-http.rb

@@ -1,3 +1,5 @@
+$: << 'lib' << '../lib'
+
 require 'eventmachine'
 require 'em-http'
 require 'fiber'
@@ -9,21 +11,23 @@ def async_fetch(url)
   f = Fiber.current
   http = EventMachine::HttpRequest.new(url).get :timeout => 10
 
-  if http.error.empty?
-    http.callback { f.resume(http) }
-    http.errback  { f.resume(http) }
+  http.callback { f.resume(http) }
+  http.errback  { f.resume(http) }
+
+  Fiber.yield
 
-    Fiber.yield
-  else
-    http
+  if http.error
+    p [:HTTP_ERROR, http.error]
   end
+
+  http
 end
 
 EventMachine.run do
   Fiber.new{
 
     puts "Setting up HTTP request #1"
-    data = async_fetch('http://www.google.moo/')
+    data = async_fetch('http://0.0.0.0/')    
     puts "Fetched page #1: #{data.response_header.status}"
 
     puts "Setting up HTTP request #2"

data/examples/multi.rb

@@ -0,0 +1,25 @@
+$: << '../lib' << 'lib'
+
+require 'eventmachine'
+require 'em-http'
+
+EventMachine.run {
+  multi = EventMachine::MultiRequest.new
+
+  reqs = [
+    'http://google.com/',
+    'http://google.ca:81/'
+  ]
+
+  reqs.each_with_index do |url, idx|
+    http = EventMachine::HttpRequest.new(url, :connect_timeout => 1)
+    req = http.get
+    multi.add idx, req
+  end
+
+  multi.callback  do
+    p multi.responses[:callback].size
+    p multi.responses[:errback].size
+    EventMachine.stop
+  end
+}

data/lib/em-http.rb

@@ -10,6 +10,7 @@ require 'em-http/core_ext/bytesize'
 require 'em-http/http_connection'
 require 'em-http/http_header'
 require 'em-http/http_encoding'
+require 'em-http/http_status_codes'
 require 'em-http/http_client_options'
 require 'em-http/http_connection_options'
 require 'em-http/client'

data/lib/em-http/client.rb

@@ -3,6 +3,7 @@ module EventMachine
   class HttpClient
     include Deferrable
     include HttpEncoding
+    include HttpStatus
 
     TRANSFER_ENCODING="TRANSFER_ENCODING"
     CONTENT_ENCODING="CONTENT_ENCODING"
@@ -36,7 +37,7 @@ module EventMachine
       @state = :response_header
 
       @response = ''
-      @error = ''
+      @error = nil
       @content_decoder = nil
       @content_charset = nil
     end
@@ -78,7 +79,7 @@ module EventMachine
       @response_header.location && @req.follow_redirect?
     end
 
-    def unbind
+    def unbind(reason = nil)
       if finished?
         if redirect?
 
@@ -106,11 +107,11 @@ module EventMachine
         end
 
       else
-        fail(self)
+        on_error(reason)
       end
     end
 
-    def on_error(msg = '')
+    def on_error(msg = nil)
       @error = msg
       fail(self)
     end
@@ -207,7 +208,7 @@ module EventMachine
 
       @response_header.http_version = version.join('.')
       @response_header.http_status  = status
-      @response_header.http_reason  = 'unknown'
+      @response_header.http_reason  = CODE[status] || 'unknown'
 
       # invoke headers callback after full parse
       # if one is specified by the user

data/lib/em-http/http_connection.rb

@@ -25,8 +25,8 @@ module EventMachine
       @parent.connection_completed
     end
 
-    def unbind
-      @parent.unbind
+    def unbind(reason=nil)
+      @parent.unbind(reason)
     end
   end
 
@@ -103,6 +103,7 @@ module EventMachine
       @pending = []
 
       @p = Http::Parser.new
+      @p.header_value_type = :mixed
       @p.on_headers_complete = proc do |h|
         client.parse_response_header(h, @p.http_version, @p.status_code)
       end
@@ -156,8 +157,8 @@ module EventMachine
       @pending.push client
     end
 
-    def unbind
-      @clients.map { |c| c.unbind }
+    def unbind(reason)
+      @clients.map { |c| c.unbind(reason) }
 
       if r = @pending.shift
         @clients.push r
@@ -174,6 +175,7 @@ module EventMachine
         end
       end
     end
+    alias :close :unbind
 
     def send_data(data)
       @conn.send_data data

data/lib/em-http/http_status_codes.rb

@@ -0,0 +1,43 @@
+module EventMachine
+  module HttpStatus
+    CODE = {
+      100 => 'Continue',
+      101 => 'Switching Protocols',
+      200 => 'OK',
+      201 => 'Created',
+      202 => 'Accepted',
+      203 => 'Non-Authoritative Information',
+      204 => 'No Content',
+      205 => 'Reset Content',
+      206 => 'Partial Content',
+      300 => 'Multiple Choices',
+      301 => 'Moved Permanently',
+      302 => 'Moved Temporarily',
+      303 => 'See Other',
+      304 => 'Not Modified',
+      305 => 'Use Proxy',
+      400 => 'Bad Request',
+      401 => 'Unauthorized',
+      402 => 'Payment Required',
+      403 => 'Forbidden',
+      404 => 'Not Found',
+      405 => 'Method Not Allowed',
+      406 => 'Not Acceptable',
+      407 => 'Proxy Authentication Required',
+      408 => 'Request Time-out',
+      409 => 'Conflict',
+      410 => 'Gone',
+      411 => 'Length Required',
+      412 => 'Precondition Failed',
+      413 => 'Request Entity Too Large',
+      414 => 'Request-URI Too Large',
+      415 => 'Unsupported Media Type',
+      500 => 'Internal Server Error',
+      501 => 'Not Implemented',
+      502 => 'Bad Gateway',
+      503 => 'Service Unavailable',
+      504 => 'Gateway Time-out',
+      505 => 'HTTP Version not supported'
+    }
+  end
+end

data/lib/em-http/middleware/oauth.rb

@@ -1,18 +1,37 @@
-require 'oauth'
-require 'oauth/client/em_http'
+require 'simple_oauth'
 
 module EventMachine
   module Middleware
 
     class OAuth
+      include HttpEncoding
+
       def initialize(opts = {})
-        @consumer = ::OAuth::Consumer.new(opts[:consumer_key], opts[:consumer_secret])
-        @access_token = ::OAuth::AccessToken.new(@consumer, opts[:access_token], opts[:access_token_secret])
+        @opts = opts.dup
+        # Allow both `oauth` gem and `simple_oauth` gem opts formats
+        @opts[:token] ||= @opts.delete(:access_token)
+        @opts[:token_secret] ||= @opts.delete(:access_token_secret)
       end
 
       def request(client, head, body)
-        @consumer.sign!(client, @access_token)
-        head.merge!(client.options[:head])
+        request = client.req
+        uri     = request.uri.join(encode_query(request.uri, request.query))
+        params  = {}
+
+        # from https://github.com/oauth/oauth-ruby/blob/master/lib/oauth/request_proxy/em_http_request.rb
+        if ["POST", "PUT"].include?(request.method)
+          head["content-type"] ||= "application/x-www-form-urlencoded" if body.is_a? Hash
+          form_encoded = head["content-type"].to_s.downcase.start_with?("application/x-www-form-urlencoded")
+
+          if form_encoded
+            CGI.parse(client.normalize_body(body)).each do |k,v|
+              # Since `CGI.parse` always returns values as an array
+              params[k] = v.size == 1 ? v.first : v
+            end
+          end
+        end
+
+        head["Authorization"] = SimpleOAuth::Header.new(request.method, uri, params, @opts)
 
         [head,body]
       end

data/lib/em-http/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class HttpRequest
-    VERSION = "1.0.0.beta.4"
+    VERSION = "1.0.0"
   end
 end

data/spec/client_spec.rb

@@ -97,6 +97,32 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should return HTTP reason" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/fail').get
+
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 404
+        http.response_header.http_reason.should == 'Not Found'
+        EventMachine.stop
+      }
+    }
+  end
+
+  it "should return HTTP reason 'unknown' on a non-standard status code" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/fail_with_nonstandard_response').get
+
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 420
+        http.response_header.http_reason.should == 'unknown'
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should build query parameters from Hash" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/').get :query => {:q => 'test'}
@@ -539,6 +565,22 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should return array of cookies on multiple Set-Cookie headers" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/set_multiple_cookies').get
+
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response_header.cookie.size.should == 2
+        http.response_header.cookie.first.should == "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"
+        http.response_header.cookie.last.should == "id=2;"
+
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should pass cookie header to server from string" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/echo_cookie').get :head => {'cookie' => 'id=2;'}

data/spec/middleware_spec.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'em-http/middleware/cookie_jar'
 
 describe EventMachine::HttpRequest do
 
@@ -141,52 +140,4 @@ describe EventMachine::HttpRequest do
     end
   end
 
-  context "CookieJar" do
-    it "should use the cookie jar as opposed to any other method when in use" do
-      lambda {
-        EventMachine.run {
-          conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/')
-          middleware = EventMachine::Middleware::CookieJar
-          conn.use middleware
-          middleware.set_cookie('http://127.0.0.1:8090/', 'id=1')
-          req = conn.get :head => {'cookie' => 'id=2;'}
-          req.callback { failed(req) }
-          req.errback  { failed(req) }
-        }
-      }.should raise_error(ArgumentError)
-    end
-
-    it "should send cookies" do
-      EventMachine.run {
-        uri = 'http://127.0.0.1:8090/cookie_parrot'
-        conn = EventMachine::HttpRequest.new(uri)
-        middleware = EventMachine::Middleware::CookieJar
-        conn.use middleware
-        middleware.set_cookie(uri, 'id=1')
-        req = conn.get
-        req.callback {
-          req.response_header.cookie.should == 'id=1'
-          EventMachine.stop
-        }
-      }
-    end
-
-    it "should store cookies and send them" do
-      EventMachine.run {
-        uri = 'http://127.0.0.1:8090/set_cookie'
-        conn = EventMachine::HttpRequest.new(uri)
-        middleware = EventMachine::Middleware::CookieJar
-        conn.use middleware
-        req = conn.get
-        req.callback {
-          req.response_header.cookie[0..3].should == 'id=1'
-          cookies = middleware.cookiejar.get_cookies(uri)
-          cookies.length.should == 1
-          cookies[0].to_s.should == "id=1"
-          EventMachine.stop
-        }
-      }
-    end
-  end
-
 end

data/spec/stallion.rb

@@ -74,6 +74,9 @@ Stallion.saddle :spec do |stable|
     if stable.request.path_info == '/fail'
       stable.response.status = 404
 
+    elsif stable.request.path_info == '/fail_with_nonstandard_response'
+      stable.response.status = 420
+
     elsif stable.request.query_string == 'q=test'
       stable.response.write 'test'
 
@@ -106,6 +109,13 @@ Stallion.saddle :spec do |stable|
       stable.response["Set-Cookie"] = "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"
       stable.response.write "cookie set"
 
+    elsif stable.request.path_info == '/set_multiple_cookies'
+      stable.response["Set-Cookie"] = [
+        "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;",
+        "id=2;"
+      ]
+      stable.response.write "cookies set"
+
     elsif stable.request.path_info == '/echo_cookie'
       stable.response.write stable.request.env["HTTP_COOKIE"]
 
@@ -177,7 +187,7 @@ Stallion.saddle :spec do |stable|
       deflater.deflate("compressed")
       stable.response.write deflater.finish
       stable.response["Content-Encoding"] = "deflate"
-      
+
     elsif stable.request.env["HTTP_IF_NONE_MATCH"]
       stable.response.status = 304
 

metadata

@@ -1,138 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-http-request
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.0.0.beta.4
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-27 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152766660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.beta.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152766660
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &2152766160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: http_parser.rb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152766160
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: &2152765700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: em-socksify
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152765700
+- !ruby/object:Gem::Dependency
+  name: em-socksify
+  requirement: &2152765320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152765320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152764860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2152764860
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152764440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152764440
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2152764020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2152764020
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &2152763600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: cookiejar
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2152763600
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  requirement: &2152763180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mongrel
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2152763180
+- !ruby/object:Gem::Dependency
+  name: mongrel
+  requirement: &2152762680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.0.pre2
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *2152762680
 description: EventMachine based, async HTTP Request client
-email: 
+email:
 - ilya@igvita.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .rspec
@@ -149,6 +144,7 @@ files:
 - examples/.gitignore
 - examples/fetch.rb
 - examples/fibered-http.rb
+- examples/multi.rb
 - examples/oauth-tweet.rb
 - examples/socks5.rb
 - lib/em-http-request.rb
@@ -161,7 +157,7 @@ files:
 - lib/em-http/http_connection_options.rb
 - lib/em-http/http_encoding.rb
 - lib/em-http/http_header.rb
-- lib/em-http/middleware/cookie_jar.rb
+- lib/em-http/http_status_codes.rb
 - lib/em-http/middleware/json_response.rb
 - lib/em-http/middleware/oauth.rb
 - lib/em-http/multi.rb
@@ -182,35 +178,31 @@ files:
 - spec/ssl_spec.rb
 - spec/stallion.rb
 - spec/stub_server.rb
-has_rdoc: true
 homepage: http://github.com/igrigorik/em-http-request
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em-http-request
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: EventMachine based, async HTTP Request client
-test_files: 
+test_files:
 - spec/client_spec.rb
 - spec/dns_spec.rb
 - spec/encoding_spec.rb

data/lib/em-http/middleware/cookie_jar.rb

@@ -1,38 +0,0 @@
-require 'cookiejar'
-
-module EventMachine
-  module Middleware
-    class CookieJar
-      class << self
-        attr_reader :cookiejar
-
-        def cookiejar=(val)
-          @cookiejar = val
-        end
-
-        def set_cookie(url, cookie)
-          @cookiejar.set_cookie url, cookie
-        end
-      end
-
-      def request(c, h, r)
-        raise ArgumentError, "You may not set cookies outside of the cookie jar" if h.delete('cookie')
-        cookies = CookieJar::cookiejar.get_cookie_header(c.last_effective_url)
-        h['cookie'] = cookies unless cookies.empty?
-        [h, r]
-      end
-
-      def response(r)
-        cookies = r.response_header.cookie
-        if cookies
-          [cookies].flatten.each { |c|
-            EventMachine::Middleware::CookieJar.cookiejar.set_cookie r.last_effective_url, c
-          }
-        end
-        r.response
-     end
-    end
-  end
-end
-
-EventMachine::Middleware::CookieJar.cookiejar = CookieJar::Jar.new