defunkt-redis 0.2 → 0.2.1

data/README.markdown

@@ -10,6 +10,8 @@ Redis is a key value store with some interesting features:
 
 See [redis on code.google.com](http://code.google.com/p/redis/wiki/README) for more information.
 
+See the build on [RunCodeRun](http://runcoderun.com/rsanheim/redis-rb)
+
 ## Dependencies
 
 1. rspec - 

data/lib/redis.rb

@@ -101,13 +101,14 @@ class Redis
   }
 
   def initialize(options = {})
-    @host      =  options[:host]    || '127.0.0.1'
-    @port      = (options[:port]    || 6379).to_i
-    @db        = (options[:db]      || 0).to_i
-    @timeout   = (options[:timeout] || 5).to_i
-    @password  = options[:password]
-    @logger    = options[:logger]
-    @namespace = options[:namespace]
+    @host        = options[:host]     || '127.0.0.1'
+    @port        = (options[:port]    || 6379).to_i
+    @db          = (options[:db]      || 0).to_i
+    @timeout     = (options[:timeout] || 5).to_i
+    @password    = options[:password]
+    @logger      = options[:logger]
+    @namespace   = options[:namespace]
+    @thread_safe = options[:thread_safe]
 
     @logger.info { self.to_s } if @logger
   end
@@ -206,14 +207,26 @@ class Redis
       command << "#{bulk}\r\n" if bulk
     end
 
-    @sock.write(command)
+    results = if @thread_safe
+      with_mutex { process_command(command, argvv) }
+    else
+      process_command(command, argvv)
+    end
 
-    results = argvv.map do |argv|
+    return pipeline ? results : results[0]
+  end
+
+  def process_command(command, argvv)
+    @sock.write(command)
+    argvv.map do |argv|
       processor = REPLY_PROCESSOR[argv[0]]
       processor ? processor.call(read_reply) : read_reply
     end
+  end
 
-    return pipeline ? results : results[0]
+  def with_mutex(&block)
+    @mutex ||= Mutex.new
+    @mutex.synchronize &block
   end
 
   def select(*args)
@@ -255,10 +268,12 @@ class Redis
   # Similar to memcache.rb's #get_multi, returns a hash mapping
   # keys to values.
   def mapped_mget(*keys)
-    mget(*keys).inject({}) do |hash, value|
+    result = {}
+    mget(*keys).each do |value|
       key = keys.shift
-      value.nil? ? hash : hash.merge(key => value)
+      result.merge!(key => value) unless value.nil?
     end
+    result
   end
 
   def mget(*keys)

data/spec/redis_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'redis/raketasks'
 require 'logger'
 
 class Foo
@@ -14,10 +15,16 @@ end
 
 describe "redis" do
   before(:all) do
+    result = RedisRunner.start_detached
+    raise("Could not start redis-server, aborting") unless result
+    
+    # yea, this sucks, but it seems like sometimes we try to connect too quickly w/o it
+    sleep 1 
+    
     # use database 15 for testing so we dont accidentally step on you real data
-    @r = Redis.new :db => 15
+    @r = Redis.new :db => 15 
   end
-
+  
   before(:each) do
     @r['foo'] = 'bar'
   end
@@ -27,7 +34,11 @@ describe "redis" do
   end
 
   after(:all) do
-    @r.quit
+    begin
+      @r.quit
+    ensure
+      RedisRunner.stop
+    end
   end
 
   it "should be able connect without a timeout" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: defunkt-redis
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []