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

data/spec/multi_spec.rb

@@ -3,39 +3,94 @@ require 'stallion'
 
 describe EventMachine::MultiRequest do
 
+  let(:multi) { EventMachine::MultiRequest.new }
+  let(:url)   { 'http://127.0.0.1:8090/' }
+
   it "should submit multiple requests in parallel and return once all of them are complete" do
     EventMachine.run {
+      multi.add :a, EventMachine::HttpRequest.new(url).get
+      multi.add :b, EventMachine::HttpRequest.new(url).post
+      multi.add :c, EventMachine::HttpRequest.new(url).head
+      multi.add :d, EventMachine::HttpRequest.new(url).delete
+      multi.add :e, EventMachine::HttpRequest.new(url).put
 
-      # create an instance of multi-request handler, and the requests themselves
-      multi = EventMachine::MultiRequest.new
-
-      # add multiple requests to the multi-handler
-      multi.add(EventMachine::HttpRequest.new('http://127.0.0.1:8090/').get(:query => {:q => 'test'}))
-      multi.add(EventMachine::HttpRequest.new('http://127.0.0.1:8090/').get)
-
-      multi.callback  {
-        multi.responses[:succeeded].size.should == 2
-        multi.responses[:succeeded][0].response.should match(/test|Hello/)
-        multi.responses[:succeeded][1].response.should match(/test|Hello/)
+      multi.callback {
+        multi.responses[:callback].size.should == 5
+        multi.responses[:callback].each { |name, response|
+          [ :a, :b, :c, :d, :e ].should include(name)
+          response.response_header.status.should == 200
+        }
+        multi.responses[:errback].size.should == 0
 
         EventMachine.stop
       }
     }
   end
 
-  it "should accept multiple open connections and return once all of them are complete" do
-    EventMachine.run {
-      http1 = EventMachine::HttpRequest.new('http://127.0.0.1:8090/').get(:query => {:q => 'test'})
-      http2 = EventMachine::HttpRequest.new('http://127.0.0.1:8090/').get
+  describe "#requests" do
+    it "should return the added requests" do
+      request1 = stub('request1', :callback => nil, :errback => nil)
+      request2 = stub('request2', :callback => nil, :errback => nil)
+
+      multi.add :a, request1
+      multi.add :b, request2
+
+      multi.requests.should == [ request1, request2 ]
+    end
+  end
+
+  describe "#responses" do
+    it "should have an empty :callback hash" do
+      multi.responses[:callback].should be_a(Hash)
+      multi.responses[:callback].size.should == 0
+    end
+
+    it "should have an empty :errback hash" do
+      multi.responses[:errback].should be_a(Hash)
+      multi.responses[:errback].size.should == 0
+    end
+
+    it "should provide access to the requests by name" do
+      EventMachine.run {
+        request1 = EventMachine::HttpRequest.new(url).get
+        request2 = EventMachine::HttpRequest.new(url).post
+        multi.add :a, request1
+        multi.add :b, request2
 
-      multi = EventMachine::MultiRequest.new([http1, http2]) do
-        multi.responses[:succeeded].size.should == 2
-        multi.responses[:succeeded][0].response.should match(/test|Hello/)
-        multi.responses[:succeeded][1].response.should match(/test|Hello/)
+        multi.callback {
+          multi.responses[:callback][:a].should equal(request1)
+          multi.responses[:callback][:b].should equal(request2)
+
+          EventMachine.stop
+        }
+      }
+    end
+  end
+
+  describe "#finished?" do
+    it "should be true when no requests have been added" do
+      multi.should be_finished
+    end
+
+    it "should be false while the requests are not finished" do
+      EventMachine.run {
+        multi.add :a, EventMachine::HttpRequest.new(url).get
+        multi.should_not be_finished
 
         EventMachine.stop
-      end
-    }
+      }
+    end
+
+    it "should be finished when all requests are finished" do
+      EventMachine.run {
+        multi.add :a, EventMachine::HttpRequest.new(url).get
+        multi.callback {
+          multi.should be_finished
+
+          EventMachine.stop
+        }
+      }
+    end
   end
 
-end
+end

data/spec/pipelining_spec.rb

@@ -27,7 +27,7 @@ requires_connection do
         pipe2.callback {
           processed += 1
           pipe2.response_header.status.should == 200
-          pipe2.response.should match('biography')
+          pipe2.response.should match(/ilya/i)
           stop.call
         }
 

data/spec/redirect_spec.rb

@@ -1,5 +1,27 @@
 require 'helper'
 
+class RedirectMiddleware
+  attr_reader :call_count
+
+  def initialize
+    @call_count = 0
+  end
+
+  def request(c, h, r)
+    @call_count += 1
+    [h.merge({'EM-Middleware' => @call_count.to_s}), r]
+  end
+end
+
+class PickyRedirectMiddleware < RedirectMiddleware
+  def response(r)
+    if r.redirect? && r.response_header['LOCATION'][-1] == '3'
+      # set redirects to 0 to avoid further processing
+      r.req.redirects = 0
+    end
+  end
+end
+
 describe EventMachine::HttpRequest do
 
   it "should follow location redirects" do
@@ -111,4 +133,68 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should capture and pass cookies on redirect and pass_cookies by default" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/multiple-with-cookie').get :redirects => 2, :head => {'cookie' => 'id=2;'}
+      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 == 2
+        http.cookies.should include("id=2;")
+        http.cookies.should include("another_id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;")
+
+        EM.stop
+      }
+    }
+  end
+
+  it "should capture and not pass cookies on redirect if passing is disabled via pass_cookies" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/multiple-with-cookie').get :redirects => 2, :pass_cookies => false, :head => {'cookie' => 'id=2;'}
+      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 == 2
+        http.cookies.should include("id=2;")
+        http.cookies.should_not include("another_id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;")
+
+        EM.stop
+      }
+    }
+  end
+
+  it "should call middleware each time it redirects" do
+    EventMachine.run {
+      conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/middleware_redirects_1')
+      conn.use RedirectMiddleware
+      http = conn.get :redirects => 3
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response_header['EM_MIDDLEWARE'].to_i.should == 3
+        EM.stop
+      }
+    }
+  end
+
+  it "should call middleware which may reject a redirection" do
+    EventMachine.run {
+      conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/middleware_redirects_1')
+      conn.use PickyRedirectMiddleware
+      http = conn.get :redirects => 3
+      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/middleware_redirects_2'
+        EM.stop
+      }
+    }
+  end
+
 end

data/spec/socksify_proxy_spec.rb

@@ -1,24 +1,24 @@
 require 'helper'
 
 requires_connection do
+  requires_port(8080) do
+    describe EventMachine::HttpRequest do
 
-  describe EventMachine::HttpRequest do
+      # ssh -D 8080 igvita
+      let(:proxy) { {:proxy => { :host => '127.0.0.1', :port => 8080, :type => :socks5 }} }
 
-    # 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://jsonip.com/', proxy).get
 
-    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
+          http.errback { failed(http) }
+          http.callback {
+            http.response_header.status.should == 200
+            http.response.should match('72.52.131')
+            EventMachine.stop
+          }
         }
-      }
+      end
     end
   end
-
 end

data/spec/stallion.rb

@@ -113,11 +113,21 @@ Stallion.saddle :spec do |stable|
       sleep(10)
       stable.response.write 'timeout'
 
+    elsif stable.request.path_info == '/cookie_parrot'
+      stable.response.status = 200
+      stable.response["Set-Cookie"] = stable.request.env['HTTP_COOKIE']
+
     elsif stable.request.path_info == '/redirect'
       stable.response.status = 301
       stable.response["Location"] = "/gzip"
       stable.response.write 'redirect'
 
+    elsif stable.request.path_info == '/redirect/multiple-with-cookie'
+      stable.response.status = 301
+      stable.response["Set-Cookie"] = "another_id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"
+      stable.response["Location"] = "/redirect"
+      stable.response.write 'redirect'
+
     elsif stable.request.path_info == '/redirect/bad'
       stable.response.status = 301
       stable.response["Location"] = "http://127.0.0.1:8090"
@@ -126,6 +136,20 @@ Stallion.saddle :spec do |stable|
       stable.response.status = 301
       stable.response["Location"] = "/"
 
+    elsif stable.request.path_info == '/redirect/middleware_redirects_1'
+      stable.response.status = 301
+      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
+      stable.response["Location"] = "/redirect/middleware_redirects_2"
+
+    elsif stable.request.path_info == '/redirect/middleware_redirects_2'
+      stable.response.status = 301
+      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
+      stable.response["Location"] = "/redirect/middleware_redirects_3"
+
+    elsif stable.request.path_info == '/redirect/middleware_redirects_3'
+      stable.response.status = 200
+      stable.response["EM-Middleware"] = stable.request.env["HTTP_EM_MIDDLEWARE"]
+
     elsif stable.request.path_info == '/redirect/nohost'
       stable.response.status = 301
       stable.response["Location"] = "http:/"
@@ -144,9 +168,16 @@ Stallion.saddle :spec do |stable|
       stable.response["Content-Encoding"] = "gzip"
 
     elsif stable.request.path_info == '/deflate'
-      stable.response.write Zlib::Deflate.deflate("compressed")
+      deflater = Zlib::Deflate.new(
+        Zlib::DEFAULT_COMPRESSION,
+        -Zlib::MAX_WBITS, # drop the zlib header which causes both Safari and IE to choke
+        Zlib::DEF_MEM_LEVEL,
+        Zlib::DEFAULT_STRATEGY
+      )
+      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

@@ -2,7 +2,7 @@
 name: em-http-request
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.4
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -05:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.0.beta.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -102,16 +102,27 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: cookiejar
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    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 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.2.0.pre2
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: EventMachine based, async HTTP Request client
 email: 
 - ilya@igvita.com
@@ -122,13 +133,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gemtest
 - .gitignore
 - .rspec
 - Changelog.md
 - Gemfile
 - README.md
 - Rakefile
+- benchmarks/clients.rb
+- benchmarks/em-excon.rb
+- benchmarks/em-profile.gif
+- benchmarks/em-profile.txt
+- benchmarks/server.rb
 - em-http-request.gemspec
+- examples/.gitignore
 - examples/fetch.rb
 - examples/fibered-http.rb
 - examples/oauth-tweet.rb
@@ -138,10 +156,14 @@ files:
 - lib/em-http/client.rb
 - lib/em-http/core_ext/bytesize.rb
 - lib/em-http/decoders.rb
+- lib/em-http/http_client_options.rb
 - lib/em-http/http_connection.rb
+- lib/em-http/http_connection_options.rb
 - lib/em-http/http_encoding.rb
 - lib/em-http/http_header.rb
-- lib/em-http/http_options.rb
+- lib/em-http/middleware/cookie_jar.rb
+- lib/em-http/middleware/json_response.rb
+- lib/em-http/middleware/oauth.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
 - lib/em-http/version.rb

data/lib/em-http/http_options.rb

@@ -1,53 +0,0 @@
-class HttpOptions
-  attr_reader :uri, :method, :host, :port, :options
-
-  def initialize(uri, options, method = :none)
-    @options = options
-    @method = method.to_s.upcase
-
-    set_uri(uri)
-
-    @options[:keepalive]  ||= false # default to single request per connection
-    @options[:redirects]  ||= 0     # default number of redirects to follow
-    @options[:followed]   ||= 0     # keep track of number of followed requests
-
-    @options[:connect_timeout] ||= 5        # default connection setup timeout
-    @options[:inactivity_timeout] ||= 10    # default connection inactivity (post-setup) timeout
-  end
-
-  def proxy
-    @options[:proxy]
-  end
-
-  def follow_redirect?
-    @options[:followed] < @options[:redirects]
-  end
-
-  def set_uri(uri)
-    uri = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI::parse(uri.to_s)
-
-    uri.path = '/' if uri.path.empty?
-    if path = @options.delete(:path)
-      uri.path = path
-    end
-
-    @uri = uri
-
-    # 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
-    else
-      @uri.port ||= 80
-    end
-
-    if proxy = @options[:proxy]
-      @host = proxy[:host]
-      @port = proxy[:port]
-    else
-      @host = @uri.host
-      @port = @uri.port
-    end
-
-  end
-end