right_http_connection 1.1.0 → 1.2.0

data/History.txt

@@ -1,30 +1,30 @@
-+++ 0.0.1 2007-05-15
+== 0.0.1 2007-05-15
+* 1 major enhancement:
+  * Initial release
 
-+ 1 major enhancement:
-  + Initial release
+== 0.1.2 2007-06-27
 
-+++ 0.1.2 2007-6-27
+* No major changes.
 
-No major changes.
+== 0.1.3 2007-07-09
 
-+++ 0.1.3 2007-7-09
+* No change.
 
-No change.
+== 0.1.4 2007-08-10
 
-+++ 0.1.4 2007-8-10
+* r1442, todd, 2007-08-07 15:45:24
+  * # 373, Add support in right_http_connection for bailing out to a block while
+    reading the HTTP response (to support GET streaming...)
 
-------------------------------------------------------------------------
-r1442 | todd | 2007-08-07 15:45:24 -0700 (Tue, 07 Aug 2007) | 654 lines
+* r1411, todd, 2007-08-03 15:14:45
+  * # 373, Stream uploads (PUTs) if the source is a file, stream, or anything
+      read()-able
 
-(#373) Add support in right_http_connection for bailing out to a block while
-reading the HTTP response (to support GET streaming...)
-
-------------------------------------------------------------------------
-r1411 | todd | 2007-08-03 15:14:45 -0700 (Fri, 03 Aug 2007) | 3 lines
-
-(#373) Stream uploads (PUTs) if the source is a file, stream, or anything
-read()-able
-
-+++ 1.1.0 2007-08-15
+== 1.1.0 2007-08-15
 Initial public release
 
+== 1.2.0 2007-10-05
+
+* r1867, konstantin, 2007-10-05 06:19:45
+  * # 220, (re)open connection to server if none exists or connection params 
+    have changed 

data/Manifest.txt

@@ -3,5 +3,4 @@ Manifest.txt
 README.txt
 Rakefile
 lib/right_http_connection.rb
-lib/right_http_connection/version.rb
 setup.rb

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/contrib/rubyforgepublisher'
 require 'fileutils'
 require 'hoe'
 include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'right_http_connection', 'version')
+require File.join(File.dirname(__FILE__), 'lib', 'right_http_connection')
 
 AUTHOR = 'RightScale'  # can also be an array of Authors
 EMAIL = "support@rightscale.com"
@@ -46,7 +46,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/**/test_*.rb"]
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
-  p.remote_rdoc_dir = "/right_http_gem_doc"
+  p.remote_rdoc_dir = "right_http_gem_doc"
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")

data/lib/right_http_connection.rb

@@ -8,6 +8,17 @@ require "time"
 require "logger"
 
 
+module RightHttpConnection #:nodoc:
+  module VERSION #:nodoc:
+    MAJOR = 1
+    MINOR = 2
+    TINY  = 0
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end
+
+
 module Rightscale
  
 =begin rdoc
@@ -173,13 +184,13 @@ them.
     # opens a new one.
     def start(request_params)
       # close the previous if exists
-      @http.finish if @http && @http.started?
+      finish
       # create new connection
       @server   = request_params[:server]
       @port     = request_params[:port]
-      @protocol = request_params[:protocol] || (@port==443 ? 'https' : 'http')
+      @protocol = request_params[:protocol]
       
-      @logger.info("Opening new HTTP connection to #{@server}")
+      @logger.info("Opening new #{@protocol.upcase} connection to #@server:#@port")
       @http = Net::HTTP.new(@server, @port)
       @http.open_timeout = HTTP_CONNECTION_OPEN_TIMEOUT
       @http.read_timeout = HTTP_CONNECTION_READ_TIMEOUT
@@ -205,7 +216,7 @@ them.
     end
 
   public
-    
+
 =begin rdoc    
     Send HTTP request to server
 
@@ -231,10 +242,15 @@ them.
       
         # try to connect server(if connection does not exist) and get response data
         begin
-          # (re)open connection to server if none exists
-          # TODO TRB 8/2/07 - you also need to get a new connection if the
-          # server, port, or proto has changed in the request_params
-          start(request_params) unless @http
+          request_params[:protocol] ||= (request_params[:port] == 443 ? 'https' : 'http')
+          # (re)open connection to server if none exists or params has changed
+          unless @http          && 
+                 @http.started? &&
+                 @server   == request_params[:server] &&
+                 @port     == request_params[:port]   &&
+                 @protocol == request_params[:protocol]
+            start(request_params)
+          end
           
           # get response and return it
           request  = request_params[:request]
@@ -292,6 +308,14 @@ them.
       end
     end
 
+    def finish(reason = '')
+      if @http && @http.started?
+        reason = ", reason: '#{reason}'" unless reason.blank?
+        @logger.info("Closing #{@http.use_ssl? ? 'HTTPS' : 'HTTP'} connection to #{@http.address}:#{@http.port}#{reason}")
+        @http.finish 
+      end
+    end
+
   # Errors received during testing:
   #
   #  #<Timeout::Error: execution expired>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.0
 specification_version: 1
 name: right_http_connection
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-08-15 00:00:00 -07:00
+  version: 1.2.0
+date: 2007-10-17 00:00:00 +04:00
 summary: RightScale's robust HTTP/S connection module
 require_paths: 
 - lib
@@ -34,7 +34,6 @@ files:
 - README.txt
 - Rakefile
 - lib/right_http_connection.rb
-- lib/right_http_connection/version.rb
 - setup.rb
 test_files: []
 

data/lib/right_http_connection/version.rb

@@ -1,9 +0,0 @@
-module RightHttpConnection #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 1
-    TINY  = 0
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end