merry_go_round 0.0.4 → 0.0.5

data/lib/merry_go_round/aggregator.rb

@@ -47,10 +47,9 @@ module MerryGoRound
 
       # Loop through all of the granularities except for the first one
       MerryGoRound.granularities.each_with_index do |granularity, index|
+        # Skip minutes since the Redis aggregator does those
         next if index == 0
 
-        # TODO: Check time interval to see if we have enough data to do this granularity
-
         # Time interval for granularity
         interval = seconds(granularity)
 
@@ -67,6 +66,9 @@ module MerryGoRound
             range = window(granularity, Time.at(timestamp).utc)
             break unless range.first < now and range.last < now
 
+            # Check time interval to see if we have enough data to do this granularity
+            break if Aggregation.where('key = ? AND granularity = ? AND timestamp = ?', result.key, granularity, range.first).first
+
             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
 

data/lib/merry_go_round/version.rb

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

data/test/merry_go_round/aggregator_test.rb

@@ -7,6 +7,7 @@ module MerryGoRound
       Timecop.freeze(Time.at(1360695600).utc) do
         redis_fixture('hour')
         MerryGoRound.aggregate!
+        MerryGoRound.aggregate!
       end
 
       # 60 minutes * 3 keys

metadata

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