eventmachine-redis 0.1.2 → 0.1.3

data/README.markdown

@@ -2,6 +2,16 @@
 
 An [EventMachine](http://github.com/eventmachine/eventmachine/) based Redis client.
 
+## Example
+
+    EM.run do
+      Redis = EM::Protocols::Redis.connect
+      Redis.push('queue', 'Hello!') do
+        shift = Redis.shift('queue') { |value| puts value }
+        shift.callback { EM.stop }
+      end
+    end
+
 ## Warning
 
 This was written as a learning exercise and is currently very incomplete.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/eventmachine-redis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eventmachine-redis}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tristan Dunn"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-05-08}
   s.description = %q{An EventMachine based Redis client.}
   s.email = %q{hello@tristandunn.com}
   s.extra_rdoc_files = [

data/lib/eventmachine-redis.rb

@@ -9,7 +9,7 @@ module EventMachine::Protocols::Redis
   TYPE_INTEGER  = ':'.freeze
   TYPE_MULTIPLE = '*'.freeze
 
-  MULTILINE_COMMANDS = %w(PUBLISH).freeze
+  MULTILINE_COMMANDS = %w(PUBLISH RPUSH).freeze
 
   def self.connect(host = 'localhost', port = 6379)
     EM.connect(host, port, self)
@@ -45,6 +45,10 @@ module EventMachine::Protocols::Redis
     command('PUBLISH', channel, message, &block)
   end
 
+  def push(key, item, &block)
+    command('RPUSH', key, item, &block)
+  end
+
   def shift(key, options = {}, &block)
     if options[:timeout]
       command('BLPOP', key, options[:timeout], &block)
@@ -55,9 +59,16 @@ module EventMachine::Protocols::Redis
 
   protected
 
-  def command(*arguments, &block)
-    @handlers << block
+  def add_handler(&block)
+    deferrable = EM::DefaultDeferrable.new
+    deferrable.callback(&block) if block_given?
+
+    @handlers.push(deferrable)
 
+    deferrable
+  end
+
+  def command(*arguments, &block)
     callback do
       command   = arguments.shift
       multiline = MULTILINE_COMMANDS.include?(command)
@@ -69,11 +80,13 @@ module EventMachine::Protocols::Redis
 
       send_data(command)
     end
+
+    add_handler(&block)
   end
 
   def handler(*arguments)
     handler = @handlers.shift
-    handler.call(*arguments) if handler
+    handler.succeed(*arguments) if handler
   end
 
   def process_response(response)

data/spec/redis_spec.rb

@@ -25,7 +25,7 @@ describe EventMachine::Protocols::Redis do
     end
 
     it 'should define multiline commands constant' do
-      Redis::MULTILINE_COMMANDS.should == %w(PUBLISH)
+      Redis::MULTILINE_COMMANDS.should == %w(PUBLISH RPUSH)
     end
 
     it 'should connect via EventMachine when calling Redis.connect' do
@@ -88,6 +88,12 @@ describe EventMachine::Protocols::Redis do
       @completed.should be_true
     end
 
+    describe '#command' do
+      it 'should return an EventMachine deferrable object' do
+        @instance.shift('key').should be_a(EventMachine::Deferrable)
+      end
+    end
+
     describe '#publish' do
       it 'should generate PUBLISH command' do
         @instance.publish('channel', 'message')
@@ -95,6 +101,13 @@ describe EventMachine::Protocols::Redis do
       end
     end
 
+    describe '#push' do
+      it 'should generate RPUSH command' do
+        @instance.push('key', 'item')
+        @instance.sent_data.should == "RPUSH key 4\r\nitem\r\n"
+      end
+    end
+
     describe '#shift' do
       it 'should generate LPOP command' do
         @instance.shift('key')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tristan Dunn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -04:00
+date: 2010-05-08 00:00:00 -04:00
 default_executable: 
 dependencies: []