em-redis 0.1.1 → 0.2

data/spec/live_redis_protocol_spec.rb

@@ -76,14 +76,14 @@ EM.describe EM::Protocols::Redis, "connected to an empty db" do
 
   should "be able to add a member to a nonexistent set" do
     @c.sadd("set_foo", "bar") do |r|
-      r.should == 1
+      r.should == true
       done
     end
   end
 
   should "be able to get info about the db as a hash" do
     @c.info do |r|
-      r.should.key? "redis_version"
+      r.should.key? :redis_version
       done
     end
   end
@@ -131,9 +131,9 @@ EM.describe EM::Protocols::Redis, "connected to a db containing some simple stri
 
   should "be able to set a value if a key doesn't exist" do
     @c.setnx "a", "foo" do |r|
-      r.should == 0
+      r.should == false
       @c.setnx "zzz", "foo" do |r|
-        r.should == 1
+        r.should == true
         done
       end
     end
@@ -141,9 +141,9 @@ EM.describe EM::Protocols::Redis, "connected to a db containing some simple stri
 
   should "be able to test for the existence of a key" do
     @c.exists "a" do |r|
-      r.should == 1
+      r.should == true
       @c.exists "zzz" do |r|
-        r.should == 0
+        r.should == false
         done
       end
     end
@@ -151,11 +151,11 @@ EM.describe EM::Protocols::Redis, "connected to a db containing some simple stri
   
   should "be able to delete a key" do
     @c.del "a" do |r|
-      r.should == 1
+      r.should == true
       @c.exists "a" do |r|
-        r.should == 0
+        r.should == false
         @c.del "a" do |r|
-          r.should == 0
+          r.should == false
           done
         end
       end
@@ -183,9 +183,9 @@ EM.describe EM::Protocols::Redis, "connected to a db containing some simple stri
 
   should "be able to rename a key unless it exists" do
     @c.renamenx "a", "x" do |r|
-      r.should == 0
+      r.should == false
       @c.renamenx "a", "zzz" do |r|
-        r.should == 1
+        r.should == true
         @c.get "zzz" do |r|
           r.should == "b"
           done
@@ -252,14 +252,14 @@ EM.describe EM::Protocols::Redis, "connected to a db containing a list" do
   end
 
   should "be able to get a range of values from a list" do
-    @c.lrange("foo", 0,1) do |r|
+    @c.lrange("foo", 0, 1) do |r|
       r.should == ["a", "b"]
       done
     end
   end
 
   should "be able to 'ltrim' a list" do
-    @c.ltrim("foo", 0,1) do |r|
+    @c.ltrim("foo", 0, 1) do |r|
       r.should == "OK"
       @c.llen("foo") do |r|
         r.should == 2
@@ -269,7 +269,7 @@ EM.describe EM::Protocols::Redis, "connected to a db containing a list" do
   end
 
   should "be able to 'rem' a list element" do
-    @c.lrem("foo", "a", 0) do |r|
+    @c.lrem("foo", 0, "a") do |r|
       r.should == 1
       @c.llen("foo") do |r|
         r.should == 2
@@ -309,9 +309,9 @@ EM.describe EM::Protocols::Redis, "connected to a db containing two sets" do
 
   should "be able to add a new member to a set unless it is a duplicate" do
     @c.sadd("foo", "d") do |r|
-      r.should == 1 # success
+      r.should == true # success
       @c.sadd("foo", "a") do |r|
-        r.should == 0 # failure
+        r.should == false # failure
         @c.scard("foo") do |r|
           r.should == 4
           done
@@ -322,9 +322,9 @@ EM.describe EM::Protocols::Redis, "connected to a db containing two sets" do
 
   should "be able to remove a set member if it exists" do
     @c.srem("foo", "a") do |r|
-      r.should == 1
+      r.should == true
       @c.srem("foo", "z") do |r|
-        r.should == 0
+        r.should == false
         @c.scard("foo") do |r|
           r.should == 2
           done
@@ -342,9 +342,9 @@ EM.describe EM::Protocols::Redis, "connected to a db containing two sets" do
 
   should "be able to detect set membership" do
     @c.sismember("foo", "a") do |r|
-      r.should == 1
+      r.should == true
       @c.sismember("foo", "z") do |r|
-        r.should == 0
+        r.should == false
         done
       end
     end
@@ -367,25 +367,22 @@ EM.describe EM::Protocols::Redis, "connected to a db containing two sets" do
     end
   end
 
-# UNION SET MANIP NOT IN RELEASE BUILDS YET
-###########################################
-#
-# should "be able to find the sets' union" do
-#   @c.sunion("foo", "bar") do |r|
-#     r.should == ["a","b","c","d","e"]
-#     done
-#   end
-# end
+  should "be able to find the sets' union" do
+    @c.sunion("foo", "bar") do |r|
+      r.sort.should == ["a","b","c","d","e"]
+      done
+    end
+  end
 
-# should "be able to find and store the sets' union" do
-#   @c.sunionstore("baz", "foo", "bar") do |r|
-#     r.should == "OK"
-#     @c.smembers("baz") do |r|
-#       r.should == ["a","b","c","d","e"]
-#       done
-#     end
-#   end
-# end
+  should "be able to find and store the sets' union" do
+    @c.sunionstore("baz", "foo", "bar") do |r|
+      r.should == 5
+      @c.smembers("baz") do |r|
+        r.sort.should == ["a","b","c","d","e"]
+        done
+      end
+    end
+  end
 
   should "be able to detect the type of a set" do
     @c.type "foo" do |r|
@@ -411,7 +408,7 @@ EM.describe EM::Protocols::Redis, "connected to a db containing three linked lis
   end
 
   should "be able to collate a sorted set of data" do
-    @c.sort("foo", "*_sort", nil, nil, "*_data") do |r|
+    @c.sort("foo", :by => "*_sort", :get => "*_data") do |r|
       r.should == ["bar", "foo"]
       done
     end

data/spec/redis_protocol_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/test_helper.rb")
 
 EM.describe EM::Protocols::Redis do
+  default_timeout 1
 
   before do
     @c = TestConnection.new
@@ -8,27 +9,27 @@ EM.describe EM::Protocols::Redis do
 
   # Inline request protocol
   should 'send inline commands correctly' do
-    @c.inline_command("GET", 'a')
-    @c.sent_data.should == "GET a\r\n"
+    @c.call_command(["GET", 'a'])
+    @c.sent_data.should == "get a\r\n"
     done
   end
-  
+
   should "space-separate multiple inline arguments" do
-    @c.inline_command("GET", 'a', 'b', 'c')
-    @c.sent_data.should == "GET a b c\r\n"
+    @c.call_command(["GET", 'a', 'b', 'c'])
+    @c.sent_data.should == "get a b c\r\n"
     done
   end
 
   # Multiline request protocol
   should "send multiline commands correctly" do
-    @c.multiline_command("SET", "foo", "abc")
-    @c.sent_data.should == "SET foo 3\r\nabc\r\n"
+    @c.call_command(["SET", "foo", "abc"])
+    @c.sent_data.should == "set foo 3\r\nabc\r\n"
     done
   end
 
   should "send integers in multiline commands correctly" do
-    @c.multiline_command("SET", "foo", 1_000_000)
-    @c.sent_data.should == "SET foo 7\r\n1000000\r\n"
+    @c.call_command(["SET", "foo", 1_000_000])
+    @c.sent_data.should == "set foo 7\r\n1000000\r\n"
     done
   end
 
@@ -37,18 +38,18 @@ EM.describe EM::Protocols::Redis do
   # SORT
   should "send sort command" do
     @c.sort "foo"
-    @c.sent_data.should == "SORT foo\r\n"
+    @c.sent_data.should == "sort foo\r\n"
     done
   end
 
   should "send sort command with all optional parameters" do
-    @c.sort "foo", "foo_sort_*", 0, 10, "data_*", true, true
-    @c.sent_data.should == "SORT foo BY foo_sort_* LIMIT 0 10 GET data_* DESC ALPHA\r\n"
+    @c.sort "foo", :by => "foo_sort_*", :limit => [0, 10], :get => "data_*", :order => "DESC ALPHA"
+    @c.sent_data.should == "sort foo BY foo_sort_* GET data_* DESC ALPHA LIMIT 0 10\r\n"
     done
   end
 
   should "parse keys response into an array" do
-    @c.keys "*" do |resp|
+    @c.keys("*") do |resp|
       resp.should == ["a","b","c"]
       done
     end
@@ -58,7 +59,7 @@ EM.describe EM::Protocols::Redis do
 
   # Inline response
   should "parse an inline response" do
-    @c.inline_command("PING") do |resp|
+    @c.call_command(["PING"]) do |resp|
       resp.should == "OK"
       done
     end
@@ -66,16 +67,24 @@ EM.describe EM::Protocols::Redis do
   end
 
   should "parse an inline integer response" do
-    @c.inline_command("EXISTS") do |resp|
+    @c.call_command(["integer"]) do |resp|
       resp.should == 0
       done
     end
     @c.receive_data ":0\r\n"
   end
 
+  should "call processor if any" do
+    @c.call_command(["EXISTS"]) do |resp|
+      resp.should == false
+      done
+    end
+    @c.receive_data ":0\r\n"
+  end
+
   should "parse an inline error response" do
     lambda do
-      @c.inline_command("BLARG")
+      @c.call_command(["blarg"])
       @c.receive_data "-FAIL\r\n"
     end.should.raise(EM::P::Redis::RedisError)
     done
@@ -83,7 +92,7 @@ EM.describe EM::Protocols::Redis do
 
   should "trigger a given error callback for inline error response instead of raising an error" do
     lambda do
-      @c.inline_command("BLARG")
+      @c.call_command(["blarg"])
       @c.on_error {|code| code.should == "FAIL"; done }
       @c.receive_data "-FAIL\r\n"
     end.should.not.raise(EM::P::Redis::RedisError)
@@ -92,7 +101,7 @@ EM.describe EM::Protocols::Redis do
 
   # Bulk response
   should "parse a bulk response" do
-    @c.inline_command("GET", "foo") do |resp|
+    @c.call_command(["GET", "foo"]) do |resp|
       resp.should == "bar"
       done
     end
@@ -101,16 +110,15 @@ EM.describe EM::Protocols::Redis do
   end
 
   should "distinguish nil in a bulk response" do
-    @c.inline_command("GET", "bar") do |resp|
+    @c.call_command(["GET", "bar"]) do |resp|
       resp.should == nil
     end
     @c.receive_data "$-1\r\n"
   end
-  
+
   # Multi-bulk response
-  
   should "parse a multi-bulk response" do
-    @c.inline_command "RANGE", 0, 10 do |resp|
+    @c.call_command(["RANGE", 0, 10]) do |resp|
       resp.should == ["a", "b", "foo"]
       done
     end
@@ -121,7 +129,7 @@ EM.describe EM::Protocols::Redis do
   end
 
   should "distinguish nil in a multi-bulk response" do
-    @c.inline_command "RANGE", 0, 10 do |resp|
+    @c.call_command(["RANGE", 0, 10]) do |resp|
       resp.should == ["a", nil, "foo"]
       done
     end

data/tasks/em-redis.rake

@@ -0,0 +1,12 @@
+namespace :redis do
+  desc "Test em-redis against a live Redis"
+  task :live_test do
+    require 'bacon'
+    sh "bacon spec/live_redis_protocol_spec.rb"
+  end
+
+  desc "Test em-redis offline"
+  task :offline_test do
+    sh "bacon spec/redis_protocol_spec.rb"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-redis
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: "0.2"
 platform: ruby
 authors: 
 - Jonathan Broad
@@ -13,14 +13,44 @@ date: 2009-12-15 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: eventmachine
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.12.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: em-spec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.2.0
     version: 
 description: |-
   An EventMachine[http://rubyeventmachine.com/] based library for interacting with the very cool Redis[http://code.google.com/p/redis/] data store by Salvatore 'antirez' Sanfilippo.
@@ -28,12 +58,8 @@ description: |-
   
   This library is only useful when used as part of an application that relies on
   Event Machine's event loop.  It implements an EM-based client protocol, which
-  leverages the non-blocking nature of the EM interface to acheive significant
+  leverages the non-blocking nature of the EM interface to achieve significant
   parallelization without threads.
-  
-  WARNING: this library is my first attempt to write an evented client protocol,
-  and isn't currently used in production anywhere.  All that bit in the license
-  about not being warranted to work for any particular purpose really applies.
 email: jonathan@relativepath.org
 executables: []
 
@@ -41,18 +67,21 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- Manifest.txt
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
 - README.rdoc
-- em-redis.gemspec
 - Rakefile
+- em-redis.gemspec
 - lib/em-redis.rb
 - lib/em-redis/redis_protocol.rb
-- spec/test_helper.rb
 - spec/live_redis_protocol_spec.rb
 - spec/redis_protocol_spec.rb
+- spec/test_helper.rb
+- tasks/em-redis.rake
 has_rdoc: true
 homepage: 
 licenses: []