excon 0.60.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53fc3b2405c940418dfb4d8a4f268b11451a1e6
-  data.tar.gz: 7275cf523885f25c3bf8eabbe8baca5d05cffd89
+  metadata.gz: edbc090e0e340afbb9c9897d1e733c2870b2c6d9
+  data.tar.gz: f9015ceea2e07c05d07d16010f87472e26da17d6
 SHA512:
-  metadata.gz: 6eb4a446aeb95dcb4674837fea2651a06547c584b943e8e29d7e0b3093b728f6226084fa8d8d6a3bfe1a3c664ace754a075cdac863a0f7aab8100ca0092c0a78
-  data.tar.gz: 6867048ad67822bf11426e2cd9fb90060c11f8849e8d685a7df660a2064d6382be0cdc14916f1cd1820c923a8cde2bb41d6a09363025bdeacc5c367fdb5c8d35
+  metadata.gz: bd222964f9f5bb2ca96af3f41fa00174e75fab56865223342405cb67869dbb46c526e0b7f8a87fff68485c724ec70e2ae5f982fe4cf3a8faeb49eee7dfe31742
+  data.tar.gz: 3a44275a35d4bb40f7af4b079daed73d115aa6e2adfc0b3746384486ec37dfb4d640eed3826f592ff9d3bf86187a8d79e9922945afea023271fa5634dc28b53e

data/.travis.yml

@@ -16,8 +16,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.3
-  - 2.4.1
+  - 2.3
+  - 2.4
+  - 2.5
   - jruby
   - rbx-3.2
   - ree

data/changelog.txt

@@ -1,3 +1,10 @@
+0.61.0 2018-03-16
+=================
+
+use default ports for sockets if none specified
+add ruby 2.4 and 2.5 to ci testing
+follow relative location redirects
+
 0.60.0 2017-12-15
 =================
 

data/lib/excon/middlewares/redirect_follower.rb

@@ -17,7 +17,8 @@ module Excon
             uri_parser = datum[:uri_parser] || Excon.defaults[:uri_parser]
 
             location = get_header(datum, 'Location')
-            uri = uri_parser.parse(location)
+            base_uri = Excon::Utils.request_uri(datum)
+            uri = uri_parser.join(base_uri, location)
 
             # delete old/redirect response
             response = datum.delete(:response)

data/lib/excon/socket.rb

@@ -24,6 +24,7 @@ module Excon
     def initialize(data = {})
       @data = data
       @nonblock = data[:nonblock]
+      @port ||= @data[:port] || 80
       @read_buffer = String.new
       @eof = false
       connect
@@ -93,7 +94,7 @@ module Excon
         args = [@data[:proxy][:hostname], @data[:proxy][:port], family, ::Socket::Constants::SOCK_STREAM]
       else
         family = @data[:family] || ::Socket::Constants::AF_UNSPEC
-        args = [@data[:hostname], @data[:port], family, ::Socket::Constants::SOCK_STREAM]
+        args = [@data[:hostname], @port, family, ::Socket::Constants::SOCK_STREAM]
       end
       if RUBY_VERSION >= '1.9.2' && defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
         args << nil << nil << false # no reverse lookup

data/lib/excon/ssl_socket.rb

@@ -6,6 +6,7 @@ module Excon
     end
 
     def initialize(data = {})
+      @port = data[:port] || 443
       super
 
       # create ssl context

data/lib/excon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Excon
-  VERSION = '0.60.0'
+  VERSION = '0.61.0'
 end

data/tests/middlewares/redirect_follower_tests.rb

@@ -62,6 +62,38 @@ Shindo.tests('Excon redirect support for relative Location headers') do
   env_restore
 end
 
+Shindo.tests('Excon redirect support for relative Location headers with dot segments') do
+  env_init
+
+  tests("request(:method => :get, :path => '/foo/baz/').body").returns('/foo/bar/') do
+    Excon.stub(
+      { :path => '/foo/baz/' },
+      {
+        :headers  => { 'Location' => '../bar/' },
+        :body     => '/foo/baz/',
+        :status   => 301
+      }
+    )
+
+    Excon.stub(
+      { :path => '/foo/bar/' },
+      {
+        :body     => '/foo/bar/',
+        :status   => 200
+      }
+    )
+
+    Excon.get(
+      'http://127.0.0.1:9292',
+      :path         => '/foo/baz/',
+      :middlewares  => Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower],
+      :mock         => true
+    ).body
+  end
+
+  env_restore
+end
+
 Shindo.tests("Excon redirecting post request") do
   env_init
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.61.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec