redis-namespace 0.4.4 → 0.5.0

data/lib/redis/namespace.rb

@@ -125,7 +125,11 @@ class Redis
     }
 
     # support previous versions of redis gem
-    ALIASES = (defined? Redis::Client) ? Redis::Client::ALIASES : Redis::ALIASES
+    ALIASES = case
+              when defined? Redis::Client::ALIASES  then Redis::Client::ALIASES
+              when defined? Redis::ALIASES          then Redis::ALIASES
+              else {}
+              end
 
     attr_accessor :namespace
 
@@ -159,7 +163,7 @@ class Redis
         args = add_namespace(args)
         args.push(last) if last
       when :alternate
-        args = [ add_namespace(Hash[*args]) ]
+        args.each_with_index { |a, i| args[i] = add_namespace(a) if i.even? }
       end
 
       # Dispatch the command to Redis and store the result.

data/spec/redis_spec.rb

@@ -29,7 +29,7 @@ describe "redis" do
     @redis['foo'] = 'bob'
     @redis['foo'].should == 'bob'
 
-    @namespaced.incr('counter', 2)
+    @namespaced.incrby('counter', 2)
     @namespaced['counter'].to_i.should == 2
     @redis['counter'].should == nil
     @namespaced.type('counter').should == 'string'
@@ -54,13 +54,13 @@ describe "redis" do
   end
 
   it "should be able to use a namespace with mset" do
-    @namespaced.mset('foo' => '1000', 'bar' => '2000')
+    @namespaced.mset('foo', '1000', 'bar', '2000')
     @namespaced.mapped_mget('foo', 'bar').should == { 'foo' => '1000', 'bar' => '2000' }
     @namespaced.mapped_mget('foo', 'baz', 'bar').should == { 'foo' => '1000', 'bar' => '2000'}
   end
 
   it "should be able to use a namespace with msetnx" do
-    @namespaced.msetnx('foo' => '1000', 'bar' => '2000')
+    @namespaced.msetnx('foo', '1000', 'bar', '2000')
     @namespaced.mapped_mget('foo', 'bar').should == { 'foo' => '1000', 'bar' => '2000' }
     @namespaced.mapped_mget('foo', 'baz', 'bar').should == { 'foo' => '1000', 'bar' => '2000'}
   end
@@ -115,30 +115,26 @@ describe "redis" do
     @namespaced['foo'].should == 'chris'
   end
 
-  it "should support command aliases (delete)" do 
-    @namespaced.delete('foo')
-    @redis.should_not have_key('ns:foo')
-  end
-
-  it "should support command aliases (set_add)" do 
-    @namespaced.set_add('bar', 'quux')
-    @namespaced.smembers('bar').should include('quux')
-  end
-
-  it "should support command aliases (push_head)" do 
-    @namespaced.push_head('bar', 'quux')
-    @redis.llen('ns:bar').should == 1
-  end
+  # Only test aliasing functionality for Redis clients that support aliases.
+  unless Redis::Namespace::ALIASES.empty?
+    it "should support command aliases (delete)" do
+      @namespaced.delete('foo')
+      @redis.should_not have_key('ns:foo')
+    end
 
-  it "should support command aliases (zset_add)" do 
-    @namespaced.zset_add('bar', 1, 'quux')
-    @redis.zcard('ns:bar').should == 1
-  end
+    it "should support command aliases (set_add)" do
+      @namespaced.set_add('bar', 'quux')
+      @namespaced.smembers('bar').should include('quux')
+    end
 
+    it "should support command aliases (push_head)" do
+      @namespaced.push_head('bar', 'quux')
+      @redis.llen('ns:bar').should == 1
+    end
 
-  Spec::Matchers.define :have_key do |expected|
-    match do |redis|
-      redis.exists(expected)
+    it "should support command aliases (zset_add)" do
+      @namespaced.zset_add('bar', 1, 'quux')
+      @redis.zcard('ns:bar').should == 1
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,3 +2,9 @@ require 'rubygems'
 $TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'redis'
+
+Spec::Matchers.define :have_key do |expected|
+  match do |redis|
+    redis.exists(expected)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis-namespace
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
-        - 1
+        - 3
         - 0
         - 0
-        version: 1.0.0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 description: |