familia 0.6.10 → 0.7.0

data/CHANGES.txt

@@ -1,5 +1,12 @@
 FAMILIA, CHANGES
 
+#### 0.7.0 (2011-03-04) ###############################
+
+* CHANGE: Use RedisObject#multi_from_redis when possible (uses mget command)
+* CHANGE: No need to check if a key exists before getting it. It will be nil anyway.
+* ADDED: Set#randomraw
+
+
 #### 0.6.10 (2011-01-08) ###############################
 
 * FIXED: RedisObject#db does not set @db

data/VERSION.yml

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

data/familia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{familia}
-  s.version = "0.6.10"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-03-04}
   s.description = %q{Organize and store ruby objects in Redis}
   s.email = %q{delano@solutious.com}
   s.extra_rdoc_files = [
@@ -44,11 +44,10 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{familia}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Organize and store ruby objects in Redis}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/familia.rb

@@ -47,8 +47,12 @@ module Familia
     end
     def trace label, redis_client, ident, context=nil
       return unless Familia.debug?
-      info "%s (%d:%s): %s" % [label, Thread.current.object_id, redis_client.object_id, ident] 
-      info "  +-> %s" % [context].flatten[0..3].join("\n      ") if context
+      info "[%s] %s/%s" % [label, redis_client.uri, ident] 
+      if context
+        context = [context].flatten
+        context.reject! { |line| line =~ /lib\/familia/ }
+        info "   %s" % context[0..6].join("\n   ") 
+      end
     end
     def uri= v
       v = URI.parse v unless URI === v

data/lib/familia/object.rb

@@ -249,15 +249,15 @@ module Familia
       obj
     end
     def from_key objkey
-      raise ArgumentError, "Null key" if objkey.to_s.empty?    
-      Familia.trace :LOAD, redis, "#{self.uri}/#{objkey}", caller if Familia.debug?
+      raise ArgumentError, "Empty key" if objkey.to_s.empty?    
+      Familia.trace :LOAD, Familia.redis(self.uri), objkey, caller if Familia.debug?
       obj = Familia::String.new objkey, :class => self
-      obj.exists? ? obj.value : nil
+      obj.value
     end
     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 if Familia.debug?
+      #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 if Familia.debug?
+      Familia.trace :EXISTS, Familia.redis(self.uri), "#{rediskey(idx, suffix)} #{ret}", caller 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 if Familia.debug?
+      Familia.trace :DELETED, Familia.redis(self.uri), "#{rediskey(idx, suffix)}: #{ret}", caller if Familia.debug?
       ret
     end
     def find suffix='*'

data/lib/familia/redisobject.rb

@@ -107,7 +107,7 @@ module Familia
     end
     
     def echo meth, trace
-      redis.echo "[#{self.class}\##{meth}] #{trace} (#{@opts[:class]}\##{name})"
+      redis.echo "[#{self.class}\##{meth}] #{trace} (#{@opts[:class]}\#)"
     end
     
     def redis
@@ -222,7 +222,7 @@ module Familia
     def to_redis v
       return v unless @opts[:class]
       ret = case @opts[:class]
-      when ::String, ::Fixnum, ::Float, Gibbler::Digest
+      when ::Symbol, ::String, ::Fixnum, ::Float, Gibbler::Digest
         v
       else
         if ::String === v
@@ -250,37 +250,54 @@ module Familia
       ret
     end
     
-    def from_redis v
-      return @opts[:default] if v.nil?
-      return v unless @opts[:class]
+    def multi_from_redis *values
+      Familia.ld "multi_from_redis: (#{@opts}) #{values}"
+      return [] if values.empty?
+      return values.flatten unless @opts[:class]
       ret = case @opts[:class]
-      when String
+      when ::String
         v.to_s
-      when Fixnum, Float
+      when ::Symbol
+        v.to_s.to_sym
+      when ::Fixnum, ::Float
         @opts[:class].induced_from v
       else
-        begin
-          if @opts[:reference] == true
-            @opts[:class].from_redis v
-          else
-            if @opts[:class].respond_to? load_method
-              @opts[:class].send load_method, v
-            else
-              raise Familia::Problem, "No such method: #{@opts[:class]}##{load_method}"
+        objs = values
+        
+        if @opts[:reference] == true
+          objs = @opts[:class].rawmultiget *values
+        end
+        objs.compact!
+        if @opts[:class].respond_to? load_method
+          objs.collect! { |obj| 
+            begin
+              v = @opts[:class].send load_method, obj
+              if v.nil?
+                Familia.ld "[#{self.class}\#multi_from_redis] nil returned for #{@opts[:class]}\##{name}" 
+              end
+              v
+            rescue => ex
+              Familia.info v
+              Familia.info "Parse error for #{rediskey} (#{load_method}): #{ex.message}"
+              Familia.info ex.backtrace
+              nil
             end
-          end
-        rescue => ex
-          Familia.info v
-          Familia.info "Parse error for #{rediskey} (#{load_method}): #{ex.message}"
-          Familia.info ex.backtrace
-          nil
+          }
+        else
+          raise Familia::Problem, "No such method: #{@opts[:class]}##{load_method}"
         end
-      end
-      if ret.nil?
-        Familia.ld "[#{self.class}\#from_redis] nil returned for #{@opts[:class]}\##{name}" 
+        objs.compact # don't use compact! b/c the return value appears in ret
       end
       ret
+    end
+    
+    def from_redis v
+      return @opts[:default] if v.nil?
+      return v unless @opts[:class]
+      ret = multi_from_redis v
+      ret.first unless ret.nil? # return the object or nil
     end 
+    
   end
   
   
@@ -347,14 +364,10 @@ module Familia
     alias_method :del, :delete
     
     def range sidx=0, eidx=-1
-      # 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
+      el = rangeraw sidx, eidx
+      multi_from_redis *el
     end
-
+    
     def rangeraw sidx=0, eidx=-1
       redis.lrange(rediskey, sidx, eidx)
     end
@@ -468,7 +481,8 @@ module Familia
     
     def members
       echo :members, caller[0] if Familia.debug
-      redis.smembers(rediskey).collect { |v| from_redis(v) }.compact
+      el = membersraw
+      multi_from_redis *el
     end
     alias_method :all, :members
     alias_method :to_a, :members
@@ -534,7 +548,11 @@ module Familia
     end
     
     def random
-      from_redis redis.srandmember(rediskey)
+      from_redis randomraw
+    end
+
+    def randomraw
+      redis.srandmember(rediskey)
     end
     
     ## Make the value stored at KEY identical to the given list
@@ -610,7 +628,8 @@ module Familia
     
     def members count=-1, opts={}
       count -= 1 if count > 0
-      range 0, count, opts
+      el = membersraw count, opts
+      multi_from_redis *el
     end
     alias_method :to_a, :members
     alias_method :all, :members
@@ -622,7 +641,8 @@ module Familia
     
     def revmembers count=-1, opts={}
       count -= 1 if count > 0
-      revrange 0, count, opts
+      el = revmembersraw count, opts
+      multi_from_redis *el
     end
 
     def revmembersraw count=-1, opts={}
@@ -664,19 +684,21 @@ module Familia
     
     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
+      el = rangeraw(sidx, eidx, opts)
+      multi_from_redis *el
     end
-
+    
     def rangeraw sidx, eidx, opts={}
       opts[:with_scores] = true if opts[:withscores]
       redis.zrange(rediskey, sidx, eidx, opts)
     end
-
+    
+    def revrange sidx, eidx, opts={}
+      echo :revrange, caller[0] if Familia.debug
+      el = revrangeraw(sidx, eidx, opts)
+      multi_from_redis *el
+    end
+    
     def revrangeraw sidx, eidx, opts={}
       opts[:with_scores] = true if opts[:withscores]
       redis.zrevrange(rediskey, sidx, eidx, opts)
@@ -685,7 +707,8 @@ 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
+      el = rangebyscoreraw(sscore, escore, opts)
+      multi_from_redis *el
     end
     
     def rangebyscoreraw sscore, escore, opts={}
@@ -777,9 +800,8 @@ module Familia
     end
     
     def values
-      redis.hvals(rediskey).collect do |v|
-        from_redis v
-      end
+      el = redis.hvals(rediskey)
+      multi_from_redis *el
     end
     
     def all
@@ -824,9 +846,8 @@ module Familia
     alias_method :merge!, :update
     
     def values_at *names
-      redis.hmget(rediskey, *names.flatten.compact).collect do |v|
-        from_redis v
-      end
+      el = redis.hmget(rediskey, *names.flatten.compact)
+      multi_from_redis *el
     end
     
     Familia::RedisObject.register self, :hash
@@ -847,7 +868,7 @@ module Familia
     end
     
     def value
-      echo :value, caller[0] if Familia.debug
+      echo :value, caller[0..5] if Familia.debug
       redis.setnx rediskey, @opts[:default] if @opts[:default]
       from_redis redis.get(rediskey)
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: familia
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 10
-  version: 0.6.10
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -05:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
         version: 0.4.2
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
         version: 0.8.6
   type: :runtime
   version_requirements: *id003
@@ -74,11 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
         version: 0.8.6
   type: :runtime
   version_requirements: *id004
@@ -128,23 +103,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: familia
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Organize and store ruby objects in Redis