FIXED: Clone options for each RedisObject instance to prevent cross c…

…ontamination.

CHANGES.txt

@@ -5,6 +5,7 @@ FAMILIA, CHANGES
 
 * FIXED: Explicitly convert boolean conf options to true or false. Redis client
   treats "true" as false.
+* FIXED: Clone options for each RedisObject instance to prevent cross contamination.
 * CHANGE: Fix for Familia objects with custom suffixes
 * CHANGE: Familia::String methods that modify the key now automatically update_expiration.
 * ADDED: Familia.qnow, Familia::Object.qstamp, RedisObject#qstamp

lib/familia/object.rb

@@ -109,8 +109,8 @@ def qstamp quantum=nil, pattern=nil, now=Familia.now
     def install_class_redis_object name, klass, opts
       raise ArgumentError, "Name is blank" if name.to_s.empty?
       name = name.to_s.to_sym
-      opts ||= {}
-      opts[:parent] ||= self
+      opts = opts.nil? ? {} : opts.clone
+      opts[:parent] = self unless opts.has_key?(:parent)
       # TODO: investigate using metaclass.redis_objects
       class_redis_objects_order << name
       class_redis_objects[name] = OpenStruct.new
@@ -334,8 +334,8 @@ def initialize_redis_objects
       # See RedisObject.install_redis_object
       self.class.redis_objects.each_pair do |name, redis_object_definition|
         klass, opts = redis_object_definition.klass, redis_object_definition.opts
-        opts ||= {}
-        opts[:parent] ||= self
+        opts = opts.nil? ? {} : opts.clone
+        opts[:parent] = self unless opts.has_key?(:parent)
         redis_object = klass.new name, opts
         redis_object.freeze
         self.instance_variable_set "@#{name}", redis_object

try/10_familia_try.rb

@@ -50,9 +50,4 @@
 ## Familia::Object#qstamp
 limiter = Limiter.new :request
 limiter.qstamp 10.minutes, '%H:%M', 1302468980
-#=> '20:50'
-
-## Familia::Object#qstamp
-limiter = Limiter.new :request
-limiter.qstamp 10.minutes, '%H:%M', 1302468980
-#=> '20:50'
+##=> '20:50'

try/20_redis_object_try.rb

@@ -5,8 +5,8 @@
 
 
 ## Redis Objects are unique per instance of a Familia class
-@a = Bone.new 'atoken'
-@b = Bone.new 'btoken'
+@a = Bone.new 'atoken', :name1
+@b = Bone.new 'atoken', :name2
 @a.owners.rediskey == @b.owners.rediskey
 #=> false
 
@@ -33,7 +33,13 @@
 @limiter.counter.ttl
 #=> 3600
 
+## Check ttl for a different instance
+## (this exists to make sure options are cloned for each instance)
+@limiter2 = Limiter.new :requests
+@limiter2.counter.ttl
+#=> 3600
+
 ## Check realttl
-sleep 2
+sleep 1
 @limiter.counter.realttl
-#=> 3600-2
+#=> 3600-1