redis_object 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c6d1f461aa94f27fe6c79750dc3e1b1fcb8120
-  data.tar.gz: b6739ea7fde6bff76edbed5377882cfe196c46ff
+  metadata.gz: b9e5ca5eeb648940280fd12e10eadde8060bf9bd
+  data.tar.gz: aa70d17724344acd63d808113f31449fe0da257b
 SHA512:
-  metadata.gz: b4cada8b2e40e5391667c19ae39ce4f7e1131a0e59951bb6d0c665212b78781493d878cb034c60ced5751da3c4d6e7b5bce0c4b86bf7e73dc11f425e9208ba1c
-  data.tar.gz: 995c5f452bc853e98e59f5791b345830d0af7b38d8a09266a83ee9234b12afe53d739744a5c307358232277b523e1a31c6c89151bedbf98f1221b2e56eacb716
+  metadata.gz: e24ee1ccdaa8cc5171a0d58ba3ebebad051cf361dbd719f954837427d1b9d5d69a5c7cfcc9b23103c25fe5aa57a2779035a1b2e6d78d5f956e9ce42351a2d7ce
+  data.tar.gz: 57b3a7698aa66d95faa01f88e83dd65d75a5160b8c722160215de280ddc8ca44cf0e839afb20e2f6249ad77be48f2384cac3d7b8fa56d6da57816cfa13e92635

data/lib/redis_object/base.rb

@@ -2,7 +2,7 @@ module Seabright
 	module ObjectBase
 		
 		def initialize(ident={})
-			if ident && (ident.class == String || (ident.class == Symbol && (ident = ident.to_s)))# && ident.gsub!(/.*:/,'') && ident.length > 0
+			if ident && (ident.class == String || (ident.class == Symbol && (ident = ident.to_s)))
 				load(ident.dup)
 			elsif ident && ident.class == Hash
 				ident[id_sym] ||= generate_id
@@ -25,23 +25,22 @@ module Seabright
 			self.class.reserve(k)
 		end
 		
-		# oved this to the dumper module in experimental - remove when it gets to base
-		# def to_json
-		# 	Yajl::Encoder.encode(actual)
-		# end
-		
 		def id
 			@id || get(id_sym) || set(id_sym, generate_id)
 		end
 		
 		def load(o_id)
-			@id = o_id
+			@id = clean_id(o_id)
 			true
 		end
 		
+		def clean_id(i)
+			self.class.clean_id(i)
+		end
+		
 		def save
 			set(:class, self.class.name)
-			set(id_sym,id.gsub(/.*:/,''))
+			set(id_sym,clean_id(id))
 			set(:key, key)
 			store.sadd(self.class.plname, key)
 			store.del(reserve_key)
@@ -217,6 +216,10 @@ module Seabright
 		
 		module ClassMethods
 			
+			def clean_id(i)
+				i.to_s.gsub(/.*:/,'').gsub(/_h$/,'')
+			end
+			
 			def generate_id
 				v = new_id
 				while exists?(v) do
@@ -260,7 +263,7 @@ module Seabright
 			
 			def recollect!
 				store.keys("#{name}:*_h").each do |ky|
-					store.sadd(plname,ky.gsub(/_h$/,''))
+					store.sadd(plname, clean_id(ky))
 				end
 			end
 			

data/lib/redis_object/keys.rb

@@ -2,7 +2,7 @@ module Seabright
 	module Keys
 		
 		def key(ident = id)
-			"#{self.class.cname}:#{ident.gsub(/^.*:/,'').gsub(/_h$/,'')}"
+			"#{self.class.cname}:#{clean_id(ident)}"
 		end
 		
 		def reserve_key(ident = id)
@@ -20,7 +20,7 @@ module Seabright
 		module ClassMethods
 			
 			def key(ident=nil)
-				"#{cname}#{ident ? ":#{ident.gsub(/^.*:/,'').gsub(/_h$/,'')}" : ""}"
+				"#{cname}#{ident ? ":#{clean_id(ident)}" : ""}"
 			end
 			
 			def reserve_key(ident=nil)

data/lib/redis_object/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - John Bragg