Merge branch 'release/v0.1.0'

Example:
store(“message”, {“count/private” => 1})
store(“message”, {“count/public” => 1})
fetch("message", 2.minutes.ago, Time.now)
  #=> { "count" => 2,
        "count/private" => 1,
        "count/public" => 1 }

.gitignore

@@ -19,6 +19,7 @@ rdoc
 pkg/*
 *.gem
 .bundle
+Gemfile.lock
 
 ## PROJECT::SPECIFIC
 .yardoc/*

.rvmrc

@@ -0,0 +1 @@
+rvm gemset use redistat

Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    redistat (0.0.6)
-      activesupport (>= 2.3.0)
-      json (>= 1.4.0)
-      redis (>= 2.1.0)
-      time_ext (>= 0.2.8)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.3)
-    diff-lcs (1.1.2)
-    i18n (0.4.2)
-    json (1.4.6)
-    redis (2.1.1)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    time_ext (0.2.8)
-      activesupport (>= 2.3.0)
-      i18n (>= 0.4.2)
-    yard (0.6.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 2.3.0)
-  json (>= 1.4.0)
-  redis (>= 2.1.0)
-  redistat!
-  rspec (>= 2.1.0)
-  time_ext (>= 0.2.8)
-  yard (>= 0.6.3)

README.md

@@ -14,7 +14,7 @@ Redis fits perfectly with all of these requirements. It has atomic operations li
 
     gem install redistat
 
-If you are using Ruby 1.8.x, it's recommended you also install the `system_timer` gem, as the Redis gem will otherwise complain.
+If you are using Ruby 1.8.x, it's recommended you also install the `SystemTimer` gem, as the Redis gem will otherwise complain.
 
 ## Usage
 

Rakefile

@@ -14,6 +14,7 @@ end
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = ['--exclude', 'spec']
 end
 
 task :default => [:start, :spec, :stop]

lib/redistat.rb

@@ -1,7 +1,7 @@
 
 require 'rubygems'
 require 'active_support'
-require 'active_support/hash_with_indifferent_access' if !Hash.respond_to?(:with_indifferent_access) # Active Support 2.x and 3.x
+require 'active_support/hash_with_indifferent_access' if !{}.respond_to?(:with_indifferent_access) # Active Support 2.x and 3.x
 require 'redis'
 require 'date'
 require 'time'
@@ -13,6 +13,7 @@ require 'redistat/collection'
 require 'redistat/connection'
 require 'redistat/database'
 require 'redistat/date'
+require 'redistat/date_helper'
 require 'redistat/event'
 require 'redistat/finder'
 require 'redistat/finder/date_set'
@@ -22,6 +23,7 @@ require 'redistat/model'
 require 'redistat/result'
 require 'redistat/scope'
 require 'redistat/summary'
+require 'redistat/version'
 
 require 'redistat/core_ext/date'
 require 'redistat/core_ext/time'
@@ -34,6 +36,7 @@ module Redistat
   KEY_EVENT = ".event:"
   KEY_LEBELS = "Redistat.lables:"
   KEY_EVENT_IDS = ".event_ids"
+  GROUP_SEPARATOR = "/"
   
   class InvalidOptions < ArgumentError; end
   class RedisServerIsTooOld < Exception; end

lib/redistat/connection.rb

@@ -18,6 +18,7 @@ module Redistat
       end
       
       def create(options = {})
+        #TODO clean/remove all ref-less connections
         ref = options.delete(:ref) || :default
         options.reverse_merge!(default_options)
         conn = (connections[connection_id(options)] ||= connection(options))
@@ -26,15 +27,11 @@ module Redistat
       end
       
       def connections
-        threaded[:connections] ||= {}
+        @connections ||= {}
       end
       
       def references
-        threaded[:references] ||= {}
+        @references ||= {}
-      end
-      
-      def threaded
-        Thread.current[:redistat] ||= {}
       end
       
       private

lib/redistat/date.rb

@@ -85,11 +85,4 @@ module Redistat
     end
     
   end
-  
-  module DateHelper
-    def to_redistat(depth = nil)
-      Redistat::Date.new(self, depth)
-    end
-    alias :to_rs :to_redistat
-  end
 end

lib/redistat/date_helper.rb

@@ -0,0 +1,8 @@
+module Redistat
+  module DateHelper
+    def to_redistat(depth = nil)
+      Redistat::Date.new(self, depth)
+    end
+    alias :to_rs :to_redistat
+  end
+end

lib/redistat/event.rb

@@ -31,7 +31,10 @@ module Redistat
     end
 
     def default_options
-      { :depth => :hour, :store_event => false, :connection_ref => nil }
+      { :depth => :hour,
+        :store_event => false,
+        :connection_ref => nil,
+        :enable_grouping => true }
     end
     
     def new?
@@ -72,7 +75,7 @@ module Redistat
     
     def save
       return false if !self.new?
-      Summary.update_all(@key, @stats, depth_limit, @connection_ref)
+      Summary.update_all(@key, @stats, depth_limit, @connection_ref, @options[:enable_grouping])
       if @options[:store_event]
         @id = self.next_id
         db.hmset("#{self.scope}#{KEY_EVENT}#{@id}",

lib/redistat/key.rb

@@ -39,10 +39,20 @@ module Redistat
       @label.hash
     end
     
+    def label_groups
+      @label.groups
+    end
+    
     def label=(input)
       @label = (input.instance_of?(Redistat::Label)) ? input : Label.create(input, @options)
     end
     
+    def groups
+      @groups ||= label_groups.map do |label_name|
+        self.class.new(@scope, label_name, self.date, @options)
+      end
+    end
+    
     def to_s(depth = nil)
       depth ||= @options[:depth]
       key = self.prefix

lib/redistat/label.rb

@@ -5,6 +5,10 @@ module Redistat
     attr_reader :raw
     attr_reader :connection_ref
     
+    def self.create(name, options = {})
+      self.new(name, options).save
+    end
+    
     def initialize(str, options = {})
       @options = options
       @raw = str.to_s
@@ -31,8 +35,18 @@ module Redistat
       @saved ||= false
     end
     
-    def self.create(name, options = {})
+    def groups
-      self.new(name, options).save
+      return @groups if @groups
+      @groups = []
+      parent = ""
+      @raw.split(GROUP_SEPARATOR).each do |part|
+        if !part.blank?
+          group = ((parent.blank?) ? "" : "#{parent}/") + part
+          @groups << group
+          parent = group
+        end
+      end
+      @groups.reverse!
     end
     
   end

lib/redistat/result.rb

@@ -1,5 +1,5 @@
 module Redistat
-  class Result < ::ActiveSupport::HashWithIndifferentAccess
+  class Result < HashWithIndifferentAccess
     
     attr_accessor :from
     attr_accessor :till

lib/redistat/summary.rb

@@ -2,23 +2,57 @@ module Redistat
   class Summary
     include Database
     
-    def self.update_all(key, stats = {}, depth_limit = nil, connection_ref = nil)
+    def self.update_all(key, stats = {}, depth_limit = nil, connection_ref = nil, enable_grouping = nil)
       stats ||= {}
-      depth_limit ||= key.depth
       return nil if stats.size == 0
+      
+      depth_limit ||= key.depth
+      enable_grouping = true if enable_grouping.nil?
+      
+      if enable_grouping
+        stats = inject_group_summaries(stats)
+        key.groups.each { |k|
+          update_key(k, stats, depth_limit, connection_ref)
+        }
+      else
+        update_key(key, stats, depth_limit, connection_ref)
+      end
+    end
+    
+    private
+    
+    def self.update_key(key, stats, depth_limit, connection_ref)
       Date::DEPTHS.each do |depth|
         update(key, stats, depth, connection_ref)
         break if depth == depth_limit
       end
     end
     
-    private
-    
     def self.update(key, stats, depth, connection_ref = nil)
       stats.each do |field, value|
         db(connection_ref).hincrby key.to_s(depth), field, value
       end
     end
     
+    def self.inject_group_summaries!(stats)
+      stats.each do |key, value|
+        parts = key.to_s.split(GROUP_SEPARATOR)
+        parts.pop
+        if parts.size > 0
+          sum_parts = []
+          parts.each do |part|
+            sum_parts << part
+            sum_key = sum_parts.join(GROUP_SEPARATOR)
+            (stats.has_key?(sum_key)) ? stats[sum_key] += value : stats[sum_key] = value
+          end
+        end
+      end
+      stats
+    end
+    
+    def self.inject_group_summaries(stats)
+      inject_group_summaries!(stats.clone)
+    end
+    
   end
 end

lib/redistat/version.rb

@@ -1,3 +1,3 @@
 module Redistat
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
-end
+end

redistat.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency 'activesupport', '>= 2.3.0'
+  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.8'
   
   s.add_development_dependency 'rspec', '>= 2.1.0'
+  s.add_development_dependency 'rcov', '>= 0.9.9'
   s.add_development_dependency 'yard', '>= 0.6.3'
 end

spec/key_spec.rb

@@ -14,6 +14,7 @@ describe Redistat::Key do
     @key.scope.should == @scope
     @key.label.should == @label
     @key.label_hash.should == @label_hash
+    @key.label_groups.should == @key.instance_variable_get("@label").groups
     @key.date.should be_instance_of(Redistat::Date)
     @key.date.to_time.to_s.should == @date.to_s
   end
@@ -60,4 +61,16 @@ describe Redistat::Key do
     @key.label_hash == @label_hash
   end
   
+  it "should create a group of keys from label group" do
+    label = 'message/public/offensive'
+    result = [ "message/public/offensive",
+               "message/public",
+               "message" ]
+    
+    key = Redistat::Key.new(@scope, label, @date, {:depth => :hour})
+    
+    key.label_groups.should == result
+    key.groups.map { |k| k.label }.should == result
+  end
+  
 end

spec/label_spec.rb

@@ -25,4 +25,24 @@ describe Redistat::Label do
     db.get("#{Redistat::KEY_LEBELS}#{label.hash}").should == name
   end
   
+  it "should separate label names into groups" do
+    name = "message/public/offensive"
+    label = Redistat::Label.new(name)
+    label.name.should == name
+    label.groups.should == [ "message/public/offensive",
+                             "message/public",
+                             "message" ]
+
+    name = "/message/public/"
+    label = Redistat::Label.new(name)
+    label.name.should == name
+    label.groups.should == [ "message/public",
+                             "message" ]
+
+    name = "message"
+    label = Redistat::Label.new(name)
+    label.name.should == name
+    label.groups.should == [ "message" ]
+  end
+  
 end

spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'rspec'
 require 'rspec/autorun'
 
 # use the test Redistat instance
-Redistat.connect(:port => 8379, :db => 15)
+Redistat.connect(:port => 8379, :db => 15, :thread_safe => true)
 Redistat.redis.flushdb

spec/summary_spec.rb

@@ -46,4 +46,78 @@ describe Redistat::Summary do
     end
   end
   
+  it "should inject stats key grouping summaries" do
+    hash = { "count/hello" => 3, "count/world"   => 7,
+             "death/bomb"  => 4, "death/unicorn" => 3,
+             :"od/sugar"   => 7, :"od/meth"      => 8 }
+    res = Redistat::Summary.send(:inject_group_summaries, hash)
+    res.should == { "count" => 10, "count/hello" => 3, "count/world"   => 7,
+                    "death" => 7,  "death/bomb"  => 4, "death/unicorn" => 3,
+                    "od"    => 15, :"od/sugar"   => 7, :"od/meth"      => 8 }
+  end
+  
+  it "should properly store key group summaries" do
+    stats = {"views" => 3, "visitors/eu" => 2, "visitors/us" => 4}
+    Redistat::Summary.update_all(@key, stats, :hour)
+    summary = db.hgetall(@key.to_s(:hour))
+    summary.should have(4).items
+    summary["views"].should == "3"
+    summary["visitors"].should == "6"
+    summary["visitors/eu"].should == "2"
+    summary["visitors/us"].should == "4"
+  end
+  
+  it "should not store key group summaries when option is disabled" do
+    stats = {"views" => 3, "visitors/eu" => 2, "visitors/us" => 4}
+    Redistat::Summary.update_all(@key, stats, :hour, nil, false)
+    summary = db.hgetall(@key.to_s(:hour))
+    summary.should have(3).items
+    summary["views"].should == "3"
+    summary["visitors/eu"].should == "2"
+    summary["visitors/us"].should == "4"
+  end
+  
+  it "should store label-based grouping enabled stats" do
+    stats = {"views" => 3, "visitors/eu" => 2, "visitors/us" => 4}
+    label = "views/about_us"
+    key = Redistat::Key.new(@scope, label, @date)
+    Redistat::Summary.update_all(key, stats, :hour)
+
+    key.groups[0].label.should == "views/about_us"
+    key.groups[1].label.should == "views"
+    child1 = key.groups[0]
+    parent = key.groups[1]
+    
+    label = "views/contact"
+    key = Redistat::Key.new(@scope, label, @date)
+    Redistat::Summary.update_all(key, stats, :hour)
+    
+    key.groups[0].label.should == "views/contact"
+    key.groups[1].label.should == "views"
+    child2 = key.groups[0]
+    
+    summary = db.hgetall(child1.to_s(:hour))
+    summary["views"].should == "3"
+    summary["visitors/eu"].should == "2"
+    summary["visitors/us"].should == "4"
+    
+    summary = db.hgetall(child2.to_s(:hour))
+    summary["views"].should == "3"
+    summary["visitors/eu"].should == "2"
+    summary["visitors/us"].should == "4"
+    
+    summary = db.hgetall(parent.to_s(:hour))
+    summary["views"].should == "6"
+    summary["visitors/eu"].should == "4"
+    summary["visitors/us"].should == "8"
+  end
+  
 end
+
+
+
+
+
+
+
+

spec/thread_safety_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe "Thread-Safety" do
+  include Redistat::Database
+  
+  before(:each) do
+    db.flushdb
+  end
+  
+  #TODO should have more comprehensive thread-safe tests
+  
+  it "should incr in multiple threads" do
+    threads = []
+    50.times do
+      threads << Thread.new {
+        db.incr("spec:incr")
+      }
+    end
+    threads.each { |t| t.join }
+    db.get("spec:incr").should == "50"
+  end
+  
+  it "should store event in multiple threads" do
+    class ThreadSafetySpec
+      include Redistat::Model
+    end
+    threads = []
+    50.times do
+      threads << Thread.new {
+        ThreadSafetySpec.store("spec:threadsafe", {:count => 1, :rand => rand(5)})
+      }
+    end
+    threads.each { |t| t.join }
+    result = ThreadSafetySpec.fetch("spec:threadsafe", 5.hours.ago, 5.hours.from_now)
+    result.total[:count].should == 50
+    result.total[:rand].should <= 250
+  end
+  
+end