redis_object 1.3.0 → 1.3.1b

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWYwNDNkM2UyZWQxZTI0ZjA5MzhlNDlhNjhmMWQxNTY4NGJiYzhmNQ==
+    YTk4ZjkxYzdmYzFjNTk0MTkzZjk1MWVjMDk4M2MzZjY0Nzg4NzRmNw==
   data.tar.gz: !binary |-
-    ZDQ1ZGQ4MTVkYjI2NmExYWY5Yzk0ZGE4ZTQ0M2RkNzMxZGRjYTNkOA==
+    YTE4M2E2YjFhOGU4MDY0MDQ5N2UyNzgzYjNkZTViMWNkNWUwOTczMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODY4MGU5YmQwMDhjMTRjNzEzNmE0NjBhMjhlZDQwMTcyNDc1YTdiZDk0YzJh
-    ZDEyOGJiMGE3NWQwNmU5ZTZmYzU0NGU3ZmUxNTdhYjAzNzM1MjkyN2ZjODRi
-    MmMzM2VhMWY1NTQ5ODBkNzFmNTc2NDZmZjMxYTA0YmVhNGU4MGQ=
+    NmI4N2EwODRhMWYyMmFiNGY3NmIxMmFkNjcyOWY3YWYyYmNkYTc1NzViZTE5
+    ZGIxYjI3MjkxOTkzMDRiMTViMTIxNGE2MzJiYzBkZGNlZmJiZTUzNjZmYzVk
+    ZGU2MjRiODk0YTM2ZmExYjI2ODVhMzgwMzk1OTFjN2NmMmZkMzU=
   data.tar.gz: !binary |-
-    OTU5OTE4ODYyMDU1ZDE5Zjg0NGYxOGI1ZmE0NjUwMjU2ZDk3MWZkYjAxOGI3
-    Y2M3ZWEwZDcwODc2ODExMDY1MjQxMWQxOGQxZjZmNTZkZmE1ZTU2NDlhNDc3
-    MjI2MmQ1ZTQxZjFlOGZkOWZiOGZiNzY0NDUxOWU4NWUxODcwNmM=
+    MDAxM2I2MmViMWFiMTA0ZmY2M2U1ZDRhMmQ5NTc2NGFiMGMzODdiNTJjNmU0
+    NTI0YTZlMjQ5ZWM3MmM0MGU2YTMyOTg3NmIzODg2Y2U4ZjgzMGMyMTUwZmY0
+    NzU4ZjQ0MDdhNGZiMDFhZTUxYjc0Y2E3NDNhZjgxNDI3ZGUyMGM=

data/lib/redis_object.rb

@@ -1,6 +1,7 @@
 require 'active_support/inflector'
 require 'active_support/core_ext/date_time/conversions'
 require 'yajl'
+require 'set'
 
 require "redis_object/storage"
 

data/lib/redis_object/base.rb

@@ -93,7 +93,7 @@ module Seabright
 		end
 		
 		def mset(dat)
-			store.hmset(hkey, *(dat.inject([]){|acc,(k,v)| acc + [k,v] }))
+			store.hmset(hkey, *(dat.inject([]){|acc,(k,v)| acc << [k,v] }.flatten))
 			cached_hash_values.merge!(dat)
 			dat.each do |k,v|
 				define_setter_getter(k)
@@ -185,8 +185,8 @@ module Seabright
 			end
 		end
 		
-		def id_sym(cls=self.class.cname)
-			"#{cls.split('::').last.downcase}_id".to_sym
+		def id_sym(cls=nil)
+			self.class.id_sym(cls)
 		end
 		
 		# Not used yet...
@@ -236,7 +236,7 @@ module Seabright
 			end
 			
 			def cname
-				self.name
+				name
 			end
 			
 			def plname
@@ -244,8 +244,9 @@ module Seabright
 			end
 			
 			def all
+				kys = store.smembers(plname)
 				Enumerator.new do |y|
-					store.smembers(plname).each do |member|
+					kys.each do |member|
 						if a = find_by_key(hkey(member))
 							y << a
 						else
@@ -341,8 +342,9 @@ 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 })
 				Enumerator.new do |y|
-					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 }).each do |k|
+					kys.each do |k|
 						y << find(k)
 					end
 				end
@@ -416,8 +418,27 @@ module Seabright
 				true
 			end
 			
-			def id_sym(cls=cname)
-				"#{cls.split('::').last.downcase}_id".to_sym
+			def id_sym(cls=nil)
+				_old_id_sym(cls)
+			end
+			
+			def _new_id_sym(cls=self.name)
+				(cls || self.name).foreign_key.to_sym
+			end
+			
+			def convert_old_id_syms!
+				ol = _old_id_sym
+				nw = id_sym
+				each do |obj|
+					if obj.is_set?(ol)
+						obj.set(nw,get(ol))
+						obj.unset(ol)
+					end
+				end
+			end
+			
+			def _old_id_sym(cls=self.name)
+				"#{(cls || self.name).split('::').last.downcase}_id".to_sym
 			end
 			
 			def describe

data/lib/redis_object/indices.rb

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

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.3.0"
+		VERSION = "1.3.1b"
 	end
 end

data/spec/base_spec.rb

@@ -10,6 +10,11 @@ module ObjectTests
 	class Doodad < RedisObject
 		
 	end
+	class Collidor < RedisObject
+		def new_id
+			"totsunique"
+		end
+	end
 end
 
 describe RedisObject do
@@ -38,6 +43,13 @@ describe RedisObject do
 		obj.should_not be_nil
 	end
 	
+	it "should be found by complex matchers" do
+		obj = ObjectTests::User.find(user_id: "test")
+		obj.should_not be_nil
+		obj = ObjectTests::User.find(user_id: /test/)
+		obj.should_not be_nil
+	end
+	
 	it "can recollect objects" do
 		ObjectTests::User.recollect!
 	end
@@ -99,4 +111,9 @@ describe RedisObject do
 		end
 	end
 	
+	it "detects id collisions" do
+		ObjectTests::Collidor.create
+		ObjectTests::Collidor.create
+	end
+	
 end

data/spec/indices_spec.rb

@@ -23,6 +23,7 @@ module IndexSpec
 		end
 		
 		sort_by :a_number
+		sort_by :a_bool
 		
 	end
 	
@@ -34,7 +35,7 @@ module IndexSpec
 		it "indexes on integer field" do
 			
 			5.times do
-				obj = IndexedObject.create(a_number: Random.rand(100))
+				obj = IndexedObject.create(a_number: Random.rand(100), a_bool: true)
 			end
 			
 			IndexedObject.indexed(:a_number,3,true).count.should eq(3)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1b
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
@@ -163,9 +163,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: redis_object
 rubygems_version: 2.0.3