cohortly 0.0.4 → 0.0.5

data/app/models/cohortly/metric.rb

@@ -15,12 +15,14 @@ module Cohortly
     
     def self.store!(args)
       data = args[4]
-      if data[:controller] && !data[:controller]['cohortly']
+      data[:tags] = []
+      if data[:controller]
+        return if data[:controller]['cohortly']
         data[:tags] = Cohortly::TagConfig.tags_for(data[:controller], data[:action])
-        data[:user_email] = data[:email] if data[:email]
-        data[:tags] += data[:add_tags] if data[:add_tags]
-        create(data)
       end
+      data[:user_email] = data[:email] if data[:email]
+      data[:tags] += data[:add_tags] if data[:add_tags]
+      create(data)
     end
 
     def self.cohort_chart_for_tag(tags = nil)

data/app/models/cohortly/report.rb

@@ -66,7 +66,7 @@ module Cohortly
     def percent_line(cohort_key)
       line = report_line(cohort_key)
       base = user_count_in_cohort(cohort_key)
-      line.collect { |x| (x/base.to_f * 100).round }.unshift base
+      line.collect { |x| (x && base > 0.0 ) ? (x/base.to_f * 100).round : 0 }.unshift base
     end
     
     def report_totals

data/lib/cohortly/version.rb

@@ -1,3 +1,3 @@
 module Cohortly
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/cohortly_test.rb

@@ -1,8 +1,5 @@
 require 'test_helper'
 
-
-
-
 class CohortlyTest < ActiveSupport::TestCase
 
   test "tag config" do
@@ -23,7 +20,6 @@ class CohortlyTest < ActiveSupport::TestCase
 
   test "cohortly record event" do
 
-
     payload = { :user_start_date => Time.now - 1.month,
                 :user_id         => 5,
                 :user_email => "jordon@example.com",
@@ -44,7 +40,27 @@ class CohortlyTest < ActiveSupport::TestCase
     assert_equal metric.user_start_date.utc.to_s, payload[:user_start_date].utc.to_s
 
   end
+  
+ test "cohortly record event without controller or action" do
 
+    payload = { :user_start_date => Time.now - 1.month,
+                :user_id         => 5,
+                :user_email => "jordon@example.com",
+                :add_tags => ['login', 'over13'] }
+
+    ActiveSupport::Notifications.instrument("cohortly.event", payload)
+
+    metric = Cohortly::Metric.first
+    assert metric,  "should create metric"
+    assert metric.created_at
+    assert metric.tags.include? 'login'
+    assert metric.tags.include? 'over13'
+    assert_equal metric.controller, nil    
+    assert_equal metric.user_email, 'jordon@example.com'
+    assert_equal metric.user_start_date.utc.to_s, payload[:user_start_date].utc.to_s
+
+  end
+  
   test "report map reduce" do
     setup_data_to_report_on
     Cohortly::Metric.cohort_chart_for_tag
@@ -53,8 +69,8 @@ class CohortlyTest < ActiveSupport::TestCase
     report = Cohortly::Report.new('cohort_report')
     assert_equal report.month_to_time('2011-08'), Time.utc(2011, 8)
     assert_equal report.time_to_month(Time.utc(2011,8)), '2011-08'
-    assert_equal report.start_month, (Time.now - 15.months).year.to_s + '-0' + (Time.now - 14.months).month.to_s
-    assert_equal report.month_cohorts.length, 15
+    assert_equal report.start_month, (Time.now - 15.months).year.to_s + '-0' + (Time.now - 15.months).month.to_s
+    assert_equal report.month_cohorts.length, 16
 
 #    assert_equal report.report_line(report.month_cohorts[2]), []
     assert_equal report.report_totals, [[14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1],
@@ -76,8 +92,8 @@ class CohortlyTest < ActiveSupport::TestCase
 
   test "counting uniq users in cohort" do
     setup_data_to_report_on
-    Cohortly::Metric.cohort_chart_for_tag
-    report = Cohortly::Report.new('cohort_report')
+    Cohortly::Metric.cohort_chart_for_tag()
+    report = Cohortly::Report.new(Cohortly::Metric.report_table_name())
     start_month = report.start_month
     start_month_time = report.month_to_time(report.start_month)
     next_month  = report.time_to_month(start_month_time + 1.month)

data/test/dummy/log/test.log

@@ -198,3 +198,227 @@ Started GET "/cohortly/reports" for 127.0.0.1 at 2011-09-27 20:59:07 -0700
   Processing by Cohortly::ReportsController#index as HTML
 Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/application (46.3ms)
 Completed 200 OK in 51ms (Views: 50.6ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:45:07 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.1ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (32.9ms)
+Completed   in 103ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:51:19 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.2ms)
+Completed   in 29ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:51:41 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.2ms)
+Completed   in 31ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:55:46 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.2ms)
+Completed   in 33ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:56:06 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.2ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.5ms)
+Completed   in 55ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:57:41 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.3ms)
+Completed   in 44ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 11:59:23 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.3ms)
+Completed   in 69ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:00:40 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (23.5ms)
+Completed   in 59ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:01:45 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (25.4ms)
+Completed   in 94ms
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:02:02 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (43.4ms)
+Completed 200 OK in 91ms (Views: 47.9ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:02:48 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (44.3ms)
+Completed 200 OK in 129ms (Views: 48.8ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:03:09 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (40.3ms)
+Completed 200 OK in 108ms (Views: 46.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:04:32 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (43.6ms)
+Completed 200 OK in 134ms (Views: 48.5ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:05:26 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (41.5ms)
+Completed 200 OK in 104ms (Views: 46.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:06:33 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (40.2ms)
+Completed 200 OK in 125ms (Views: 46.2ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:06:51 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (39.0ms)
+Completed 200 OK in 105ms (Views: 43.6ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:08:42 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (39.5ms)
+Completed 200 OK in 131ms (Views: 44.1ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:09:36 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (42.5ms)
+Completed 200 OK in 108ms (Views: 48.9ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:10:00 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (88.0ms)
+Completed 200 OK in 180ms (Views: 94.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:11:21 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (88.5ms)
+Completed 200 OK in 163ms (Views: 94.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:12:15 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.3ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (44.5ms)
+Completed 200 OK in 137ms (Views: 50.5ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:13:08 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.1ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (87.8ms)
+Completed 200 OK in 153ms (Views: 93.8ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:15:44 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.3ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (45.1ms)
+Completed 200 OK in 125ms (Views: 49.8ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:16:06 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (40.2ms)
+Completed 200 OK in 104ms (Views: 45.5ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:16:47 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (44.8ms)
+Completed 200 OK in 139ms (Views: 49.4ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:18:42 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (42.0ms)
+Completed 200 OK in 109ms (Views: 48.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:19:59 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (41.3ms)
+Completed 200 OK in 130ms (Views: 47.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:22:43 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.9ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (43.4ms)
+Completed 200 OK in 110ms (Views: 49.8ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:29:01 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (42.9ms)
+Completed 200 OK in 133ms (Views: 47.7ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:31:19 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1.0ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (42.9ms)
+Completed 200 OK in 110ms (Views: 47.9ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:33:50 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (40.8ms)
+Completed 200 OK in 48ms (Views: 46.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-08 12:35:42 -0700
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (40.5ms)
+Completed 200 OK in 46ms (Views: 45.0ms)

metadata

@@ -2,7 +2,7 @@
 name: cohortly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bruce Hauman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 -07:00
+date: 2011-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: []