httpi 2.2.1 → 2.2.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.2.2 (edge)
+
+* 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).
+
 ### 2.2.1 (2014-06-11)
 
 * Fix: [#116](https://github.com/savonrb/httpi/pull/116) Fix NoMethodError when not using NTLM.

data/lib/httpi.rb

@@ -136,7 +136,15 @@ module HTTPI
       yield adapter_class.client if block_given?
       log_request(method, request, Adapter.identify(adapter_class.class))
 
-      adapter_class.request(method)
+      response = adapter_class.request(method)
+
+      if response and response.code == 302 and request.follow_redirect?
+        log('Following redirect...')
+        request.url = response.headers['location']
+        return request(method, request, adapter)
+      end
+
+      response
     end
 
     # Shortcut for setting the default adapter to use.

data/lib/httpi/auth/ssl.rb

@@ -92,9 +92,9 @@ module HTTPI
       # Sets the +OpenSSL+ ca certificate.
       attr_writer :ca_cert
 
-      # Returns an <tt>OpenSSL::PKey::RSA</tt> for the +cert_key_file+.
+      # Returns an <tt>OpenSSL::PKey</tt> subclass (usually <tt>OpenSSL::PKey::RSA</tt>) for the +cert_key_file+.
       def cert_key
-        @cert_key ||= (OpenSSL::PKey::RSA.new(File.read(cert_key_file), cert_key_password) if cert_key_file)
+        @cert_key ||= (OpenSSL::PKey.read(File.read(cert_key_file), cert_key_password) if cert_key_file)
       end
 
       # Sets the +OpenSSL+ certificate key.

data/lib/httpi/request.rb

@@ -11,7 +11,7 @@ module HTTPI
   class Request
 
     # Available attribute writers.
-    ATTRIBUTES = [:url, :proxy, :headers, :body, :open_timeout, :read_timeout]
+    ATTRIBUTES = [:url, :proxy, :headers, :body, :open_timeout, :read_timeout, :follow_redirect]
 
     # Accepts a Hash of +args+ to mass assign attributes and authentication credentials.
     def initialize(args = {})
@@ -123,6 +123,13 @@ module HTTPI
       ATTRIBUTES.each { |key| send("#{key}=", args[key]) if args[key] }
     end
 
+    attr_writer :follow_redirect
+
+    # Returns whether or not redirects should be followed - defaults to false if not set.
+    def follow_redirect?
+      @follow_redirect ||= false
+    end
+
     private
 
     # Stores the cookies from past requests.

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "2.2.1"
+  VERSION = "2.2.3"
 
 end

data/spec/httpi/httpi_spec.rb

@@ -195,12 +195,26 @@ describe HTTPI do
   end
 
   describe ".request" do
+    let(:request) { HTTPI::Request.new('http://example.com') }
+
     it "allows custom HTTP methods" do
-      request = HTTPI::Request.new("http://example.com")
       httpclient.any_instance.expects(:request).with(:custom)
 
       client.request(:custom, request, :httpclient)
     end
+
+    it 'follows redirects' do
+      request.follow_redirect = true
+      redirect_location = 'http://foo.bar'
+
+      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(redirect_location)
+
+      client.request(:custom, request, :httpclient)
+    end
   end
 
   HTTPI::REQUEST_METHODS.each do |method|
@@ -249,7 +263,7 @@ describe HTTPI do
 
     describe ".log" do
       it "defaults to true" do
-        expect(HTTPI.log?).to be_true
+        expect(HTTPI.log?).to be_truthy
       end
     end
 

data/spec/httpi/request_spec.rb

@@ -206,11 +206,22 @@ describe HTTPI::Request do
   describe "#auth?" do
     it "returns true when auth credentials are specified" do
       request.auth.basic "username", "password"
-      expect(request.auth?).to be_true
+      expect(request.auth?).to be_truthy
     end
 
     it "returns false otherwise" do
-      expect(request.auth?).to be_false
+      expect(request.auth?).to be_falsey
+    end
+  end
+
+  describe '#follow_redirect?' do
+    it 'returns true when follow_redirect is set to true' do
+      request.follow_redirect = true
+      expect(request.follow_redirect?).to be_truthy
+    end
+
+    it 'returns false by default' do
+      expect(request.follow_redirect?).to be_falsey
     end
   end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
+  prerelease: 
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -170,25 +183,26 @@ 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: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Common interface for Ruby's HTTP libraries
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDM4YmYwM2E3NWM1YzQ4OGQ3MWZkNWIxNGVhZTIwZDEzOWYyMmJiOA==
-  data.tar.gz: !binary |-
-    ZTU1NmUxZDRlMjczZjRjMDFkNjZhZGM5Mjc5ZWFiZTJlNzQ5ZWQ3NQ==
-SHA512:
-  metadata.gz: !binary |-
-    MWNiMjU5ZmQxYzRjODI2ZWZhNjAyNjBiZDkwMmUzMjY4NDY4ZDQyM2RiMDMx
-    NTlhOWRlMDdlM2Q1Y2E2ZjZlMDkzMGIwNWIyMjU2NTE1MzBjYTEwMzllOWE0
-    Y2FmNWUwZDY5OWFmODM2ZWEyYTc4MTI5MWNlMjdiZjhlMjI1NWE=
-  data.tar.gz: !binary |-
-    NjU1MzY3YWQ1MWVjNzlmYWNjNjE3MWJjOGMzMTIyY2E5NmJlNzJjYjFjNGI0
-    NDc0NjcwZGY4OTIwYzQ2MTQ5OThjNzZmZjUzMGYzYzE0ZGE4NzIwNjU4OWJm
-    ZTI1Nzc1OGVkZTRjMDI2ZmM3YzZmMGQ1ZDUzNjA1MTRmZTZmZjc=