redis_object 1.4.6 → 1.4.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjUwNzhkOGUyMjk3Njc5MTA4OGI2MmJmYmM2YjZiNmUwNGYyNTAwYQ==
+    ZjZmYjVhYmM1NDZmZTY1MTgyZWE3NDE3ZmYxZTFkOTAyNjM1OGJkYg==
   data.tar.gz: !binary |-
-    OWQzMGVkOTRiNmIxMzMyNGVmYTEwYTcyNTNiYzNkZjE4ZTYyZWU4NA==
-!binary "U0hBNTEy":
+    YmViNzk2OTIyMTFjNWJhM2Q5MDc5MzZmOTNjMWYxNWNlYmVkMDlhYw==
+SHA512:
   metadata.gz: !binary |-
-    ZmY1OTNkNjc0YTZkYzVlNTdhNGU3YTE2ZmE0MTIwOTVlMjdjNWYxMjQ4YTZh
-    NTc3ZmVkNmRjMDkwYTgyYTI5NTFkNGY4YTNlYmVlZjAyYzg5ZjdkNmRiZWY5
-    ZWIxMmI2ODgwZTRkOTMwNWQxY2M4NGRiYTJlYWFmZjlhODEzZTU=
+    NmI0NTBiOWEyMjliMzIyMTUxOTM0NDFmOWRkMmIwOTRlYWE2ZTEzYWFhNmRh
+    NzA5MmQ2NTcwYjc2YWE2MzhiMDM5MTlkYjQyNTU1ZGRlMzA3MDk5NGVkYTY5
+    Nzg0YTQ4NTZiZGExOTU1NjNkYTIwZDFlMWVlNDc5Y2FjOTQwNzk=
   data.tar.gz: !binary |-
-    NGViMjUzNWIxZjYxZWUzYjU3NGY0MzEwNjkyMmRmNWU5NWI3ZGUwZWFjY2Mw
-    YWEyZjAzZGU3MjExNGY2ZDBjNDUxZDY2ZmYxYWY4MmVhNTFjYjA5NjMxMzgy
-    OTQ2ZGUwODZhNDYxNDliMzM3MmI5ZDhhYjY0ZDk2N2JmNWJiZmY=
+    YjkwMDRmN2E2OTcwMjQ0NmM4ZjlmM2RlNmMxM2NiNTczMzRmMjA4ZjE4YzYy
+    ODNkYWEzZDQ1NWY1MjFkZTFiMmI0OTM1MDcxYzVkYjYyNjdkNDQ0YWUxMjNm
+    M2E5OTAwOTUyYmZjOTg0YzZkYWU0MjA0NjQ4ZDJjNGM1OWVjN2U=

data/.travis.yml

@@ -3,4 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
 env:
-  - "TEST_DB=14"
+  - "TEST_DB=14"
+addons:
+  code_climate:
+    repo_token: "8b629930bc603ff8abbbe21d72914c991d265959abdd284a638e9d8366e9ade5"

data/Gemfile

@@ -5,6 +5,7 @@ group :test do
 	gem 'rspec'
 	gem 'coveralls', require: false
 	gem 'fuubar'
+	gem "codeclimate-test-reporter", require: nil
 end
 
 group :development, :test do

data/lib/redis_object/base.rb

@@ -369,26 +369,109 @@ module Seabright
 					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)
-				mtchr = pkt.keys.count > 1 ? :MultiMatcher : :Matcher
-				pkt = pkt.flatten.map do |i|
-					case i
+			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(i)
+						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
-						i.to_s
+						v.to_s
 					end
+					i << x
+					i
 				end
-				kys = run_script(mtchr,[plname],pkt)
+				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("\\","")}"
@@ -403,10 +486,22 @@ module Seabright
 				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))

data/lib/redis_object/version.rb

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

data/spec/base_spec.rb

@@ -57,6 +57,50 @@ describe RedisObject do
 		obj = ObjectTests::User.find(user_id: /Test/, blah: nil)
 		obj.first.should be_nil
 	end
+
+	it "should be found by or matchers" do
+		obj = ObjectTests::User.new("sico")
+		obj.save
+		obj.foo = "bar!"
+		obj2 = ObjectTests::User.new("notsico")
+		obj2.save
+		obj2.stuff = "woo!"
+		res = ObjectTests::User.or_find(stuff: "woo!", foo: "bar!")
+		res.count.should eq(2)
+	end
+
+	it "should be found by complex or matchers" do
+		obj = ObjectTests::User.new("sico")
+		obj.save
+		obj.foo = "bar!"
+		obj2 = ObjectTests::User.new("notsico")
+		obj2.save
+		obj2.stuff = "woo!"
+		res = ObjectTests::User.or_find(stuff: /Woo!/i, foo: "bar!")
+		res.count.should eq(2)
+		res = ObjectTests::User.or_find(stuff: /Woo!/i, foo: /bar!/i)
+		res.count.should eq(2)
+		res = ObjectTests::User.or_find(stuff: /Woo(.*)/i, foo: /bar!/i)
+		res.count.should eq(2)
+		res = ObjectTests::User.or_find(stuff: /woo!/i, foo: /Bar!/)
+		res.count.should eq(1)
+	end
+
+	it "should be found by or-matcher using same key" do
+		obj = ObjectTests::User.new("sico")
+		obj.save
+		obj.foo = "bar!"
+		obj2 = ObjectTests::User.new("notsico")
+		obj2.save
+		obj2.foo = "woo!"
+		res = ObjectTests::User.or_find(foo: ["woo!","bar!"])
+		res.count.should eq(2)
+	end
+
+	it "should raise an ArguemntError when passing array to find" do
+		expect { ObjectTests::User.find(user_id: ["test","sico"]) }.to raise_error(ArgumentError)
+		expect { ObjectTests::User.or_find(user_id: ["test","sico"]) }.not_to raise_error
+	end
 	
 	it "should be found by nil matchers" do
 		obj = ObjectTests::User.find(blah: nil)

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ require 'rspec'
 require 'simplecov'
 require 'coveralls'
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: redis_object
-rubygems_version: 2.0.3
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Maps arbitrary objects to a Redis store with indices and smart retrieval