em-http-request 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b892384de4aaa4e5983ce807f416814c0f5768
-  data.tar.gz: e7a1f158af27740ba67b4515ae3e338dff44666d
+  metadata.gz: a07874f78e22e8d5050980f2c9bc898bb95a0cf7
+  data.tar.gz: 11853fc0cee6e4f6ec2f5b1bf13d0ad156085861
 SHA512:
-  metadata.gz: 44faab083fdc1c80147ec45999ad6fc8490bfde5ee6dd5b9a06969ef7b49918c08e3c6fbc1eb552f527cfd17fca78fdcad2fc30bf4a62bb0fa2027b266b4f48a
-  data.tar.gz: 74ee5fd141fb0055383e0befb7e7ed75c567273d445652187088c33dbe3a4d424ee0505b673953eb402248f066384e5c1b9ba2bc141b1b2560c67c441e9731f6
+  metadata.gz: a2599aea8d7c5a25f98bb4795bdeaca42de935afac3fce0ae1b705a53ff8bb82cfbe6fc8c76af1c3dcd7f68719af45e76c97f94b58dabec2eb1523c108a5397b
+  data.tar.gz: 5d7c7cab7d3ef0e594400a8c56e60943899da1122263f376bc602dad2dec88037f08cadf26de006b464bd3082445e6d403ddb76c2fc3f9a70f2c62db4130119a

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.2.4
+script: bundle exec rake spec
+notifications:
+  email:
+    - ilya@igvita.com

data/README.md

@@ -1,7 +1,6 @@
 # EM-HTTP-Request 
 
-[![Gem Version](https://badge.fury.io/rb/em-http-request.png)](http://rubygems.org/gems/em-http-request)
-[![Analytics](https://ga-beacon.appspot.com/UA-71196-10/em-http-request/readme)](https://github.com/igrigorik/ga-beacon)
+[![Gem Version](https://badge.fury.io/rb/em-http-request.png)](http://rubygems.org/gems/em-http-request) [![Build Status](https://travis-ci.org/igrigorik/em-http-request.svg)](https://travis-ci.org/igrigorik/em-http-request)
 
 Async (EventMachine) HTTP client, with support for:
 
@@ -13,7 +12,7 @@ Async (EventMachine) HTTP client, with support for:
 - Streaming file uploads
 - HTTP proxy and SOCKS5 support
 - Basic Auth & OAuth
-- Connection-level & Global middleware support
+- Connection-level & global middleware support
 - HTTP parser via [http_parser.rb](https://github.com/tmm1/http_parser.rb)
 - Works wherever EventMachine runs: Rubinius, JRuby, MRI
 
@@ -21,7 +20,7 @@ Async (EventMachine) HTTP client, with support for:
 
     gem install em-http-request
 
-- Introductory [screencast](http://everburning.com/news/eventmachine-screencast-em-http-request/)
+- Introductory [screencast](http://everburning.com/news/eventmachine-screencast-em-http-request)
 - [Issuing GET/POST/etc requests](https://github.com/igrigorik/em-http-request/wiki/Issuing-Requests)
 - [Issuing parallel requests with Multi interface](https://github.com/igrigorik/em-http-request/wiki/Parallel-Requests)
 - [Handling Redirects & Timeouts](https://github.com/igrigorik/em-http-request/wiki/Redirects-and-Timeouts)

data/em-http-request.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'em-http-request'
 
   s.add_dependency 'addressable', '>= 2.3.4'
-  s.add_dependency 'cookiejar', '<= 0.3.0'
+  s.add_dependency 'cookiejar', '!= 0.3.1'
   s.add_dependency 'em-socksify', '>= 0.3'
   s.add_dependency 'eventmachine', '>= 1.0.3'
   s.add_dependency 'http_parser.rb', '>= 0.6.0'

data/lib/em-http/client.rb

@@ -155,11 +155,16 @@ module EventMachine
 
       # Set the User-Agent if it hasn't been specified
       if !head.key?('user-agent')
-        head['user-agent'] = "EventMachine HttpClient"
+        head['user-agent'] = 'EventMachine HttpClient'
       elsif head['user-agent'].nil?
         head.delete('user-agent')
       end
 
+      # Set the Accept-Encoding header if none is provided
+      if !head.key?('accept-encoding') && req.compressed
+        head['accept-encoding'] = 'gzip, compressed'
+      end
+
       # Set the auth from the URI if given
       head['Authorization'] = @req.uri.userinfo.split(/:/, 2) if @req.uri.userinfo
 

data/lib/em-http/http_client_options.rb

@@ -1,7 +1,7 @@
 class HttpClientOptions
   attr_reader :uri, :method, :host, :port
   attr_reader :headers, :file, :body, :query, :path
-  attr_reader :keepalive, :pass_cookies, :decoding
+  attr_reader :keepalive, :pass_cookies, :decoding, :compressed
 
   attr_accessor :followed, :redirects
 
@@ -18,6 +18,7 @@ class HttpClientOptions
 
     @pass_cookies = options.fetch(:pass_cookies, true)  # pass cookies between redirects
     @decoding     = options.fetch(:decoding, true)      # auto-decode compressed response
+    @compressed   = options.fetch(:compressed, true)    # auto-negotiated compressed response
 
     set_uri(uri, options[:path], options[:query])
   end

data/lib/em-http/http_connection_options.rb

@@ -20,6 +20,7 @@ class HttpConnectionOptions
     uri = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI::parse(uri.to_s)
     @https = uri.scheme == "https"
     uri.port ||= (@https ? 443 : 80)
+    @tls[:sni_hostname] = uri.host
 
     if proxy = options[:proxy]
       @host = proxy[:host]

data/lib/em-http/http_encoding.rb

@@ -53,7 +53,12 @@ module EventMachine
       # uri in request header, as opposed to a relative path.
       # Don't modify the header with CONNECT proxies. It's unneeded and will
       # cause 400 Bad Request errors with many standard setups.
-      query = uri.join(query) if connopts.proxy && !connopts.connect_proxy?
+      if connopts.proxy && !connopts.connect_proxy?
+        query = uri.join(query)
+        # Drop the userinfo, it's been converted to a header and won't be
+        # accepted by the proxy
+        query.userinfo = nil
+      end
 
       HTTP_REQUEST_HEADER % [method.to_s.upcase, query]
     end

data/lib/em-http/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class HttpRequest
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/spec/client_spec.rb

@@ -386,7 +386,7 @@ describe EventMachine::HttpRequest do
     }
   end
 
-  it "should detect gzip encoding" do
+  it "should auto-detect and decode gzip encoding" do
     EventMachine.run {
 
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/gzip').get :head => {"accept-encoding" => "gzip, compressed"}
@@ -446,6 +446,36 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should default to requesting compressed response" do
+    EventMachine.run {
+
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/echo_accept_encoding').get
+
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should == "gzip, compressed"
+
+        EventMachine.stop
+      }
+    }
+  end
+
+  it "should default to requesting compressed response" do
+    EventMachine.run {
+
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/echo_accept_encoding').get :compressed => false
+
+      http.errback { failed(http) }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should == ""
+
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should timeout after 0.1 seconds of inactivity" do
     EventMachine.run {
       t = Time.now.to_i

data/spec/http_proxy_spec.rb

@@ -52,6 +52,23 @@ describe EventMachine::HttpRequest do
       }
     end
 
+    it "should strip basic auth from before the host in URI sent to proxy" do
+      EventMachine.run {
+
+        http = EventMachine::HttpRequest.new('http://user:pass@127.0.0.1:8090/echo_authorization_header', proxy).get
+
+        http.errback { failed(http) }
+        http.callback {
+          http.response_header.status.should == 200
+          # The test proxy server gives the requested uri back in this header
+          http.response_header['X_THE_REQUESTED_URI'].should == 'http://127.0.0.1:8090/echo_authorization_header'
+          # Ensure the basic auth was converted to a header correctly
+          http.response.should match('authorization:Basic dXNlcjpwYXNz')
+          EventMachine.stop
+        }
+      }
+    end
+
     it "should include query parameters specified in the options" do
       EventMachine.run {
         http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/', proxy).get :query => { 'q' => 'test' }

data/spec/pipelining_spec.rb

@@ -8,10 +8,10 @@ requires_connection do
       EventMachine.run do
 
         # Mongrel doesn't support pipelined requests - bah!
-        conn = EventMachine::HttpRequest.new('http://www.mexicodiario.com/')
+        conn = EventMachine::HttpRequest.new('http://www.bing.com/')
 
         pipe1 = conn.get :keepalive => true
-        pipe2 = conn.get :path => '/contact/', :keepalive => true
+        pipe2 = conn.get :path => '/news', :keepalive => true
 
         processed = 0
         stop = proc { EM.stop if processed == 2}
@@ -36,10 +36,10 @@ requires_connection do
 
     it "should perform successful pipelined HEAD requests" do
       EventMachine.run do
-        conn = EventMachine::HttpRequest.new('http://www.mexicodiario.com/')
+        conn = EventMachine::HttpRequest.new('http://www.bing.com/')
 
         pipe1 = conn.head :keepalive => true
-        pipe2 = conn.head :path => '/contact/', :keepalive => true
+        pipe2 = conn.head :path => '/news', :keepalive => true
 
         processed = 0
         stop = proc { EM.stop if processed == 2}

data/spec/stallion.rb

@@ -17,7 +17,7 @@ module Stallion
 
     def match?(request)
       method = request['REQUEST_METHOD']
-      right_method = @methods.empty? or @methods.include?(method)
+      @methods.empty? or @methods.include?(method)
     end
   end
 
@@ -36,7 +36,7 @@ module Stallion
 
     def call(request, response)
       @request, @response = request, response
-      @boxes.each do |(path, methods), mount|
+      @boxes.each do |_, mount|
         if mount.match?(request)
           mount.ride
         end
@@ -96,6 +96,9 @@ Stallion.saddle :spec do |stable|
     elsif stable.request.path_info == '/echo_content_length_from_header'
       stable.response.write "content-length:#{stable.request.env["CONTENT_LENGTH"]}"
 
+    elsif stable.request.path_info == '/echo_authorization_header'
+      stable.response.write "authorization:#{stable.request.env["HTTP_AUTHORIZATION"]}"
+
     elsif stable.request.head? && stable.request.path_info == '/'
       stable.response.status = 200
 
@@ -235,6 +238,10 @@ Stallion.saddle :spec do |stable|
       stable.response.write deflater.finish
       stable.response["Content-Encoding"] = "deflate"
 
+    elsif stable.request.path_info == '/echo_accept_encoding'
+      stable.response.status = 200
+      stable.response.write stable.request.env["HTTP_ACCEPT_ENCODING"]
+
     elsif stable.request.env["HTTP_IF_NONE_MATCH"]
       stable.response.status = 304
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-http-request
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -28,16 +28,16 @@ dependencies:
   name: cookiejar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: em-socksify
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ files:
 - ".gemtest"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - README.md
@@ -237,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: em-http-request
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: EventMachine based, async HTTP Request client
@@ -263,3 +264,4 @@ test_files:
 - spec/ssl_spec.rb
 - spec/stallion.rb
 - spec/stub_server.rb
+has_rdoc: