redis_object 1.3.6 → 1.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFmMDJkMzA1MjU1MDk0MDZhNTRlNmI0MGE4YjQ5NmY3MGI4NjU0Mw==
+    ZGQ0NGY4MDBkY2I2OTY1MTFjMmRjNTY2NDgzZmNjYTk0OTcwMzUyNg==
   data.tar.gz: !binary |-
-    ZmRmMGI2ZTZkYjJjNjI1MTk0MjZmY2Q0ODE3ZTQ1NDYwZTlmMmJjYQ==
+    MjgyMDg2MDkzNjY0NDJjOWEyN2RkZDQwNDc3NDYzYWU5OTc4M2Q5Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjUyYjVjZGRhMmJmYzkzZDMwYjlmODc1NjNhMDI2ZmY5Y2UwMmQ2Nzk4OGRl
-    MGNmNWIxMmM5ZmVlYTJmMjUzNDg4ZDQ3NThhMzFlMGQ2MmIzZjJlMDI2NGIy
-    ZTYyYWYxZWRlY2M3YjQ3YjUzMjA2MTJjMzQzMzA2MGFkM2FlYjk=
+    ZmFlMmVhOTY2Y2MxOThmN2MzNTVmNjc5MzU0NTNjMzE5OWNlZGNiYzQxMzFm
+    NjBkZGM1MTEzNzgyMTdhOWY5ODE3ZTBmMjg3NjEyNWZiYjE5NTNiZmUxNWJm
+    OWEyYTEwMGEyZDU3OWE0YmQwYThiNTc4MzRjOGI4YjgwMGVkZWY=
   data.tar.gz: !binary |-
-    OWEzODIzZjI0MGQwYTI5YTUzYTlmOWFjZmZmMmRlMGNlZDIyNTc5MmU3Nzcx
-    OThmOWNlOTk3ZjBjZGRlMDBlYjJhMDM5ZmU1YjJlMjJhNjc5YmQxNzgxNjlk
-    MWI4OWU4ZTQyNGRhOTBkMjMxNDJmZTk1ZTA4OWIwMTNkOTY2MjI=
+    NGU4MDUwNDBiMGFhYTA5ODk5NTQ1NGRlOWM4OGUzZWY2YjgzODgyZWIxMTEw
+    NDE5Y2ZhMjQxYzIzMDQ5NmQwZjY1N2Y4MjY3Yzg5ZDZhOTgwYmQ0MjFkYzY2
+    MjQ5ZGQwYmQ1OTcyNDU4Y2NkNWNjNzIyYmQzNDU2ODcwMTVkMmM=

data/lib/redis_object/base.rb

@@ -278,19 +278,27 @@ module Seabright
 				end
 			end
 			
+			NilPattern = 'nilpattern:'
+			
 			RedisObject::ScriptSources::Matcher = "local itms = redis.call('SMEMBERS',KEYS[1])
 				local out = {}
 				local val
 				local pattern
 				for i, v in ipairs(itms) do
 					val = redis.call('HGET',v..'_h',ARGV[1])
-					if ARGV[2]:find('^pattern:') then
-						pattern = ARGV[2]:gsub('^pattern:','')
-						if val:match(pattern) ~= nil then
-							table.insert(out,itms[i])
+					if val then
+						if ARGV[2]:find('^pattern:') then
+							pattern = ARGV[2]:gsub('^pattern:','')
+							if val:match(pattern) ~= nil then
+								table.insert(out,itms[i])
+							end
+						else
+							if val == ARGV[2] then
+								table.insert(out,itms[i])
+							end
 						end
 					else
-						if val == ARGV[2] then
+						if ARGV[2] == '#{NilPattern}' then
 							table.insert(out,itms[i])
 						end
 					end
@@ -333,7 +341,11 @@ module Seabright
 								end
 							end
 						else
-							good = false
+							if matchers[n][2] == '#{NilPattern}' then
+								good = true
+							else
+								good = false
+							end
 						end
 					end
 					if good == true then
@@ -343,7 +355,18 @@ module Seabright
 				return out".gsub(/\t/,'').freeze
 			
 			def match(pkt)
-				kys = run_script(pkt.keys.count > 1 ? :MultiMatcher : :Matcher,[plname],pkt.flatten.map{|i| i.is_a?(Regexp) ? convert_regex_to_lua(i) : i.to_s })
+				mtchr = pkt.keys.count > 1 ? :MultiMatcher : :Matcher
+				pkt = pkt.flatten.map do |i|
+					case i
+					when Regexp
+						convert_regex_to_lua(i)
+					when NilClass
+						NilPattern
+					else
+						i.to_s
+					end
+				end
+				kys = run_script(mtchr,[plname],pkt)
 				Enumerator.new do |y|
 					kys.each do |k|
 						y << find(k)

data/lib/redis_object/version.rb

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

data/spec/base_spec.rb

@@ -45,9 +45,19 @@ describe RedisObject do
 	
 	it "should be found by complex matchers" do
 		obj = ObjectTests::User.find(user_id: "test")
-		obj.should_not be_nil
+		obj.first.should_not be_nil
 		obj = ObjectTests::User.find(user_id: /test/)
-		obj.should_not be_nil
+		obj.first.should_not be_nil
+	end
+	
+	it "should be found by nil matchers" do
+		obj = ObjectTests::User.find(blah: nil)
+		obj.first.should_not be_nil
+	end
+	
+	it "should be found by regex matchers that do not exist as keys" do
+		obj = ObjectTests::User.find(blah: /test/)
+		obj.first.should be_nil
 	end
 	
 	it "can recollect objects" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils