redistat 0.3.0 → 0.4.0

data/lib/redistat/buffer.rb

@@ -3,33 +3,33 @@ require 'redistat/core_ext/hash'
 module Redistat
   class Buffer
     include Synchronize
-    
+
     def self.instance
       @instance ||= self.new
     end
-    
+
     def size
       synchronize do
         @size ||= 0
       end
     end
-    
+
     def size=(value)
       synchronize do
         @size = value
       end
     end
-    
+
     def count
       @count ||= 0
     end
-    
+
     def store(key, stats, depth_limit, opts)
       return false unless should_buffer?
-      
+
       to_flush = {}
       buffkey = buffer_key(key, opts)
-      
+
       synchronize do
         if !queue.has_key?(buffkey)
           queue[buffkey] = { :key         => key,
@@ -37,19 +37,19 @@ module Redistat
                              :depth_limit => depth_limit,
                              :opts        => opts }
         end
-        
+
         queue[buffkey][:stats].merge_and_incr!(stats)
         incr_count
-        
+
         # return items to be flushed if buffer size limit has been reached
         to_flush = reset_queue
       end
-      
+
       # flush any data that's been cleared from the queue
       flush_data(to_flush)
       true
     end
-    
+
     def flush(force = false)
       to_flush = {}
       synchronize do
@@ -57,28 +57,28 @@ module Redistat
       end
       flush_data(to_flush)
     end
-    
+
     private
-    
+
     # should always be called from within a synchronize block
     def incr_count
       @count ||= 0
       @count += 1
     end
-    
+
     def queue
       @queue ||= {}
     end
-    
+
     def should_buffer?
       size > 1 # buffer size of 1 would be equal to not using buffer
     end
-    
+
     # should always be called from within a synchronize block
     def should_flush?
       (!queue.blank? && count >= size)
     end
-    
+
     # returns items to be flushed if buffer size limit has been reached
     # should always be called from within a synchronize block
     def reset_queue(force = false)
@@ -88,20 +88,23 @@ module Redistat
       @count = 0
       data
     end
-    
+
     def flush_data(buffer_data)
       buffer_data.each do |k, item|
         Summary.update(item[:key], item[:stats], item[:depth_limit], item[:opts])
       end
     end
-    
+
+    # depth_limit is not needed as it's evident in key.to_s
     def buffer_key(key, opts)
-      # depth_limit is not needed as it's evident in key.to_s
-      opts_index = Summary.default_options.keys.sort { |a,b| a.to_s <=> b.to_s }.map do |k|
-        opts[k] if opts.has_key?(k)
+      # covert keys to strings, as sorting a Hash with Symbol keys fails on
+      # Ruby 1.8.x.
+      opts = opts.inject({}) do |result, (k, v)|
+        result[k.to_s] = v
+        result
       end
-      "#{key.to_s}:#{opts_index.join(':')}"
+      "#{key.to_s}:#{opts.sort.flatten.join(':')}"
     end
-    
+
   end
 end

data/lib/redistat/collection.rb

@@ -1,20 +1,20 @@
 module Redistat
   class Collection < ::Array
-    
+
     attr_accessor :from
     attr_accessor :till
     attr_accessor :depth
     attr_accessor :total
-    
+
     def initialize(options = {})
       @from = options[:from] ||= nil
       @till = options[:till] ||= nil
       @depth = options[:depth] ||= nil
     end
-    
+
     def total
       @total ||= {}
     end
-    
+
   end
-end
+end

data/lib/redistat/connection.rb

@@ -2,22 +2,23 @@ require 'monitor'
 
 module Redistat
   module Connection
-    
+
     REQUIRED_SERVER_VERSION = "1.3.10"
-    
+    MIN_EXPIRE_SERVER_VERSION = "2.1.3"
+
     # TODO: Create a ConnectionPool instance object using Sychronize mixin to replace Connection class
-    
+
     class << self
-      
+
       # TODO: clean/remove all ref-less connections
-      
+
       def get(ref = nil)
         ref ||= :default
         synchronize do
           connections[references[ref]] || create
         end
       end
-      
+
       def add(conn, ref = nil)
         ref ||= :default
         synchronize do
@@ -26,7 +27,7 @@ module Redistat
           connections[conn.client.id] = conn
         end
       end
-      
+
       def create(options = {})
         synchronize do
           options = options.clone
@@ -37,39 +38,43 @@ module Redistat
           conn
         end
       end
-      
+
       def connections
         @connections ||= {}
       end
-      
+
       def references
         @references ||= {}
       end
-      
+
       private
-      
+
       def monitor
         @monitor ||= Monitor.new
       end
-      
+
       def synchronize(&block)
         monitor.synchronize(&block)
       end
-      
+
       def connection(options)
         check_redis_version(Redis.new(options))
       end
-      
+
       def connection_id(options = {})
         options = options.reverse_merge(default_options)
         "redis://#{options[:host]}:#{options[:port]}/#{options[:db]}"
       end
-      
+
       def check_redis_version(conn)
         raise RedisServerIsTooOld if conn.info["redis_version"] < REQUIRED_SERVER_VERSION
+        if conn.info["redis_version"] < MIN_EXPIRE_SERVER_VERSION
+          STDOUT.puts "WARNING: You MUST upgrade Redis to v2.1.3 or later " +
+            "if you are using key expiry."
+        end
         conn
       end
-      
+
       def default_options
         {
           :host => '127.0.0.1',
@@ -78,7 +83,7 @@ module Redistat
           :timeout => 5
         }
       end
-      
+
     end
   end
-end
+end

data/lib/redistat/core_ext.rb

@@ -2,4 +2,4 @@ require 'redistat/core_ext/bignum'
 require 'redistat/core_ext/date'
 require 'redistat/core_ext/fixnum'
 require 'redistat/core_ext/hash'
-require 'redistat/core_ext/time'
+require 'redistat/core_ext/time'

data/lib/redistat/core_ext/bignum.rb

@@ -1,8 +1,8 @@
 class Bignum
   include Redistat::DateHelper
-  
+
   def to_time
     Time.at(self)
   end
-  
+
 end

data/lib/redistat/core_ext/date.rb

@@ -1,8 +1,8 @@
 class Date
   include Redistat::DateHelper
-  
+
   def to_time
     Time.parse(self.to_s)
   end
-  
+
 end

data/lib/redistat/core_ext/fixnum.rb

@@ -1,8 +1,8 @@
 class Fixnum
   include Redistat::DateHelper
-  
+
   def to_time
     Time.at(self)
   end
-  
+
 end

data/lib/redistat/core_ext/hash.rb

@@ -1,9 +1,9 @@
 class Hash
-  
+
   def merge_and_incr(hash)
     self.clone.merge_and_incr!(hash)
   end
-  
+
   def merge_and_incr!(hash)
     raise ArgumentError unless hash.is_a?(Hash)
     hash.each do |key, value|
@@ -11,7 +11,7 @@ class Hash
     end
     self
   end
-  
+
   def set_or_incr(key, value)
     return false unless value.is_a?(Numeric)
     self[key] = 0 unless self.has_key?(key)
@@ -19,5 +19,5 @@ class Hash
     self[key] += value
     true
   end
-  
+
 end

data/lib/redistat/date.rb

@@ -1,6 +1,6 @@
 module Redistat
   class Date
-    
+
     attr_accessor :year
     attr_accessor :month
     attr_accessor :day
@@ -9,9 +9,9 @@ module Redistat
     attr_accessor :sec
     attr_accessor :usec
     attr_accessor :depth
-    
+
     DEPTHS = [:year, :month, :day, :hour, :min, :sec, :usec]
-    
+
     def initialize(input, depth = nil)
       @depth = depth
       if input.is_a?(::Time)
@@ -26,12 +26,12 @@ module Redistat
         from_integer(input)
       end
     end
-    
+
     def to_t
       ::Time.local(@year, @month, @day, @hour, @min, @sec, @usec)
     end
     alias :to_time :to_t
-    
+
     def to_d
       ::Date.civil(@year, @month, @day)
     end
@@ -41,7 +41,7 @@ module Redistat
       to_time.to_i
     end
     alias :to_integer :to_i
-    
+
     def to_s(depth = nil)
       depth ||= @depth ||= :sec
       output = ""
@@ -57,9 +57,9 @@ module Redistat
       output
     end
     alias :to_string :to_s
-    
+
     private
-    
+
     def from_time(input)
       DEPTHS.each do |k|
         send("#{k}=", input.send(k))
@@ -74,15 +74,15 @@ module Redistat
         send("#{k}=", 0)
       end
     end
-    
+
     def from_integer(input)
       from_time(::Time.at(input))
     end
-    
+
     def from_string(input)
       input += "19700101000000"[input.size..-1] if input =~ /^\d\d\d[\d]+$/i
       from_time(::Time.parse(input))
     end
-    
+
   end
 end

data/lib/redistat/event.rb

@@ -2,13 +2,13 @@ module Redistat
   class Event
     include Database
     include Options
-    
+
     attr_reader :id
     attr_reader :key
-    
+
     attr_accessor :stats
     attr_accessor :meta
-    
+
     def default_options
       { :depth => :hour,
         :store_event => false,
@@ -16,7 +16,7 @@ module Redistat
         :enable_grouping => true,
         :label_indexing => true }
     end
-    
+
     def initialize(scope, label = nil, date = nil, stats = {}, opts = {}, meta = {}, is_new = true)
       parse_options(opts)
       @key = Key.new(scope, label, date, @options)
@@ -24,35 +24,35 @@ module Redistat
       @meta = meta ||= {}
       @new = is_new
     end
-    
+
     def new?
       @new
     end
-    
+
     def date
       @key.date
     end
-    
+
     def date=(input)
       @key.date = input
     end
-    
+
     def scope
       @key.scope
     end
-    
+
     def scope=(input)
       @key.scope = input
     end
-    
+
     def label
       @key.label
     end
-    
+
     def label_hash
       @key.label_hash
     end
-    
+
     def label=(input)
       @key.label = input
     end
@@ -60,7 +60,7 @@ module Redistat
     def next_id
       db.incr("#{self.scope}#{KEY_NEXT_ID}")
     end
-    
+
     def save
       return false if !self.new?
       Summary.update_all(@key, @stats, depth_limit, @options)
@@ -78,21 +78,21 @@ module Redistat
       @new = false
       self
     end
-    
+
     def depth_limit
       @options[:depth] ||= @key.depth
     end
-    
+
     def self.create(*args)
       self.new(*args).save
     end
-    
+
     def self.find(scope, id)
       event = db.hgetall "#{scope}#{KEY_EVENT}#{id}"
       return nil if event.size == 0
       self.new( event["scope"], event["label"], event["date"], JSON.parse(event["stats"]),
                 JSON.parse(event["options"]), JSON.parse(event["meta"]), false )
     end
-    
+
   end
-end
+end