excon 0.42.1 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b684746ccebdb53136049cd54cba9ebf0744af4
-  data.tar.gz: 465cf9dd32177506553a7edf2b401dbadfaa1c6a
+  metadata.gz: 77a0da513895a3cba30b16145e7bea66033973cb
+  data.tar.gz: c573a10ec3c2f569628b1c605dc6d47a25caecf5
 SHA512:
-  metadata.gz: 32b65518b5c0b201baf63c8528cf640655d741e778bbcf35a45fc1cf0529eda1ecbb9ed7800665a2fb124f17acef8808871ad38e88ff045192755e1f7d6ed7a6
-  data.tar.gz: 258fcc17aae09ce9243ad7ed5849458947018de60cf06efb53f1abd14ed447d4b3ffc0863c6925368706d90c2187c45fcf32b2ef6f186d3ec2cae104761df201
+  metadata.gz: 740736aa1390923d0ce8d30b4739b149509cdfe445e5ea90ef21e2f1f69e1df2603d22d722b9d4ac835c349e503d03349fbfcdc978104057edcc1310d130c654
+  data.tar.gz: fa08c954a4fcb5bc746d3ab32194b7bb41fef491b86b8ac3d5e0436d6c816f3074232e4ee807b132fc450d53f2f84ffe3a770738e5130c7ec65818faa5feea76

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.42.1)
+    excon (0.43.0)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,10 @@
+0.43.0 01/09/2015
+=================
+
+use basic error instead of nil as default for socket error
+allow setup_proxy to accept uri
+add disable_proxy and proxy: false to disable proxy settings
+
 0.42.1 12/04/2014
 =================
 

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.42.1'
-  s.date              = '2014-12-04'
+  s.version           = '0.43.0'
+  s.date              = '2015-01-09'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -392,6 +392,13 @@ module Excon
     end
 
     def setup_proxy
+      if @data[:disable_proxy]
+        if @data[:proxy]
+          raise ArgumentError, "`:disable_proxy` parameter and `:proxy` parameter cannot both be set at the same time."
+        end
+        return
+      end
+
       unless @data[:scheme] == UNIX
         if no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"]
           no_proxy_list = no_proxy_env.scan(/\*?\.?([^\s,:]+)(?::(\d+))?/i).map { |s| [s[0], s[1]] }
@@ -410,8 +417,8 @@ module Excon
           @data.delete(:proxy)
         when Hash
           # no processing needed
-        when String
-          uri = URI.parse(@data[:proxy])
+        when String, URI
+          uri = @data[:proxy].is_a?(String) ? URI.parse(@data[:proxy]) : @data[:proxy]
           @data[:proxy] = {
             :host       => uri.host,
             # path is only sensible for a Unix socket proxy

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.42.1'
+  VERSION = '0.43.0'
 
   CR_NL = "\r\n"
 
@@ -67,6 +67,7 @@ module Excon
     :client_cert,
     :certificate,
     :certificate_path,
+    :disable_proxy,
     :private_key,
     :private_key_path,
     :connect_timeout,

data/lib/excon/errors.rb

@@ -8,7 +8,7 @@ module Excon
     class SocketError < Error
       attr_reader :socket_error
 
-      def initialize(socket_error=nil)
+      def initialize(socket_error=Excon::Error.new)
         if socket_error.message =~ /certificate verify failed/
           super("Unable to verify certificate, please set `Excon.defaults[:ssl_ca_path] = path_to_certs`, `ENV['SSL_CERT_DIR'] = path_to_certs`, `Excon.defaults[:ssl_ca_file] = path_to_file`, `ENV['SSL_CERT_FILE'] = path_to_file`, `Excon.defaults[:ssl_verify_callback] = callback` (see OpenSSL::SSL::SSLContext#verify_callback), or `Excon.defaults[:ssl_verify_peer] = false` (less secure).")
         else

data/tests/proxy_tests.rb

@@ -66,6 +66,15 @@ Shindo.tests('Excon proxy support') do
         tests('connection.data[:proxy][:scheme]').returns('http') do
           connection.data[:proxy][:scheme]
         end
+
+        tests('with disable_proxy set') do
+          connection = nil
+
+          tests('connection.data[:proxy]').returns(nil) do
+            connection = Excon.new('http://foo.com', :disable_proxy => true)
+            connection.data[:proxy]
+          end
+        end
       end
 
       tests('an https connection') do
@@ -83,6 +92,15 @@ Shindo.tests('Excon proxy support') do
         tests('connection.data[:proxy][:scheme]').returns('http') do
           connection.data[:proxy][:scheme]
         end
+
+        tests('with disable_proxy set') do
+          connection = nil
+
+          tests('connection.data[:proxy]').returns(nil) do
+            connection = Excon.new('https://foo.com', :disable_proxy => true)
+            connection.data[:proxy]
+          end
+        end
       end
 
       tests('http proxy from the environment overrides config') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.43.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport