httpi 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ac8ba040207b5a0590492395b374fdcab38691
-  data.tar.gz: 2c4f27ee87ca5200523f3191081e243704504915
+  metadata.gz: 7fdb3bb23a9cba076a235fac76aa7aa0aa04a803
+  data.tar.gz: 7740630503dc0ffedc3f909f1418d45f0a443156
 SHA512:
-  metadata.gz: b81b972077db62ec3f8896a80d9a95c410dbddffcfbf681cdb0f7d322122fefb8c3b04ebfd92a403e8812a9f1c59fe333a15a4d4ed514a3fb3b48caf1ace6539
-  data.tar.gz: 3afa2f7660560043a23d03de67bacba6909951eb62dd23c1ad071dd893278260883b3c91d066758928d66a8297f368cb1c56a0cf9b77dd25819fe617c0c65271
+  metadata.gz: 14a720954983eecb0fd4497f2c0e87269ceb5373c0856e19d4de9b7a102c7adba108e8fb44b020a80dc038b820355efffff9dfcdf0dad94f24668953c4d9b38d
+  data.tar.gz: 5f8119a473f8daf6c7dfd597a172002ead1f5b1fceea7456c083e14a9daee93da63d23a7018030103389a3397ae9e6df986780e032a7612f5d39a482b3619f5c

data/.travis.yml

@@ -2,4 +2,7 @@ language: "ruby"
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode

data/CHANGELOG.md

@@ -1,9 +1,10 @@
-### 2.3.0
+### 2.4.0
 
-* Improvement: [#136](https://github.com/savonrb/httpi/pull/136) Allow setting of ssl versions depending on what versions OpenSSL provides at runtime.
+* Formally drop support for ruby 1.8.7
 
-### 2.2.8 (edge)
+### 2.3.0
 
+* Improvement: [#136](https://github.com/savonrb/httpi/pull/136) Allow setting of ssl versions depending on what versions OpenSSL provides at runtime.
 * Improvement: [#133](https://github.com/savonrb/httpi/pull/133) Add 'query' to available attribute writers so it can be set with 'new'
 * Fix: [#132](https://github.com/savonrb/httpi/pull/132) Fix a few warnings, among which a circular require
 

data/httpi.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/savonrb/#{s.name}"
   s.summary     = "Common interface for Ruby's HTTP libraries"
   s.description = s.summary
+  s.required_ruby_version = '>= 1.9.2'
 
   s.rubyforge_project = s.name
   s.license = 'MIT'

data/lib/httpi.rb

@@ -1,3 +1,4 @@
+require "uri"
 require "httpi/version"
 require "httpi/logger"
 require "httpi/request"
@@ -159,8 +160,8 @@ module HTTPI
       response = adapter_class.request(method)
 
       if response &&  HTTPI::Response::RedirectResponseCodes.member?(response.code) && request.follow_redirect?
-        log("Following redirect: '#{response.headers['location']}'.")
-        request.url = response.headers['location']
+        request.url = URI.join(request.url, response.headers['location'])
+        log("Following redirect: '#{request.url}'.")
         return request(method, request, adapter)
       end
 

data/lib/httpi/adapter/excon.rb

@@ -66,9 +66,10 @@ module HTTPI
           opts[:ssl_ca_file] = ssl.ca_cert_file if ssl.ca_cert_file
           opts[:client_cert] = ssl.cert     if ssl.cert
           opts[:client_key]  = ssl.cert_key if ssl.cert_key
-          opts[:ssl_version] = ssl.ssl_version if ssl.ssl_version
         end
 
+        opts[:ssl_version] = ssl.ssl_version if ssl.ssl_version
+
         opts
       end
 

data/lib/httpi/adapter/net_http.rb

@@ -5,15 +5,6 @@ require "httpi/response"
 require 'kconv'
 require 'socket'
 
-begin
-  require 'net/ntlm'
-  require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION)
-  unless Net::NTLM::VERSION::STRING >= '0.3.2'
-    raise ArgumentError, 'Invalid version of rubyntlm. Please use v0.3.2+.'
-  end
-rescue LoadError
-end
-
 module HTTPI
   module Adapter
 
@@ -24,8 +15,9 @@ module HTTPI
     class NetHTTP < Base
 
       register :net_http, :deps => %w(net/https)
-
       def initialize(request)
+        check_net_ntlm_version!
+
         @request = request
         @client = create_client
       end
@@ -58,6 +50,16 @@ module HTTPI
       end
 
       private
+      def check_net_ntlm_version!
+        begin
+          require 'net/ntlm'
+          require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION)
+          unless Net::NTLM::VERSION::STRING >= '0.3.2'
+            raise ArgumentError, 'Invalid version of rubyntlm. Please use v0.3.2+.'
+          end
+        rescue LoadError
+        end
+      end
 
       def perform(http, http_request, &block)
         http.request http_request, &block

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/spec/httpi/httpi_spec.rb

@@ -222,7 +222,7 @@ describe HTTPI do
   end
 
   describe ".request" do
-    let(:request) { HTTPI::Request.new('http://example.com') }
+    let(:request) { HTTPI::Request.new('http://example.com/foo/') }
 
     it "allows custom HTTP methods" do
       httpclient.any_instance.expects(:request).with(:custom)
@@ -238,7 +238,33 @@ describe HTTPI do
       response = HTTPI::Response.new(200, {}, 'success')
 
       httpclient.any_instance.expects(:request).twice.with(:custom).returns(redirect, response)
-      request.expects(:url=).with(redirect_location)
+      request.expects(:url=).with(URI.parse(redirect_location))
+
+      client.request(:custom, request, :httpclient)
+    end
+
+    it 'follows redirects with absolute path' do
+      request.follow_redirect = true
+      redirect_location = '/bar/foo'
+
+      redirect = HTTPI::Response.new(302, {'location' => redirect_location}, 'Moved')
+      response = HTTPI::Response.new(200, {}, 'success')
+
+      httpclient.any_instance.expects(:request).twice.with(:custom).returns(redirect, response)
+      request.expects(:url=).with(URI.parse('http://example.com/bar/foo'))
+
+      client.request(:custom, request, :httpclient)
+    end
+
+    it 'follows redirects with relative path' do
+      request.follow_redirect = true
+      redirect_location = 'bar/foo'
+
+      redirect = HTTPI::Response.new(302, {'location' => redirect_location}, 'Moved')
+      response = HTTPI::Response.new(200, {}, 'success')
+
+      httpclient.any_instance.expects(:request).twice.with(:custom).returns(redirect, response)
+      request.expects(:url=).with(URI.parse('http://example.com/foo/bar/foo'))
 
       client.request(:custom, request, :httpclient)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="