em-redislite 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.2 (2012-04-11)
+
+* Avoid sending commands after Client#unbind.
+
 == 0.2.1 (2012-04-08)
 
 * Rename em/redis-synchrony -> em-synchrony/em-redislite.

data/lib/em-synchrony/em-redislite.rb

@@ -7,15 +7,6 @@ module EM
       def command name, *args
         EM::Synchrony.sync send_command(name, *args)
       end
-
-      def send_command name, *args
-        defer = DefaultDeferrable.new
-        @pool << defer
-        send_data "*#{args.length + 1}\r\n" +
-                  "$#{name.length}\r\n#{name}\r\n" +
-                  args.map(&:to_s).inject('') {|a,v| a + "$#{v.bytesize}\r\n#{v}\r\n"}
-        defer
-      end
     end
   end
 end

data/lib/em/redis.rb

@@ -3,16 +3,18 @@ require 'eventmachine'
 module EM
   module Redis
 
-    VERSION  = '0.2.1'
+    VERSION  = '0.2.2'
     DEFAULTS = { host: '127.0.0.1', port: 6379 }
 
-    class Error < StandardError; end
+    class Error           < StandardError; end
+    class DataError       < Error; end
+    class ConnectionError < Error; end
 
     def self.connect options = {}
       options = DEFAULTS.merge(options)
       begin
         EM.connect options[:host], options[:port], Client, { host: options[:host], port: options[:port] }
-      rescue ConnectionError => e
+      rescue EM::ConnectionError => e
         client = Client.new(nil)
         client.fail(Error.new(e.message))
         client
@@ -22,6 +24,8 @@ module EM
     class Client < Connection
       include Deferrable
 
+      DB_ERROR = 'lost redis connection'
+
       def initialize options = {}
         @options = options
       end
@@ -38,8 +42,10 @@ module EM
         signature ? super : true
       end
 
-      def command name, *args
+      def send_command name, *args
         defer = DefaultDeferrable.new
+        return defer.tap {defer.fail(ConnectionError.new(DB_ERROR))} if error?
+
         @pool << defer
         send_data "*#{args.length + 1}\r\n" +
                   "$#{name.length}\r\n#{name}\r\n" +
@@ -47,6 +53,8 @@ module EM
         defer
       end
 
+      alias :command :send_command
+
       def on_error msg, dns_error = false
         unbind(msg)
       end
@@ -59,8 +67,11 @@ module EM
         EM.reconnect @options[:host], @options[:port], self
       end
 
-      def unbind msg = 'lost db connection'
-        error = Error.new(msg)
+      def unbind msg = DB_ERROR
+        close_connection
+        error      = ConnectionError.new(msg)
+        @signature = nil
+
         @pool.each {|r| r.fail(error) }
         @pool = []
         fail error
@@ -99,7 +110,7 @@ module EM
           when ':' then @pool.shift.succeed(data[1..-1])
           when '$' then @want_bytes = data[1..-1].to_i
           when '*' then @want_lines = data[1..-1].to_i
-          else     fail Error.new("Unknown data format: #{data}")
+          else     @pool.shift.fail DataError.new("Unknown data format: #{data}")
         end
 
         process_bytes(nil) if @want_bytes < 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-redislite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine