socketpool 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/socketpool.rb

@@ -25,7 +25,7 @@ class SocketPool
 
     # Pool size and timeout.
     @size      = opts[:size] || 2
-    @timeout   = opts[:timeout]   || 5.0
+    @timeout   = opts[:timeout] || 5
     @eager      = opts[:eager] || false
 
     # Mutex for synchronizing pool access
@@ -77,17 +77,13 @@ class SocketPool
 
   # Adds a new socket to the pool and checks it out.
   def checkout_new_socket
-    begin
-      socket = Socket.new(so_domain(@socktype), so_type(@socktype), 0)
-      @sockaddr ||= Socket.pack_sockaddr_in(@port, @host) if ![:unix, :unigram].include?(@socktype)
-      @sockaddr ||= Socket.pack_sockaddr_un(@host) if [:unix, :unigram].include?(@socktype)
-      socket.connect(@sockaddr)
-      if @sockopts.size > 0
-        @sockopts.each{ |opt| socket.setsockopt(opt[:level], opt[:optname], opt[:optval]) }  
-      end
-    rescue => ex
-      raise ConnectionFailure, "Failed to connect to host #{@host} and port #{@port}: #{ex}"
-    end
+    socket = Socket.new(so_domain(@socktype), so_type(@socktype), 0)
+
+    # Pack address for sockets and set any options passed
+    @sockaddr ||= Socket.pack_sockaddr_in(@port, @host) if ![:unix, :unigram].include?(@socktype)
+    @sockaddr ||= Socket.pack_sockaddr_un(@host) if [:unix, :unigram].include?(@socktype)
+    @sockopts.each{ |opt| socket.setsockopt(opt[:level], opt[:optname], opt[:optval]) } if @sockopts.size > 0 
+    socket.connect(@sockaddr)
 
     @checked_out << socket
     @sockets << socket

data/spec/socketpool_spec.rb

@@ -1,6 +1,27 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "SocketPool arguments" do
+  before :each do 
+    begin
+      s = TCPSocket.new("127.0.0.1", "11222")
+      s.close
+      socket_open = true
+    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+      socket_open = false
+    end
+
+    if !socket_open
+      @tcp_server = TCPServer.new(11222)
+      @udp_server = UDPSocket.new
+      @udp_server.bind(nil, 11223)
+    end
+  end
+
+  after :each do
+    @tcp_server.close if defined?(@tcp_server)
+    @udp_server.close if defined?(@udp_server)
+  end
+
   describe SocketPool.new('127.0.0.1', '11222') do 
     specify { subject.port.should eq('11222')}
     specify { subject.host.should eq('127.0.0.1')}
@@ -25,9 +46,9 @@ describe "SocketPool arguments" do
   end
 
   describe "UDP => Eager SocketPool" do 
-    subject { SocketPool.new('127.0.0.1', '11222', :type => :udp, :eager => true) }
+    subject { SocketPool.new('127.0.0.1', '11223', :type => :udp, :eager => true) }
     
-    specify { subject.port.should eq('11222')}
+    specify { subject.port.should eq('11223')}
     specify { subject.host.should eq('127.0.0.1')}
     specify { subject.size.should eq(2)}
     specify { subject.timeout.should eq(5.0)}
@@ -39,9 +60,9 @@ describe "SocketPool arguments" do
   end
 
   describe "UDP => Eager SocketPool => resized, short timeout" do 
-    subject { SocketPool.new('127.0.0.1', '11222', :type => :udp, :eager => true, :size => 19, :timeout => 1) }
+    subject { SocketPool.new('127.0.0.1', '11223', :type => :udp, :eager => true, :size => 19, :timeout => 1) }
     
-    specify { subject.port.should eq('11222')}
+    specify { subject.port.should eq('11223')}
     specify { subject.host.should eq('127.0.0.1')}
     specify { subject.size.should eq(19)}
     specify { subject.timeout.should eq(1.0)}
@@ -57,16 +78,16 @@ describe "SocketPool arguments" do
       SocketPool.new('127.0.0.1', '11222', 
         :type => :tcp, 
         :eager => true, 
-        :size => 19, 
-        :timeout => 1, 
+        :size => 7, 
+        :timeout => 1,  
         :socketopts => [{:level => Socket::IPPROTO_TCP, :optname => Socket::TCP_NODELAY, :optval => 1}]) 
     }
     
     specify { subject.port.should eq('11222')}
     specify { subject.host.should eq('127.0.0.1')}
-    specify { subject.size.should eq(19)}
+    specify { subject.size.should eq(7)}
     specify { subject.timeout.should eq(1.0)}
-    specify { subject.instance_variable_get(:@sockets).size.should eq(19)}
+    specify { subject.instance_variable_get(:@sockets).size.should eq(7)}
     specify { subject.instance_variable_get(:@checked_out).should eq([])}
     specify { subject.instance_variable_get(:@eager).should eq(true)}
     specify { subject.instance_variable_get(:@socktype).should eq(:tcp)}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socketpool
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Brandon Dewitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-08-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,6 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile

data/Gemfile.lock

@@ -1,28 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  rspec (~> 2.3.0)