Merge 3fedfb6 into 7bc8ed8

.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - 2.5.0
   - jruby
 env:
   global:

lib/httpi/auth/ssl.rb

@@ -10,7 +10,15 @@ class SSL
 
       VERIFY_MODES = [:none, :peer, :fail_if_no_peer_cert, :client_once]
       CERT_TYPES = [:pem, :der]
-      SSL_VERSIONS = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }.sort.reverse
+
+      # Fix for
+      # httpi/auth/ssl.rb:13: warning: constant OpenSSL::SSL::SSLContext::METHODS is deprecated
+      ssl_context = OpenSSL::SSL::SSLContext
+      SSL_VERSIONS = if ssl_context.const_defined? :METHODS_MAP
+        ssl_context.const_get(:METHODS_MAP).keys
+      else
+        ssl_context::METHODS.reject { |method| method.match(/server|client/) }
+      end.sort.reverse
 
       # Returns whether SSL configuration is present.
       def present?

spec/httpi/adapter/curb_spec.rb

@@ -257,8 +257,14 @@
           end
 
           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
+            ssl_context = OpenSSL::SSL::SSLContext
+            versions = if ssl_context.const_defined? :METHODS_MAP
+              ssl_context.const_get(:METHODS_MAP).keys
+            else
+              ssl_context::METHODS.reject { |method| method.match(/server|client/) }
+            end
+
+            version = versions.select { |method| method.to_s.match(/SSLv2|SSLv23/) }.first
             request.auth.ssl.ssl_version = version
             curb.expects(:ssl_version=).with(2)
 

spec/httpi/auth/ssl_spec.rb

@@ -3,7 +3,12 @@
 
 describe HTTPI::Auth::SSL do
   before(:all) do
-    @ssl_versions = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }.sort.reverse
+    ssl_context = OpenSSL::SSL::SSLContext
+    @ssl_versions = if ssl_context.const_defined? :METHODS_MAP
+      ssl_context.const_get(:METHODS_MAP).keys
+    else
+      ssl_context::METHODS.reject { |method| method.match(/server|client/) }
+    end.sort.reverse
   end
 
   describe "VERIFY_MODES" do