httpi 2.2.7 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 498e0d42bbd55c69f3af23ceed4a8cccd5ef67a0
-  data.tar.gz: ecc70c0b81c7589367cb251cd2212d1ae0860491
+  metadata.gz: 06ac8ba040207b5a0590492395b374fdcab38691
+  data.tar.gz: 2c4f27ee87ca5200523f3191081e243704504915
 SHA512:
-  metadata.gz: c0aee94848b721977728c3c88aac525fd3765765e07811bf9d5cd789124570b13013a45ca56837579686505812b5020b28e0fcc2cb49312aefe1c590ed58aeb9
-  data.tar.gz: 96bd3a4d7bf1b6a9bc2b529f780241e4a70db8fdbb32be36ad92ff9cd9369cecc9b09dc03055e879803ab7c0e3fe5b0cdd97d99a3dd0c13d7ced78dc38608cf7
+  metadata.gz: b81b972077db62ec3f8896a80d9a95c410dbddffcfbf681cdb0f7d322122fefb8c3b04ebfd92a403e8812a9f1c59fe333a15a4d4ed514a3fb3b48caf1ace6539
+  data.tar.gz: 3afa2f7660560043a23d03de67bacba6909951eb62dd23c1ad071dd893278260883b3c91d066758928d66a8297f368cb1c56a0cf9b77dd25819fe617c0c65271

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 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.
+
+### 2.2.8 (edge)
+
+* 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
+
 ### 2.2.7
 
 * Fix: [#131](https://github.com/savonrb/httpi/pull/131) Excon adapter should respect :ssl_version

data/lib/httpi.rb

@@ -109,7 +109,7 @@ module HTTPI
         builder_name = builder.to_s.capitalize
         begin
           builder = HTTPI::QueryBuilder.const_get(builder_name)
-        rescue NameError => ex
+        rescue NameError
           raise ArgumentError, "Invalid builder. Available builders are: [:flat, :nested]"
         end
       end

data/lib/httpi/adapter/base.rb

@@ -1,4 +1,3 @@
-require "httpi"
 require "httpi/adapter"
 
 module HTTPI

data/lib/httpi/adapter/curb.rb

@@ -111,14 +111,17 @@ module HTTPI
         end
 
         @client.ssl_version = case ssl.ssl_version
-          when :TLSv1 then 1
-          when :SSLv2 then 2
-          when :SSLv3 then 3
+          when :TLSv1_2 then 1
+          when :TLSv1_1 then 1
+          when :TLSv1   then 1
+          when :SSLv2   then 2
+          when :SSLv23  then 2
+          when :SSLv3   then 3
         end
       end
 
       def respond_with(client)
-        status, headers = parse_header_string(client.header_str)
+        headers = parse_header_string(client.header_str).last
         Response.new client.response_code, headers, client.body_str
       end
 

data/lib/httpi/adapter/net_http.rb

@@ -170,7 +170,7 @@ module HTTPI
         end
 
         request_client = request_class.new @request.url.request_uri, @request.headers
-        request_client.basic_auth *@request.auth.credentials if @request.auth.basic?
+        request_client.basic_auth(*@request.auth.credentials) if @request.auth.basic?
 
         if @request.auth.digest?
           raise NotSupportedError, "Net::HTTP does not support HTTP digest authentication"

data/lib/httpi/auth/ssl.rb

@@ -10,7 +10,7 @@ module HTTPI
 
       VERIFY_MODES = [:none, :peer, :fail_if_no_peer_cert, :client_once]
       CERT_TYPES = [:pem, :der]
-      SSL_VERSIONS = [:TLSv1, :SSLv2, :SSLv3]
+      SSL_VERSIONS = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }.sort.reverse
 
       # Returns whether SSL configuration is present.
       def present?

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, :follow_redirect]
+    ATTRIBUTES = [:url, :proxy, :headers, :body, :open_timeout, :read_timeout, :follow_redirect, :query]
 
     # Accepts a Hash of +args+ to mass assign attributes and authentication credentials.
     def initialize(args = {})
@@ -82,9 +82,9 @@ module HTTPI
     # or an Array of `HTTPI::Cookie` objects.
     def set_cookies(object_or_array)
       if object_or_array.respond_to?(:cookies)
-        cookie_store.add *object_or_array.cookies
+        cookie_store.add(*object_or_array.cookies)
       else
-        cookie_store.add *object_or_array
+        cookie_store.add(*object_or_array)
       end
 
       cookies = cookie_store.fetch

data/lib/httpi/response.rb

@@ -24,7 +24,8 @@ module HTTPI
       self.raw_body = body
     end
 
-    attr_accessor :code, :headers, :raw_body, :attachments
+    attr_accessor :code, :headers, :raw_body
+    attr_writer :attachments
 
     # Returns whether the HTTP response is considered successful.
     def error?

data/lib/httpi/version.rb

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

data/spec/httpi/adapter/curb_spec.rb

@@ -238,8 +238,10 @@ unless RUBY_PLATFORM =~ /java/
             adapter.request(:get)
           end
 
-          it 'to 2 when ssl_version is specified as SSLv2' do
-            request.auth.ssl.ssl_version = :SSLv2
+          it 'to 2 when ssl_version is specified as SSLv2/SSLv23' do
+            version = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }
+            version = version.select { |method| method.to_s.match /SSLv2|SSLv23/ }.first
+            request.auth.ssl.ssl_version = version
             curb.expects(:ssl_version=).with(2)
 
             adapter.request(:get)

data/spec/httpi/auth/ssl_spec.rb

@@ -2,6 +2,9 @@ require "spec_helper"
 require "httpi/auth/ssl"
 
 describe HTTPI::Auth::SSL do
+  before(:all) do
+    @ssl_versions = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match /server|client/ }.sort.reverse
+  end
 
   describe "VERIFY_MODES" do
     it "contains the supported SSL verify modes" do
@@ -136,32 +139,22 @@ describe HTTPI::Auth::SSL do
 
   describe "SSL_VERSIONS" do
     it "contains the supported SSL versions" do
-      expect(HTTPI::Auth::SSL::SSL_VERSIONS).to eq([:TLSv1, :SSLv2, :SSLv3])
+      expect(HTTPI::Auth::SSL::SSL_VERSIONS).to eq(@ssl_versions)
     end
   end
 
   describe "#ssl_version" do
     subject { HTTPI::Auth::SSL.new }
 
-    it 'returns the SSL version for :TLSv1' do
-      subject.ssl_version = :TLSv1
-      expect(subject.ssl_version).to eq(:TLSv1)
-    end
-
-    it 'returns the SSL version for :SSLv2' do
-      subject.ssl_version = :SSLv2
-      expect(subject.ssl_version).to eq(:SSLv2)
-    end
-
-    it 'returns the SSL version for :SSLv3' do
-      subject.ssl_version = :SSLv3
-      expect(subject.ssl_version).to eq(:SSLv3)
+    it "returns the SSL version" do
+      subject.ssl_version = @ssl_versions.first
+      expect(subject.ssl_version).to eq(@ssl_versions.first)
     end
 
     it 'raises ArgumentError if the version is unsupported' do
       expect { ssl.ssl_version = :ssl_fail }.
         to raise_error(ArgumentError, "Invalid SSL version :ssl_fail\n" +
-                                      "Please specify one of [:TLSv1, :SSLv2, :SSLv3]")
+                                      "Please specify one of #{@ssl_versions}")
     end
   end
 

data/spec/httpi/request_spec.rb

@@ -11,9 +11,10 @@ describe HTTPI::Request do
     end
 
     it "accepts a Hash of accessors to set" do
-      request = HTTPI::Request.new :url => "http://example.com", :open_timeout => 30
-      expect(request.url).to eq(URI("http://example.com"))
+      request = HTTPI::Request.new :url => "http://example.com", :open_timeout => 30, :query => { key: "value" }
+      expect(request.url).to eq(URI("http://example.com?key=value"))
       expect(request.open_timeout).to eq(30)
+      expect(request.query).to eq("key=value")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.3.0
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack