requests 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f498fdcb052c62a2936dc7346be84c539cea04ed
-  data.tar.gz: f6959db0f600cb93d767d7b69239fea389ce94e2
+  metadata.gz: 41390f6d44a892d862b7d1ea50926da5770ba58c
+  data.tar.gz: 6ee4ee954976e8d56e1d0f9646faa8993c6fe2fb
 SHA512:
-  metadata.gz: 7220d08539742522762d74f9a8dd8aee1cf77fb43b60f27914a849843d6cfd094f34d5e7f2f453908d3baa9209401c65718cbc96a73b21d37d3a9c256961c458
-  data.tar.gz: ca15d8700c19ee2501b816e136c91166d3824ac3b0266a13d4b7c88a9d55db7c79deeb922e4ff163f86b6f58f02ff7a7742b02dca75d4d8316ea392350388a8e
+  metadata.gz: 217e21d6a5372943c548434d2c4d8684760083a152eefdceff959d97b42857de3d261a11fd3ef04a34e4e43315861f453ec63dd1f16552c7e98b1ace0584cab0
+  data.tar.gz: de74c5f4c50bcc593247bba8dd412df9afbb267a8d8ee0d2c4dfe8ebd79930839f3ba2cef00e3312ae4cb7efc525f65450bd2a9bd87c78304749d9ec809cade4

data/lib/requests.rb

@@ -21,7 +21,9 @@ module Requests
     headers: {},
     data: nil,
     params: nil,
-    auth: nil)
+    auth: nil,
+    proxy: nil,
+    options: {})
 
     uri = URI.parse(url)
     uri.query = encode_www_form(params) if params
@@ -30,7 +32,8 @@ module Requests
 
     basic_auth(headers, *auth) if auth
 
-    response = Net::HTTP.start(uri.host, uri.port, opts(uri)) do |http|
+    proxy = proxy.to_h.values_at(:host, :port, :user, :password)
+    response = Net::HTTP.start(uri.host, uri.port, *proxy, opts(uri, options)) do |http|
       http.send_request(method, uri, body, headers)
     end
 
@@ -46,11 +49,13 @@ private
     URI.encode_www_form(params)
   end
 
-  def self.opts(uri)
+  def self.opts(uri, options)
     if uri.scheme == 'https'
       { use_ssl: true,
         verify_mode: OpenSSL::SSL::VERIFY_PEER,
-        ca_file: CA_FILE
+        ca_file: CA_FILE,
+        read_timeout: options[:read_timeout],
+        open_timeout: options[:open_timeout],
       }
     end
   end

data/requests.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "requests"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
   s.summary = "Requests: HTTP for Humans (Ruby port)"
   s.description = "Because Requests for Python is awesome"
   s.authors = ["Cyril David"]

data/tests/proxy_test.rb

@@ -0,0 +1,32 @@
+require 'requests/sugar'
+require 'webrick'
+require 'webrick/httpproxy'
+require 'thread'
+require 'logger'
+
+port = ENV.fetch("PROXY_PORT", 8000)
+
+setup do
+  WEBrick::HTTPProxyServer.new(
+    ServerName: "0.0.0.0",
+    Port: port,
+    Logger: Logger.new("/dev/null"),
+    AccessLog: []
+  )
+end
+
+test 'request via proxy' do |proxy|
+  Thread.new { proxy.start }
+
+  r = Requests.get('http://httpbin.org/get', params: { foo: 'bar' }, proxy: {
+    host: '0.0.0.0', port: port
+  })
+
+  assert_equal 200, r.status
+  assert_equal ['application/json'], r.headers['content-type']
+  assert(r.json['args'] && r.json['args']['foo'] == 'bar')
+
+  assert_equal ["1.1 vegur, 1.1 0.0.0.0:#{port}"], r.headers['via']
+
+  proxy.shutdown
+end

data/tests/requests_test.rb

@@ -57,3 +57,37 @@ test 'Error' do
     assert_equal Net::HTTPNotFound, e.response.class
   end
 end
+
+test 'read timeout' do
+  begin
+    Requests.get('http://httpbin.org:10000', options: { read_timeout: 1 })
+  rescue => err
+    assert err.kind_of?(Errno::ECONNREFUSED)
+  end
+end
+
+test 'read timeout not failing' do
+  begin
+    Requests.get('http://httpbin.org/get', options: { read_timeout: 30 })
+  rescue => err
+    flunk(err)
+  end
+end
+
+test 'open timeout' do
+  begin
+    Requests.get('http://httpbin.org:10000', options: { open_timeout: 1 })
+  rescue => err
+    assert err.kind_of?(Errno::ECONNREFUSED)
+  else
+    flunk("expected exception")
+  end
+end
+
+test 'open timeout not failing' do
+  begin
+    Requests.get('http://httpbin.org/get', options: { open_timeout: 30 })
+  rescue => err
+    flunk(err)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requests
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
@@ -37,6 +37,7 @@ files:
 - lib/requests/sugar.rb
 - makefile
 - requests.gemspec
+- tests/proxy_test.rb
 - tests/requests_test.rb
 - tests/ssl_test.rb
 homepage: http://github.com/cyx/requests
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Requests: HTTP for Humans (Ruby port)'