redistat 0.3.0 → 0.4.0

data/spec/options_spec.rb

@@ -1,36 +1,36 @@
 require "spec_helper"
 
 describe Redistat::Options do
-  
+
   before(:each) do
     @helper = OptionsHelper.new
     @helper.parse_options(:wtf => 'dude', :foo => 'booze')
   end
-  
+
   it "should #parse_options" do
     @helper.options[:hello].should == 'world'
     @helper.options[:foo].should == 'booze'
     @helper.options[:wtf].should == 'dude'
     @helper.raw_options.should_not have_key(:hello)
   end
-  
+
   it "should create option_accessors" do
     @helper.hello.should == 'world'
     @helper.hello('woooo')
     @helper.hello.should == 'woooo'
   end
-  
+
 end
 
 class OptionsHelper
   include Redistat::Options
-  
+
   option_accessor :hello
-  
+
   def default_options
     { :hello => 'world',
       :foo => 'bar' }
   end
-  
-  
-end
+
+
+end

data/spec/result_spec.rb

@@ -1,14 +1,14 @@
 require "spec_helper"
 
 describe Redistat::Result do
-  
+
   it "should should initialize properly" do
     options = {:from => "from", :till => "till"}
     result = Redistat::Result.new(options)
     result.from.should == "from"
     result.till.should == "till"
   end
-  
+
   it "should have set_or_incr method" do
     result = Redistat::Result.new
     result[:world].should be_nil
@@ -17,5 +17,5 @@ describe Redistat::Result do
     result.set_or_incr(:world, 8)
     result[:world].should == 11
   end
-  
-end
+
+end

data/spec/scope_spec.rb

@@ -2,20 +2,20 @@ require "spec_helper"
 
 describe Redistat::Scope do
   include Redistat::Database
-  
+
   before(:all) do
     db.flushdb
   end
-  
+
   before(:each) do
     @name = "PageViews"
     @scope = Redistat::Scope.new(@name)
   end
-  
+
   it "should initialize properly" do
     @scope.to_s.should == @name
   end
-  
+
   it "should increment next_id" do
     scope = Redistat::Scope.new("Visitors")
     @scope.next_id.should == 1
@@ -23,5 +23,5 @@ describe Redistat::Scope do
     @scope.next_id.should == 2
     scope.next_id.should == 2
   end
-  
-end
+
+end

data/spec/spec_helper.rb

@@ -2,6 +2,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec'
+  add_filter '/vendor'
+end
+
 # require stuff
 require 'redistat'
 require 'rspec'

data/spec/summary_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Redistat::Summary do
   include Redistat::Database
-  
+
   before(:each) do
     db.flushdb
     @scope = "PageViews"
@@ -10,28 +10,43 @@ describe Redistat::Summary do
     @date = Time.now
     @key = Redistat::Key.new(@scope, @label, @date, {:depth => :day})
     @stats = {"views" => 3, "visitors" => 2}
+    @expire = {:hour => 24*3600}
   end
-  
+
   it "should update a single summary properly" do
     Redistat::Summary.send(:update_fields, @key, @stats, :hour)
     summary = db.hgetall(@key.to_s(:hour))
     summary.should have(2).items
     summary["views"].should == "3"
     summary["visitors"].should == "2"
-    
+
     Redistat::Summary.send(:update_fields, @key, @stats, :hour)
     summary = db.hgetall(@key.to_s(:hour))
     summary.should have(2).items
     summary["views"].should == "6"
     summary["visitors"].should == "4"
-    
+
     Redistat::Summary.send(:update_fields, @key, {"views" => -4, "visitors" => -3}, :hour)
     summary = db.hgetall(@key.to_s(:hour))
     summary.should have(2).items
     summary["views"].should == "2"
     summary["visitors"].should == "1"
   end
-  
+
+  it "should set key expiry properly" do
+    Redistat::Summary.update_all(@key, @stats, :hour,{:expire => @expire})
+    ((24*3600)-1..(24*3600)+1).should include(db.ttl(@key.to_s(:hour)))
+    [:day, :month, :year].each do |depth|
+      db.ttl(@key.to_s(depth)).should == -1
+    end
+
+    db.flushdb
+    Redistat::Summary.update_all(@key, @stats, :hour, {:expire => {}})
+    [:hour, :day, :month, :year].each do |depth|
+      db.ttl(@key.to_s(depth)).should == -1
+    end
+  end
+
   it "should update all summaries properly" do
     Redistat::Summary.update_all(@key, @stats, :sec)
     [:year, :month, :day, :hour, :min, :sec, :usec].each do |depth|
@@ -45,7 +60,7 @@ describe Redistat::Summary do
       end
     end
   end
-  
+
   it "should update summaries even if no label is set" do
     key = Redistat::Key.new(@scope, nil, @date, {:depth => :day})
     Redistat::Summary.send(:update_fields, key, @stats, :hour)
@@ -54,7 +69,7 @@ describe Redistat::Summary do
     summary["views"].should == "3"
     summary["visitors"].should == "2"
   end
-  
+
   it "should inject stats key grouping summaries" do
     hash = { "count/hello" => 3, "count/world"   => 7,
              "death/bomb"  => 4, "death/unicorn" => 3,
@@ -64,7 +79,7 @@ describe Redistat::Summary do
                     "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)
@@ -75,7 +90,7 @@ describe Redistat::Summary do
     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, {:enable_grouping => false})
@@ -85,7 +100,7 @@ describe Redistat::Summary do
     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"
@@ -96,37 +111,29 @@ describe Redistat::Summary do
     key.groups[1].label.to_s.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.to_s.should == "views/contact"
     key.groups[1].label.to_s.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
-
-
-
-
-
-
-
 
+end

data/spec/synchronize_spec.rb

@@ -1,63 +1,124 @@
 require "spec_helper"
 
-describe Redistat::Synchronize do
-  it { should respond_to(:monitor) }
-  it { should respond_to(:thread_safe) }
-  it { should respond_to(:thread_safe=) }
-  
-  describe "instanciated class with Redistat::Synchronize included" do
-    subject { SynchronizeSpecHelper.new }
-    it { should respond_to(:monitor) }
-    it { should respond_to(:thread_safe) }
-    it { should respond_to(:thread_safe=) }
-    it { should respond_to(:synchronize) }
-    
-  end
-  
-  describe "#synchronize method" do
-    
-    before(:each) do
-      Redistat::Synchronize.instance_variable_set("@thread_safe", nil)
-      @obj = SynchronizeSpecHelper.new
-    end
-    
-    it "should share single Monitor object across all objects" do
-      @obj.monitor.should == Redistat::Synchronize.monitor
-    end
-    
-    it "should share thread_safe option across all objects" do
-      obj2 = SynchronizeSpecHelper.new
-      Redistat::Synchronize.thread_safe.should be_false
-      @obj.thread_safe.should be_false
-      obj2.thread_safe.should be_false
-      @obj.thread_safe = true
-      Redistat::Synchronize.thread_safe.should be_true
-      @obj.thread_safe.should be_true
-      obj2.thread_safe.should be_true
-    end
-    
-    it "should not synchronize when thread_safe is disabled" do
-      # monitor receives :synchronize twice cause #thread_safe is _always_ synchronized
-      Redistat::Synchronize.monitor.should_receive(:synchronize).twice
-      @obj.thread_safe.should be_false # first #synchronize call
-      @obj.synchronize { 'foo' } # one #synchronize call while checking #thread_safe
-    end
-    
-    it "should synchronize when thread_safe is enabled" do
-      Monitor.class_eval {
-        # we're stubbing synchronize to ensure it's being called correctly, but still need it :P
-        alias :real_synchronize :synchronize
-      }
-      Redistat::Synchronize.monitor.should_receive(:synchronize).with.exactly(4).times.and_return { |block|
-        Redistat::Synchronize.monitor.real_synchronize(&block)
-      }
-      @obj.thread_safe.should be_false # first synchronize call
-      Redistat::Synchronize.thread_safe = true # second synchronize call
-      @obj.synchronize { 'foo' } # two synchronize calls, once while checking thread_safe, once to call black
+module Redistat
+  describe Synchronize do
+
+    let(:klass) { Synchronize }
+
+    describe '.included' do
+      it 'includes InstanceMethods in passed object' do
+        base = mock('Base')
+        base.should_receive(:include).with(klass::InstanceMethods)
+        klass.included(base)
+      end
+    end # included
+
+    describe '.monitor' do
+      it 'returns a Monitor instance' do
+        klass.monitor.should be_a(Monitor)
+      end
+
+      it 'caches Monitor instance' do
+        klass.monitor.object_id.should == klass.monitor.object_id
+      end
+    end # monitor
+
+    describe '.thread_safe' do
+      after { klass.instance_variable_set('@thread_safe', nil) }
+
+      it 'returns value of @thread_safe' do
+        klass.instance_variable_set('@thread_safe', true)
+        klass.thread_safe.should be_true
+      end
+
+      it 'defaults to false' do
+        klass.thread_safe.should be_false
+      end
+
+      it 'uses #synchronize' do
+        klass.monitor.should_receive(:synchronize).once
+        klass.thread_safe.should be_nil
+      end
+    end # thread_safe
+
+    describe '.thread_safe=' do
+      after { klass.instance_variable_set('@thread_safe', nil) }
+
+      it 'sets @thread_safe' do
+        klass.instance_variable_get('@thread_safe').should be_nil
+        klass.thread_safe = true
+        klass.instance_variable_get('@thread_safe').should be_true
+      end
+
+      it 'uses #synchronize' do
+        klass.monitor.should_receive(:synchronize).once
+        klass.thread_safe = true
+        klass.instance_variable_get('@thread_safe').should be_nil
+      end
+    end # thread_safe=
+
+    describe "InstanceMethods" do
+      subject { SynchronizeSpecHelper.new }
+
+      describe '.monitor' do
+        it 'defers to Redistat::Synchronize' do
+          klass.should_receive(:monitor).once
+          subject.monitor
+        end
+      end # monitor
+
+      describe '.thread_safe' do
+        it ' defers to Redistat::Synchronize' do
+          klass.should_receive(:thread_safe).once
+          subject.thread_safe
+        end
+      end # thread_safe
+
+      describe '.thread_safe=' do
+        it 'defers to Redistat::Synchronize' do
+          klass.should_receive(:thread_safe=).once.with(true)
+          subject.thread_safe = true
+        end
+      end # thread_safe=
+
+      describe 'when #thread_safe is true' do
+        before { subject.stub(:thread_safe).and_return(true) }
+
+        describe '.synchronize' do
+          it 'defers to #monitor' do
+            subject.monitor.should_receive(:synchronize).once
+            subject.synchronize { 'foo' }
+          end
+
+          it 'passes block along to #monitor.synchronize' do
+            yielded = false
+            subject.synchronize { yielded = true }
+            yielded.should be_true
+          end
+        end # synchronize
+      end # when #thread_safe is true
+
+      describe 'when #thread_safe is false' do
+        before { subject.stub(:thread_safe).and_return(false) }
+
+        describe '.synchronize' do
+          it 'does not defer to #monitor' do
+            subject.monitor.should_not_receive(:synchronize)
+            subject.synchronize { 'foo' }
+          end
+
+          it 'yields block' do
+            yielded = false
+            subject.synchronize { yielded = true }
+            yielded.should be_true
+          end
+        end # synchronize
+      end # when #thread_safe is false
+
     end
-  end
-  
-end
+
+  end # Synchronize
+end # Redistat
 
 class SynchronizeSpecHelper
   include Redistat::Synchronize

data/spec/thread_safety_spec.rb

@@ -2,13 +2,13 @@ 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
@@ -19,7 +19,7 @@ describe "Thread-Safety" do
     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
@@ -35,5 +35,5 @@ describe "Thread-Safety" do
     result.total[:count].should == 50
     result.total[:rand].should <= 250
   end
-  
-end
+
+end