excon 0.40.0 → 0.41.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODlkNWVjNzM5NDE2MzY0NzhmYWRlYzJjNDYzMWI3NTE0ZDQ4MWJlNg==
-  data.tar.gz: !binary |-
-    ZGFiN2VhOTJiNDRjMGVhYWE3YjU0NjIyYjZiZTg3YWIyMmU0ZThjMQ==
+SHA1:
+  metadata.gz: c8ebf3518cde85fc3af71ea0cf17a505b2a94be1
+  data.tar.gz: be825cbf92ebc6383d2adcda8f536dd9e1c08575
 SHA512:
-  metadata.gz: !binary |-
-    NDMxNjEzM2M1YjhmNmE4MTNjMjljNDkzNWMyZjUxNmIyYWE2ZGFiYmQyMDBk
-    MWQzZTZlMDE1YzE3MmEwZWQzMjQyMGFiMWViZjhlMzlmZjI0M2IwMDE5YmI4
-    ODg4MjczZDczYjNhZDhlMzA5MTAwNTlkNjZhMzk1Njc4ZDgzYjc=
-  data.tar.gz: !binary |-
-    ZDk4MTk3ZmYxYjJkY2E5YTFhNWFjMWUxYmEyYTA5MjllNWVhZmY1NjEwOTU0
-    YzUyYjY1NDcwZmYyZTEwNzQ0M2RmZWY3YjE1YjlkYTk2NmU3NGYyOGFmNTNh
-    YWFkYTc1OTkxYTk0NTI2MzFjZjFmM2MwMDg0Mzc5OTM0YzE3YmQ=
+  metadata.gz: db487e313f577d715204046da7676e155061e5c954690217f318bf98238ae462d7a6b41b5edc4f587804c5bf4a42c7826d9fbef9ca9d3beecdff88ddc12fc0cb
+  data.tar.gz: 11f213779b3e188003abf391fe4d7304dd2a28481a6bf090c5e7b9fb6b57e3dfbbc8ab3a4162be385d67cb07cf49b1bb58f7e8f8f3c58a568fb635de9c9d3f33

data/CONTRIBUTORS.md

@@ -19,6 +19,8 @@
 * Dane Harrigan <dane.harrigan@gmail.com>
 * Dave Myron <therealdave.myron@gmail.com>
 * Dave Newton <davelnewton@gmail.com>
+* David Biehl <dbiehl@ncmedical.com>
+* David Biehl <lazylodr@gmail.com>
 * Dimitrij Denissenko <dimitrij@blacksquaremedia.com>
 * Dominik Richter <dominik.richter@gmail.com>
 * Eugene Howe <eugene@xtreme-computers.net>
@@ -28,6 +30,7 @@
 * Glenn Pratt <glennpratt@gmail.com>
 * Graeme Nelson <graeme.nelson@gmail.com>
 * Hakan Ensari <hakan.ensari@papercavalier.com>
+* Ian Neubert <ian@ianneubert.com>
 * Jacob Atzen <jacob@incremental.dk>
 * James Watling <watling.james@gmail.com>
 * Jeremy Hinegardner <jeremy@copiousfreetime.org>

data/Gemfile.lock

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

data/changelog.txt

@@ -1,3 +1,9 @@
+0.41.0 11/05/2014
+=================
+
+add :ssl_verify_peer_host option for dev purposes
+add #reason_phrase to response
+
 0.40.0 10/06/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.40.0'
-  s.date              = '2014-10-06'
+  s.version           = '0.41.0'
+  s.date              = '2014-11-05'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -120,6 +120,8 @@ Gem::Specification.new do |s|
     tests/authorization_header_tests.rb
     tests/bad_tests.rb
     tests/basic_tests.rb
+    tests/data/127.0.0.1.cert.crt
+    tests/data/127.0.0.1.cert.key
     tests/data/excon.cert.crt
     tests/data/excon.cert.key
     tests/data/xs
@@ -145,6 +147,7 @@ Gem::Specification.new do |s|
     tests/rackups/request_methods.ru
     tests/rackups/response_header.ru
     tests/rackups/ssl.ru
+    tests/rackups/ssl_mismatched_cn.ru
     tests/rackups/ssl_verify_peer.ru
     tests/rackups/streaming.ru
     tests/rackups/thread_safety.ru

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.40.0'
+  VERSION = '0.41.0'
 
   CR_NL = "\r\n"
 
@@ -84,6 +84,7 @@ module Excon
     :ssl_ca_path,
     :ssl_verify_callback,
     :ssl_verify_peer,
+    :ssl_verify_peer_host,
     :ssl_version,
     :tcp_nodelay,
     :uri_parser,

data/lib/excon/response.rb

@@ -22,6 +22,12 @@ module Excon
     def status
       @data[:status]
     end
+    def reason_phrase=(new_reason_phrase)
+      @data[:reason_phrase] = new_reason_phrase
+    end
+    def reason_phrase
+      @data[:reason_phrase]
+    end
     def remote_ip=(new_remote_ip)
       @data[:remote_ip] = new_remote_ip
     end
@@ -37,13 +43,17 @@ module Excon
 
     def self.parse(socket, datum)
       # this will discard any trailing lines from the previous response if any.
-      until status = socket.readline[9,11].to_i
-      end
+      begin
+        line = socket.readline
+      end until status = line[9, 3].to_i
+
+      reason_phrase = line[13..-3] # -3 strips the trailing "\r\n"
 
       datum[:response] = {
         :body          => '',
         :headers       => Excon::Headers.new,
-        :status        => status
+        :status        => status,
+        :reason_phrase => reason_phrase
       }
 
       unix_proxy = datum[:proxy] ? datum[:proxy][:scheme] == UNIX : false

data/lib/excon/ssl_socket.rb

@@ -126,7 +126,7 @@ module Excon
 
       # verify connection
       if @data[:ssl_verify_peer]
-        @socket.post_connection_check(@data[:host])
+        @socket.post_connection_check(@data[:ssl_verify_peer_host] || @data[:host])
       end
 
       @socket

data/tests/basic_tests.rb

@@ -112,6 +112,38 @@ Shindo.tests('Excon basics (ssl)') do
   end
 end
 
+Shindo.tests('Excon ssl verify peer (ssl)') do
+  with_rackup('ssl.ru') do
+    connection = nil
+    test do
+      ssl_ca_file = File.join(File.dirname(__FILE__), 'data', '127.0.0.1.cert.crt')
+      connection = Excon.new('https://127.0.0.1:9443', :ssl_verify_peer => true, :ssl_ca_file => ssl_ca_file )
+      true
+    end
+
+    tests('response.status').returns(200) do
+      response = connection.request(:method => :get, :path => '/content-length/100')
+
+      response.status
+    end
+  end
+
+  with_rackup('ssl_mismatched_cn.ru') do
+    connection = nil
+    test do
+      ssl_ca_file = File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt')
+      connection = Excon.new('https://127.0.0.1:9443', :ssl_verify_peer => true, :ssl_ca_file => ssl_ca_file, :ssl_verify_peer_host => 'Excon' )
+      true
+    end
+
+    tests('response.status').returns(200) do
+      response = connection.request(:method => :get, :path => '/content-length/100')
+
+      response.status
+    end
+  end
+end
+
 Shindo.tests('Excon basics (ssl file)',['focus']) do
   with_rackup('ssl_verify_peer.ru') do
 

data/tests/data/127.0.0.1.cert.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICEzCCAXwCCQC94mWSE0+JcjANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCQ0ExDjAMBgNVBAoTBUV4Y29uMQ4wDAYDVQQLEwVFeGNvbjES
+MBAGA1UEAxMJMTI3LjAuMC4xMB4XDTE0MTAyODIwMjMzMVoXDTE5MTAyNzIwMjMz
+MVowTjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQ4wDAYDVQQKEwVFeGNvbjEO
+MAwGA1UECxMFRXhjb24xEjAQBgNVBAMTCTEyNy4wLjAuMTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAvqlKlQMoS4q9jgsm+sBh7B9jEJVYHqNBluqgLubMEmjs
+xFZUIicx+LmMPfUdnqtGDihR7q3yh/xeJuzzux38FBwTBDl8NRXWSyRkJqdi9XUA
+qihAlkqDoZ6Eb867isF7C5FEqohAuCE0FUaYU1HY3bV/foLqxEbyvQVwaRZ4rjkC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQCRxnrtbFJrBT4duYtOVuG/j8G46bf1DPrF
+wuRf38gdO2Ldu+kdNRMhQrgSA9CfkjwwQpcVK2gZTuGTdmtqTnvIKilsomtG3tFK
+ThWxuW6HrU9XgZ5KXIguVnL5tjYBNslsCFiQUeU/b8GF2MyMkOGUIC0p411ZB9v/
+mTKRgzf/qQ==
+-----END CERTIFICATE-----

data/tests/data/127.0.0.1.cert.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC+qUqVAyhLir2OCyb6wGHsH2MQlVgeo0GW6qAu5swSaOzEVlQi
+JzH4uYw99R2eq0YOKFHurfKH/F4m7PO7HfwUHBMEOXw1FdZLJGQmp2L1dQCqKECW
+SoOhnoRvzruKwXsLkUSqiEC4ITQVRphTUdjdtX9+gurERvK9BXBpFniuOQIDAQAB
+AoGAEwJB41VrQQzWFUFbY4imuqnucIrTPEq+kVNXIRX1pqg7Yt/Qh48s1kV5i/vS
+Ni2RUHwInylMku5AXNUm/7LfnN1zCHiYVkddL6df73BdzKfM86j+eQJdqye3AOkZ
+GKrutsE8AEwOBCPtM9z3EbbAQZQpBBGyvAH3z8/GFLa34LkCQQDwEhEJleUGxiSR
+anm43iFWsNBqW680YSz3kh1O7aC+09u8BOvOJ6azOMBYgxBno0IR9Oe7k0iBl+8e
+YJmAuCVHAkEAy0/wdYeKwv9Dd3y9I+lS11VvaQaY2dmFmhbkPl/AAjUHju5ZF7me
+Znwpq0jLlKRlKatVjkO/mkOeWs1/8MhQfwJBAO5VkVKJ3IjAF7fCFDvjUwfEm/Sr
+NyJyQvk5tx0PrqEkpSZhYFUXaljNQ6/b1mJ9Yu9+yrye+MGnu73Vuy9eIasCQFT4
+fejA0y+X+5xul6Xwl9zDKiLczPkPPhUeSBoBbn/9pcEIwFd4DkmKzud1LxBafKUj
+pEgm7GcOp5oPlM8PCQUCQQCtPFpgobUK9nRewxWagUL+xlEo6C1CPFhTwtQvnyi9
+6UwgxZtOdzAc3xRvHo4uK3OwGuOklqkpIeiZg3hoZb6B
+-----END RSA PRIVATE KEY-----

data/tests/rackups/ssl.ru

@@ -4,9 +4,13 @@ require 'webrick/https'
 
 require File.join(File.dirname(__FILE__), 'basic')
 
+key_file = File.join(File.dirname(__FILE__), '..', 'data', '127.0.0.1.cert.key')
+cert_file = File.join(File.dirname(__FILE__), '..', 'data', '127.0.0.1.cert.crt')
 Rack::Handler::WEBrick.run(Basic, {
   :Port             => 9443,
-  :SSLCertName      => [["CN", WEBrick::Utils::getservername]],
   :SSLEnable        => true,
-  :SSLVerifyClient  => OpenSSL::SSL::VERIFY_NONE
+  :SSLPrivateKey    => OpenSSL::PKey::RSA.new(File.open(key_file).read),
+  :SSLCertificate   => OpenSSL::X509::Certificate.new(File.open(cert_file).read),
+  :SSLCACertificateFile => cert_file,
+  :SSLVerifyClient  => OpenSSL::SSL::VERIFY_NONE,
 })

data/tests/rackups/ssl_mismatched_cn.ru

@@ -0,0 +1,15 @@
+require 'openssl'
+require 'webrick'
+require 'webrick/https'
+
+require File.join(File.dirname(__FILE__), 'basic')
+key_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.key')
+cert_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.crt')
+Rack::Handler::WEBrick.run(Basic, {
+  :Port             => 9443,
+  :SSLEnable        => true,
+  :SSLPrivateKey    => OpenSSL::PKey::RSA.new(File.open(key_file).read),
+  :SSLCertificate   => OpenSSL::X509::Certificate.new(File.open(cert_file).read),
+  :SSLCACertificateFile => cert_file,
+  :SSLVerifyClient  => OpenSSL::SSL::VERIFY_NONE,
+})

data/tests/response_tests.rb

@@ -168,6 +168,20 @@ Shindo.tests('Excon Response Parsing') do
 
     end
 
+    tests('status line parsing') do
+
+      tests('proper status code').returns(404) do
+        resp = Excon.get('http://127.0.0.1:9292/not-found')
+        resp.status
+      end
+
+      tests('proper reason phrase').returns("Not Found") do
+        resp = Excon.get('http://127.0.0.1:9292/not-found')
+        resp.reason_phrase
+      end
+
+    end
+
   end
 
   env_restore

data/tests/servers/good.rb

@@ -163,6 +163,12 @@ module GoodServer
         send_data "\r\n"
         send_data "hello world"
       end
+
+    when 'not-found'
+      start_response(:status => "404 Not Found")
+      send_data "Content-Length: 11\r\n"
+      send_data "\r\n"
+      send_data "hello world"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,118 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shindo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: EXtended http(s) CONnections
@@ -183,6 +183,8 @@ files:
 - tests/authorization_header_tests.rb
 - tests/bad_tests.rb
 - tests/basic_tests.rb
+- tests/data/127.0.0.1.cert.crt
+- tests/data/127.0.0.1.cert.key
 - tests/data/excon.cert.crt
 - tests/data/excon.cert.key
 - tests/data/xs
@@ -208,6 +210,7 @@ files:
 - tests/rackups/request_methods.ru
 - tests/rackups/response_header.ru
 - tests/rackups/ssl.ru
+- tests/rackups/ssl_mismatched_cn.ru
 - tests/rackups/ssl_verify_peer.ru
 - tests/rackups/streaming.ru
 - tests/rackups/thread_safety.ru
@@ -231,22 +234,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)