From 2031b69e6e4069406a5f574253159d50daf14142 Mon Sep 17 00:00:00 2001 From: Michael Witrant Date: Sun, 5 May 2013 13:34:54 +0200 Subject: [PATCH 1/2] use method name instead of __method__ (which is wrong in this situation on Debian Squeeze Ruby 1.9) --- lib/discourse_redis.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 853b5ee85c9..92a438a7d73 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -46,7 +46,7 @@ class DiscourseRedis zrange zrangebyscore zrank zrem zremrangebyrank zremrangebyscore zrevrange zrevrangebyscore zrevrank zrangebyscore).each do |m| define_method m do |*args| args[0] = "#{DiscourseRedis.namespace}:#{args[0]}" - @redis.send(__method__, *args) + @redis.send(m, *args) end end From 6018c2f98b62fd3717104d8e386a682baeaa640e Mon Sep 17 00:00:00 2001 From: Michael Witrant Date: Sun, 5 May 2013 15:58:37 +0200 Subject: [PATCH 2/2] use symbols in redis proxy methods --- lib/discourse_redis.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 92a438a7d73..677425c95fe 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -43,7 +43,8 @@ class DiscourseRedis lindex linsert llen lpop lpush lpushx lrange lrem lset ltrim mget move mset msetnx persist pexpire pexpireat psetex pttl rename renamenx rpop rpoplpush rpush rpushx sadd scard sdiff set setbit setex setnx setrange sinter sismember smembers sort spop srandmember srem strlen sunion ttl type watch zadd zcard zcount zincrby - zrange zrangebyscore zrank zrem zremrangebyrank zremrangebyscore zrevrange zrevrangebyscore zrevrank zrangebyscore).each do |m| + zrange zrangebyscore zrank zrem zremrangebyrank zremrangebyscore zrevrange zrevrangebyscore zrevrank zrangebyscore + ).map(&:to_sym).each do |m| define_method m do |*args| args[0] = "#{DiscourseRedis.namespace}:#{args[0]}" @redis.send(m, *args)