familia 0.6.8 → 0.6.9

data/CHANGES.txt

@@ -1,5 +1,12 @@
 FAMILIA, CHANGES
 
+#### 0.6.9 (2011-01-09) ###############################
+
+* ADDED: RedisObject#cache
+* ADDED: RedisObject#echo
+# ADDED: Familia.logger (new option: :logger)
+
+
 #### 0.6.8 (2011-01-08) ###############################
 
 * CHANGE: RedisObject#members calls compact to remove nils

data/VERSION.yml

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

data/familia.gemspec

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

data/lib/familia.rb

@@ -32,7 +32,7 @@ module Familia
   @dump_method = :to_json
   @load_method = :from_json
   class << self
-    attr_reader :clients, :uri
+    attr_reader :clients, :uri, :logger
     attr_accessor :debug, :secret, :delim, :dump_method, :load_method
     attr_writer :apiversion
     def debug?() @debug == true end
@@ -71,14 +71,27 @@ module Familia
       connect(uri) unless @clients[uri.serverid] 
       @clients[uri.serverid]
     end
+    def log(level, path)
+      logger = Log4r::Logger.new('familia')
+      logger.outputters = Log4r::FileOutputter.new 'familia', :filename => path
+      logger.level = Log4r.const_get(level)
+      logger
+    end
     def connect(uri=nil)
       uri &&= URI.parse uri if String === uri
       uri ||= Familia.uri
       conf = uri.conf
-      conf[:thread_safe] = true
-      client = Redis.new conf
-      Familia.trace :CONNECT, client, conf.inspect, caller[0..3] if Familia.debug
-      @clients[uri.serverid] = client
+      conf[:thread_safe] = true unless conf.has_key?(:thread_safe)
+      if conf.has_key?(:logging) && conf[:logging].to_s == "true"
+        require 'logger'
+        require 'log4r'
+        @logger ||= log :DEBUG, "./familia.log"
+        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
     def reconnect_all!
       Familia.classes.each do |klass|

data/lib/familia/redisobject.rb

@@ -48,6 +48,12 @@ module Familia
     
     attr_reader :name, :parent
     attr_writer :redis
+
+      # RedisObject instances are frozen. `cache` is a hash
+      # for you to store values retreived from Redis. This is
+      # not used anywhere by default, but you're encouraged
+      # to use it in your specific scenarios. 
+    attr_reader :cache
     
     # +name+: If parent is set, this will be used as the suffix 
     # for rediskey. Otherwise this becomes the value of the key.
@@ -92,9 +98,18 @@ module Familia
       @parent = @opts.delete(:parent)
       @ttl = @opts.delete(:ttl) 
       @redis ||= @opts.delete(:redis)
+      @cache = {}
       init if respond_to? :init
     end
     
+    def clear_cache
+      @cache.clear
+    end
+    
+    def echo meth, trace
+      redis.echo "[#{self.class}\##{meth}] #{trace} (#{@opts[:class]}\##{name})"
+    end
+    
     def redis
       return @redis if @redis
       parent? ? parent.redis : Familia.redis(db)
@@ -216,7 +231,7 @@ module Familia
         end
       end
       if ret.nil?
-        Familia.info "[#{self.class}\#to_redis] nil returned for #{@opts[:class]}\##{name}" 
+        Familia.ld "[#{self.class}\#to_redis] nil returned for #{@opts[:class]}\##{name}" 
       end
       ret
     end
@@ -248,7 +263,7 @@ module Familia
         end
       end
       if ret.nil?
-        Familia.info "[#{self.class}\#from_redis] nil returned for #{@opts[:class]}\##{name}" 
+        Familia.ld "[#{self.class}\#from_redis] nil returned for #{@opts[:class]}\##{name}" 
       end
       ret
     end 
@@ -267,6 +282,7 @@ module Familia
     end
     
     def push *values
+      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]
       self
@@ -315,7 +331,12 @@ module Familia
     alias_method :del, :delete
     
     def range sidx=0, eidx=-1
-      redis.lrange(rediskey, sidx, eidx).collect { |v| from_redis(v) }.compact
+      # TODO: Use mget here and everywhere like it.
+      #if @opts[:reference] == true
+      #  redis.lrange(rediskey, sidx, eidx)
+      #else
+        redis.lrange(rediskey, sidx, eidx).collect { |v| from_redis(v) }.compact
+      #end
     end
 
     def rangeraw sidx=0, eidx=-1
@@ -323,6 +344,7 @@ module Familia
     end
     
     def members count=-1
+      echo :members, caller[0] if Familia.debug
       count -= 1 if count > 0
       range 0, count
     end
@@ -428,6 +450,7 @@ module Familia
     end
     
     def members
+      echo :members, caller[0] if Familia.debug
       redis.smembers(rediskey).collect { |v| from_redis(v) }.compact
     end
     alias_method :all, :members
@@ -621,10 +644,12 @@ module Familia
     end
     
     def range sidx, eidx, opts={}
+      echo :range, caller[0] if Familia.debug
       rangeraw(sidx, eidx, opts).collect { |v| from_redis(v) }.compact
     end
 
     def revrange sidx, eidx, opts={}
+      echo :revrange, caller[0] if Familia.debug
       revrangeraw(sidx, eidx, opts).collect { |v| from_redis(v) }.compact
     end
 
@@ -640,10 +665,12 @@ module Familia
     
     # e.g. obj.metrics.rangebyscore (now-12.hours), now, :limit => [0, 10]
     def rangebyscore sscore, escore, opts={}
+      echo :rangebyscore, caller[0] if Familia.debug
       rangebyscoreraw(sscore, escore, opts).collect { |v| from_redis( v) }.compact
     end
     
     def rangebyscoreraw sscore, escore, opts={}
+      echo :rangebyscoreraw, caller[0] if Familia.debug
       opts[:with_scores] = true if opts[:withscores]
       redis.zrangebyscore(rediskey, sscore, escore, opts)
     end
@@ -797,6 +824,7 @@ module Familia
     end
     
     def value
+      echo :value, caller[0] if Familia.debug
       redis.setnx rediskey, @opts[:default] if @opts[:default]
       from_redis redis.get(rediskey)
     end

metadata

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