redis_object 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ccf1c938d105fd4c5de98d24c25a6009d56939
-  data.tar.gz: 3b51f8681e54015ab02aba99fdc998402adb592d
+  metadata.gz: 24c6d1f461aa94f27fe6c79750dc3e1b1fcb8120
+  data.tar.gz: b6739ea7fde6bff76edbed5377882cfe196c46ff
 SHA512:
-  metadata.gz: 07e05812157992cb885463dc32ee8e7567c6557dbf899938d5830938e8d5a9af2413cdeb7aa982bdfcb3cd198b4e9269bd27c195aaa3f8303f940d57d85e2a16
-  data.tar.gz: d64f93d5c17ac8373576ab43b01fc5d2f240a645dff175e8d52e594e69a97970f207bf7aa10547e69e8dcbf80821e33153650e630b03d25c4ad8b0fc5bdfbc18
+  metadata.gz: b4cada8b2e40e5391667c19ae39ce4f7e1131a0e59951bb6d0c665212b78781493d878cb034c60ced5751da3c4d6e7b5bce0c4b86bf7e73dc11f425e9208ba1c
+  data.tar.gz: 995c5f452bc853e98e59f5791b345830d0af7b38d8a09266a83ee9234b12afe53d739744a5c307358232277b523e1a31c6c89151bedbf98f1221b2e56eacb716

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
+services:
+  - redis-server
 rvm:
   - 1.9.3
   - 2.0.0
 env:
-  - "TEST_DB=14"
-addons:
-  code_climate:
-    repo_token: "8b629930bc603ff8abbbe21d72914c991d265959abdd284a638e9d8366e9ade5"
+  - "TEST_DB=14"

data/Gemfile

@@ -3,9 +3,8 @@ source "http://rubygems.org"
 group :test do
 	gem 'rake'
 	gem 'rspec'
-	gem 'coveralls', require: false
 	gem 'fuubar'
-	gem "codeclimate-test-reporter", require: nil
+	gem 'simplecov'
 end
 
 group :development, :test do

data/README.markdown

@@ -3,9 +3,6 @@ RedisObject is a fast and simple-to-use object persistence layer for Ruby.
 
 [![Gem Version](https://badge.fury.io/rb/redis_object.png)](https://rubygems.org/gems/redis_object)
 [![Build Status](https://travis-ci.org/remotezygote/RedisObject.png?branch=master)](https://travis-ci.org/remotezygote/RedisObject)
-[![Coverage Status](https://coveralls.io/repos/remotezygote/RedisObject/badge.png?branch=master)](https://coveralls.io/r/remotezygote/RedisObject?branch=master)
-[![Code Climate](https://codeclimate.com/github/remotezygote/RedisObject.png)](https://codeclimate.com/github/remotezygote/RedisObject)
-[![Dependency Status](https://gemnasium.com/remotezygote/RedisObject.png)](https://gemnasium.com/remotezygote/RedisObject)
 
 ## Prerequisites
 You'll need [Redis](http://redis.io). Other storage adapters are in the works. Maybe.

data/lib/redis_object.rb

@@ -8,6 +8,7 @@ require "redis_object/ext/list_enumerator"
 
 require "redis_object/ext/script_cache"
 require "redis_object/base"
+require "redis_object/matchers"
 require "redis_object/inheritance_tracking"
 require "redis_object/storage"
 require "redis_object/keys"
@@ -28,6 +29,7 @@ module Seabright
 		
 		include Seabright::Filters
 		include Seabright::ObjectBase
+		include Seabright::Matchers
 		include Seabright::InheritanceTracking
 		include Seabright::CachedScripts
 		include Seabright::Storage

data/lib/redis_object/base.rb

@@ -278,231 +278,6 @@ 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 val then
-						if ARGV[2]:find('^pattern:') then
-							pattern = ARGV[2]:gsub('^pattern:','')
-							if val:match(pattern) then
-								table.insert(out,itms[i])
-							end
-						elseif ARGV[2]:find('^ipattern:') then
-							pattern = ARGV[2]:gsub('^ipattern:',''):lower()
-							if val:lower():match(pattern) then
-								table.insert(out,itms[i])
-							end
-						else
-							if val == ARGV[2] then
-								table.insert(out,itms[i])
-							end
-						end
-					else
-						if ARGV[2] == '#{NilPattern}' then
-							table.insert(out,itms[i])
-						end
-					end
-				end
-				return out".gsub(/\t/,'').freeze
-			
-			RedisObject::ScriptSources::MultiMatcher = "local itms = redis.call('SMEMBERS',KEYS[1])
-				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(itms) do
-					good = true
-					for n=1,#matchers do
-						val = redis.call('HGET',v..'_h',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,itms[i])
-					end
-				end
-				return out".gsub(/\t/,'').freeze
-
-			RedisObject::ScriptSources::OrMatcher = "local itms = redis.call('SMEMBERS',KEYS[1])
-				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(itms) do
-					good = false
-					for n=1,#matchers do
-						val = redis.call('HGET',v..'_h',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,itms[i])
-					end
-				end
-				return out".gsub(/\t/,'').freeze
-			
-			def match(pkt, use_or=false)
-				if use_or
-					mtchr = :OrMatcher
-				else
-					mtchr = pkt.keys.count > 1 ? :MultiMatcher : :Matcher
-				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,[plname],pkt.flatten)
-				ListEnumerator.new(kys) do |y|
-					kys.each do |k|
-						y << find(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 grab(ident)
-				case ident
-				when String, Symbol
-					return store.exists(self.hkey(ident.to_s)) ? self.new(ident.to_s) : nil
-				when Hash
-					return match(ident)
-				end
-				nil
-			end
-
-			def or_grab(ident)
-				case ident
-				when Hash
-					return match(ident, true)
-				end
-				nil
-			end
-			
-			def find(ident)
-				grab(ident)
-			end
-
-			def or_find(ident)
-				or_grab(ident)
-			end
-			
 			def exists?(k)
 				store.exists(self.hkey(k)) || store.exists(self.reserve_key(k))
 			end
@@ -513,14 +288,6 @@ module Seabright
 				obj
 			end
 			
-			# def dump
-			# 	out = []
-			# 	each do |obj|
-			# 		out << obj.dump
-			# 	end
-			# 	out.join("\n")
-			# end
-			
 			def use_dbnum(db=0)
 				@dbnum = db
 			end

data/lib/redis_object/collection.rb

@@ -242,7 +242,7 @@ module Seabright
 		RedisObject::ScriptSources::RevScript = "redis.call('ZINTERSTORE', KEYS[1], 2, KEYS[2], KEYS[3], 'WEIGHTS', 1, 0)\nlocal keys = redis.call('ZREVRANGE', KEYS[1], 0, KEYS[4])\nredis.call('DEL', KEYS[1])\nreturn keys".freeze
 		
 		def keys_by_index(idx,num=-1,reverse=false)
-			keys = run_script(reverse ? :RevScript : :FwdScript, [temp_key, index_key(idx), key, num])
+			keys = run_script(reverse ? :RevScript : :FwdScript, [temp_key, sort_index_key(idx), key, num])
 			ListEnumerator.new(keys) do |y|
 				keys.each do |member|
 					y << member
@@ -250,8 +250,8 @@ module Seabright
 			end
 		end
 		
-		def index_key(idx)
-			class_const.index_key(idx)
+		def sort_index_key(idx)
+			class_const.sort_index_key(idx)
 		end
 		
 		def item_key(k)

data/lib/redis_object/indices.rb

@@ -1,4 +1,15 @@
 module Seabright
+	
+	class RedisObject
+		
+		def self.reindex_everything!
+			RedisObject.child_classes.each do |cls|
+				cls.reindex_all_indices!
+			end
+		end
+		
+	end
+	
 	module Indices
 		
 		def index_key(idx)
@@ -13,13 +24,27 @@ module Seabright
 					
 					def indexed_set_method(meth,k,v)
 						ret = send("unindexed_#{meth}".to_sym,k,v)
+						if self.class.has_index?(k)
+							set_index k, v, hkey
+						end
 						if self.class.has_sort_index?(k)
-							store.zrem(index_key(k), hkey)
-							store.zadd(index_key(k), score_format(k,v), hkey)
+							set_sort_index k, v, hkey
 						end
 						ret
 					end
 					
+					def set_index(k,v,hkey)
+						if cur = get(k)
+							store.srem(self.class.index_key(k,cur), hkey)
+						end
+						store.sadd(self.class.index_key(k,v), hkey)
+					end
+					
+					def set_sort_index(k,v,hkey)
+						store.zrem(self.class.sort_index_key(k), hkey)
+						store.zadd(self.class.sort_index_key(k), score_format(k,v), hkey)
+					end
+					
 					alias_method :unindexed_set, :set unless method_defined?(:unindexed_set)
 					def set(k,v)
 						indexed_set_method(:set,k,v)
@@ -32,12 +57,13 @@ module Seabright
 					
 					alias_method :unindexed_mset, :mset unless method_defined?(:unindexed_mset)
 					def mset(dat)
-						ret = unindexed_mset(dat)
+						dat.select {|k,v| self.class.has_index?(k) }.each do |k,v|
+							set_index k, v, hkey
+						end
 						dat.select {|k,v| self.class.has_sort_index?(k) }.each do |k,v|
-							store.zrem(index_key(k), hkey)
-							store.zadd(index_key(k), score_format(k,v), hkey)
+							set_sort_index k, v, hkey
 						end
-						ret
+						unindexed_mset(dat)
 					end
 					
 				end
@@ -45,7 +71,7 @@ module Seabright
 			end
 			
 			def indexed(idx,num=-1,reverse=false)
-				kys = store.send(reverse ? :zrevrange : :zrange, index_key(idx), 0, num-1)
+				kys = store.send(reverse ? :zrevrange : :zrange, sort_index_key(idx), 0, num-1)
 				out = ListEnumerator.new(kys) do |yielder|
 					kys.each do |member|
 						if a = self.find_by_key(member)
@@ -62,12 +88,25 @@ module Seabright
 				end
 			end
 			
-			def index_key(idx)
+			def index_key(k,v)
+				"#{self.plname}::field_index::#{k}::#{v}"
+			end
+			
+			def sort_index_key(idx)
 				"#{self.plname}::#{idx}"
 			end
 			
+			def indices
+				@@indices ||= Set.new
+			end
+			
 			def sort_indices
-				@@sort_indices ||= []
+				@@sort_indices ||= Set.new
+			end
+			
+			def index(k)
+				indices << k.to_sym
+				intercept_sets_for_indices!
 			end
 			
 			def sort_by(k)
@@ -76,12 +115,26 @@ module Seabright
 			end
 			
 			def reindex(k)
-				store.del index_key(k)
+				store.keys(index_key(k,"*")).each do |ik|
+					store.del ik
+				end
 				all.each do |obj|
-					obj.set(k,obj.get(k))
+					if v = obj.get(k)
+						obj.set_index(k, v, obj.hkey)
+					end
+				end
+			end
+			
+			def reindex_all_indices!
+				indices.each do |k|
+					reindex(k)
 				end
 			end
 			
+			def has_index?(k)
+				k and indices.include?(k.to_sym)
+			end
+			
 			def has_sort_index?(k)
 				k and sort_indices.include?(k.to_sym)
 			end

data/lib/redis_object/matchers.rb

@@ -0,0 +1,496 @@
+module Seabright
+	module Matchers
+		
+		module ClassMethods
+			
+			NilPattern = 'nilpattern:'
+			
+			GetKeyList = "local itms
+				if KEYS[2] then
+					itms = {}
+					for n=2,#KEYS do
+						local kys = redis.call('SMEMBERS',KEYS[n])
+						for k=1,#kys do
+							local rk
+							if kys[k]:match('.*_h') then
+								rk = kys[k]
+							else
+								rk = kys[k]..'_h'
+							end
+							table.insert(itms, rk)
+						end
+					end
+				else
+					itms = {}
+					local kys = redis.call('SMEMBERS',KEYS[1])
+					for k=1,#kys do
+						local rk
+						if kys[k]:match('.*_h') then
+							rk = kys[k]
+						else
+							rk = kys[k]..'_h'
+						end
+						table.insert(itms, rk)
+					end
+				end".gsub(/\t/,'').freeze
+			
+			RedisObject::ScriptSources::KeyListFor = GetKeyList + "
+				return itms
+			".gsub(/\t/,'').freeze
+			
+			RedisObject::ScriptSources::Matcher = GetKeyList + "
+				local out = {}
+				local val
+				local pattern
+				for i, v in ipairs(itms) 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,itms[i])
+							end
+						elseif ARGV[2]:find('^ipattern:') then
+							pattern = ARGV[2]:gsub('^ipattern:',''):lower()
+							if val:lower():match(pattern) then
+								table.insert(out,itms[i])
+							end
+						else
+							if val == ARGV[2] then
+								table.insert(out,itms[i])
+							end
+						end
+					else
+						if ARGV[2] == '#{NilPattern}' then
+							table.insert(out,itms[i])
+						end
+					end
+				end
+				return out".gsub(/\t/,'').freeze
+			
+			RedisObject::ScriptSources::MultiMatcher = GetKeyList + "
+				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(itms) 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,itms[i])
+					end
+				end
+				return out".gsub(/\t/,'').freeze
+			
+			RedisObject::ScriptSources::OrMatcher = GetKeyList + "
+				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(itms) 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,itms[i])
+					end
+				end
+				return out".gsub(/\t/,'').freeze
+			
+			def match(pkt, use_or=false)
+				if use_or
+					mtchr = :OrMatcher
+				else
+					mtchr = pkt.keys.count > 1 ? :MultiMatcher : :Matcher
+				end
+				if (ids = pkt[id_sym] || pkt[id_sym.to_s]) and !ids.is_a?(Regexp)
+					return match_by_id(ids, pkt, use_or)
+				end
+				indcs = [plname] + extract_usable_indices(pkt)
+				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, indcs, pkt.flatten)
+				ListEnumerator.new(kys) do |y|
+					kys.each do |k|
+						y << find(k)
+					end
+				end
+			end
+			
+			RedisObject::ScriptSources::FirstMatcher = GetKeyList + "
+				local val
+				local pattern
+				for i, v in ipairs(itms) 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
+								return itms[i]
+							end
+						elseif ARGV[2]:find('^ipattern:') then
+							pattern = ARGV[2]:gsub('^ipattern:',''):lower()
+							if val:lower():match(pattern) then
+								return itms[i]
+							end
+						else
+							if val == ARGV[2] then
+								return itms[i]
+							end
+						end
+					else
+						if ARGV[2] == '#{NilPattern}' then
+							return itms[i]
+						end
+					end
+				end
+				return ''".gsub(/\t/,'').freeze
+			
+			RedisObject::ScriptSources::FirstMultiMatcher = GetKeyList + "
+				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(itms) 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
+						return itms[i]
+					end
+				end
+				return ''".gsub(/\t/,'').freeze
+			
+			RedisObject::ScriptSources::FirstOrMatcher = GetKeyList + "
+				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(itms) 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
+						return itms[i]
+					end
+				end
+				return ''".gsub(/\t/,'').freeze
+			
+			def extract_usable_indices(pkt)
+				pkt.inject([]) do |acc,(k,v)|
+					if self.has_index?(k)
+						acc << index_key(k,v)
+					end
+					acc
+				end
+			end
+			
+			def match_by_id(ids, pkt, use_or = false)
+				case ids
+				when Array
+					raise ArgumentError.new("An array can only be used with the or_find_first method") unless use_or
+					ids.map do |i|
+						match_by_id(i, pkt, use_or)
+					end.flatten
+				when String, Symbol
+					if obj = find(ids)
+						pkt.each do |k,v|
+							case v
+							when Regexp
+								return nil unless v.match(obj.get(k))
+							when Array
+								raise ArgumentError.new("An array can only be used with the or_find_first method") unless use_or
+								return nil unless v.any? { |val| obj.get(k) == v }
+							when String, Symbol
+								return nil unless obj.get(k) == v
+							when NilClass
+								return nil unless obj.get(k) == nil
+							end
+						end
+					end
+					[obj]
+				end
+			end
+			
+			def match_first(pkt, use_or=false)
+				if use_or
+					mtchr = :FirstOrMatcher
+				else
+					mtchr = pkt.keys.count > 1 ? :FirstMultiMatcher : :FirstMatcher
+				end
+				if (ids = pkt[id_sym] || pkt[id_sym.to_s]) and !ids.is_a?(Regexp)
+					return match_by_id(ids, pkt, use_or).first
+				end
+				indcs = [plname] + extract_usable_indices(pkt)
+				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 or_find_first method") unless use_or
+						inject_key(i.last, v)
+					when NilClass
+						NilPattern
+					else
+						v.to_s
+					end
+					i << x
+					i
+				end
+				find_by_key(run_script(mtchr,indcs, pkt.flatten))
+			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 grab(ident)
+				case ident
+				when String, Symbol
+					return store.exists(self.hkey(ident.to_s)) ? self.new(ident.to_s) : nil
+				when Hash
+					return match(ident)
+				end
+				nil
+			end
+			
+			def or_grab(ident)
+				case ident
+				when Hash
+					return match(ident, true)
+				end
+				nil
+			end
+			
+			def find(ident)
+				grab(ident)
+			end
+			
+			def find_first(ident)
+				match_first(ident)
+			end
+			
+			def or_find(ident)
+				or_grab(ident)
+			end
+			
+			def or_find_first(ident)
+				match_first(ident)
+			end
+			
+		end
+		
+		def self.included(base)
+			base.extend(ClassMethods)
+		end
+		
+	end
+end
+

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.4.9"
+		VERSION = "1.5.0"
 	end
 end

data/spec/benchmark_spec.rb

@@ -22,7 +22,6 @@ module BenchmarkSpec
 		end
 		
 		def aggregate
-			sleep 0.1
 			42.7
 		end
 		benchmark :aggregate

data/spec/indices_spec.rb

@@ -15,8 +15,7 @@ module IndexSpec
 	
 	TestData = TestValues.inject({}){|acc,(k,v)| acc["a_#{k}".to_sym] = v; acc }
 	
-	# Delicious pizza!
-	class IndexedObject < RedisObject
+	class SortedObject < RedisObject
 		
 		TestValues.keys.each do |type|
 			send(type.to_sym,"a_#{type}".to_sym)
@@ -27,23 +26,60 @@ module IndexSpec
 		
 	end
 	
+	class IndexedObject < RedisObject
+		
+		index :some_text
+		
+	end
+	
 	describe Seabright::Indices do
+		
 		before do
 			RedisObject.store.flushdb
 		end
 		
-		it "indexes on integer field" do
+		it "sorts on integer field" do
 			
 			5.times do
-				obj = IndexedObject.create(a_number: Random.rand(100), a_bool: true)
+				obj = SortedObject.create(a_number: Random.rand(100), a_bool: true)
 			end
 			
-			IndexedObject.indexed(:a_number,3,true).count.should eq(3)
-			IndexedObject.indexed(:a_number,3,true) do |o|
-				o.should be_a(IndexedObject)
+			SortedObject.indexed(:a_number,3,true).count.should eq(3)
+			SortedObject.indexed(:a_number,3,true) do |o|
+				o.should be_a(SortedObject)
 			end
 			
 		end
 				
+		it "indexes on string field" do
+			
+			cnt = 0
+			5.times do
+				obj = IndexedObject.create(some_text: "a" + cnt.to_s)
+				cnt += 1
+			end
+			
+			IndexedObject.find_first(some_text: "a0").should be_a(IndexedObject)
+			IndexedObject.find_first(some_text: "a4").should be_a(IndexedObject)
+			IndexedObject.find_first(some_text: "a5").should eq(nil)
+			
+			IndexedObject.reindex_all_indices!
+			
+			IndexedObject.find_first(some_text: "a0").should be_a(IndexedObject)
+			IndexedObject.find_first(some_text: "a4").should be_a(IndexedObject)
+			IndexedObject.find_first(some_text: "a5").should eq(nil)
+			
+			RedisObject.reindex_everything!
+			
+			IndexedObject.find_first(some_text: "a0").should be_a(IndexedObject)
+			IndexedObject.find_first(some_text: "a4").should be_a(IndexedObject)
+			IndexedObject.find_first(some_text: "a5").should eq(nil)
+			
+			# IndexedObject.indexed(:a_number,3,true) do |o|
+			# 	o.should be_a(IndexedObject)
+			# end
+			
+		end
+				
 	end
 end

data/spec/spec_helper.rb

@@ -6,15 +6,9 @@ require 'test/unit'
 require 'rspec'
 
 require 'simplecov'
-require 'coveralls'
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
 SimpleCov.start do
 	add_filter "_spec.rb"
 	# add_filter "/experimental/"

data/spec/timestamp_spec.rb

@@ -13,7 +13,6 @@ module TriggerSpec
 			
 			(1..5).each do |n|
 				TimestampedObject.create(n.to_s)
-				sleep Random.rand(1.0)
 			end
 			
 			TimestampedObject.recently_created.first.id.should eq("5")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
@@ -116,6 +116,7 @@ files:
 - lib/redis_object/inheritance_tracking.rb
 - lib/redis_object/keys.rb
 - lib/redis_object/logger.rb
+- lib/redis_object/matchers.rb
 - lib/redis_object/storage.rb
 - lib/redis_object/storage/adapter.rb
 - lib/redis_object/storage/aws.rb
@@ -149,7 +150,7 @@ files:
 - spec/timestamp_spec.rb
 - spec/trigger_spec.rb
 - spec/types_spec.rb
-- spec/view_caching_spec.rb
+- spec/view_caching_spec_disabled.rb
 - spec/views_spec.rb
 homepage: ''
 licenses: []
@@ -192,6 +193,6 @@ test_files:
 - spec/timestamp_spec.rb
 - spec/trigger_spec.rb
 - spec/types_spec.rb
-- spec/view_caching_spec.rb
+- spec/view_caching_spec_disabled.rb
 - spec/views_spec.rb
 has_rdoc: