transport 1.0.3 → 1.0.4

data/Rakefile

@@ -1,50 +1,13 @@
-require 'rubygems'
-
-gem 'rspec'
-require 'rspec'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-
-gem 'reek'
 require 'reek/rake/task'
+require 'rdoc/task'
 
-require 'rake/rdoctask'
+RSpec::Core::RakeTask.new(:spec)
+Rake::RDocTask.new(:spec)
 
 task :default => :spec
 
-namespace :gem do
-
-  desc "Builds the gem"
-  task :build do
-    system "gem build *.gemspec && mkdir -p pkg/ && mv *.gem pkg/"
-  end
-
-  desc "Builds and installs the gem"
-  task :install => :build do
-    system "gem install pkg/"
-  end
-
-end
-
-Reek::Rake::Task.new do |task|
-  task.fail_on_error = true
-end
-
-desc "Generate the rdoc"
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_files.add [ "README.rdoc", "lib/**/*.rb" ]
-  rdoc.main = "README.rdoc"
-end
-
-desc "Run all specs in spec directory"
-RSpec::Core::RakeTask.new do |task|
-  task.pattern = "spec/lib/**/*_spec.rb"
-end
-
-namespace :spec do
-
-  desc "Run all integration specs in spec/acceptance directory"
-  RSpec::Core::RakeTask.new(:acceptance) do |task|
-    task.pattern = "spec/acceptance/**/*_spec.rb"
-  end
-
+Reek::Rake::Task.new do |t|
+  t.fail_on_error = false
 end

data/lib/transport/http.rb

@@ -19,7 +19,8 @@ module Transport
     private
 
     def perform_request
-      @http_response = Net::HTTP.start(@uri.host, @uri.port) do |connection|
+      use_ssl = @uri.scheme == 'https'
+      @http_response = Net::HTTP.start(@uri.host, @uri.port, nil, nil, nil, nil, :use_ssl => use_ssl) do |connection|
         connection.request @request
       end
       @response = @http_response.body

data/lib/transport/http/request_builder.rb

@@ -34,8 +34,10 @@ module Transport
         uri = URI.parse @url
         generate_query
         @request_path = uri.path
-        @request_path += "/" if @request_path == ""
-        @request_path += "?" + @query if HTTP_METHODS_WITH_PARAMETERS.include?(@http_method.to_sym) && @query
+        @request_path << "/" if @request_path == ""
+        query = uri.query || ''
+        query << @query if HTTP_METHODS_WITH_PARAMETERS.include?(@http_method.to_sym) && @query
+        @request_path << "?" << query unless query.empty?
       end
 
       def initialize_request

data/spec/lib/transport/http_spec.rb

@@ -5,7 +5,7 @@ require 'logger'
 describe Transport::HTTP do
 
   before :each do
-    @uri = mock URI, :host => "host", :port => 1234
+    @uri = mock URI, :host => "host", :port => 1234, :scheme => "http"
     @request = mock Net::HTTPRequest, :path => "/path"
     @logger = mock ::Logger, :info => nil
     @options = { :expected_status_code => 200, :logger => @logger }
@@ -21,9 +21,22 @@ describe Transport::HTTP do
 
   describe "perform" do
 
-    it "should perform the request" do
-      Net::HTTP.should_receive(:start).with("host", 1234).and_return(@response)
-      @transport.perform
+    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
+      end
+    end
+
+    context "when HTTPS scheme" do
+      before :each 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
+      end
     end
 
     it "should initialize the formatter" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transport
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23192160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *23192160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &23191420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *23191420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Provide a single command interface to perform http/json requests. A spec
   helper to perform request against a fake server is also included.
 email: b.phifty@gmail.com
@@ -44,33 +86,33 @@ files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/transport.rb
+- lib/transport/common/request_builder.rb
+- lib/transport/json.rb
+- lib/transport/http/request_builder/parameter_serializer.rb
+- lib/transport/http/request_builder.rb
+- lib/transport/http/formatter.rb
+- lib/transport/spec.rb
 - lib/transport/json/request_builder.rb
 - lib/transport/json/response_parser.rb
 - lib/transport/common.rb
-- lib/transport/http.rb
-- lib/transport/common/request_builder.rb
-- lib/transport/http/formatter.rb
-- lib/transport/http/request_builder.rb
-- lib/transport/http/request_builder/parameter_serializer.rb
 - lib/transport/unexpected_status_code_error.rb
-- lib/transport/spec.rb
+- lib/transport/http.rb
 - lib/transport/spec/faker.rb
-- lib/transport/json.rb
+- lib/transport.rb
+- spec/acceptance/json_spec.rb
+- spec/acceptance/http_spec.rb
+- spec/lib/transport/json_spec.rb
+- spec/lib/transport/common/request_builder_spec.rb
 - spec/lib/transport/unexpected_status_code_error_spec.rb
+- spec/lib/transport/http/request_builder_spec.rb
+- spec/lib/transport/http/request_builder/parameter_serializer_spec.rb
+- spec/lib/transport/http/formatter_spec.rb
 - spec/lib/transport/json/request_builder_spec.rb
 - spec/lib/transport/json/response_parser_spec.rb
 - spec/lib/transport/http_spec.rb
 - spec/lib/transport/common_spec.rb
-- spec/lib/transport/common/request_builder_spec.rb
-- spec/lib/transport/http/request_builder_spec.rb
-- spec/lib/transport/http/request_builder/parameter_serializer_spec.rb
-- spec/lib/transport/http/formatter_spec.rb
-- spec/lib/transport/json_spec.rb
 - spec/lib/transport/spec/faker_spec.rb
 - spec/spec_helper.rb
-- spec/acceptance/http_spec.rb
-- spec/acceptance/json_spec.rb
 homepage: http://github.com/phifty/transport
 licenses: []
 post_install_message: 
@@ -89,24 +131,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3188865586453898669
 requirements:
 - The 'json' gem if ruby version 1.8.x is used.
 rubyforge_project: transport
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A HTTP/JSON transport layer.
 test_files:
+- spec/acceptance/json_spec.rb
+- spec/acceptance/http_spec.rb
+- spec/lib/transport/json_spec.rb
+- spec/lib/transport/common/request_builder_spec.rb
 - spec/lib/transport/unexpected_status_code_error_spec.rb
+- spec/lib/transport/http/request_builder_spec.rb
+- spec/lib/transport/http/request_builder/parameter_serializer_spec.rb
+- spec/lib/transport/http/formatter_spec.rb
 - spec/lib/transport/json/request_builder_spec.rb
 - spec/lib/transport/json/response_parser_spec.rb
 - spec/lib/transport/http_spec.rb
 - spec/lib/transport/common_spec.rb
-- spec/lib/transport/common/request_builder_spec.rb
-- spec/lib/transport/http/request_builder_spec.rb
-- spec/lib/transport/http/request_builder/parameter_serializer_spec.rb
-- spec/lib/transport/http/formatter_spec.rb
-- spec/lib/transport/json_spec.rb
 - spec/lib/transport/spec/faker_spec.rb
-- spec/acceptance/http_spec.rb
-- spec/acceptance/json_spec.rb