Merge pull request #595 from estolfo/RUBY-889-ssl-options

RUBY-889 Only use ssl options if :ssl is true

Author: estolfo

lib/mongo/server/connectable.rb

@@ -82,7 +82,11 @@ def timeout
 
       private
 
-      attr_reader :socket, :ssl_options
+      attr_reader :socket
+
+      def ssl_options
+        @ssl_options[:ssl] == true ? @ssl_options : {}
+      end
 
       def ensure_connected
         ensure_same_process!

spec/mongo/server/connection_spec.rb

@@ -284,6 +284,39 @@
       end
     end
 
+    context 'when ssl is false' do
+
+      context 'when ssl options are provided' do
+
+        let(:ssl_options) do
+          { :ssl => false, :ssl_key => 'file', :ssl_key_pass_phrase => 'iamaphrase' }
+        end
+
+        let(:connection) do
+          described_class.new(server, ssl_options)
+        end
+
+        it 'does not set the ssl options' do
+          expect(connection.send(:ssl_options)).to be_empty
+        end
+      end
+
+      context 'when ssl options are not provided' do
+
+        let(:ssl_options) do
+          { :ssl => false }
+        end
+
+        let(:connection) do
+          described_class.new(server, ssl_options)
+        end
+
+        it 'does not set the ssl options' do
+          expect(connection.send(:ssl_options)).to be_empty
+        end
+      end
+    end
+
     context 'when authentication options are provided' do
 
       let(:connection) do