nightfury 0.5 → 0.6

data/lib/nightfury.rb

@@ -4,8 +4,22 @@ require 'json'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/numeric/time'
 require 'active_support/concern'
 
+class Time
+  def round(seconds = 60)
+    Time.at((self.to_f / seconds).round * seconds)
+  end
+
+  def floor(seconds = 60)
+    Time.at((self.to_f / seconds).floor * seconds)
+  end
+end
+
 module Nightfury
   class << self
     attr_accessor :redis, :namespace

data/lib/nightfury/identity.rb

@@ -36,8 +36,10 @@ module Nightfury
       end
       
       attr_accessor :id, :tags
+      attr_reader :redis
 
       def initialize(id, options={})
+        @redis = Nightfury.redis
         @id = id
         @tags = options[:tags]
       end
@@ -49,6 +51,10 @@ module Nightfury
         "#{store_name}.#{id}#{tag_ids}"
       end
 
+      def new_record?
+        redis.keys("#{key_prefix}*").empty?
+      end
+
       private 
 
       def generate_tag_ids

data/lib/nightfury/metric.rb

@@ -1,13 +1,17 @@
 module Nightfury
   module Metric
     class Base      
-      attr_reader :name, :redis, :redis_key_prefix, :store_as
+
+      ALLOWED_STEPS = [:minute, :hour, :week, :month, :year]
+
+      attr_reader :name, :redis, :redis_key_prefix, :store_as, :step
       
       def initialize(name, options={})
         @name = name
         @redis = Nightfury.redis
         @redis_key_prefix = options[:redis_key_prefix]
         @store_as = options[:store_as]
+        @step =  ALLOWED_STEPS.include?(options[:step]) ? options[:step] : :minute
       end
 
       def redis_key

data/lib/nightfury/metric/time_series.rb

@@ -20,7 +20,7 @@ module Nightfury
         return nil unless redis.exists(redis_key)
         data_point = ''
         if timestamp
-          timestamp = timestamp.to_i
+          timestamp = get_step_time(timestamp).to_i
           data_point = redis.zrangebyscore(redis_key, 0, timestamp, withscores: true)
           data_point = data_point.each_slice(2).map {|pair| pair }.last
         else
@@ -37,8 +37,8 @@ module Nightfury
 
       def get_range(start_time, end_time)
         return nil unless redis.exists(redis_key)        
-        start_time = start_time.to_i
-        end_time = end_time.to_i
+        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)
         decode_many_data_points(data_points)
       end
@@ -75,9 +75,8 @@ module Nightfury
       private
       
       def add_value_to_timeline(value, time)
-        time = time.to_i
-        value = "#{time}:#{value}"
-        redis.zadd redis_key, time, value
+        timestamp = get_step_time(time).to_i
+        redis.zadd redis_key, timestamp, value
       end
 
       def decode_many_data_points(data_points)
@@ -91,13 +90,7 @@ module Nightfury
       end
 
       def decode_data_point(data_point)
-        data_point = data_point.first
-        colon_index = data_point.index(':')
-
-        [
-          data_point[0...colon_index], 
-          data_point[colon_index+1..-1]
-        ]
+        [data_point[1], data_point[0]]
       end
 
       def save_meta
@@ -108,6 +101,15 @@ module Nightfury
       def init_time_series
         redis.zadd redis_key, 0, default_meta.to_json
       end
+
+      def get_step_time(time)
+        case step
+          when :minute then time.round(60)
+          when :hour then time.round(1.hour)
+          when :week then time.round(1.week)
+          when :month then time.round(Time.days_in_month(time.month, time.year))
+        end
+      end
     end
   end
 end

data/lib/nightfury/version.rb

@@ -1,3 +1,3 @@
 module Nightfury
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

data/spec/nightfury/identity_spec.rb

@@ -41,6 +41,11 @@ describe Nightfury::Identity::Base do
       d.id.should == 1
     end
 
+    it "should respond to redis" do
+      d = Dummy.new(1)
+      d.redis.should == Nightfury.redis
+    end
+
     it "should generates a key prefix" do
       d = Dummy.new(1)
       d.key_prefix.should == 'dummy.1'
@@ -52,6 +57,16 @@ describe Nightfury::Identity::Base do
       d.key_prefix.should == 'd.1'
     end
 
+    it "should be able tell if self is a new record" do
+      Dummy.metric(:new_metric)
+
+      d = Dummy.new(1)
+      d.should be_new_record
+      
+      d.new_metric.set(1)
+      d.should_not be_new_record
+    end
+
     it "should include tags in the key prefix" do
       DummyTwo = Class.new(Dummy)
       DummyTwo.store_as = :d

data/spec/nightfury/metric/count_time_series_spec.rb

@@ -14,7 +14,7 @@ describe Nightfury::Metric::CountTimeSeries do
         end
         Timecop.return
 
-        count_series.get.should == { time_now.to_i.to_s => "2"}
+        count_series.get.values.first.should == "2"
       end
 
       it "should be able to increment value by a given step" do
@@ -28,18 +28,18 @@ describe Nightfury::Metric::CountTimeSeries do
         end
         Timecop.return
 
-        count_series.get.should == { time_now.to_i.to_s => "3"}
+        count_series.get.values.first.should == "3"
       end
 
 
-      it "should be able to increment value at a given timestamp" do
+      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 + 10
+        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 == { time_later.to_i.to_s => "2"}
+        count_series.get.should == { time_later.round(60).to_i.to_s => "2"}
       end
     end
 
@@ -48,50 +48,50 @@ describe Nightfury::Metric::CountTimeSeries do
         count_series = Nightfury::Metric::CountTimeSeries.new(1)
         time_now = Time.now
         count_series.incr(2, time_now)
-        count_series.get.should == { time_now.to_i.to_s => "2"}
+        count_series.get.should == { time_now.round(60).to_i.to_s => "2"}
       end
     end
   end
   
   describe "Decr" do
     context "Has data points" do
-      it "should be able to decrement value by 1 at the current timestamp by default" 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 - 10)
+        count_series.set(1, time_now - 61)
 
         Timecop.freeze(time_now) do
           count_series.decr
         end
         Timecop.return
 
-        count_series.get.should == { time_now.to_i.to_s => "0"}
+        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 - 10)
+        count_series.set(2, time_now - 61)
 
         Timecop.freeze(time_now) do
           count_series.decr(2)
         end
         Timecop.return
 
-        count_series.get.should == { time_now.to_i.to_s => "0"}
+        count_series.get.values.first.should == "0"
       end
 
 
-      it "should be able to decrement value at a given timestamp" do
+      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 + 10
+        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 == { time_later.to_i.to_s => "0"}
+        count_series.get.should == { time_later.round(60).to_i.to_s => "0"}
       end
     end
 
@@ -100,7 +100,7 @@ describe Nightfury::Metric::CountTimeSeries do
         count_series = Nightfury::Metric::CountTimeSeries.new(1)
         time_now = Time.now
         count_series.decr(2, time_now)
-        count_series.get.should == { time_now.to_i.to_s => "-2"}
+        count_series.get.should == { time_now.round(60).to_i.to_s => "-2"}
       end
     end
   end

data/spec/nightfury/metric/time_series_spec.rb

@@ -31,11 +31,11 @@ describe Nightfury::Metric::TimeSeries do
         it "should get the most recent data point" do
           ts_metric = Nightfury::Metric::TimeSeries.new(:time)
           time_now = Time.now
-          time_later = time_now + 10
+          time_later = time_now + 60
           ts_metric.set(1, time_now)
           ts_metric.set(2, time_later)
           result = ts_metric.get
-          result[time_later.to_i.to_s].should == '2'
+          result.values.first.should == '2'
         end
 
         it "should return nil if there are no data points" do
@@ -45,14 +45,14 @@ describe Nightfury::Metric::TimeSeries do
       end
 
       context "with timestamp" do
-        it "should get the data point at the time stamp" do
+        it "should get the data point at the nearest time step" do
           ts_metric = Nightfury::Metric::TimeSeries.new(:time)
           time_now = Time.now
-          time_later = time_now + 10
+          time_later = time_now + 60
           ts_metric.set(1, time_now)
           ts_metric.set(2, time_later)
           result = ts_metric.get(time_now)
-          result[time_now.to_i.to_s].should == '1'
+          result.values.first.should == '1'
         end
 
         context "no data point at the timestamp" do
@@ -66,7 +66,7 @@ describe Nightfury::Metric::TimeSeries do
             set_time = Time.now - 60
             ts_metric.set(1, set_time)
             result = ts_metric.get(Time.now)
-            result[set_time.to_i.to_s].should == '1'
+            result.values.first.should == '1'
           end
         end
       end
@@ -92,16 +92,14 @@ describe Nightfury::Metric::TimeSeries do
 
         10.times do |i|
           ts_metric.set(i, loop_time)
-          loop_time = loop_time + 1
+          loop_time = loop_time + 61
         end
 
-        start_time = time + 3
-        end_time = time + 5
+        start_time = time + (3*60)
+        end_time = time + (5*60)
 
         result = ts_metric.get_range(start_time, end_time)
-        result[start_time.to_i.to_s].should == '3'
-        result[(start_time.to_i + 1).to_s].should == '4'
-        result[end_time.to_i.to_s].should == '5'
+        result.values.should == ['3','4','5']
       end
     end
 
@@ -125,7 +123,7 @@ describe Nightfury::Metric::TimeSeries do
 
         10.times do |i|
           ts_metric.set(i, loop_time)
-          loop_time = loop_time + 1
+          loop_time = loop_time + 61
         end
 
         result = ts_metric.get_all
@@ -150,13 +148,13 @@ describe Nightfury::Metric::TimeSeries do
     end
   
     describe "add the value to timeline" do
-      it "should default time to current time" do
+      it "should default time to the step near the current time" do
         time_now = Time.now 
         ts_metric = Nightfury::Metric::TimeSeries.new(:avg_time)
 
         flexmock(ts_metric.redis).should_receive(:zadd)
                                  .with(ts_metric.redis_key, 
-                                       time_now.to_i, 
+                                       time_now.round(60).to_i, 
                                        FlexMock.any)
                                  .once
 
@@ -166,30 +164,18 @@ describe Nightfury::Metric::TimeSeries do
         Timecop.return
       end
 
-      it "should add at specified time" do
+      it "should add at the step near to specified time" do
         time = Time.now - 60
         ts_metric = Nightfury::Metric::TimeSeries.new(:avg_time)
 
         flexmock(ts_metric.redis).should_receive(:zadd)
                                  .with(ts_metric.redis_key, 
-                                       time.to_i, 
+                                       time.round(60).to_i, 
                                        FlexMock.any)
                                  .once
 
         ts_metric.set(1, time)
       end
-
-      it "should add the time to the value to avoid duplicate value in the set" do
-        time = Time.now
-        ts_metric = Nightfury::Metric::TimeSeries.new(:avg_time)
-
-        flexmock(ts_metric.redis).should_receive(:zadd)
-                                 .with(FlexMock.any, 
-                                       FlexMock.any, 
-                                       "#{time.to_i}:1")
-                                 .once
-        ts_metric.set(1, time)
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightfury
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies: []
 description: Nightfury is a reporting/analytics backend written on Redis
 email: