redis_object 1.4.7 → 1.4.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjZmYjVhYmM1NDZmZTY1MTgyZWE3NDE3ZmYxZTFkOTAyNjM1OGJkYg==
-  data.tar.gz: !binary |-
-    YmViNzk2OTIyMTFjNWJhM2Q5MDc5MzZmOTNjMWYxNWNlYmVkMDlhYw==
+SHA1:
+  metadata.gz: 309bfbe4b9a0f3b7cd21f4489158961a6eb71544
+  data.tar.gz: dea0e37b8a70a54279e4d933326a39fefa4fb71b
 SHA512:
-  metadata.gz: !binary |-
-    NmI0NTBiOWEyMjliMzIyMTUxOTM0NDFmOWRkMmIwOTRlYWE2ZTEzYWFhNmRh
-    NzA5MmQ2NTcwYjc2YWE2MzhiMDM5MTlkYjQyNTU1ZGRlMzA3MDk5NGVkYTY5
-    Nzg0YTQ4NTZiZGExOTU1NjNkYTIwZDFlMWVlNDc5Y2FjOTQwNzk=
-  data.tar.gz: !binary |-
-    YjkwMDRmN2E2OTcwMjQ0NmM4ZjlmM2RlNmMxM2NiNTczMzRmMjA4ZjE4YzYy
-    ODNkYWEzZDQ1NWY1MjFkZTFiMmI0OTM1MDcxYzVkYjYyNjdkNDQ0YWUxMjNm
-    M2E5OTAwOTUyYmZjOTg0YzZkYWU0MjA0NjQ4ZDJjNGM1OWVjN2U=
+  metadata.gz: f636bd5f287ec4a923442bd8ffed7d8dd135a5e7adc54b5d629738bb7103f84f991d863af237fd404b9184bbc4c35fbc4e9f548e09e5899bb822648a11bc16a9
+  data.tar.gz: 7c515b5507ea353a13ad484c5c19649a066cb6943b1790e1235599cfcfbbd7e5a054fce7a56608b8d4c76cbd233ca579e3909c3fca243193f76c8e254dc63db4

data/lib/redis_object/collection.rb

@@ -273,15 +273,214 @@ module Seabright
 			find k
 		end
 		
-		def match(pkt)
-			Enumerator.new do |y|
-				each do |i|
-					if pkt.all? {|hk,va| i.get(hk)==va }
-						y << i
+		NilPattern = 'nilpattern:'
+		
+		RedisObject::ScriptSources::ColMatcher = "
+			local out = {}
+			local val
+			local pattern
+			for i, v in ipairs(KEYS) do
+				val = redis.call('HGET',v,ARGV[1])
+				if val then
+					if ARGV[2]:find('^pattern:') then
+						pattern = ARGV[2]:gsub('^pattern:','')
+						if val:match(pattern) then
+							table.insert(out,KEYS[i])
+						end
+					elseif ARGV[2]:find('^ipattern:') then
+						pattern = ARGV[2]:gsub('^ipattern:',''):lower()
+						if val:lower():match(pattern) then
+							table.insert(out,KEYS[i])
+						end
+					else
+						if val == ARGV[2] then
+							table.insert(out,KEYS[i])
+						end
+					end
+				else
+					if ARGV[2] == '#{NilPattern}' then
+						table.insert(out,KEYS[i])
+					end
+				end
+			end
+			return out".gsub(/\t/,'').freeze
+		
+		RedisObject::ScriptSources::ColMultiMatcher = "
+			local out = {}
+			local matchers = {}
+			local matcher = {}
+			local mod
+			for i=1,#ARGV do
+				mod = i % 2
+				if mod == 1 then
+					matcher[1] = ARGV[i]
+				else
+					matcher[2] = ARGV[i]
+					table.insert(matchers,matcher)
+					matcher = {}
+				end
+			end
+			local val
+			local good
+			local pattern
+			for i, v in ipairs(KEYS) do
+				good = true
+				for n=1,#matchers do
+					val = redis.call('HGET',v,matchers[n][1])
+					if val then
+						if matchers[n][2]:find('^pattern:') then
+							pattern = matchers[n][2]:gsub('^pattern:','')
+							if val:match(pattern) then
+								good = good
+							else
+								good = false
+								break
+							end
+						elseif matchers[n][2]:find('^ipattern:') then
+							pattern = matchers[n][2]:gsub('^ipattern:',''):lower()
+							if val:lower():match(pattern) then
+								good = good
+							else
+								good = false
+								break
+							end
+						else
+							if val ~= matchers[n][2] then
+								good = false
+								break
+							end
+						end
+					else
+						if matchers[n][2] == '#{NilPattern}' then
+							good = good
+						else
+							good = false
+							break
+						end
 					end
 				end
+				if good == true then
+					table.insert(out,KEYS[i])
+				end
+			end
+			return out".gsub(/\t/,'').freeze
+
+		RedisObject::ScriptSources::ColOrMatcher = "
+			local out = {}
+			local matchers = {}
+			local matcher = {}
+			local mod
+			for i=1,#ARGV do
+				mod = i % 2
+				if mod == 1 then
+					matcher[1] = ARGV[i]
+				else
+					matcher[2] = ARGV[i]
+					table.insert(matchers,matcher)
+					matcher = {}
+				end
+			end
+
+			local val
+			local good
+			local pattern
+			for i, v in ipairs(KEYS) do
+				good = false
+				for n=1,#matchers do
+					val = redis.call('HGET',v,matchers[n][1])
+					if val then
+						if matchers[n][2]:find('^pattern:') then
+							pattern = matchers[n][2]:gsub('^pattern:','')
+							if val:match(pattern) then
+								good = true
+								break
+							else
+								good = good
+							end
+						elseif matchers[n][2]:find('^ipattern:') then
+							pattern = matchers[n][2]:gsub('^ipattern:',''):lower()
+							if val:lower():match(pattern) then
+								good = true
+								break
+							else
+								good = good
+							end
+						else
+							if val == matchers[n][2] then
+								good = true
+								break
+							end
+						end
+					else
+						if matchers[n][2] == '#{NilPattern}' then
+							good = good
+							break
+						else
+							good = false
+						end
+					end
+				end
+				if good == true then
+					table.insert(out,KEYS[i])
+				end
+			end
+			return out".gsub(/\t/,'').freeze
+		
+		def match(pkt, use_or=false)
+			if use_or
+				mtchr = :ColOrMatcher
+			else
+				mtchr = pkt.keys.count > 1 ? :ColMultiMatcher : :ColMatcher
+			end
+			pkt = pkt.flatten.reduce([]) do |i,v|
+				x = case v
+				when Regexp
+					convert_regex_to_lua(v)
+				when Array
+					raise ArgumentError.new("An array can only be used with the find_or method") unless use_or
+					inject_key(i.last, v)
+				when NilClass
+					NilPattern
+				else
+					v.to_s
+				end
+				i << x
+				i
+			end
+			kys = run_script(mtchr,self,pkt.flatten)
+			ListEnumerator.new(kys) do |y|
+				kys.each do |k|
+					y << class_const.find_by_key(k)
+				end
 			end
 		end
+
+		def inject_key(key,list)
+			out = []
+			list.each do |i|
+				if i == list.first
+					out << i
+				else
+					out << key
+					out << i
+				end
+			end
+			out
+		end
+		
+		def convert_regex_to_lua(reg)
+			"#{reg.casefold? ? "i" : ""}pattern:#{reg.source.gsub("\\","")}"
+		end
+		
+		# def match(pkt)
+		# 	Enumerator.new do |y|
+		# 		each do |i|
+		# 			if pkt.all? {|hk,va| i.get(hk)==va }
+		# 				y << i
+		# 			end
+		# 		end
+		# 	end
+		# end
 		
 		def real_at(key)
 			class_const.find_by_key(key)

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.4.7"
+		VERSION = "1.4.8"
 	end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
 description: ''
@@ -87,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - README.markdown
@@ -160,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis_object
-rubygems_version: 2.1.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Maps arbitrary objects to a Redis store with indices and smart retrieval