bloom_filter 0.6.5 → 0.6.6

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_dependency "eventmachine", ">=0.12.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/bloom_filter.gemspec

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

data/lib/bloom_filter.rb

@@ -57,8 +57,16 @@ class BloomFilter
     [@m, @k, *@bits].join(DUMP_SEPARATOR)
   end
   
-  def replace(file)
-    m, k, bits = self.class.read(file)
+  def dup
+    self.class.new(@m, @k, @bits.dup)
+  end
+  
+  def replace(*args)
+    m, k, bits = if args.size == 1
+      self.class.read(args.first)
+    else
+      args
+    end
     @m, @k = m, k
     @bits.replace(bits)
   end

data/lib/bloom_filter/client.rb

@@ -116,6 +116,7 @@ class BloomFilter
           self.disconnect
           @raise_on_timeout ? raise : default
         rescue BloomFilter::ConnectionError, Errno::EPIPE
+          self.disconnect
           @raise_on_error ? raise : default
         end
       else

data/lib/bloom_filter/server.rb

@@ -67,18 +67,14 @@ class BloomFilter
         write_response(request_body.split(Protocol::DEFAULT_SEPARATOR).collect { |el| self.class.filter.include?(el) })
       when Protocol::DUMP
         begin
-          File.open(request_body, "w") do |f|
-            f.write(self.class.filter.dump)
-          end
+          deferred_dump(request_body)
           write_response(true)
         rescue Exception => e
           write_response(false)
         end
       when Protocol::LOAD
         begin
-          File.open(request_body, "r") do |file|
-            self.class.filter.replace(file)
-          end
+          deferred_load(request_body)
           write_response(true)
         rescue Exception => e
           write_response(false)
@@ -93,5 +89,27 @@ class BloomFilter
       str = vector.to_s
       send_data([str.size].pack(PACK_N) + str)
     end
+    
+    def deferred_load(file_name)
+      file = File.open(file_name, "r") # open here so IO errors are thrown to the caller
+      
+      loader = lambda do
+        attrs = BloomFilter.read(file)
+        file.close unless file.nil? || file.closed?
+        attrs
+      end
+      
+      setter = lambda do |attributes|
+        self.class.filter.replace(*attributes)
+      end
+      
+      EM.defer(loader, setter)
+    end
+    
+    def deferred_dump(file_name)
+      file = File.open(file_name, "w")
+      duped = self.class.filter.dup
+      EM.defer { file.write(duped.dump) }
+    end
   end
 end

data/test/bloom_filter_client_test.rb

@@ -123,6 +123,7 @@ class BloomFilterClientTest < Test::Unit::TestCase
     socket = mock()
     
     socket.stubs(:closed?).returns(false)
+    socket.stubs(:close)
     TCPSocket.stubs(:new).with("localhost", 4111).returns(socket)
     IO.stubs(:select).returns(socket)
     socket.stubs(:write)

data/test/bloom_filter_server_test.rb

@@ -38,11 +38,14 @@ class BloomFilterServerTest < Test::Unit::TestCase
     
     should "send dump" do
       path = "/tmp/f"
-      @filter.expects(:dump).returns("dumped_data")
+      dupped = mock()
+      @filter.expects(:dup).returns(dupped)
+      dupped.expects(:dump).returns("dumped_data")
       
       file = mock()
-      File.expects(:open).with(path, 'w').yields(file)
+      File.expects(:open).with(path, 'w').returns(file)
       file.expects(:write).with("dumped_data")
+      EM.expects(:defer).with().yields()
       
       expects_send_data("#{[1].pack("N")}#{BloomFilter::Protocol::TRUE}")
       
@@ -53,9 +56,14 @@ class BloomFilterServerTest < Test::Unit::TestCase
     should "send load" do
       path = "/tmp/f"
       file = mock()
-      @filter.expects(:replace).with(file)
-      File.expects(:open).with(path, 'r').yields(file)
-      
+      file.stubs(:closed?)
+      file.stubs(:close)
+      attrs = [1,2,3]
+      BloomFilter.stubs(:read).with(file).returns(attrs)
+      @filter.expects(:replace).with(*attrs)
+      EM.expects(:defer).with {|loader, setter| setter.call(loader.call); true}
+      File.expects(:open).with(path, 'r').returns(file)
+
       expects_send_data("#{[1].pack("N")}#{BloomFilter::Protocol::TRUE}")
       
       @server.receive_data("#{[path.size + 1].pack("N")}#{BloomFilter::Protocol::LOAD}#{path}")

metadata

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