familia 0.6.9 → 0.6.10

data/CHANGES.txt

@@ -1,5 +1,15 @@
 FAMILIA, CHANGES
 
+#### 0.6.10 (2011-01-08) ###############################
+
+* FIXED: RedisObject#db does not set @db
+* CHANGE: RedisObject#to_redis returns the original String if the given value 
+is a String, even if :class is specified.
+* CHANGE: Update expiration when adding to List, Set, SortedSet, and HashKey
+* CHANGE: Only call Familia.ld when in debug mode.
+* ADDED: RedisObject#rename, renamenx, persist
+
+
 #### 0.6.9 (2011-01-09) ###############################
 
 * ADDED: RedisObject#cache

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :MAJOR: 0
 :MINOR: 6
-:PATCH: 9
+:PATCH: 10

data/familia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{familia}
-  s.version = "0.6.9"
+  s.version = "0.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-02-08}
   s.description = %q{Organize and store ruby objects in Redis}
   s.email = %q{delano@solutious.com}
   s.extra_rdoc_files = [

data/lib/familia.rb

@@ -28,7 +28,7 @@ module Familia
   @classes = []
   @suffix = :object.freeze
   @index = :id.freeze
-  @debug = false.freeze
+  @debug = false
   @dump_method = :to_json
   @load_method = :from_json
   class << self
@@ -89,7 +89,6 @@ module Familia
         conf[:logger] = Familia.logger
       end
       redis = Redis.new conf
-      p redis.client.logger
       Familia.trace :CONNECT, redis, conf.inspect, caller[0..3] if Familia.debug
       @clients[uri.serverid] = redis
     end

data/lib/familia/object.rb

@@ -226,7 +226,7 @@ module Familia
     def rawmultiget(*ids)
       ids.collect! { |objid| rediskey(objid) }
       return [] if ids.compact.empty?
-      Familia.trace :MULTIGET, self.redis, "#{ids.size}: #{ids}", caller
+      Familia.trace :MULTIGET, self.redis, "#{ids.size}: #{ids}", caller if Familia.debug?
       ids = self.redis.mget *ids
     end
     
@@ -257,7 +257,7 @@ module Familia
     def from_redis idx, suffix=:object
       return nil if idx.to_s.empty?
       objkey = rediskey idx, suffix
-      Familia.trace :FROMREDIS, Familia.redis(self.uri), objkey, caller.first
+      Familia.trace :FROMREDIS, Familia.redis(self.uri), objkey, caller.first if Familia.debug?
       me = from_key objkey
       me
     end
@@ -265,12 +265,12 @@ module Familia
       return false if idx.to_s.empty?
       objkey = rediskey idx, suffix
       ret = Familia.redis(self.uri).exists objkey
-      Familia.trace :EXISTS, Familia.redis(self.uri), "#{rediskey(idx, suffix)} #{ret}", caller.first
+      Familia.trace :EXISTS, Familia.redis(self.uri), "#{rediskey(idx, suffix)} #{ret}", caller.first if Familia.debug?
       ret
     end
     def destroy! idx, suffix=:object
       ret = Familia.redis(self.uri).del rediskey(idx, suffix)
-      Familia.trace :DELETED, Familia.redis(self.uri), "#{rediskey(idx, suffix)}: #{ret}", caller.first
+      Familia.trace :DELETED, Familia.redis(self.uri), "#{rediskey(idx, suffix)}: #{ret}", caller.first if Familia.debug?
       ret
     end
     def find suffix='*'
@@ -287,7 +287,7 @@ module Familia
     end
     def expand(short_idx, suffix=self.suffix)
       expand_key = Familia.rediskey(self.prefix, "#{short_idx}*", suffix)
-      Familia.trace :EXPAND, Familia.redis(self.uri), expand_key, caller.first
+      Familia.trace :EXPAND, Familia.redis(self.uri), expand_key, caller.first if Familia.debug?
       list = Familia.redis(self.uri).keys expand_key
       case list.size
       when 0
@@ -360,7 +360,7 @@ module Familia
     
     def allkeys
       # TODO: Use redis_objects instead
-      keynames = [rediskey]
+      keynames = []
       self.class.suffixes.each do |sfx| 
         keynames << rediskey(sfx)
       end
@@ -381,7 +381,7 @@ module Familia
       self.class.rediskey self.index, suffix
     end
     def save
-      #Familia.trace :SAVE, Familia.redis(self.class.uri), redisuri, caller.first
+      #Familia.trace :SAVE, Familia.redis(self.class.uri), redisuri, caller.first if Familia.debug?
       preprocess if respond_to?(:preprocess)
       self.update_time if self.respond_to?(:update_time)
       # TODO: Check here (run checkup)
@@ -396,7 +396,7 @@ module Familia
     def destroy!
       ret = self.object.delete
       if Familia.debug?
-        Familia.trace :DELETED, Familia.redis(self.class.uri), "#{rediskey}: #{ret}", caller.first
+        Familia.trace :DELETED, Familia.redis(self.class.uri), "#{rediskey}: #{ret}", caller.first if Familia.debug?
       end
       self.class.instances.rem self if ret > 0
       ret

data/lib/familia/redisobject.rb

@@ -96,7 +96,7 @@ module Familia
       self.extend @opts[:extend] if Module === @opts[:extend]
       @db = @opts.delete(:db)
       @parent = @opts.delete(:parent)
-      @ttl = @opts.delete(:ttl) 
+      @ttl ||= @opts.delete(:ttl) 
       @redis ||= @opts.delete(:redis)
       @cache = {}
       init if respond_to? :init
@@ -124,17 +124,16 @@ module Familia
     # After this is called once, this method will always return the 
     # same value.
     def db 
-      return @db if @db
       # Note it's important that we select this value at the last
       # possible moment rather than in initialize b/c the value 
       # could be modified after that but before this is called. 
       if @opts[:class] && @opts[:class].ancestors.member?(Familia)
-        @db = @opts[:class].db 
+        @opts[:class].db 
+      elsif parent?
+        parent.db
       else
-        @db = parent? ? parent.db : self.class.db
+        self.class.db || @db || 0
       end
-      @db ||= 0
-      @db
     end
     
     def ttl
@@ -169,7 +168,13 @@ module Familia
       redis.move rediskey, db
     end
         
-    # TODO: rename, renamenx
+    def rename newkey
+      redis.rename rediskey, newkey
+    end
+
+    def renamenx newkey
+      redis.renamenx rediskey, newkey
+    end
     
     def type 
       redis.type rediskey
@@ -202,6 +207,10 @@ module Familia
       redis.expireat rediskey, unixtime
     end
     
+    def persist
+      redis.persist rediskey
+    end
+    
     def dump_method
       @opts[:dump_method] || Familia.dump_method
     end
@@ -213,10 +222,13 @@ module Familia
     def to_redis v
       return v unless @opts[:class]
       ret = case @opts[:class]
-      when String, Fixnum, Float, Gibbler::Digest
+      when ::String, ::Fixnum, ::Float, Gibbler::Digest
         v
       else
-        if @opts[:reference] == true
+        if ::String === v
+          v
+          
+        elsif @opts[:reference] == true
           unless v.respond_to? :index
             raise Familia::Problem, "#{v.class} does not have an index method"
           end
@@ -224,8 +236,10 @@ module Familia
             raise Familia::Problem, "#{v.class} is not Familia (#{name})"
           end
           v.index
+
         elsif v.respond_to? dump_method
           v.send dump_method
+          
         else
           raise Familia::Problem, "No such method: #{v.class}.#{dump_method}"
         end
@@ -285,6 +299,7 @@ module Familia
       echo :push, caller[0] if Familia.debug
       values.flatten.compact.each { |v| redis.rpush rediskey, to_redis(v) }
       redis.ltrim rediskey, -@opts[:maxlength], -1 if @opts[:maxlength]
+      update_expiration
       self
     end
     
@@ -297,6 +312,7 @@ module Familia
       values.flatten.compact.each { |v| redis.lpush rediskey, to_redis(v) }
       # TODO: test maxlength
       redis.ltrim rediskey, 0, @opts[:maxlength] - 1 if @opts[:maxlength]
+      update_expiration
       self
     end
     
@@ -442,6 +458,7 @@ module Familia
     
     def add *values
       values.flatten.compact.each { |v| redis.sadd rediskey, to_redis(v) }
+      update_expiration
       self
     end
     
@@ -563,7 +580,9 @@ module Familia
     
     # NOTE: The argument order is the reverse of #[]=
     def add score, v
-      redis.zadd rediskey, score, to_redis(v)
+      ret = redis.zadd rediskey, score, to_redis(v)
+      update_expiration
+      ret
     end
     
     def score v
@@ -731,7 +750,9 @@ module Familia
     end
     
     def []= n, v
-      redis.hset rediskey, n, to_redis(v)
+      ret = redis.hset rediskey, n, to_redis(v)
+      update_expiration
+      ret
     end
     alias_method :put, :[]=
     alias_method :store, :[]=
@@ -796,7 +817,9 @@ module Familia
     def update h={}
       raise ArgumentError, "Argument to bulk_set must be a hash" unless Hash === h
       data = h.inject([]){ |ret,pair| ret << [pair[0], to_redis(pair[1])] }.flatten
-      redis.hmset(rediskey, *data)
+      ret = redis.hmset(rediskey, *data)
+      update_expiration
+      ret
     end
     alias_method :merge!, :update
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: familia
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 6
-  - 9
-  version: 0.6.9
+  - 10
+  version: 0.6.10
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -05:00
+date: 2011-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency