httpi 2.2.4 → 2.2.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTg1OTVkMjUyODliYTU2NTE1YTk4ZTVmM2MwODczOTM2YWIyN2VmNg==
+  data.tar.gz: !binary |-
+    NWJhMGMyMzljNmUxNGNlYWE1OTllNWNhZDhiNTgwNjAxNDJjMmIyNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NDQ4MjVjMWUxNzZiOWViMWY1YjJkZTZlOWQ1ZDRjNWM0NTlmNWM3MDA3NWU1
+    N2Q2M2EzMDE5Nzc5MDAxZWMyZGFlZjM1NDM0NTQxNzM1YzVjOWUxZTYxZWRk
+    Njc4NmM1ZWQxNmYwMzU2NjkzY2I1NzYzMTA5NGFhZjU4Mjg3Y2E=
+  data.tar.gz: !binary |-
+    MzM3ZjZmOWJhOWNmZjgwMTA0MzcxZmJiNjQ1MDlmODk1MjlmN2Q3MWU4YWNj
+    NzNhMDYyNzJjZGQxNGU2ZGYwZDEyMDdiYjI5ZDc4M2RhOTI1MTE0Mjc2NGY4
+    NTU5YWRmYjFkODc1MWFkOWU3NTYxMzhkNzJjYWU5ZTQwYTE0Yzg=

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-### 2.2.2 (edge)
+### 2.2.5
+
+* Feature: [#123](https://github.com/savonrb/httpi/pull/123) Don't warn about missing rubyntlm gem if it is optional. Thanks to [PChambino](https://github.com/PChambino)
+
+### 2.2.4
+
+* Fix: [#120](https://github.com/savonrb/httpi/pull/120) fixed an unintended crash when an incompatible version of NTLM was required. Thanks to [hubrix](https://github.com/hubrix)
+
+### 2.2.3
+
+* Feature: [#117](https://github.com/savonrb/httpi/pull/117) Follow 302 redirects
+* Feature: [#118](https://github.com/savonrb/httpi/pull/118) Support for SSL certificate private keys in formats other than RSA
+
+### 2.2.2
 
 * Feature: [#118](https://github.com/savonrb/httpi/pull/118) Support for other SSL certificate keys, not only RSA. Thanks to [Novikov Andrey](https://github.com/Envek).
 

data/lib/httpi.rb

@@ -138,8 +138,8 @@ module HTTPI
 
       response = adapter_class.request(method)
 
-      if response and response.code == 302 and request.follow_redirect?
-        log('Following redirect...')
+      if response &&  HTTPI::Response::RedirectResponseCodes.member?(response.code) && request.follow_redirect?
+        log("Following redirect: '#{response.headers['location']}'.")
         request.url = response.headers['location']
         return request(method, request, adapter)
       end

data/lib/httpi/adapter/net_http.rb

@@ -11,8 +11,7 @@ begin
   unless Net::NTLM::VERSION::STRING >= '0.3.2'
     raise ArgumentError, 'Invalid version of rubyntlm. Please use v0.3.2+.'
   end
-rescue LoadError => e
-  HTTPI.logger.debug('Net::NTLM is not available. Install via gem install rubyntlm.')
+rescue LoadError
 end
 
 module HTTPI
@@ -86,7 +85,7 @@ module HTTPI
 
       def negotiate_ntlm_auth(http, &requester)
         unless Net.const_defined?(:NTLM)
-          HTTPI.logger.fatal('Cannot negotiate ntlm auth if net/ntlm is not present. Perhaps the net/ntlm gem is not installed?')
+          raise NotSupportedError, 'Net::NTLM is not available. Install via gem install rubyntlm.'
         end
 
         # first figure out if we should use NTLM or Negotiate

data/lib/httpi/response.rb

@@ -14,6 +14,8 @@ module HTTPI
 
     # Range of HTTP response codes considered to be successful.
     SuccessfulResponseCodes = 200..299
+    # HTTP response codes considered to be a redirect.
+    RedirectResponseCodes = [301, 302, 303, 307, 308]
 
     # Initializer expects an HTTP response +code+, +headers+ and +body+.
     def initialize(code, headers, body)

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = "2.2.4"
+  VERSION = "2.2.5"
 end

data/spec/httpi/adapter/net_http_spec.rb

@@ -76,15 +76,14 @@ describe HTTPI::Adapter::NetHTTP do
       expect(response.body).to eq("ntlm-auth")
     end
 
-    it 'fatal logs when net/ntlm is not available, but ntlm authentication was requested' do
+    it 'does not support ntlm authentication when Net::NTLM is not available' do
       Net.expects(:const_defined?).with(:NTLM).returns false
 
       request = HTTPI::Request.new(@server.url + 'ntlm-auth')
       request.auth.ntlm("testing", "failures")
-      HTTPI.logger.expects(:fatal)
 
-      response = HTTPI.get(request, adapter)
-      expect(response.body).to eq("ntlm-auth")
+      expect { HTTPI.get(request, adapter) }.
+        to raise_error(HTTPI::NotSupportedError, /Net::NTLM is not available/)
     end
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.2.4
-  prerelease: 
+  version: 2.2.5
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -183,26 +170,25 @@ files:
 homepage: http://github.com/savonrb/#{s.name}
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: httpi
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Common interface for Ruby's HTTP libraries
 test_files: []