nightfury 0.7.1 → 0.7.2

data/lib/nightfury/metric/avg_time_series.rb

@@ -1,11 +1,21 @@
 module Nightfury
   module Metric
     class AvgTimeSeries < TimeSeries
+      def get_padded_range(start_time, end_time)
+        data_points = get_range(start_time, end_time)
+        each_timestamp(start_time, end_time) do |current_step_time, last_step_time|
+          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] = '0.0'
+        end
+        data_points
+      end
 
       protected
 
       def before_set(value, time)
-        step_time = get_step_time(time).to_i
+        step_time = get_step_time(time)
         data_point, meta_value = get_exact(step_time, true)
         current_count = current_total = 0.0
         unless data_point.nil?

data/lib/nightfury/metric/count_time_series.rb

@@ -1,6 +1,17 @@
 module Nightfury
   module Metric
     class CountTimeSeries < TimeSeries
+      def get_padded_range(start_time, end_time)
+        data_points = get_range(start_time, end_time)
+        each_timestamp(start_time, end_time) do |current_step_time, last_step_time|
+          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]
+        end
+        data_points
+      end
+
       def incr(step=1, timestamp = Time.now)
         last_data_point = get
         if last_data_point

data/lib/nightfury/metric/time_series.rb

@@ -5,6 +5,16 @@ module Nightfury
       def self.floor_time(time, seconds=60)
         Time.at((time.to_f / seconds).floor * seconds)
       end
+      
+      def self.seconds_in_step(step_name, time)
+        {
+          minute: 60,
+          hour: 1.hour,
+          day: 1.day,
+          week: 1.week,
+          month: Time.days_in_month(time.month, time.year)
+        }[step_name]
+      end
 
       def initialize(name, options={})
         super(name, options)
@@ -51,9 +61,9 @@ module Nightfury
 
       def get_range(start_time, end_time)
         return nil unless redis.exists(redis_key)        
-        start_time = get_step_time(start_time).to_i
-        end_time   = get_step_time(end_time).to_i
-        data_points = redis.zrangebyscore(redis_key, start_time, end_time, withscores: true)
+        start_time = get_step_time(start_time)
+        end_time   = get_step_time(end_time)
+        data_points = redis.zrangebyscore(redis_key, start_time.to_i, end_time.to_i, withscores: true)
         decode_many_data_points(data_points)
       end
 
@@ -80,14 +90,8 @@ module Nightfury
         {}
       end
 
-      protected
-
-      def before_set(value, time)
-        [value, time]
-      end
-
-      def decode_data_point(data_point)
-        [data_point[1], data_point[0], {}]
+      def seconds_in_step(time)
+        self.class.seconds_in_step(step, time)
       end
 
       def floor_time(time, seconds=60)
@@ -95,15 +99,30 @@ module Nightfury
       end
 
       def get_step_time(time)
-        case step
-          when :minute then floor_time(time, 60)
-          when :hour then floor_time(time, 1.hour)
-          when :day then floor_time(time, 1.day)
-          when :week then floor_time(time, 1.week)
-          when :month then floor_time(time, Time.days_in_month(time.month, time.year))
+        floor_time(time, seconds_in_step(time))
+      end
+
+      def each_timestamp(start_time, end_time, &block)
+        start_time = get_step_time(start_time).to_i
+        end_time = get_step_time(end_time).to_i
+        current_step_time, last_step_time = start_time, nil
+        start_time.step(end_time, seconds_in_step(Time.at(current_step_time))) do
+          yield(current_step_time, last_step_time)
+          last_step_time = current_step_time
+          current_step_time += seconds_in_step(Time.at(current_step_time))
         end
       end
 
+      protected
+
+      def before_set(value, time)
+        [value, time]
+      end
+
+      def decode_data_point(data_point)
+        [data_point[1], data_point[0], {}]
+      end
+      
       private
       
       def add_value_to_timeline(value, time)

data/lib/nightfury/version.rb

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

data/spec/nightfury/metric/avg_time_series_spec.rb

@@ -1,6 +1,19 @@
 require 'spec_helper'
 
 describe Nightfury::Metric::AvgTimeSeries do
+  describe "#get_padded_range" do
+    it "should fill the missing data points" do
+      count_series = Nightfury::Metric::AvgTimeSeries.new(:count)
+      start_time = Time.new(2013,1,1,0,0,0)
+      end_time = start_time + 120
+      missing_time = start_time + 60
+
+      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 == "0.0"
+    end
+  end
+
   it "should calculate avg in buckets defined by step" do
     avg_metric = Nightfury::Metric::AvgTimeSeries.new(:avg)
     first_bucket_time = Time.now

data/spec/nightfury/metric/count_time_series_spec.rb

@@ -1,6 +1,19 @@
 require 'spec_helper'
 
 describe Nightfury::Metric::CountTimeSeries do
+  describe "#get_padded_range" do
+    it "should fill the missing data points" do
+      count_series = Nightfury::Metric::CountTimeSeries.new(:count)
+      start_time = Time.new(2013,1,1,0,0,0)
+      end_time = start_time + 120
+      missing_time = start_time + 60
+
+      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"
+    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

data/spec/nightfury/metric/time_series_spec.rb

@@ -18,6 +18,22 @@ describe Nightfury::Metric::TimeSeries do
     end
   end
 
+  describe "#each_timestamp" do
+    it "should iterate through each timestamp between a start and a end time" do
+      ts_metric = Nightfury::Metric::TimeSeries.new(:avg_time)
+
+      start_time = Time.new(2013,1,1,0,0,0)
+      mid_time = start_time + 60
+      end_time = mid_time + 60
+
+      expected = [[start_time.to_i, nil], [mid_time.to_i, start_time.to_i], [end_time.to_i, mid_time.to_i]]
+
+      expect { |b|
+        ts_metric.each_timestamp(start_time, end_time, &b)
+      }.to yield_successive_args(*expected)
+    end
+  end
+
   describe "Getter" do
     describe "#get" do
       it "should retrun nil if metric key on redis is empty" do
@@ -179,7 +195,7 @@ describe Nightfury::Metric::TimeSeries do
       it "should call before_set, before adding the value to the timeline" do
         ts_metric = Nightfury::Metric::TimeSeries.new(:avg_time)
         time = Time.now
-        flexmock(ts_metric).should_receive(:before_set).with(1, time).once
+        flexmock(ts_metric).should_receive(:before_set).with(1, time).and_return([1,time]).once
         ts_metric.set(1, time)
       end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightfury
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors: