merry_go_round 0.0.2 → 0.0.3

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.sqlite3

data/Gemfile

@@ -16,4 +16,10 @@ group :test do
   gem 'minitest'
   gem 'minitest-wscolor'
   gem 'simplecov', require: false
+
+  gem 'sqlite3'
+  gem 'fakeredis'
+  gem 'rack-test', require: 'rack/test'
+  gem 'timecop'
+  gem 'm', require: false
 end

data/Readme.markdown

@@ -26,27 +26,49 @@ Or install it yourself as:
 
 ## Usage
 
-You'll need to add the migrations to your app. Simply run:
+You'll need to add the migrations and rake tasks to your app. Simply run:
 
     $ rails generate merry_go_round:install
 
+### Configuring
+
+All of the configuration is optional.
+
 Merry Go Round will automatically detect most Redis servers. If you need to configure it, add an initializer with:
 
 ``` ruby
 MerryGoRound.configure do |config|
+  # You can set a hash with a url and a custom namespace
   config.redis = { url: 'redis://redis.example.com:7372/12', namespace: 'mynamespace' }
+
+  # You can also set an existing redis client or a new one
+  config.redis = Redis.new
 end
 ```
 
+By default, it will namespace to `merry_go_round` using [redis-namespace](https://github.com/defunkt/redis-namespace).
+
 ### Aggregating
 
 To run the aggregator, run:
 
     $ rake merry_go_round:aggregate
 
-By default, it will aggregate everything at 1 minute, 1 hour, 1 day, 1 week, 1 month, and 1 year. All you need to do is run the command and it will automatically aggregate for each time period. If that time period is not complete, it will not aggregate them (i.e. if you have been running Merry Go Round for 5 days, it won't generate week and higher aggregations).
+It will aggregate data into minute, hour, day, week, month, quarter and year buckets. All you need to do is run the command and it will automatically aggregate for each time period. If that time period is not complete, it will not aggregate them (i.e. if you have been running Merry Go Round for 5 days, it won't generate week and higher aggregations).
+
+It is recommened to run the aggregator via cron (or [Heroku Scheduler](https://devcenter.heroku.com/articles/scheduler)) every 5 minutes. Since it uses ActiveRecord to store the aggregations, it will have to load your environment which can take a bit. Running the aggregator more than once at the same time is currently not supported and will potentially do bad things.
+
+### Querying
+
+Once you have some data in Merry Go Round, it's easy to get it out.
+
+``` ruby
+MerryGoRound::Aggregation.for_key('users', :day)
+```
+
+This will return an array of `MerryGoRound::Aggregation` objects for every day in this month. You can pass other options to customize the fetching. To get just the values, add `.collect(&:value)` to the end. It's usefull to work with the aggregation objects since they have a timestamp on them.
 
-It is recommened to run the aggregator via cron (or [Heroku Scheduler](https://devcenter.heroku.com/articles/scheduler)) every 5 minutes. Since it uses ActiveRecord to store the aggregations, it will have to load your environment.
+It's worth noting, they have a `children` method that will return the next level down. For example, calling `children` on an object returned from the above call will return 24 objects that have `:hour` as their granularity. You can further drill down all the way to minute.
 
 ## Contributing
 

data/lib/merry_go_round.rb

@@ -1,13 +1,9 @@
-require 'merry_go_round/version'
-require 'merry_go_round/aggregator'
-require 'merry_go_round/entry'
-require 'merry_go_round/aggregation'
-require 'merry_go_round/railtie' if defined? Rails
-
 require 'redis'
 require 'redis/namespace'
 
 module MerryGoRound
+  GRANULARITIES = [:minute, :hour, :day, :week, :year].freeze
+
   def self.configure
     yield self
   end
@@ -43,6 +39,10 @@ module MerryGoRound
     @@redis = Redis::Namespace.new(namespace, redis: client)
   end
 
+  def self.granularities
+    GRANULARITIES
+  end
+
 private
 
   def self.determine_redis_provider
@@ -51,3 +51,13 @@ private
     ENV[provider]
   end
 end
+
+require 'merry_go_round/version'
+require 'merry_go_round/utils'
+require 'merry_go_round/aggregator'
+require 'merry_go_round/entry'
+require 'merry_go_round/aggregation'
+require 'merry_go_round/query'
+require 'merry_go_round/web'
+require 'merry_go_round/railtie' if defined? Rails
+

data/lib/merry_go_round/aggregation.rb

@@ -4,19 +4,26 @@ module MerryGoRound
   # Aggregation is the ActiveRecord store for aggregated data points. You should
   # never create aggregations directly unless you know what you're doing.
   class Aggregation < ActiveRecord::Base
-    GRANULARITIES = [:minute, :hour, :day, :week, :year]
-
     attr_accessible :key, :value, :timestamp, :granularity, :parent_id
 
     belongs_to :parent, class_name: 'MerryGoRound::Aggregation'
     has_many :children, class_name: 'MerryGoRound::Aggregation', foreign_key: :parent_id
 
+    validates :key, :value, :timestamp, :granularity, presence: true
+    validate :valid_granularity
+
     def self.table_name
       'merry_go_round_aggregations'
     end
 
-    def self.for_key(key, granularity = GRANULARITIES.first)
-      where('key = ? AND granularity = ?', key, granularity)
+    def self.for_key(key, granularity = MerryGoRound.granularities.first)
+     where('key = ? AND granularity = ?', key, granularity)
+    end
+
+  private
+
+    def valid_granularity
+      errors.add(:message, 'is not a valid granularity') unless MerryGoRound.granularities.include?(self.granularity.to_sym)
     end
   end
 end

data/lib/merry_go_round/aggregator.rb

@@ -1,8 +1,10 @@
 module MerryGoRound
   class Aggregator
+    include Utils
+
     def aggregate!
       from_redis
-      # existing_slivers
+      compound
     end
 
   private
@@ -14,7 +16,7 @@ module MerryGoRound
     # Aggregate stuff since the last aggregation in Redis
     def from_redis
       # Aggregate to the first granularity
-      redis_granularity = Aggregation::GRANULARITIES.first
+      redis_granularity = MerryGoRound.granularities.first
 
       # Get entry keys from Redis
       redis_keys = redis.keys 'entry-*'
@@ -22,7 +24,7 @@ module MerryGoRound
       # Loop through the Redis keys
       redis_keys.each do |redis_key|
         # Extract the timestamp
-        timestamp = Time.utc(redis_key.sub('entry-', '').to_i)
+        timestamp = Time.at(redis_key.sub('entry-', '').to_i).utc
 
         # TODO: Make sure this timestamp hasn't already been aggregated
 
@@ -39,28 +41,54 @@ module MerryGoRound
       end
     end
 
-    # Aggregate existing slivers (i.e. hour -> day)
-    def existing_slivers
+    # Aggregate existing aggregations (i.e. hour -> day)
+    def compound
+      now = Time.now.utc.to_i
+
       # Loop through all of the granularities except for the first one
-      grans = GRANULARITIES.slice(1, GRANULARITIES.length - 1)
-      grans.each_with_index do |granularity, index|
+      MerryGoRound.granularities.each_with_index do |granularity, index|
+        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)
+
         # Get the previous granularity
-        prev_gran = GRANULARITIES[index - 1]
+        prev_gran = MerryGoRound.granularities[index - 1]
 
-        # Get slivers with the previous granularity
-        Sliver.where(granularity: prev_gran, )
-      end
-    end
+        # Get where we left off for this granularity
+        results = Aggregation.select('MAX(timestamp) AS timestamp, key').where(granularity: prev_gran).group(:key).order('timestamp DESC')
 
-    def self.seconds(granularity)
-      map = {
-        minute: 60,
-        hour: 3600,
-        day: 86400,
-        week: 604800,
-        year: 31536000
-      }
-      map[granularity]
+        # 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
+
+            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
+
+            # Get the aggregated value
+            # TODO: This should probably done in SQL
+            value = children.collect(&:value).reduce(:+)
+
+            # 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|
+              child.parent_id = agg.id
+              child.save
+            end
+
+            # Increment the timestamp
+            timestamp += interval
+          end
+        end
+      end
     end
   end
 end

data/lib/merry_go_round/core_ext/time.rb

@@ -0,0 +1,32 @@
+class Time
+  def beginning_of_minute
+    change(sec: 0)
+  end
+
+  def end_of_minute
+    change(
+      sec: 59,
+      usec: Rational(999999999, 1000)
+    )
+  end
+
+  def beginning_of_hour
+    change(min: 0)
+  end
+
+  def end_of_hour
+    change(
+      :min => 59,
+      :sec => 59,
+      :usec => Rational(999999999, 1000)
+    )
+  end
+
+  def all_minute
+    beginning_of_minute..end_of_minute
+  end
+
+  def all_hour
+    beginning_of_hour..end_of_hour
+  end
+end

data/lib/merry_go_round/query.rb

@@ -0,0 +1,71 @@
+module MerryGoRound
+  class Query
+    include Utils
+
+    attr_accessor :keys, :granularity, :min, :max
+
+    def initialize(params = {})
+      self.granularity = params[:granularity] || :hour
+      self.keys = [params[:keys]].flatten.compact
+      parse_max(params)
+      parse_min(params)
+    end
+
+    def execute
+      query = MerryGoRound::Aggregation
+      if keys && keys.length > 0
+        query = query.where('key in (?)', keys)
+      end
+      query = query.where('granularity = ? and timestamp >= ? and timestamp <= ?', granularity, min, max)
+      query = query.order('key, timestamp')
+
+      records = query.all
+      keys = records.map(&:key).uniq
+
+      results = keys.inject({}) do |out, current_key|
+        out[current_key] = records.select{|record| record.key == current_key }.map do |item|
+          {
+            id: item.id,
+            parent_id: item.parent_id,
+            timestamp: item.timestamp,
+            value: item.value,
+            granularity: item.granularity
+          }
+        end
+
+        out
+      end
+
+      {
+        results: results,
+        query: self.as_json
+      }
+    end
+
+    private
+
+    def parse_max(params)
+      max = Time.at((params[:max] || Time.now).to_i).utc
+      # remove seconds
+      self.max = max - max.sec
+    end
+
+    def parse_min(params)
+      if params[:min]
+        min = Time.at(params[:min].to_i).utc
+      else
+        current_granularity = MerryGoRound.granularities.index(granularity)
+
+        unless less_granularity = MerryGoRound.granularities[current_granularity + 1]
+          less_granularity = query.granularity
+        end
+
+        min = Time.now.utc - seconds(less_granularity)
+      end
+
+      # remove seconds
+      self.min = min - min.sec
+    end
+
+  end
+end

data/lib/merry_go_round/utils.rb

@@ -0,0 +1,23 @@
+require 'active_support/time'
+require 'merry_go_round/core_ext/time'
+
+module MerryGoRound
+  module Utils
+    module_function
+
+    def seconds(granularity)
+      map = {
+        minute: 60,
+        hour: 3600,
+        day: 86400,
+        week: 604800,
+        year: 31536000
+      }
+      map[granularity]
+    end
+
+    def window(granularity, timestamp)
+      timestamp.utc.send(:"all_#{granularity.to_s}")
+    end
+  end
+end

data/lib/merry_go_round/version.rb

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

data/lib/merry_go_round/web.rb

@@ -0,0 +1,36 @@
+require 'sinatra'
+require 'multi_json'
+require 'merry_go_round/aggregation'
+
+class MerryGoRound::Web < Sinatra::Application
+
+  before do
+    content_type 'application/json'
+  end
+
+  # Homepage
+  get '/config' do
+    response_hash = {
+    }
+    body { MultiJson.dump(response_hash) }
+  end
+
+  get '/query' do
+    results = MerryGoRound::Query.new(params).execute
+    body { MultiJson.dump(results)}
+  end
+
+  protected
+
+  def render_error(message, status = 500)
+
+    response_hash = {
+      error: {
+        status: status,
+        message: message
+      }
+    }
+
+    halt status, MultiJson.dump(response_hash)
+  end
+end

data/lib/rails/generators/merry_go_round/install/templates/add_aggregations.rb

@@ -17,7 +17,7 @@ class AddMerryGoRoundAggregations < ActiveRecord::Migration
       t.integer :parent_id
     end
 
-    add_index :merry_go_round_aggregations, [:key, :granularity, :timestamp, :parent_id], name: 'merry_go_round_aggregations_kgtp'
+    add_index :merry_go_round_aggregations, [:granularity, :timestamp, :key, :parent_id], name: 'merry_go_round_aggregations_kgtp'
     add_index :merry_go_round_aggregations, [:parent_id, :granularity, :timestamp], name: 'merry_go_round_aggregations_pgt'
   end
 end

data/merry_go_round.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.2'
   gem.add_dependency 'activerecord', '>= 3.0.0'
+  gem.add_dependency 'activesupport', '>= 3.0.0'
   gem.add_dependency 'redis', '>= 3.0.0'
   gem.add_dependency 'redis-namespace'
-  gem.add_dependency 'thor'
+  gem.add_dependency 'sinatra'
 end

data/test/fixtures/hour.yml

@@ -0,0 +1,240 @@
+entry-1360692000:
+  user: 167
+  vote: 589
+  comment: 40
+entry-1360692060:
+  user: 17
+  vote: 448
+  comment: 49
+entry-1360692120:
+  user: 77
+  vote: 320
+  comment: 45
+entry-1360692180:
+  user: 143
+  vote: 101
+  comment: 2
+entry-1360692240:
+  user: 19
+  vote: 389
+  comment: 22
+entry-1360692300:
+  user: 77
+  vote: 895
+  comment: 36
+entry-1360692360:
+  user: 59
+  vote: 205
+  comment: 18
+entry-1360692420:
+  user: 136
+  vote: 891
+  comment: 20
+entry-1360692480:
+  user: 68
+  vote: 233
+  comment: 32
+entry-1360692540:
+  user: 144
+  vote: 392
+  comment: 32
+entry-1360692600:
+  user: 74
+  vote: 984
+  comment: 19
+entry-1360692660:
+  user: 116
+  vote: 283
+  comment: 38
+entry-1360692720:
+  user: 102
+  vote: 750
+  comment: 38
+entry-1360692780:
+  user: 100
+  vote: 214
+  comment: 15
+entry-1360692840:
+  user: 198
+  vote: 622
+  comment: 38
+entry-1360692900:
+  user: 130
+  vote: 503
+  comment: 10
+entry-1360692960:
+  user: 24
+  vote: 372
+  comment: 21
+entry-1360693020:
+  user: 88
+  vote: 669
+  comment: 10
+entry-1360693080:
+  user: 45
+  vote: 414
+  comment: 8
+entry-1360693140:
+  user: 28
+  vote: 367
+  comment: 42
+entry-1360693200:
+  user: 70
+  vote: 168
+  comment: 10
+entry-1360693260:
+  user: 28
+  vote: 156
+  comment: 13
+entry-1360693320:
+  user: 151
+  vote: 175
+  comment: 38
+entry-1360693380:
+  user: 186
+  vote: 737
+  comment: 29
+entry-1360693440:
+  user: 175
+  vote: 946
+  comment: 39
+entry-1360693500:
+  user: 33
+  vote: 735
+  comment: 21
+entry-1360693560:
+  user: 177
+  vote: 328
+  comment: 37
+entry-1360693620:
+  user: 45
+  vote: 722
+  comment: 43
+entry-1360693680:
+  user: 91
+  vote: 250
+  comment: 31
+entry-1360693740:
+  user: 153
+  vote: 501
+  comment: 25
+entry-1360693800:
+  user: 43
+  vote: 890
+  comment: 18
+entry-1360693860:
+  user: 4
+  vote: 937
+  comment: 45
+entry-1360693920:
+  user: 135
+  vote: 527
+  comment: 12
+entry-1360693980:
+  user: 133
+  vote: 662
+  comment: 9
+entry-1360694040:
+  user: 129
+  vote: 793
+  comment: 25
+entry-1360694100:
+  user: 43
+  vote: 963
+  comment: 28
+entry-1360694160:
+  user: 11
+  vote: 104
+  comment: 27
+entry-1360694220:
+  user: 7
+  vote: 748
+  comment: 8
+entry-1360694280:
+  user: 177
+  vote: 302
+  comment: 12
+entry-1360694340:
+  user: 174
+  vote: 122
+  comment: 17
+entry-1360694400:
+  user: 79
+  vote: 489
+  comment: 28
+entry-1360694460:
+  user: 11
+  vote: 973
+  comment: 3
+entry-1360694520:
+  user: 46
+  vote: 272
+  comment: 22
+entry-1360694580:
+  user: 173
+  vote: 877
+  comment: 24
+entry-1360694640:
+  user: 130
+  vote: 379
+  comment: 25
+entry-1360694700:
+  user: 130
+  vote: 537
+  comment: 48
+entry-1360694760:
+  user: 124
+  vote: 771
+  comment: 7
+entry-1360694820:
+  user: 135
+  vote: 618
+  comment: 17
+entry-1360694880:
+  user: 192
+  vote: 844
+  comment: 50
+entry-1360694940:
+  user: 186
+  vote: 150
+  comment: 16
+entry-1360695000:
+  user: 193
+  vote: 142
+  comment: 6
+entry-1360695060:
+  user: 56
+  vote: 786
+  comment: 39
+entry-1360695120:
+  user: 72
+  vote: 473
+  comment: 16
+entry-1360695180:
+  user: 9
+  vote: 904
+  comment: 14
+entry-1360695240:
+  user: 33
+  vote: 450
+  comment: 50
+entry-1360695300:
+  user: 175
+  vote: 836
+  comment: 43
+entry-1360695360:
+  user: 91
+  vote: 694
+  comment: 6
+entry-1360695420:
+  user: 61
+  vote: 788
+  comment: 48
+entry-1360695480:
+  user: 193
+  vote: 918
+  comment: 30
+entry-1360695540:
+  user: 119
+  vote: 721
+  comment: 11

data/test/merry_go_round/aggregation_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+module MerryGoRound
+  class AggregationTest < TestCase
+    def test_creating
+      Aggregation.create(key: 'test', value: 1, granularity: 'minute', timestamp: Time.now)
+    end
+
+    def test_validating_granularities
+      agg = Aggregation.new(key: 'test', value: 2, granularity: 'crap', timestamp: Time.now)
+      refute agg.save
+
+      agg.granularity = :minute
+      assert agg.save
+    end
+  end
+end

data/test/merry_go_round/aggregator_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+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!
+
+      # 60 minutes * 3 keys
+      assert_equal 60 * 3, Aggregation.where(granularity: 'minute').count
+
+      # 1 hour * 3 keys
+      assert_equal 3, Aggregation.where(granularity: 'hour').count
+
+      # No days since there is only an hour of data
+      assert_equal 0, Aggregation.where(granularity: 'day').count
+
+      # The minute aggregations should belong to an hour one
+      refute_nil Aggregation.where(granularity: 'minute').first.parent_id
+      assert_equal 'hour', Aggregation.where(granularity: 'minute').first.parent.granularity
+    end
+  end
+end

data/test/merry_go_round/query_test.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+
+module MerryGoRound
+  class QueryTest < TestCase
+    def test_execute
+      redis_fixture('hour')
+      MerryGoRound.aggregate!
+
+      min = MerryGoRound::Aggregation.minimum(:timestamp).to_i
+      max = MerryGoRound::Aggregation.maximum(:timestamp).to_i
+
+      query = Query.new(max: max, granularity: :hour)
+      out = query.execute
+
+      assert_equal 2, out.keys.length
+      out[:results].keys.each do |key|
+        assert_equal 1, out[:results][key].length
+      end
+    end
+
+    def test_parsing_with_no_arguments
+      Timecop.freeze(Time.now) do
+        max_time = Time.at(Time.now.to_i)
+
+        query = Query.new(keys: 'test')
+        # should default to now, sans seconds
+        expected_max = max_time.utc - max_time.utc.sec
+        # should default to a day ago
+        expected_min = expected_max - 86400
+
+        assert_query_match query, expected_min, expected_max, 'test', :hour
+      end
+    end
+
+    def test_parsing_with_min_and_max
+      Timecop.freeze(Time.now) do
+        # add some arbitrary offset
+        max_time = Time.now - 5000
+        # back in time by a day
+        min_time = max_time - 86400
+
+        query = Query.new(min: min_time.to_i, max: max_time.to_i, keys: 'test')
+        expected_max = max_time.utc - max_time.utc.sec
+        expected_min = min_time.utc - min_time.utc.sec
+
+        assert_query_match query, expected_min, expected_max, 'test', :hour
+      end
+    end
+
+    def test_parsing_with_granularity
+      Timecop.freeze(Time.now) do
+        max_time = Time.at(Time.now.to_i)
+
+        query = Query.new(granularity: :week, keys: 'test')
+        # should default to now, sans seconds
+        expected_max = max_time.utc - max_time.utc.sec
+        # should default to a day ago
+        expected_min = expected_max - 31536000
+
+        assert_query_match query, expected_min, expected_max, 'test', :week
+      end
+    end
+
+    def assert_query_match(query, expected_min, expected_max, expected_key, expected_granularity)
+      assert_equal expected_max.to_i, query.max.to_i
+      assert_equal expected_min.to_i, query.min.to_i
+      assert_equal expected_granularity, query.granularity
+      assert_equal [expected_key], query.keys
+    end
+  end
+end

data/test/merry_go_round/utils_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+module MerryGoRound
+  class UtilsTest < TestCase
+    include Utils
+  end
+end

data/test/merry_go_round/web_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+require 'rack/test'
+
+class WebTest < MerryGoRound::TestCase
+  include Rack::Test::Methods
+
+  def app
+    MerryGoRound::Web
+  end
+
+  def test_root
+    get '/query'
+    # puts last_response.body
+  end
+end

data/test/schema.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+ActiveRecord::Schema.define(:version => 20130212042134) do
+  create_table "merry_go_round_aggregations", :force => true do |t|
+    t.string   "key",                        :null => false
+    t.integer  "value",       :default => 0, :null => false
+    t.datetime "timestamp",                  :null => false
+    t.string   "granularity",                :null => false
+    t.integer  "parent_id"
+  end
+
+  add_index "merry_go_round_aggregations", ["granularity", "timestamp", "key", "parent_id"], :name => "merry_go_round_aggregations_kgtp"
+  add_index "merry_go_round_aggregations", ["parent_id", "granularity", "timestamp"], :name => "merry_go_round_aggregations_pgt"
+end

data/test/support/active_record.rb

@@ -0,0 +1,2 @@
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+load File.expand_path('../../schema.rb', __FILE__)

data/test/support/fixtures.rb

@@ -0,0 +1,17 @@
+module FixtureMacros
+  def fixture(name)
+    path = File.expand_path("../../fixtures/#{name}.yml", __FILE__)
+    YAML::load(File.open(path))
+  end
+
+  def redis_fixture(name)
+    hash = fixture(name)
+    redis = MerryGoRound.redis
+
+    hash.each do |key, value|
+      value.each do |k, v|
+        redis.hset key, k, v
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -14,4 +14,10 @@ Dir["#{File.expand_path(File.dirname(__FILE__))}/support/*.rb"].each do |file|
 end
 
 class MerryGoRound::TestCase < MiniTest::Unit::TestCase
+  include FixtureMacros
+
+  def teardown
+    MerryGoRound::Aggregation.delete_all
+    MerryGoRound.redis.flushdb
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merry_go_round
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -78,8 +94,7 @@ dependencies:
 description: Simple data-warehousing.
 email:
 - sam@soff.es
-executables:
-- merry
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -90,19 +105,31 @@ files:
 - LICENSE
 - Rakefile
 - Readme.markdown
-- bin/merry
 - lib/merry_go_round.rb
 - lib/merry_go_round/aggregation.rb
 - lib/merry_go_round/aggregator.rb
+- lib/merry_go_round/core_ext/time.rb
 - lib/merry_go_round/entry.rb
+- lib/merry_go_round/query.rb
 - lib/merry_go_round/railtie.rb
+- lib/merry_go_round/utils.rb
 - lib/merry_go_round/version.rb
+- lib/merry_go_round/web.rb
 - lib/rails/generators/merry_go_round/install/USAGE
 - lib/rails/generators/merry_go_round/install/install_generator.rb
 - lib/rails/generators/merry_go_round/install/templates/add_aggregations.rb
 - lib/rails/generators/merry_go_round/install/templates/merry_go_round.rake
 - merry_go_round.gemspec
+- test/fixtures/hour.yml
+- test/merry_go_round/aggregation_test.rb
+- test/merry_go_round/aggregator_test.rb
+- test/merry_go_round/query_test.rb
+- test/merry_go_round/utils_test.rb
+- test/merry_go_round/web_test.rb
 - test/merry_go_round_test.rb
+- test/schema.rb
+- test/support/active_record.rb
+- test/support/fixtures.rb
 - test/test_helper.rb
 homepage: https://github.com/seesawco/merry_go_round
 licenses:
@@ -125,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1524497332131136507
+      hash: -1990269655294854867
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -133,6 +160,15 @@ signing_key:
 specification_version: 3
 summary: Simple data-warehousing with Redis and PostgreSQL.
 test_files:
+- test/fixtures/hour.yml
+- test/merry_go_round/aggregation_test.rb
+- test/merry_go_round/aggregator_test.rb
+- test/merry_go_round/query_test.rb
+- test/merry_go_round/utils_test.rb
+- test/merry_go_round/web_test.rb
 - test/merry_go_round_test.rb
+- test/schema.rb
+- test/support/active_record.rb
+- test/support/fixtures.rb
 - test/test_helper.rb
 has_rdoc: 

data/bin/merry

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-lib = File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'merry_go_round/cli'
-
-MerryGoRound::Cli.start