bloom_filter 0.6.0 → 0.6.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "misterfunnyarsal@gmail.com"
     gem.homepage = "http://github.com/arya/bloom_filter"
     gem.authors = ["Arya Asemanfar"]
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"
     gem.add_dependency "eventmachine", ">=0.12.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/bloom_filter.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bloom_filter}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar"]
-  s.date = %q{2010-01-23}
+  s.date = %q{2010-01-26}
   s.default_executable = %q{bloom_filter_server}
   s.description = %q{}
   s.email = %q{misterfunnyarsal@gmail.com}
@@ -53,17 +53,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.8"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.8"])
   end
 end
+

data/lib/bloom_filter/client.rb

@@ -2,12 +2,16 @@ require 'socket'
 require 'bloom_filter/protocol'
 
 class BloomFilter
-  class Client
+  class Timeout < StandardError; end
+    
+  class Client    
+    
     PACK_N = "N"
     def initialize(host, port, options = {})
       @host, @port = host, port
       @timeout = options[:timeout]
-      reconnect
+      @raise_on_timeout = options[:raise_on_timeout] || false
+      self.connect
     end
   
     def add(el)
@@ -60,15 +64,25 @@ class BloomFilter
       end
     end
     
-    def reconnect
-      @socket.close if @socket && !@socket.closed?
-      @socket = begin
-        TCPSocket.new(@host, @port)
-      rescue Exception => e
-        nil
+    def connect
+      unless self.connected?
+        @socket = begin
+          TCPSocket.new(@host, @port)
+        rescue Exception => e
+          nil
+        end
       end
     end
     
+    def reconnect
+      self.disconnect
+      self.connect
+    end
+    
+    def disconnect
+      @socket.close if self.connected?
+    end
+    
     def connected?
       !!(@socket && !@socket.closed?)
     end
@@ -78,6 +92,8 @@ class BloomFilter
       ready = IO.select([@socket], nil, nil, timeout || @timeout)
       if ready
         block.call
+      elsif @raise_on_timeout
+        raise BloomFilter::Timeout
       else
         default
       end

data/test/bloom_filter_client_test.rb

@@ -57,5 +57,25 @@ class BloomFilterClientTest < Test::Unit::TestCase
       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")
+      IO.expects(:select).with([@socket], nil, nil, 1).returns(nil)
+      assert !@client.add("hello")      
+    end
+  end
+  
+  should "raise on timeout if set to" do
+    socket = mock()
+    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)
+    assert_raises(BloomFilter::Timeout) do
+      client.add("hello")      
+    end    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bloom_filter
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -08:00
+date: 2010-01-26 00:00:00 -08:00
 default_executable: bloom_filter_server
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement