bloomrb 0.0.2 → 0.0.3

data/lib/bloomrb.rb

@@ -1,17 +1,23 @@
 require 'socket'
 
 class Bloomrb
-  attr_accessor :host, :port
+  attr_accessor :host, :port, :retries
 
-  def initialize(host = 'localhost', port = 8673)
-    self.host = host
-    self.port = port
+  def initialize(host = 'localhost', port = 8673, retries = 5)
+    self.host    = host
+    self.port    = port
+    self.retries = retries
   end
 
   def socket
     @socket ||= TCPSocket.new(host, port)
   end
 
+  def disconnect
+    @socket.close if @socket
+    @socket = nil
+  end
+
   def filter(name)
     BloomFilter.new(name, self)
   end
@@ -48,14 +54,20 @@ class Bloomrb
   end
 
   def multi(filter, keys)
+    return Hash.new if keys.empty?
+
     Hash[keys.zip(execute('m', filter, *keys).split(' ').map{|r| r == 'Yes'})]
   end
-  
+
   def any?(filter, keys)
+    return false if keys.empty?
+
     !!(execute('m', filter, *keys) =~ /Yes/)
   end
 
   def all?(filter, keys)
+    return true if keys.empty?
+
     !!(execute('m', filter, *keys) !~ /No/)
   end
 
@@ -64,6 +76,8 @@ class Bloomrb
   end
 
   def bulk(filter, keys)
+    return "" if keys.empty?
+
     execute('b', filter, *keys)
   end
 
@@ -88,7 +102,7 @@ class Bloomrb
     begin
       socket.puts(cmd)
       result = socket.gets.chomp
-      throw result if result =~ /^Client Error:/
+      raise "#{result}: #{cmd[0..99]}" if result =~ /^Client Error:/
 
       if result == 'START'
         result = []
@@ -98,7 +112,7 @@ class Bloomrb
       end
       result
     rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::EPIPE
-      raise if (retry_count += 1) >= 5
+      raise if (retry_count += 1) >= retries
       @socket = nil
       sleep(1)
       retry

metadata

@@ -1,65 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bloomrb
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Simon Kroeger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-11 00:00:00 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies: []
-
 description: Wraps the bloomd protocol for usage in ruby projects
 email: simon.kroeger@sponsorpay.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/bloomrb.rb
 homepage: https://github.com/SponsorPay/bloomrb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby client for bloomd
 test_files: []
-