excon 0.0.26 → 0.1.0

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+group :test do
+  gem "shindo"
+  gem "tach"
+
+  gem "sinatra"
+  gem "rake"
+  gem "mongrel"
+  gem "open4"
+end

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.0.26'
-  s.date              = '2010-06-07'
+  s.version           = '0.1.0'
+  s.date              = '2010-06-19'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    Gemfile
     README.rdoc
     Rakefile
     benchmarks/excon_vs.rb

data/lib/excon.rb

@@ -16,7 +16,7 @@ require 'excon/response'
 module Excon
 
   unless const_defined?(:VERSION)
-    VERSION = '0.0.26'
+    VERSION = '0.1.0'
   end
 
   CHUNK_SIZE = 1048576 # 1 megabyte

data/lib/excon/connection.rb

@@ -11,7 +11,6 @@ module Excon
         :query    => uri.query,
         :scheme   => uri.scheme
       }.merge!(params)
-      reset_socket
     end
 
     def request(params, &block)
@@ -82,6 +81,11 @@ module Excon
     private
 
     def reset_socket
+      socket && socket.close
+      sockets.delete(socket_key)
+    end
+
+    def connect
       new_socket = TCPSocket.open(@connection[:host], @connection[:port])
 
       if @connection[:scheme] == 'https'
@@ -92,16 +96,22 @@ module Excon
         new_socket.connect
       end
 
-      Thread.current[:_excon_sockets] ||= {}
-      Thread.current[:_excon_sockets][socket_key] = new_socket
+      new_socket
+    end
+
+    def closed?
+      sockets[socket_key] && sockets[socket_key].closed?
     end
 
     def socket
-      Thread.current[:_excon_sockets] ||= {}
-      if !Thread.current[:_excon_sockets][socket_key] || Thread.current[:_excon_sockets][socket_key].closed?
+      if closed?
         reset_socket
       end
-      Thread.current[:_excon_sockets][socket_key]
+      sockets[socket_key] ||= connect
+    end
+
+    def sockets
+      Thread.current[:_excon_sockets] ||= {}
     end
 
     def socket_key

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 26
-  version: 0.0.26
+  version: 0.1.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -07:00
+date: 2010-06-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- Gemfile
 - README.rdoc
 - Rakefile
 - benchmarks/excon_vs.rb