nightfury 0.7.2 → 0.8.0

data/lib/nightfury/metric/avg_time_series.rb

@@ -30,7 +30,8 @@ module Nightfury
       end
 
       def decode_data_point(data_point)
-        current_count, current_total, data = data_point[0].split(',')
+        time, data_with_meta = super(data_point)
+        current_count, current_total, data = data_with_meta.split(',')
         [data_point[1], data, {current_count: current_count, current_total: current_total}]
       end
     end

data/lib/nightfury/metric/count_time_series.rb

@@ -7,32 +7,28 @@ module Nightfury
           current_step_time = current_step_time.to_s
           last_step_time = last_step_time.to_s
           next if data_points[current_step_time]
-          data_points[current_step_time] = data_points[last_step_time]
+          data_points[current_step_time] = 0.to_s
         end
         data_points
       end
 
-      def incr(step=1, timestamp = Time.now)
-        last_data_point = get
-        if last_data_point
-          time, value = last_data_point.flatten
-          value = value.to_i + step
-          set(value, timestamp)
-        else
-          set(step, timestamp)
-        end
+      def incr(step=1, time = Time.now)
+        value = 0
+        step_time = get_step_time(time)
+        data_point = get_exact(step_time)
+        value = data_point.flatten[1] unless data_point.nil?
+        updated_value = value.to_i + step
+        set(updated_value, step_time) 
       end 
 
-      def decr(step=1, timestamp = Time.now)
-        last_data_point = get
-        if last_data_point
-          time, value = last_data_point.flatten
-          value = value.to_i - step
-          set(value, timestamp)
-        else
-          set(-step, timestamp)
-        end
-      end 
+      def decr(step=1, time = Time.now)
+        value = 0
+        step_time = get_step_time(time)
+        data_point = get_exact(step_time)
+        value = data_point.flatten[1] unless data_point.nil?
+        updated_value = value.to_i - step
+        set(updated_value, step_time)
+      end
     end
   end
 end

data/lib/nightfury/metric/time_series.rb

@@ -120,13 +120,21 @@ module Nightfury
       end
 
       def decode_data_point(data_point)
-        [data_point[1], data_point[0], {}]
+        data_point = data_point.first
+        colon_index = data_point.index(':')
+        [
+	        data_point[0...colon_index], 
+	        data_point[colon_index+1..-1],
+          {}
+        ]
       end
       
       private
       
       def add_value_to_timeline(value, time)
         timestamp = get_step_time(time).to_i
+        redis.zremrangebyscore redis_key, timestamp, timestamp
+        value = "#{timestamp}:#{value}"
         redis.zadd redis_key, timestamp, value
       end
 

data/lib/nightfury/version.rb

@@ -1,3 +1,3 @@
 module Nightfury
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/nightfury/metric/count_time_series_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Nightfury::Metric::CountTimeSeries do
   describe "#get_padded_range" do
-    it "should fill the missing data points" do
+    it "should fill the missing data points with zero" do
       count_series = Nightfury::Metric::CountTimeSeries.new(:count)
       start_time = Time.new(2013,1,1,0,0,0)
       end_time = start_time + 120
@@ -10,111 +10,134 @@ describe Nightfury::Metric::CountTimeSeries do
 
       count_series.set(1, start_time)
       count_series.set(2, end_time)
-      count_series.get_padded_range(start_time, end_time)[missing_time.to_i.to_s].should == "1"
+      count_series.get_padded_range(start_time, end_time)[missing_time.to_i.to_s].should == "0"
     end
   end
 
   describe "Incr" do
-    context "Has data points" do
-      it "should be able to increment value by 1 at the current timestamp by default" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        # Add a data point
-        count_series.set(1, time_now - 10)
-
-        Timecop.freeze(time_now) do
-          count_series.incr
-        end
-        Timecop.return
-
-        count_series.get.values.first.should == "2"
-      end
+    it "should increment the count at the step time of the given timestamp" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      #Add a data point
+      count_series.set(2, time_now)
+      
+      count_series.incr(2, time_now)
 
-      it "should be able to increment value by a given step" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        # Add a data point
-        count_series.set(1, time_now - 10)
+      count_series.get.values.first.should == "4"
+    end
+  
+    it "should increment the count at the step time of the current time by default" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      #Add a data point
+      count_series.set(2, time_now)
+      
+      Timecop.freeze(time_now) do
+        count_series.incr(2)
+      end
+      Timecop.return
 
-        Timecop.freeze(time_now) do
-          count_series.incr(2)
-        end
-        Timecop.return
+      count_series.get.values.first.should == "4"
+    end
 
-        count_series.get.values.first.should == "3"
+    it "should increment the count by 1 by default" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      #Add a data point
+      count_series.set(2, time_now)
+      
+      Timecop.freeze(time_now) do
+        count_series.incr
       end
+      Timecop.return
 
+      count_series.get.values.first.should == "3"
+    end
 
-      it "should be able to increment value at a step near the given timestamp" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        time_later = time_now + 61
-        # Add a data point
-        count_series.set(1, time_now - 10)
-        count_series.incr(1,time_later)
-        count_series.get.should == { floor_time(time_later, 60).to_i.to_s => "2"}
-      end
+    it "should set the count to the step when there is no data point at the step time" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      count_series.incr(1, time_now)
+      count_series.get(time_now).values.first.should == "1"
     end
 
-    context "Has no data points" do
-      it "should add a data point with the given step" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        count_series.incr(2, time_now)
-        count_series.get.should == { floor_time(time_now, 60).to_i.to_s => "2"}
-      end
+    it "should increment the right step bucket" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      first_step_bucket = Time.now
+      second_step_bucket = Time.now + 61
+
+      count_series.set(5, first_step_bucket)
+      count_series.set(6, second_step_bucket)
+
+      count_series.incr(1, first_step_bucket)
+      count_series.incr(1, second_step_bucket)
+
+      count_series.get(first_step_bucket).values.first.should == "6"
+      count_series.get(second_step_bucket).values.first.should == "7"
     end
   end
   
   describe "Decr" do
-    context "Has data points" do
-      it "should be able to decrement value by 1 at a step near the current timestamp by default" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        # Add a data point
-        count_series.set(1, time_now - 61)
-
-        Timecop.freeze(time_now) do
-          count_series.decr
-        end
-        Timecop.return
-
-        count_series.get.values.first.should == "0"
-      end
-
-      it "should be able to decrement value by a given step" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        # Add a data point
-        count_series.set(2, time_now - 61)
+    it "should decrement the count at the step time of the given timestamp" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:counter)
+      time_now = Time.now
+      
+      #Add a data point
+      count_series.set(2, time_now)
 
-        Timecop.freeze(time_now) do
-          count_series.decr(2)
-        end
-        Timecop.return
+      count_series.decr(2, time_now)
 
-        count_series.get.values.first.should == "0"
+      count_series.get.values.first.should == "0"
+    end
+  
+    it "should decrement the count at the step time of the current time by default" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      #Add a data point
+      count_series.set(2, time_now)
+      
+      Timecop.freeze(time_now) do
+        count_series.decr(2)
       end
+      Timecop.return
 
+      count_series.get.values.first.should == "0"
+    end
 
-      it "should be able to decrement value at nearest step of a given timestamp" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        time_later = time_now + 61
-        # Add a data point
-        count_series.set(1, time_now - 10)
-        count_series.decr(1,time_later)
-        count_series.get.should == { floor_time(time_later, 60).to_i.to_s => "0"}
+    it "should decrement the count by 1 by default" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      #Add a data point
+      count_series.set(2, time_now)
+      
+      Timecop.freeze(time_now) do
+        count_series.decr
       end
+      Timecop.return
+
+      count_series.get.values.first.should == "1"
     end
 
-    context "Has no data points" do
-      it "should add a data point with the given step" do
-        count_series = Nightfury::Metric::CountTimeSeries.new(1)
-        time_now = Time.now
-        count_series.decr(2, time_now)
-        count_series.get.should == { floor_time(time_now, 60).to_i.to_s => "-2"}
-      end
+    it "should set the count to the step when there is no data point at the step time" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      time_now = Time.now
+      count_series.decr(1, time_now)
+      count_series.get(time_now).values.first.should == "-1"
+    end
+
+    it "should decrement the right step bucket" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      first_step_bucket = Time.now
+      second_step_bucket = Time.now + 61
+
+      count_series.set(5, first_step_bucket)
+      count_series.set(6, second_step_bucket)
+
+      count_series.decr(1, first_step_bucket)
+      count_series.decr(1, second_step_bucket)
+
+      count_series.get(first_step_bucket).values.first.should == "4"
+      count_series.get(second_step_bucket).values.first.should == "5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightfury
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies: []
 description: Nightfury is a reporting/analytics backend written on Redis
 email: