em-redis 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.2 / 2009-12-29
+* reselect database after reconnecting
+
 == 0.2.1 / 2009-12-15
 * updated gem dependencies
 
@@ -17,5 +20,3 @@
 
 * initial release
 * compatible with Redis 0.093
-
-

data/README.rdoc

@@ -13,13 +13,12 @@ parallelization without threads.
 
 == FEATURES/PROBLEMS:
 
-* Implements most Redis commands (see {the list of available commands here}[http://code.google.com/p/redis/wiki/CommandReference] with the notable
-exception of MONITOR and AUTH 
+Implements most Redis commands (see {the list of available commands here}[http://code.google.com/p/redis/wiki/CommandReference] with the notable
+exception of MONITOR.
 
 == SYNOPSIS:
 
-* Like any Deferrable eventmachine-based protocol implementation, using EM-Redis involves making calls and passing blocks that serve as callbacks when
-the call returns.  
+Like any Deferrable eventmachine-based protocol implementation, using EM-Redis involves making calls and passing blocks that serve as callbacks when the call returns.  
 
   require 'em-redis'
 
@@ -34,11 +33,11 @@ the call returns.
     end
   end
 
-* To run live tests on a Redis server (currently compatible with 1.02)
-  
+To run live tests on a Redis server (currently compatible with 1.3)
+
   rake redis:live_test
 
-* To run a test of the underlying protocol implemention
+To run a test of the underlying protocol implemention
 
   rake redis:offline_test
 
@@ -51,7 +50,7 @@ currently in the form of bacon specs.  I'll port them to RSpec at some point.
 
 == INSTALL:
 
-* sudo gem install em-redis
+  sudo gem install em-redis
 
 == LICENSE:
 

data/Rakefile

@@ -15,8 +15,8 @@ task :default => ['redis:live_test', 'redis:offline_test']
 
 Bones {
   name 'em-redis'
-  authors 'Jonathan Broad'
-  email 'jonathan@relativepath.org'
+  authors ['Jonathan Broad', 'Eugene Pimenov']
+  email 'libc@me.com'
   url ''
   version EMRedis::VERSION
 

data/lib/em-redis.rb

@@ -2,7 +2,7 @@
 module EMRedis
 
   # :stopdoc:
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/em-redis/redis_protocol.rb

@@ -154,10 +154,6 @@ module EventMachine
         "sync"    => true
       }
 
-      def [](key)
-        self.get(key)
-      end
-
       def []=(key,value)
         set(key,value)
       end
@@ -187,6 +183,16 @@ module EventMachine
         call_command(decrement ? ["decrby",key,decrement] : ["decr",key], &blk)
       end
 
+      def select(db, &blk)
+        @current_database = db
+        call_command(['select', db], &blk)
+      end
+
+      def auth(password, &blk)
+        @current_password = password
+        call_command(['auth', password], &blk)
+      end
+
       # Similar to memcache.rb's #get_multi, returns a hash mapping
       # keys to values.
       def mapped_mget(*keys)
@@ -389,7 +395,11 @@ module EventMachine
       def unbind
         puts "*** unbinding" if $debug
         if @connected or @reconnecting
-          EM.add_timer(1){ reconnect @host, @port }
+          EM.add_timer(1) do
+            reconnect @host, @port
+            auth @current_password if @current_password
+            select @current_database if @current_database
+          end
           @connected = false
           @reconnecting = true
           @deferred_status = nil

data/spec/live_redis_protocol_spec.rb

@@ -97,12 +97,11 @@ EM.describe EM::Protocols::Redis, "connected to an empty db" do
 
   should "be able to save db in the background" do
     @c.bgsave do |r|
-      r.should == "OK"
+      r.should == "Background saving started"
       done
     end
   end
 
-
 end
 
 EM.describe EM::Protocols::Redis, "connected to a db containing some simple string-valued keys" do
@@ -122,6 +121,13 @@ EM.describe EM::Protocols::Redis, "connected to a db containing some simple stri
     end
   end
 
+  should "be able to fetch the values of multiple keys in a hash" do
+    @c.mapped_mget "a", "x" do |r|
+      r.should == {"a" => "b",  "x" => "y"}
+      done
+    end
+  end
+
   should "be able to fetch all the keys" do
     @c.keys "*" do |r|
       r.sort.should == ["a", "x"]
@@ -421,3 +427,26 @@ EM.describe EM::Protocols::Redis, "connected to a db containing three linked lis
     end
   end
 end
+
+EM.describe EM::Protocols::Redis, "when reconnecting" do
+  before do
+    @c = EM::Protocols::Redis.connect
+    @c.select "14"
+    @c.flushdb
+  end
+
+  should "select previously selected datase" do
+    #simulate disconnect
+    @c.set('foo', 'a') { @c.close_connection_after_writing }
+
+    EM.add_timer(2) do
+      @c.get('foo') do |r|
+        r.should == 'a'
+        @c.get('non_existing') do |r|
+          r.should == nil
+          done
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: em-redis
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jonathan Broad
+- Eugene Pimenov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +03:00
+date: 2009-12-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +61,7 @@ description: |-
   Event Machine's event loop.  It implements an EM-based client protocol, which
   leverages the non-blocking nature of the EM interface to achieve significant
   parallelization without threads.
-email: jonathan@relativepath.org
+email: libc@me.com
 executables: []
 
 extensions: []
@@ -75,7 +76,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- em-redis.gemspec
 - lib/em-redis.rb
 - lib/em-redis/redis_protocol.rb
 - spec/live_redis_protocol_spec.rb

data/em-redis.gemspec

@@ -1,47 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{em-redis}
-  s.version = "0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jonathan Broad"]
-  s.date = %q{2009-12-15}
-  s.description = %q{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.
-Modeled after eventmachine's implementation of the memcached protocol, and influenced by Ezra Zygmuntowicz's {redis-rb}[http://github.com/ezmobius/redis-rb/tree/master] library (distributed as part of Redis).
-
-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 achieve significant
-parallelization without threads.}
-  s.email = %q{jonathan@relativepath.org}
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "em-redis.gemspec", "lib/em-redis.rb", "lib/em-redis/redis_protocol.rb", "spec/live_redis_protocol_spec.rb", "spec/redis_protocol_spec.rb", "spec/test_helper.rb", "tasks/em-redis.rake"]
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{em-redis}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{An EventMachine[http://rubyeventmachine}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_development_dependency(%q<em-spec>, [">= 0.2.0"])
-      s.add_development_dependency(%q<bones>, [">= 3.2.0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_dependency(%q<em-spec>, [">= 0.2.0"])
-      s.add_dependency(%q<bones>, [">= 3.2.0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-    s.add_dependency(%q<bacon>, [">= 1.1.0"])
-    s.add_dependency(%q<em-spec>, [">= 0.2.0"])
-    s.add_dependency(%q<bones>, [">= 3.2.0"])
-  end
-end