merry_go_round 0.0.3 → 0.0.4

data/lib/merry_go_round/aggregator.rb

@@ -43,7 +43,7 @@ module MerryGoRound
 
     # Aggregate existing aggregations (i.e. hour -> day)
     def compound
-      now = Time.now.utc.to_i
+      now = Time.now.utc
 
       # Loop through all of the granularities except for the first one
       MerryGoRound.granularities.each_with_index do |granularity, index|
@@ -62,10 +62,10 @@ module MerryGoRound
 
         # Loop through the results
         results.each do |result|
-          timestamp = result.timestamp.to_i
-          while timestamp < now
-            range = window(granularity, Time.at(timestamp))
-            break unless range.last < Time.now
+          timestamp = result.timestamp.utc.to_i
+          while timestamp < now.to_i
+            range = window(granularity, Time.at(timestamp).utc)
+            break unless range.first < now and range.last < now
 
             children = Aggregation.where('key = ? AND granularity = ? AND timestamp >= ? AND timestamp <= ?', result.key, prev_gran, range.first, range.last).order('timestamp ASC')
             break unless children.length > 0
@@ -76,7 +76,6 @@ module MerryGoRound
 
             # Create the aggregation
             agg = Aggregation.create(key: result.key, value: value, granularity: granularity, timestamp: range.first)
-            # puts agg.inspect
 
             # Associate the children with their parent
             children.each do |child|

data/lib/merry_go_round/version.rb

@@ -1,3 +1,3 @@
 module MerryGoRound
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/merry_go_round/aggregator_test.rb

@@ -4,10 +4,10 @@ module MerryGoRound
   class AggregatorTest < TestCase
     def test_aggregating_from_redis
       # Load the fixture. There is 60 minutes of data with 3 keys in each minute
-      redis_fixture('hour')
-
-      # Aggregate!
-      MerryGoRound.aggregate!
+      Timecop.freeze(Time.at(1360695600).utc) do
+        redis_fixture('hour')
+        MerryGoRound.aggregate!
+      end
 
       # 60 minutes * 3 keys
       assert_equal 60 * 3, Aggregation.where(granularity: 'minute').count

data/test/merry_go_round/query_test.rb

@@ -3,8 +3,10 @@ require 'test_helper'
 module MerryGoRound
   class QueryTest < TestCase
     def test_execute
-      redis_fixture('hour')
-      MerryGoRound.aggregate!
+      Timecop.freeze(Time.at(1360695600).utc) do
+        redis_fixture('hour')
+        MerryGoRound.aggregate!
+      end
 
       min = MerryGoRound::Aggregation.minimum(:timestamp).to_i
       max = MerryGoRound::Aggregation.maximum(:timestamp).to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merry_go_round
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1990269655294854867
+      hash: 4560439133261810306
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23