bloom_filter 0.6.3 → 0.6.4

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/bloom_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bloom_filter}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2010-02-01}
   s.default_executable = %q{bloom_filter_server}
   s.description = %q{}
   s.email = %q{misterfunnyarsal@gmail.com}

data/lib/bloom_filter/client.rb

@@ -16,6 +16,7 @@ class BloomFilter
     end
   
     def add(el)
+      self.connect
       el = el.to_s
       @socket.write("#{[el.size + 1].pack(PACK_N)}#{Protocol::ADD}#{el}")
       timeout_or_default(false) do
@@ -25,6 +26,7 @@ class BloomFilter
     alias_method :<<, :add
   
     def include?(el)
+      self.connect
       el = el.to_s
       @socket.write("#{[el.size + 1].pack(PACK_N)}#{Protocol::INCLUDE}#{el}")
       timeout_or_default(true) do
@@ -33,6 +35,7 @@ class BloomFilter
     end
   
     def &(els)
+      self.connect
       if els.size == 1
         el = els.first
         self.include?(el) ? [el] : []
@@ -52,6 +55,7 @@ class BloomFilter
     end
     
     def dump(path, timeout = nil)
+      self.connect
       @socket.write("#{[path.size + 1].pack(PACK_N)}#{Protocol::DUMP}#{path}")
       timeout_or_default(false, timeout) do
         @socket.read(@socket.read(4).unpack(PACK_N).first) == Protocol::TRUE
@@ -59,6 +63,7 @@ class BloomFilter
     end
     
     def load(path, timeout = nil)
+      self.connect
       @socket.write("#{[path.size + 1].pack(PACK_N)}#{Protocol::LOAD}#{path}")
       timeout_or_default(false, timeout) do
         @socket.read(@socket.read(4).unpack(PACK_N).first) == Protocol::TRUE
@@ -94,10 +99,12 @@ class BloomFilter
       if ready
         block.call
       elsif @raise_on_timeout
+        self.disconnect
         raise BloomFilter::Timeout
       else
+        self.disconnect
         default
       end
     end
   end
-end
+end

data/test/bloom_filter_client_test.rb

@@ -5,6 +5,7 @@ class BloomFilterClientTest < Test::Unit::TestCase
   context "with a client object" do
     setup do
       @socket = mock()
+      @socket.stubs(:closed?).returns(false)
       TCPSocket.expects(:new).with("localhost", 4111).returns(@socket)
       IO.stubs(:select).returns(@socket)
       @client = BloomFilter::Client.new("localhost", 4111, :timeout => 1)
@@ -60,12 +61,14 @@ class BloomFilterClientTest < Test::Unit::TestCase
     
     should "timeout" do
       @socket.expects(:write).with("#{[6].pack("N")}#{BloomFilter::Protocol::ADD}hello")
+      @socket.stubs(:close)
       IO.expects(:select).with([@socket], nil, nil, 1)
       @client.add("hello")
     end
   
     should "return false for add if it times out" do
       @socket.expects(:write).with("#{[6].pack("N")}#{BloomFilter::Protocol::ADD}hello")
+      @socket.stubs(:close)
       IO.expects(:select).with([@socket], nil, nil, 1).returns(nil)
       assert !@client.add("hello")      
     end
@@ -73,6 +76,8 @@ class BloomFilterClientTest < Test::Unit::TestCase
   
   should "raise on timeout if set to" do
     socket = mock()
+    socket.stubs(:closed?).returns(false)
+    socket.stubs(:close)
     TCPSocket.expects(:new).with("localhost", 4111).returns(socket)
     IO.stubs(:select).returns(socket)
     client = BloomFilter::Client.new("localhost", 4111, :timeout => 1, :raise_on_timeout => true)
@@ -84,4 +89,38 @@ class BloomFilterClientTest < Test::Unit::TestCase
       client.add("hello")      
     end    
   end
+  
+  should "close socket on timeout" do
+    socket = mock()
+    socket.stubs(:closed?).returns(false)
+    socket.expects(:close)
+    TCPSocket.expects(:new).with("localhost", 4111).returns(socket)
+    IO.stubs(:select).returns(socket)
+    client = BloomFilter::Client.new("localhost", 4111, :timeout => 1, :raise_on_timeout => true)
+    
+    
+    socket.expects(:write).with("#{[6].pack("N")}#{BloomFilter::Protocol::ADD}hello")
+    IO.expects(:select).with([socket], nil, nil, 1).returns(nil)
+    begin
+      client.add("hello")
+    rescue BloomFilter::Timeout
+    end
+  end
+  
+  should "reconnect if not connected before making a call" do
+    socket = mock()
+    
+    socket.expects(:closed?).returns(true).once
+    TCPSocket.expects(:new).with("localhost", 4111).returns(socket).twice
+    IO.stubs(:select).returns(socket)
+    client = BloomFilter::Client.new("localhost", 4111, :timeout => 1, :raise_on_timeout => true)
+
+    socket.expects(:write).with("#{[6].pack("N")}#{BloomFilter::Protocol::ADD}hello")
+    socket.expects(:read).with(4).returns([1].pack("N"))
+    socket.expects(:read).with(1).returns(BloomFilter::Protocol::TRUE)
+
+    
+    IO.expects(:select).with([socket], nil, nil, 1).returns(socket)
+    client.add("hello")      
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bloom_filter
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-02-01 00:00:00 -08:00
 default_executable: bloom_filter_server
 dependencies: 
 - !ruby/object:Gem::Dependency