transport 1.0.4 → 1.0.5

data/lib/transport.rb

@@ -1,4 +1,3 @@
-
 module Transport
 
   autoload :Common, File.join(File.dirname(__FILE__), "transport", "common")

data/lib/transport/http.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'openssl'
 require File.join(File.dirname(__FILE__), "common")
 
 module Transport
@@ -11,7 +12,11 @@ module Transport
     autoload :Formatter, File.join(File.dirname(__FILE__), "http", "formatter")
 
     def perform
-      perform_request
+      if RUBY_VERSION < "1.9"
+        perform_request_1_8
+      else
+        perform_request
+      end
       log_transport
       check_status_code
     end
@@ -20,7 +25,15 @@ module Transport
 
     def perform_request
       use_ssl = @uri.scheme == 'https'
-      @http_response = Net::HTTP.start(@uri.host, @uri.port, nil, nil, nil, nil, :use_ssl => use_ssl) do |connection|
+      @http_response = Net::HTTP.start(@uri.host, @uri.port, :use_ssl => use_ssl, :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |connection|
+        connection.request @request
+      end
+      @response = @http_response.body
+    end
+
+    def perform_request_1_8
+      warn "SSL not supported with this version of Ruby" if @uri.scheme == 'https'
+      @http_response = Net::HTTP.start(@uri.host, @uri.port) do |connection|
         connection.request @request
       end
       @response = @http_response.body

data/spec/lib/transport/http_spec.rb

@@ -22,9 +22,16 @@ describe Transport::HTTP do
   describe "perform" do
 
     context "when using HTTP scheme" do
-      it "should perform the request" do
-        Net::HTTP.should_receive(:start).with("host", 1234, nil, nil, nil, nil, { :use_ssl => false }).and_return(@response)
-        @transport.perform
+      if RUBY_VERSION < "1.9"
+        it "should perform the request" do
+          Net::HTTP.should_receive(:start).with("host", 1234).and_return(@response)
+          @transport.perform
+        end
+      else
+        it "should perform the request" do
+          Net::HTTP.should_receive(:start).with("host", 1234, anything()).and_return(@response)
+          @transport.perform
+        end
       end
     end
 
@@ -33,9 +40,20 @@ describe Transport::HTTP do
         https_uri = mock URI, :host => "host", :port => 1234, :scheme => "https"
         @transport = described_class.new https_uri, @request, @options
       end
-      it "should perform the request" do
-        Net::HTTP.should_receive(:start).with("host", 1234, nil, nil, nil, nil, { :use_ssl => true }).and_return(@response)
-        @transport.perform
+      if RUBY_VERSION < "1.9"
+        it "should perform the request" do
+          Net::HTTP.should_receive(:start).with("host", 1234).and_return(@response)
+          @transport.perform
+        end
+        it "should trigger a warning" do
+          @transport.should_receive(:warn).with("SSL not supported with this version of Ruby")
+          @transport.perform
+        end
+      else
+        it "should perform the request" do
+          Net::HTTP.should_receive(:start).with("host", 1234, { :use_ssl => true, :verify_mode => OpenSSL::SSL::VERIFY_NONE }).and_return(@response)
+          @transport.perform
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transport
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3188865586453898669
+      hash: -668763505907960514
 requirements:
 - The 'json' gem if ruby version 1.8.x is used.
 rubyforge_project: transport