nightfury 0.6.1 → 0.6.2

data/lib/nightfury.rb

@@ -10,16 +10,6 @@ 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/metric/time_series.rb

@@ -1,6 +1,10 @@
 module Nightfury
   module Metric
     class TimeSeries < Base
+      
+      def self.round_time(time, seconds=60)
+        Time.at((time.to_f / seconds).round * seconds)
+      end
 
       def initialize(name, options={})
         super(name, options)
@@ -102,13 +106,17 @@ module Nightfury
         redis.zadd redis_key, 0, default_meta.to_json
       end
 
+      def round_time(time, seconds=60)
+        self.class.round_time(time, seconds)
+      end
+
       def get_step_time(time)
         case step
-          when :minute then time.round(60)
-          when :hour then time.round(1.hour)
-          when :day then time.round(1.day)
-          when :week then time.round(1.week)
-          when :month then time.round(Time.days_in_month(time.month, time.year))
+          when :minute then round_time(time, 60)
+          when :hour then round_time(time, 1.hour)
+          when :day then round_time(time, 1.day)
+          when :week then round_time(time, 1.week)
+          when :month then round_time(time, Time.days_in_month(time.month, time.year))
         end
       end
     end

data/lib/nightfury/version.rb

@@ -1,3 +1,3 @@
 module Nightfury
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/nightfury/metric/count_time_series_spec.rb

@@ -39,7 +39,7 @@ describe Nightfury::Metric::CountTimeSeries do
         # Add a data point
         count_series.set(1, time_now - 10)
         count_series.incr(1,time_later)
-        count_series.get.should == { time_later.round(60).to_i.to_s => "2"}
+        count_series.get.should == { round_time(time_later, 60).to_i.to_s => "2"}
       end
     end
 
@@ -48,7 +48,7 @@ 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.round(60).to_i.to_s => "2"}
+        count_series.get.should == { round_time(time_now, 60).to_i.to_s => "2"}
       end
     end
   end
@@ -91,7 +91,7 @@ describe Nightfury::Metric::CountTimeSeries do
         # Add a data point
         count_series.set(1, time_now - 10)
         count_series.decr(1,time_later)
-        count_series.get.should == { time_later.round(60).to_i.to_s => "0"}
+        count_series.get.should == { round_time(time_later, 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.round(60).to_i.to_s => "-2"}
+        count_series.get.should == { round_time(time_now, 60).to_i.to_s => "-2"}
       end
     end
   end

data/spec/nightfury/metric/time_series_spec.rb

@@ -154,7 +154,7 @@ describe Nightfury::Metric::TimeSeries do
 
         flexmock(ts_metric.redis).should_receive(:zadd)
                                  .with(ts_metric.redis_key, 
-                                       time_now.round(60).to_i, 
+                                       round_time(time_now, 60).to_i, 
                                        FlexMock.any)
                                  .once
 
@@ -170,7 +170,7 @@ describe Nightfury::Metric::TimeSeries do
 
         flexmock(ts_metric.redis).should_receive(:zadd)
                                  .with(ts_metric.redis_key, 
-                                       time.round(60).to_i, 
+                                       round_time(time, 60).to_i, 
                                        FlexMock.any)
                                  .once
 

data/spec/spec_helper.rb

@@ -33,3 +33,7 @@ RSpec.configure do |config|
     REDIS_CLIENT.flushdb
   end
 end
+
+def round_time(time, seconds=60)
+  Nightfury::Metric::TimeSeries.round_time(time, 60)
+end

metadata

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