redis-namespace 0.10.0 → 1.0

data/README.md

@@ -5,8 +5,10 @@ Requires the redis gem.
 
 Namespaces all Redis calls.
 
-    r = Redis::Namespace.new(:ns, :redis => @r)
-    r['foo'] = 1000
+``` ruby
+r = Redis::Namespace.new(:ns, :redis => @r)
+r['foo'] = 1000
+```
 
 This will perform the equivalent of:
 
@@ -21,6 +23,14 @@ Installation
     $ gem install redis-namespace
 
 
+
+Testing
+=======
+
+    $ bundle install
+    $ rake
+
+
 Author
 =====
 

data/Rakefile

@@ -3,5 +3,5 @@ task :test    => :spec
 
 desc "Run specs"
 task :spec do
-  exec "spec spec/redis_spec.rb"
+  exec "rspec spec/redis_spec.rb"
 end

data/lib/redis/namespace.rb

@@ -45,6 +45,7 @@ class Redis
       "blpop"            => [ :exclude_last ],
       "brpop"            => [ :exclude_last ],
       "dbsize"           => [],
+      "debug"            => [ :exclude_first ],
       "decr"             => [ :first ],
       "decrby"           => [ :first ],
       "del"              => [ :all   ],
@@ -55,6 +56,7 @@ class Redis
       "get"              => [ :first ],
       "getset"           => [ :first ],
       "hset"             => [ :first ],
+      "hsetnx"           => [ :first ],
       "hget"             => [ :first ],
       "hincrby"          => [ :first ],
       "hmget"            => [ :first ],
@@ -78,6 +80,7 @@ class Redis
       "lrem"             => [ :first ],
       "lset"             => [ :first ],
       "ltrim"            => [ :first ],
+      "mapped_hmset"     => [ :first ],
       "mapped_mget"      => [ :all, :all ],
       "mget"             => [ :all ],
       "monitor"          => [ :monitor ],
@@ -122,6 +125,7 @@ class Redis
       "unsubscribe"      => [ :all ],
       "zadd"             => [ :first ],
       "zcard"            => [ :first ],
+      "zcount"           => [ :first ],
       "zincrby"          => [ :first ],
       "zrange"           => [ :first ],
       "zrangebyscore"    => [ :first ],
@@ -156,8 +160,14 @@ class Redis
       method_missing(:type, key)
     end
 
+    alias_method :self_respond_to?, :respond_to?
+
     def respond_to?(command)
-      @redis.respond_to?(command)
+      if self_respond_to?(command)
+        true
+      else
+        @redis.respond_to?(command)
+      end
     end
 
     def keys(query = nil)
@@ -165,9 +175,17 @@ class Redis
     end
 
     def method_missing(command, *args, &block)
-      (before, after) = COMMANDS[command.to_s] ||
+      handling = COMMANDS[command.to_s] ||
         COMMANDS[ALIASES[command.to_s]]
 
+      if handling.nil?
+        warn("redis-namespace does not know how to handle '#{command}' command.
+              Passing it to redis as is.")
+        return
+      end
+
+      (before, after) = handling
+
       # Add the namespace to any parameters that are keys.
       case before
       when :first
@@ -184,6 +202,11 @@ class Redis
         args.push(last) if last
       when :alternate
         args.each_with_index { |a, i| args[i] = add_namespace(a) if i.even? }
+      when :sort
+        args[0] = add_namespace(args[0]) if args[0]
+        [:by, :get, :store].each do |key|
+          args[1][key] = add_namespace(args[1][key]) if args[1][key]
+        end if args[1].is_a?(Hash)
       end
 
       # Dispatch the command to Redis and store the result.

data/spec/redis_spec.rb

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require 'redis/namespace'
-require 'logger'
 
 describe "redis" do
   before(:all) do
@@ -79,6 +77,14 @@ describe "redis" do
     @namespaced.hincrby('bar', 'a_number', 3)
     @namespaced.hmget('bar', 'a_number').should == ['4']
     @namespaced.hgetall('bar').should == {'key' => 'value', 'key1' => 'value1', 'a_number' => '4'}
+
+    @namespaced.hsetnx('foonx','nx',10).should be_true
+    @namespaced.hsetnx('foonx','nx',12).should be_false
+    @namespaced.hget('foonx','nx').should == "10"
+    @namespaced.hkeys('foonx').should     == %w{ nx }
+    @namespaced.hvals('foonx').should     == %w{ 10 }
+    @namespaced.mapped_hmset('baz', {'key' => 'value', 'key1' => 'value1', 'a_number' => 4})
+    @namespaced.hgetall('baz').should == {'key' => 'value', 'key1' => 'value1', 'a_number' => '4'}
   end
 
   it "should properly intersect three sets" do
@@ -101,6 +107,24 @@ describe "redis" do
     @namespaced.sunion('foo', 'bar').sort.should == %w( 1 2 3 4 )
   end
 
+  it "should add namespace to sort" do
+    @namespaced.sadd('foo', 1)
+    @namespaced.sadd('foo', 2)
+    @namespaced.set('weight_1', 2)
+    @namespaced.set('weight_2', 1)
+    @namespaced.set('value_1', 'a')
+    @namespaced.set('value_2', 'b')
+
+    @namespaced.sort('foo').should == %w( 1 2 )
+    @namespaced.sort('foo', :limit => [0, 1]).should == %w( 1 )
+    @namespaced.sort('foo', :order => 'desc').should == %w( 2 1 )
+    @namespaced.sort('foo', :by => 'weight_*').should == %w( 2 1 )
+    @namespaced.sort('foo', :get => 'value_*').should == %w( a b )
+
+    @namespaced.sort('foo', :store => 'result')
+    @namespaced.lrange('result', 0, -1).should == %w( 1 2 )
+  end
+
   it "should yield the correct list of keys" do
     @namespaced["foo"] = 1
     @namespaced["bar"] = 2
@@ -123,6 +147,10 @@ describe "redis" do
     @namespaced['foo'].should == 'chris'
   end
 
+  it "should respond to :namespace=" do
+    @namespaced.respond_to?(:namespace=).should == true
+  end
+
   # Only test aliasing functionality for Redis clients that support aliases.
   unless Redis::Namespace::ALIASES.empty?
     it "should support command aliases (delete)" do

data/spec/spec_helper.rb

@@ -1,9 +1,17 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
+Bundler.require(:default, :test)
+
+require 'rspec'
+require 'redis'
+require 'logger'
+
 $TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'redis'
+require 'redis/namespace'
 
-Spec::Matchers.define :have_key do |expected|
+RSpec::Matchers.define :have_key do |expected|
   match do |redis|
     redis.exists(expected)
   end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: redis-namespace
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
+  - 1
   - 0
-  - 10
-  - 0
-  version: 0.10.0
+  version: "1.0"
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -07:00
+date: 2011-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -61,23 +63,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Namespaces Redis commands.