merry_go_round 0.0.1 → 0.0.2

data/Readme.markdown

@@ -28,7 +28,7 @@ Or install it yourself as:
 
 You'll need to add the migrations to your app. Simply run:
 
-    $ merry install
+    $ rails generate merry_go_round:install
 
 Merry Go Round will automatically detect most Redis servers. If you need to configure it, add an initializer with:
 
@@ -42,11 +42,11 @@ end
 
 To run the aggregator, run:
 
-    $ merry go
+    $ 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 is recommened to run the aggregator via cron (or [Heroku Scheduler](https://devcenter.heroku.com/articles/scheduler)) every few minutes. Since it uses ActiveRecord to store the aggregations, it will have to load your environment.
+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.
 
 ## Contributing
 

data/lib/merry_go_round/aggregation.rb

@@ -4,13 +4,19 @@ 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 :aggregation, foreign_key: :parent_id
-    has_many :aggregations, foreign_key: :parent_id
+    belongs_to :parent, class_name: 'MerryGoRound::Aggregation'
+    has_many :children, class_name: 'MerryGoRound::Aggregation', foreign_key: :parent_id
+
+    def self.table_name
+      'merry_go_round_aggregations'
+    end
 
-    def self.values_for_key(key, granularity = 60)
-      where('key = ? AND granularity = ?', granularity)
+    def self.for_key(key, granularity = GRANULARITIES.first)
+      where('key = ? AND granularity = ?', key, granularity)
     end
   end
 end

data/lib/merry_go_round/aggregator.rb

@@ -1,10 +1,8 @@
 module MerryGoRound
   class Aggregator
-    GRANULARITIES = [:minute, :hour, :day, :week, :year] # :month, :quarter
-
     def aggregate!
       from_redis
-      existing_slivers
+      # existing_slivers
     end
 
   private
@@ -16,7 +14,7 @@ module MerryGoRound
     # Aggregate stuff since the last aggregation in Redis
     def from_redis
       # Aggregate to the first granularity
-      redis_granularity = GRANULARITIES.first
+      redis_granularity = Aggregation::GRANULARITIES.first
 
       # Get entry keys from Redis
       redis_keys = redis.keys 'entry-*'
@@ -26,19 +24,18 @@ module MerryGoRound
         # Extract the timestamp
         timestamp = Time.utc(redis_key.sub('entry-', '').to_i)
 
-        # Make sure this timestamp hasn't already been aggregated
-        redis.multi do
-          # Get the hash of Merry Go Round keys and values
-          hash = redis.hgetall redis_key
+        # TODO: Make sure this timestamp hasn't already been aggregated
 
-          # Loop through each key/value in the hash
-          hash.each do |key, value|
-            Sliver.create(key: key, value: value, timestamp: timestamp, granularity: redis_granularity)
-          end
+        # Get the hash of Merry Go Round keys and values
+        hash = redis.hgetall redis_key
 
-          # Delete the key
-          redis.del redis_key
+        # Loop through each key/value in the hash
+        hash.each do |key, value|
+          Aggregation.create(key: key, value: value, timestamp: timestamp, granularity: redis_granularity)
         end
+
+        # Delete the key
+        redis.del redis_key
       end
     end
 

data/lib/merry_go_round/version.rb

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

data/lib/rails/generators/merry_go_round/install/install_generator.rb

@@ -17,6 +17,7 @@ module MerryGoRound
 
       def copy_migrations
         migration_template 'add_aggregations.rb', 'db/migrate/add_merry_go_round_aggregations.rb'
+        copy_file 'merry_go_round.rake', 'lib/tasks/merry_go_round.rake'
       end
     end
   end

data/lib/rails/generators/merry_go_round/install/templates/merry_go_round.rake

@@ -0,0 +1,6 @@
+namespace :merry_go_round do
+  desc 'Run the aggregations'
+  task aggregate: :environment do
+    MerryGoRound.aggregate!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merry_go_round
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -94,13 +94,13 @@ files:
 - lib/merry_go_round.rb
 - lib/merry_go_round/aggregation.rb
 - lib/merry_go_round/aggregator.rb
-- lib/merry_go_round/cli.rb
 - lib/merry_go_round/entry.rb
 - lib/merry_go_round/railtie.rb
 - lib/merry_go_round/version.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/merry_go_round_test.rb
 - test/test_helper.rb
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3503042711735793145
+      hash: 1524497332131136507
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/merry_go_round/cli.rb

@@ -1,17 +0,0 @@
-require 'thor'
-require 'merry_go_round'
-
-module MerryGoRound
-  class Cli < Thor
-    desc 'go', 'Aggregate collected data in Redis into ActiveRecord Slivers.'
-    def go
-      MerryGoRound.aggregate!
-    end
-
-    desc 'install', 'Install the Merry Go Round migration'
-    def install
-      system 'rails generate merry_go_round:install'
-      puts "\n\nThe migratation has been installed. Don't forget to run `rake db:migrate`.\n"
-    end
-  end
-end