redis_object 1.3.7 → 1.3.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQ0NGY4MDBkY2I2OTY1MTFjMmRjNTY2NDgzZmNjYTk0OTcwMzUyNg==
+    NGI2MTI4YzhkODE3NmYzMzM3MjIzNmY3ZDZhMTVjMjkwZTQ0Y2E4Zg==
   data.tar.gz: !binary |-
-    MjgyMDg2MDkzNjY0NDJjOWEyN2RkZDQwNDc3NDYzYWU5OTc4M2Q5Mw==
+    NGY2NjMxOTJiYTQzZmRhYWI4MzRmNmMxNjUwMGVjNzM2MDU4ZmJhZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmFlMmVhOTY2Y2MxOThmN2MzNTVmNjc5MzU0NTNjMzE5OWNlZGNiYzQxMzFm
-    NjBkZGM1MTEzNzgyMTdhOWY5ODE3ZTBmMjg3NjEyNWZiYjE5NTNiZmUxNWJm
-    OWEyYTEwMGEyZDU3OWE0YmQwYThiNTc4MzRjOGI4YjgwMGVkZWY=
+    OGZiODZhZjZiNzRjNmZkNDhhYTE1YjYwMjNkYjkzYzM0ZTU5ZDJkZjhiYjNm
+    YWFlMGE4Y2Y1YTEyYzFmZTZmYzAxY2RhNzQ4MTExNTZiMTM0YzFjNmE1MGMw
+    MTkxOTRjMDI1ODM0Y2NmZjcyOWU3N2E1OTJkYjVkZGEyOGQyYWQ=
   data.tar.gz: !binary |-
-    NGU4MDUwNDBiMGFhYTA5ODk5NTQ1NGRlOWM4OGUzZWY2YjgzODgyZWIxMTEw
-    NDE5Y2ZhMjQxYzIzMDQ5NmQwZjY1N2Y4MjY3Yzg5ZDZhOTgwYmQ0MjFkYzY2
-    MjQ5ZGQwYmQ1OTcyNDU4Y2NkNWNjNzIyYmQzNDU2ODcwMTVkMmM=
+    MGM0NDZjODBlZDViMDMyNDFhMGU2MGVhZDU3NzM3MjZmMDEyNzM2OThjYjgw
+    MzYxMGIwNTI3MjY2MTIzMDA3NDFmODBlYWRlMjQ1ODgwODI0NTJhYzYxMTJm
+    MDQyZjVlMWE4MGIzYzEzNDcwYjZmMDc5YjViOWI4MWNlZTBiMTU=

data/lib/redis_object.rb

@@ -4,6 +4,7 @@ require 'yajl'
 require 'set'
 
 require "redis_object/storage"
+require "redis_object/ext/list_enumerator"
 
 require "redis_object/ext/script_cache"
 require "redis_object/base"

data/lib/redis_object/base.rb

@@ -246,7 +246,7 @@ module Seabright
 			
 			def all
 				kys = store.smembers(plname)
-				Enumerator.new do |y|
+				ListEnumerator.new(kys) do |y|
 					kys.each do |member|
 						if a = find_by_key(hkey(member))
 							y << a
@@ -367,7 +367,7 @@ module Seabright
 					end
 				end
 				kys = run_script(mtchr,[plname],pkt)
-				Enumerator.new do |y|
+				ListEnumerator.new(kys) do |y|
 					kys.each do |k|
 						y << find(k)
 					end

data/lib/redis_object/collection.rb

@@ -218,7 +218,7 @@ module Seabright
 		
 		def indexed(idx,num=-1,reverse=false)
 			keys = keys_by_index(idx,num,reverse)
-			out = Enumerator.new do |y|
+			out = ListEnumerator.new(keys) do |y|
 				keys.each do |member|
 					if a = class_const.find_by_key(member)
 						y << a
@@ -243,7 +243,7 @@ module Seabright
 		
 		def keys_by_index(idx,num=-1,reverse=false)
 			keys = run_script(reverse ? :RevScript : :FwdScript, [temp_key, index_key(idx), key, num])
-			Enumerator.new do |y|
+			ListEnumerator.new(keys) do |y|
 				keys.each do |member|
 					y << member
 				end
@@ -276,7 +276,7 @@ module Seabright
 		def match(pkt)
 			Enumerator.new do |y|
 				each do |i|
-					if pkt.map {|hk,va| i.get(hk)==va }.all?
+					if pkt.all? {|hk,va| i.get(hk)==va }
 						y << i
 					end
 				end

data/lib/redis_object/ext/list_enumerator.rb

@@ -0,0 +1,21 @@
+class ListEnumerator < Enumerator
+	
+	def initialize(base,&block)
+		@base = base
+		super(&block)
+	end
+	
+	def count
+		@base.size
+	end
+	
+	def member?(obj)
+		case obj
+		when String
+			@base.member?(obj)
+		else
+			super(obj)
+		end
+	end
+	
+end

data/lib/redis_object/indices.rb

@@ -46,7 +46,7 @@ module Seabright
 			
 			def indexed(idx,num=-1,reverse=false)
 				kys = store.send(reverse ? :zrevrange : :zrange, index_key(idx), 0, num-1)
-				out = Enumerator.new do |yielder|
+				out = ListEnumerator.new(kys) do |yielder|
 					kys.each do |member|
 						if a = self.find_by_key(member)
 							yielder << a

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.3.7"
+		VERSION = "1.3.8"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - John Bragg
@@ -104,6 +104,7 @@ files:
 - lib/redis_object/ext/benchmark.rb
 - lib/redis_object/ext/cleaner.rb
 - lib/redis_object/ext/filters.rb
+- lib/redis_object/ext/list_enumerator.rb
 - lib/redis_object/ext/sanitization.rb
 - lib/redis_object/ext/script_cache.rb
 - lib/redis_object/ext/shardable.rb