redistat 0.3.0 → 0.4.0

data/lib/redistat/mixins/date_helper.rb

@@ -5,4 +5,4 @@ module Redistat
     end
     alias :to_rs :to_redistat
   end
-end
+end

data/lib/redistat/mixins/options.rb

@@ -1,10 +1,10 @@
 module Redistat
   module Options
-    
+
     def self.included(base)
       base.extend(ClassMethods)
     end
-    
+
     module ClassMethods
       def option_accessor(*opts)
         opts.each do |option|
@@ -18,24 +18,24 @@ module Redistat
         end
       end
     end
-    
+
     def parse_options(opts)
       opts ||= {}
       @raw_options = opts
       @options = default_options.merge(opts.reject { |k,v| v.nil? })
     end
-    
+
     def default_options
       {}
     end
-    
+
     def options
       @options ||= {}
     end
-    
+
     def raw_options
       @raw_options ||= {}
     end
-    
+
   end
-end
+end

data/lib/redistat/mixins/synchronize.rb

@@ -2,42 +2,43 @@ require 'monitor'
 
 module Redistat
   module Synchronize
-    
+
     class << self
       def included(base)
         base.send(:include, InstanceMethods)
       end
-      
+
       def monitor
         @monitor ||= Monitor.new
       end
-      
+
       def thread_safe
         monitor.synchronize do
-          @thread_safe ||= false
+          return @thread_safe unless @thread_safe.nil?
+          @thread_safe = false
         end
       end
-      
+
       def thread_safe=(value)
         monitor.synchronize do
           @thread_safe = value
         end
       end
     end # << self
-    
+
     module InstanceMethods
       def thread_safe
         Synchronize.thread_safe
       end
-      
+
       def thread_safe=(value)
         Synchronize.thread_safe = value
       end
-      
+
       def monitor
         Synchronize.monitor
       end
-      
+
       def synchronize(&block)
         if thread_safe
           monitor.synchronize(&block)
@@ -46,6 +47,6 @@ module Redistat
         end
       end
     end # InstanceMethods
-    
+
   end
-end
+end

data/lib/redistat/model.rb

@@ -2,16 +2,16 @@ module Redistat
   module Model
     include Database
     include Options
-    
+
     def self.included(base)
       base.extend(self)
     end
-    
-    
+
+
     #
     # statistics store/fetch methods
-    # 
-    
+    #
+
     def store(label, stats = {}, date = nil, opts = {}, meta = {})
       Event.new(self.name, label, date, stats, options.merge(opts), meta).save
     end
@@ -28,42 +28,50 @@ module Redistat
                     :from  => from,
                     :till  => till }.merge(options.merge(opts)) )
     end
-    
+
     def find_event(event_id)
       Event.find(self.name, event_id)
     end
-    
-    
+
+
     #
     # options methods
     #
-    
+
     option_accessor :depth
     option_accessor :scope
     option_accessor :store_event
     option_accessor :hashed_label
     option_accessor :label_indexing
-    
+
     alias :class_name :scope
-    
+
+    def expire(exp = nil)
+      if !exp.nil?
+        options[:expire] = exp.is_a?(Hash) ? exp : Hash.new(exp)
+      else
+        options[:expire]
+      end
+    end
+
     def connect_to(opts = {})
       Connection.create(opts.merge(:ref => name))
       options[:connection_ref] = name
     end
-    
-    
+
+
     #
     # resource access methods
     #
-    
+
     def connection
       db(options[:connection_ref])
     end
     alias :redis :connection
-    
+
     def name
       options[:scope] || (@name ||= self.to_s)
     end
-      
+
   end
-end
+end

data/lib/redistat/result.rb

@@ -2,17 +2,17 @@ require 'active_support/core_ext/hash/indifferent_access'
 
 module Redistat
   class Result < HashWithIndifferentAccess
-    
+
     attr_accessor :from
     attr_accessor :till
-    
+
     alias :date :from
     alias :date= :from=
-    
+
     def initialize(options = {})
       @from = options[:from] ||= nil
       @till = options[:till] ||= nil
     end
-    
+
   end
 end

data/lib/redistat/scope.rb

@@ -1,18 +1,18 @@
 module Redistat
   class Scope
     include Database
-    
+
     def initialize(name)
       @name = name.to_s
     end
-    
+
     def to_s
       @name
     end
-    
+
     def next_id
       db.incr("#{@name}#{KEY_NEXT_ID}")
     end
-    
+
   end
-end
+end

data/lib/redistat/summary.rb

@@ -1,61 +1,68 @@
 module Redistat
   class Summary
     include Database
-    
+
     class << self
-      
+
       def default_options
-        { :enable_grouping => true,
-          :label_indexing => true,
-          :connection_ref => nil }
+        {
+          :enable_grouping => true,
+          :label_indexing  => true,
+          :connection_ref  => nil,
+          :expire          => {}
+        }
       end
-      
+
       def buffer
         Redistat.buffer
       end
-      
+
       def update_all(key, stats = {}, depth_limit = nil, opts = {})
         stats ||= {}
         return if stats.empty?
-        
+
         options = default_options.merge((opts || {}).reject { |k,v| v.nil? })
-        
+
         depth_limit ||= key.depth
-        
+
         update_through_buffer(key, stats, depth_limit, options)
       end
-      
+
       def update_through_buffer(*args)
         update(*args) unless buffer.store(*args)
       end
-      
-      def update(key, stats, depth_limit, opts)
+
+      def update(key, stats, depth_limit, opts = {})
         if opts[:enable_grouping]
           stats = inject_group_summaries(stats)
           key.groups.each do |k|
-            update_key(k, stats, depth_limit, opts[:connection_ref])
+            update_key(k, stats, depth_limit, opts)
             k.update_index if opts[:label_indexing]
           end
         else
-          update_key(key, stats, depth_limit, opts[:connection_ref])
+          update_key(key, stats, depth_limit, opts)
         end
       end
-      
+
       private
-      
-      def update_key(key, stats, depth_limit, connection_ref)
+
+      def update_key(key, stats, depth_limit, opts = {})
         Date::DEPTHS.each do |depth|
-          update_fields(key, stats, depth, connection_ref)
+          update_fields(key, stats, depth, opts)
           break if depth == depth_limit
         end
       end
-      
-      def update_fields(key, stats, depth, connection_ref = nil)
+
+      def update_fields(key, stats, depth, opts = {})
         stats.each do |field, value|
-          db(connection_ref).hincrby key.to_s(depth), field, value
+          db(opts[:connection_ref]).hincrby key.to_s(depth), field, value
+        end
+
+        if opts[:expire] && !opts[:expire][depth].nil?
+          db(opts[:connection_ref]).expire key.to_s(depth), opts[:expire][depth]
         end
       end
-      
+
       def inject_group_summaries!(stats)
         summaries = {}
         stats.each do |key, value|
@@ -72,11 +79,11 @@ module Redistat
         end
         stats.merge_and_incr!(summaries)
       end
-      
+
       def inject_group_summaries(stats)
         inject_group_summaries!(stats.clone)
       end
-      
+
     end
   end
-end
+end

data/lib/redistat/version.rb

@@ -1,3 +1,3 @@
 module Redistat
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/redistat.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_runtime_dependency 'activesupport', '>= 2.3.6'
   s.add_runtime_dependency 'json', '>= 1.4.0'
   s.add_runtime_dependency 'redis', '>= 2.1.0'
   s.add_runtime_dependency 'time_ext', '>= 0.2.9'
-  
+
+  s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '>= 2.1.0'
-  s.add_development_dependency 'rcov', '>= 0.9.9'
   s.add_development_dependency 'yard', '>= 0.6.3'
+  s.add_development_dependency 'simplecov', '>= 0.6.1'
 end

data/spec/buffer_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Redistat::Buffer do
-  
+
   before(:each) do
     @class  = Redistat::Buffer
     @buffer = Redistat::Buffer.instance
@@ -10,17 +10,17 @@ describe Redistat::Buffer do
     @depth_limit = :hour
     @opts = {:enable_grouping => true}
   end
-  
+
   # let's cleanup after ourselves for the other specs
   after(:each) do
     @class.instance_variable_set("@instance", nil)
     @buffer.size = 0
   end
-  
+
   it "should provide instance of itself" do
     @buffer.should be_a(@class)
   end
-  
+
   it "should only buffer if buffer size setting is greater than 1" do
     @buffer.size.should == 0
     @buffer.send(:should_buffer?).should be_false
@@ -31,7 +31,7 @@ describe Redistat::Buffer do
     @buffer.size.should == 2
     @buffer.send(:should_buffer?).should be_true
   end
-  
+
   it "should only flush buffer if buffer size is greater than or equal to buffer size setting" do
     @buffer.size.should == 0
     @buffer.send(:queue).size.should == 0
@@ -50,7 +50,7 @@ describe Redistat::Buffer do
     @buffer.send(:incr_count)
     @buffer.send(:should_flush?).should be_true
   end
-  
+
   it "should force flush queue irregardless of result of #should_flush? when #reset_queue is called with true" do
     @buffer.send(:queue)[:hello] = 'world'
     @buffer.send(:incr_count)
@@ -62,7 +62,7 @@ describe Redistat::Buffer do
     @buffer.send(:reset_queue, true).should == {:hello => 'world'}
     @buffer.instance_variable_get("@count").should == 0
   end
-  
+
   it "should #flush_data into Summary.update properly" do
     # the root level key value doesn't actually matter, but it's something like this...
     data = {'ScopeName/label/goes/here:2011::true:true' => {
@@ -75,14 +75,16 @@ describe Redistat::Buffer do
     Redistat::Summary.should_receive(:update).with(@key, @stats, @depth_limit, @opts)
     @buffer.send(:flush_data, data)
   end
-  
+
   it "should build #buffer_key correctly" do
     opts = {:enable_grouping => true, :label_indexing => false, :connection_ref => nil}
-    @buffer.send(:buffer_key, @key, opts).should == "#{@key.to_s}::true:false"
+    @buffer.send(:buffer_key, @key, opts).should ==
+      "#{@key.to_s}:connection_ref::enable_grouping:true:label_indexing:false"
     opts = {:enable_grouping => false, :label_indexing => true, :connection_ref => :omg}
-    @buffer.send(:buffer_key, @key, opts).should == "#{@key.to_s}:omg:false:true"
+    @buffer.send(:buffer_key, @key, opts).should ==
+      "#{@key.to_s}:connection_ref:omg:enable_grouping:false:label_indexing:true"
   end
-  
+
   describe "Buffering" do
     it "should store items on buffer queue" do
       @buffer.store(@key, @stats, @depth_limit, @opts).should be_false
@@ -96,7 +98,7 @@ describe Redistat::Buffer do
       @buffer.send(:queue)[@buffer.send(:queue).keys.first][:stats][:count].should == 2
       @buffer.send(:queue)[@buffer.send(:queue).keys.first][:stats][:views].should == 6
     end
-    
+
     it "should flush buffer queue when size is reached" do
       key = mock('Key', :to_s => "Scope/labelx:2011")
       @buffer.size = 10
@@ -115,18 +117,18 @@ describe Redistat::Buffer do
       4.times { @buffer.store(key, @stats, @depth_limit, @opts).should be_true }
     end
   end
-  
+
   describe "Thread-Safety" do
     it "should read/write to buffer queue in a thread-safe manner" do
-      
-      # This spec passes wether thread safety is enabled or not. In short I need
-      # better specs for thread-safety, and personally a better understanding of
-      # thread-safety in general.
+
+      # Setting thread_safe to false only makes the spec fail with
+      # JRuby. 1.8.x and 1.9.x both pass fine for some reason
+      # regardless of what the thread_safe option is set to.
       Redistat.thread_safe = true
-      
+
       key = mock('Key', :to_s => "Scope/labelx:2011")
       @buffer.size = 100
-      
+
       Redistat::Summary.should_receive(:update).exactly(2).times.and_return do |k, stats, depth_limit, opts|
         depth_limit.should == @depth_limit
         opts.should == @opts
@@ -138,7 +140,7 @@ describe Redistat::Buffer do
           stats[:views].should == 120
         end
       end
-      
+
       threads = []
       10.times do
         threads << Thread.new {
@@ -146,12 +148,12 @@ describe Redistat::Buffer do
           4.times { @buffer.store(key, @stats, @depth_limit, @opts).should be_true }
         }
       end
-      
+
       threads.each { |t| t.join }
     end
-    
-    it "should have better specs that actually fail when thread-safety is off"
-    
+
+    it "should have specs that fail on 1.8.x/1.9.x when thread_safe is disabled"
+
   end
-  
+
 end