em-http-request 1.0.3 → 1.1.0

data/spec/helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'em-http'
+require 'em-http/middleware/oauth2'
 require 'yajl'
 
 require 'stallion'

data/spec/middleware/oauth2_spec.rb

@@ -0,0 +1,15 @@
+describe EventMachine::Middleware::OAuth2 do
+  it "should add an access token to a URI with no query parameters" do
+    middleware = EventMachine::Middleware::OAuth2.new(:access_token => "fedcba9876543210")
+    uri = Addressable::URI.parse("https://graph.facebook.com/me")
+    middleware.update_uri! uri
+    uri.to_s.should == "https://graph.facebook.com/me?access_token=fedcba9876543210"
+  end
+
+  it "should add an access token to a URI with query parameters" do
+    middleware = EventMachine::Middleware::OAuth2.new(:access_token => "fedcba9876543210")
+    uri = Addressable::URI.parse("https://graph.facebook.com/me?fields=photo")
+    middleware.update_uri! uri
+    uri.to_s.should == "https://graph.facebook.com/me?fields=photo&access_token=fedcba9876543210"
+  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(/2011/i)
+          pipe2.response.should match(/html/i)
           stop.call
         }
 
@@ -63,4 +63,4 @@ requires_connection do
     end
   end
 
-end
+end

data/spec/redirect_spec.rb

@@ -40,21 +40,33 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should not follow redirects on created" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/created').get :redirects => 1
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 201
+        http.response.should match(/Hello/)
+        EM.stop
+      }
+    }
+  end
+
   it "should not forward cookies across domains with http redirect" do
 
     expires  = (Date.today + 2).strftime('%a, %d %b %Y %T GMT')
     response =<<-HTTP.gsub(/^ +/, '')
       HTTP/1.1 301 MOVED PERMANENTLY
-      Location: http://localhost:8081/
+      Location: http://localhost:8071/
       Set-Cookie: foo=bar; expires=#{expires}; path=/; HttpOnly
 
     HTTP
 
     EventMachine.run do
-      @stub = StubServer.new(:host => '127.0.0.1', :port => 8080, :response => response)
-      @echo = StubServer.new(:host => 'localhost', :port => 8081, :echo     => true)
+      @stub = StubServer.new(:host => '127.0.0.1', :port => 8070, :response => response)
+      @echo = StubServer.new(:host => 'localhost', :port => 8071, :echo     => true)
 
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :redirects => 1
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8070/').get :redirects => 1
 
       http.errback  { failed(http) }
       http.callback do
@@ -71,16 +83,43 @@ describe EventMachine::HttpRequest do
     expires  = (Date.today + 2).strftime('%a, %d %b %Y %T GMT')
     response =<<-HTTP.gsub(/^ +/, '')
       HTTP/1.1 301 MOVED PERMANENTLY
-      Location: http://127.0.0.1:8081/
+      Location: http://127.0.0.1:8071/
       Set-Cookie: foo=bar; expires=#{expires}; path=/; HttpOnly
 
     HTTP
 
     EventMachine.run do
-      @stub = StubServer.new(:host => '127.0.0.1', :port => 8080, :response => response)
-      @echo = StubServer.new(:host => '127.0.0.1', :port => 8081, :echo     => true)
+      @stub = StubServer.new(:host => '127.0.0.1', :port => 8070, :response => response)
+      @echo = StubServer.new(:host => '127.0.0.1', :port => 8071, :echo     => true)
 
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :redirects => 1
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8070/').get :redirects => 1
+
+      http.errback  { failed(http) }
+      http.callback do
+        http.response.should match(/Cookie/)
+        @stub.stop
+        @echo.stop
+        EM.stop
+      end
+    end
+  end
+
+
+  it "should normalize path and forward valid cookies across domains" do
+
+    expires  = (Date.today + 2).strftime('%a, %d %b %Y %T GMT')
+    response =<<-HTTP.gsub(/^ +/, '')
+      HTTP/1.1 301 MOVED PERMANENTLY
+      Location: http://127.0.0.1:8071?omg=ponies
+      Set-Cookie: foo=bar; expires=#{expires}; path=/; HttpOnly
+
+    HTTP
+
+    EventMachine.run do
+      @stub = StubServer.new(:host => '127.0.0.1', :port => 8070, :response => response)
+      @echo = StubServer.new(:host => '127.0.0.1', :port => 8071, :echo     => true)
+
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8070/').get :redirects => 1
 
       http.errback  { failed(http) }
       http.callback do
@@ -94,9 +133,10 @@ describe EventMachine::HttpRequest do
 
   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")
+      response = "HTTP/1.0 301 MOVED PERMANENTLY\r\nlocation: http://127.0.0.1:8090/redirect\r\n\r\n"
+      @stub = StubServer.new(:host => '127.0.0.1', :port => 8070, :response => response)
 
-      http = EventMachine::HttpRequest.new('http://127.0.0.1:8081/').get :redirects => 3
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8070/').get :redirects => 3
       http.errback { failed(http) }
 
       http.callback {
@@ -106,7 +146,7 @@ describe EventMachine::HttpRequest do
         http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
         http.redirects.should == 3
 
-        @s.stop
+        @stub.stop
         EM.stop
       }
     }
@@ -153,7 +193,7 @@ describe EventMachine::HttpRequest do
 
   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 = EventMachine::HttpRequest.new('http://127.0.0.1:8070/', :connect_timeout => 0.1).get :redirects => 5
       http.callback { failed(http) }
       http.errback {
         http.redirects.should == 0
@@ -236,6 +276,20 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should follow location redirects with path" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect').get :path => '/redirect', :redirects => 1
+      http.errback { failed(http) }
+      http.callback {
+        http.last_effective_url.to_s.should == 'http://127.0.0.1:8090/gzip'
+        http.response_header.status.should == 200
+        http.redirects.should == 1
+
+        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')

data/spec/socksify_proxy_spec.rb

@@ -1,6 +1,7 @@
 require 'helper'
 
 requires_connection do
+
   requires_port(8080) do
     describe EventMachine::HttpRequest do
 
@@ -21,4 +22,39 @@ requires_connection do
       end
     end
   end
+
+  requires_port(8081) do
+    describe EventMachine::HttpRequest do
+
+      # brew install tinyproxy
+      let(:http_proxy) { {:proxy => { :host => '127.0.0.1', :port => 8081 }} }
+
+      it "should use HTTP proxy by default" do
+        EventMachine.run {
+          http = EventMachine::HttpRequest.new('http://jsonip.com/', http_proxy).get
+
+          http.errback { failed(http) }
+          http.callback {
+            http.response_header.status.should == 200
+            http.response.should match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
+            EventMachine.stop
+          }
+        }
+      end
+
+      it "should auto CONNECT via HTTP proxy for HTTPS requests" do
+        EventMachine.run {
+          http = EventMachine::HttpRequest.new('https://ipjson.herokuapp.com/', http_proxy).get
+
+          http.errback { failed(http) }
+          http.callback {
+            http.response_header.status.should == 200
+            http.response.should match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
+            EventMachine.stop
+          }
+        }
+      end
+    end
+  end
+
 end

data/spec/stallion.rb

@@ -140,6 +140,11 @@ Stallion.saddle :spec do |stable|
       stable.response["Location"] = "/gzip"
       stable.response.write 'redirect'
 
+    elsif stable.request.path_info == '/redirect/created'
+      stable.response.status = 201
+      stable.response["Location"] = "/"
+      stable.response.write  'Hello, World!'
+
     elsif stable.request.path_info == '/redirect/multiple-with-cookie'
       stable.response.status = 301
       stable.response["Set-Cookie"] = "another_id=1; expires=Sat, 09 Aug 2031 17:53:39 GMT; path=/;"
@@ -223,6 +228,8 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.path_info == '/relative-location'
       stable.response.status = 301
       stable.response["Location"] = '/forwarded'
+    elsif stable.request.path_info == '/echo-user-agent'
+      stable.response.write stable.request.env["HTTP_USER_AGENT"].inspect
 
     elsif
       stable.response.write  'Hello, World!'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-http-request
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0.beta.2
 - !ruby/object:Gem::Dependency
   name: em-socksify
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: cookiejar
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,8 @@ files:
 - benchmarks/server.rb
 - em-http-request.gemspec
 - examples/.gitignore
+- examples/digest_auth/client.rb
+- examples/digest_auth/server.rb
 - examples/fetch.rb
 - examples/fibered-http.rb
 - examples/multi.rb
@@ -208,20 +210,25 @@ files:
 - lib/em-http/http_encoding.rb
 - lib/em-http/http_header.rb
 - lib/em-http/http_status_codes.rb
+- lib/em-http/middleware/digest_auth.rb
 - lib/em-http/middleware/json_response.rb
 - lib/em-http/middleware/oauth.rb
+- lib/em-http/middleware/oauth2.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
 - lib/em-http/version.rb
 - spec/client_fiber_spec.rb
 - spec/client_spec.rb
+- spec/digest_auth_spec.rb
 - spec/dns_spec.rb
 - spec/encoding_spec.rb
 - spec/external_spec.rb
 - spec/fixtures/google.ca
 - spec/fixtures/gzip-sample.gz
+- spec/gzip_spec.rb
 - spec/helper.rb
 - spec/http_proxy_spec.rb
+- spec/middleware/oauth2_spec.rb
 - spec/middleware_spec.rb
 - spec/multi_spec.rb
 - spec/pipelining_spec.rb
@@ -257,13 +264,16 @@ summary: EventMachine based, async HTTP Request client
 test_files:
 - spec/client_fiber_spec.rb
 - spec/client_spec.rb
+- spec/digest_auth_spec.rb
 - spec/dns_spec.rb
 - spec/encoding_spec.rb
 - spec/external_spec.rb
 - spec/fixtures/google.ca
 - spec/fixtures/gzip-sample.gz
+- spec/gzip_spec.rb
 - spec/helper.rb
 - spec/http_proxy_spec.rb
+- spec/middleware/oauth2_spec.rb
 - spec/middleware_spec.rb
 - spec/multi_spec.rb
 - spec/pipelining_spec.rb