redis-hash 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd513ffa6a5374f208a77c5691d904159cd2b30
-  data.tar.gz: 1fd22758f74c901188e26d6c39609d7439cf74f0
+  metadata.gz: 6bb41716c01e4eab76eff18483a814bb3c200b53
+  data.tar.gz: e7f14f833828cc07f90d72b36189c1018b92e390
 SHA512:
-  metadata.gz: fb7f0371d442f9a920fe35dfdf5a09143834985b1a835301b9040b190595990abd061cdfa212590fdb6a0402e743e7fc8221c972dc3cbbf3ab1c2d8221f5513e
-  data.tar.gz: fc40ad9e406554dc072f0e8f7c648b870cfa59bf5a83d5fa30bf441c9831fb7b7cfe24ac6eb52ba1fecfb76ed07c2f40e73625ec42494056d3ed55bde3a823f2
+  metadata.gz: 341facd819d2a24fdb89c1116f38df6d1f8dbe1364e0cc2dab4804a9c960228eae0dbbf8b47e5d2063ce0ca69f84c2acc4dfdd28610b53660c4c736efd2c205d
+  data.tar.gz: 4ba25754aab9bbed3c87dbd3da00afaf44236310b821166f137acd974d28131a8d96e39a528547053711ea527f5121a9e51f337f906733d75e00a8957b55eb51

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-hash (0.0.1)
+    redis-hash (0.0.2)
       redis
 
 GEM

data/lib/redis_hash.rb

@@ -3,7 +3,7 @@ require "redis"
 class RedisHash
 	attr_reader :name
 
-	VERSION = "0.0.2"
+	VERSION = "0.0.3"
 
 	class InvalidNameException < StandardError; end;
 	class InvalidRedisConfigException < StandardError; end;
@@ -13,10 +13,13 @@ class RedisHash
 
 		raise InvalidNameException.new unless name.kind_of?(String) && name.size > 0
 		@name = name
-		@redis = if redis_or_options.kind_of? Redis
+		@redis = if redis_or_options.kind_of?(Redis)
 			         redis_or_options
 			       elsif redis_or_options.kind_of? Hash
 				       ::Redis.new redis_or_options
+			       elsif defined?(ConnectionPool) && redis_or_options.kind_of?(ConnectionPool)
+							 @pooled = true
+							 redis_or_options
 			       else
 				       raise InvalidRedisConfigException.new
 		         end
@@ -26,9 +29,9 @@ class RedisHash
 		keys = keys.flatten
 		if keys.size > 0
 			values = if 1 == keys.size
-				         @redis.hget name, keys.first
+				         with{|redis| redis.hget name, keys.first }
 				       else
-					       @redis.hmget name, *keys
+					       with{|redis| redis.hmget name, *keys }
 			         end
 
 			keys.each_with_index.map do |k,i|
@@ -39,57 +42,59 @@ class RedisHash
 
 	def set hash
 		if hash.size > 0
-			if 1 == hash.size
-				@redis.hset name, hash.keys.first, hash.values.first
-			else
-				@redis.hmset name, *(hash.map { |k, v| [k, v] }.flatten)
+			with do |redis|
+				if 1 == hash.size
+					redis.hset name, hash.keys.first, hash.values.first
+				else
+					redis.hmset name, *(hash.map { |k, v| [k, v] }.flatten)
+				end
 			end
 		end
 	end
 
 	def set_if_does_not_exist hash
-		@redis.hsetnx(name, hash.keys.first, hash.values.first)
+		with{|redis| redis.hsetnx(name, hash.keys.first, hash.values.first)}
 	end
 
 	def increment_integer_key key, increment_amount = 1
-		@redis.hincrby(name, key, increment_amount)
+		with{|redis| redis.hincrby(name, key, increment_amount)}
 	end
 
 	def increment_float_key key, increment_amount = 1
-		@redis.hincrbyfloat(name, key, increment_amount)
+		with{|redis| redis.hincrbyfloat(name, key, increment_amount)}
 	end
 
 	def remove *keys
 		keys = keys.flatten
 		if keys.size > 0
-			@redis.hdel name, *keys
+			with{|redis| redis.hdel name, *keys}
 		end
 	end
 
 	def all
-		@redis.hgetall name
+		with{|redis| redis.hgetall name}
 	end
 
 	def keys
-		@redis.hkeys name
+		with{|redis| redis.hkeys name}
 	end
 
 	def values
-		@redis.hvals name
+		with{|redis| redis.hvals name}
 	end
 
 	def include? key
-		@redis.hexists(name, key)
+		with{|redis| redis.hexists(name, key)}
 	end
 
 	def size
-		@redis.hlen name
+		with{|redis| redis.hlen name}
 	end
 
 	alias count size
 
 	def scan cursor = 0, amount = 10, match = "*"
-		@redis.hscan name, cursor, :count => amount, :match => match
+		with{|redis| redis.hscan name, cursor, :count => amount, :match => match}
 	end
 
 	def enumerator(slice_size = 10)
@@ -106,13 +111,27 @@ class RedisHash
 	end
 
 	def clear
-		@redis.del name
+		with{|redis| redis.del name}
 		{}
 	end
 
 	alias flush clear
 
 	def expire seconds
-		@redis.expire name, seconds
+		with{|redis| redis.expire name, seconds}
+	end
+
+	private
+
+	def with(&block)
+		if pooled?
+			@redis.with(&block)
+		else
+			block.call(@redis)
+		end
+	end
+
+	def pooled?
+		!!@pooled
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-hash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Misha Conway