retention_magic 0.1beta2 → 0.1beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 202a0352d4733122ab78e0761e9ef41d5477d13c
-  data.tar.gz: bcd0445686ed5e9bb71528a937d3e0fcc2911840
+  metadata.gz: 62db181a49bfa473329ed2b6b1b29a8a74245a82
+  data.tar.gz: d4ffc7246b4af371d0aeb94c78b5b87e583c0a50
 SHA512:
-  metadata.gz: abc384b5ef612dee76e75ec282d5ffd2381ede9612e00bf5d48e215996fa9a201cd7804f760962504bcc416c2e575b9c6086a92a588d410d027dec581e24bed2
-  data.tar.gz: 80dd27806353b8d83801cd0b666f0e10929935829b88dd3e97d1c1d0d1ad69853339a2baa88f9a4bd2700f8c520a1dca318a4ec390f26148d8a27d9075b7165f
+  metadata.gz: 9de9f5e839cabb2ab01dd6d1070eace1fe0e6b77ba234c4c7c5a62f45f5149f80bb6a3e07443f974c555b7ab36376bbed9411be43294c28fb218e5d65e5c36db
+  data.tar.gz: fe7f26162a7814ed340ac0f44b6ac072645f52ba1dff147d9de986f9dee4d7a9214f79e72355cf732c0e75097c73ad2471364b75b1a4ad5e022a0cefe3c05d4c

data/app/controllers/retention_magic/graphs_controller.rb

@@ -6,15 +6,15 @@ module RetentionMagic
       # RetentionMagic configuration setup
       @user_class = RetentionMagic.user_class.constantize
 
-
-      first_user = @user_class.order(:created_at).first
-      first_cohort = @first_user.created_at.beginning_of_month
+      @first_user = @user_class.order(:created_at).first
+      first_cohort_week = 12.weeks.ago.to_date.beginning_of_week
       today = Date.today
 
+      difference_in_days_between_now_and_first_cohort = (today.beginning_of_week - first_cohort_week).to_i
+
       # For presenting the widgets
-      @first_cohort_label = first_cohort.strftime("%h %Y")
-      @current_cohort_label = today.strftime("%h %Y")
-      @number_of_months = (today.year * 12 + today.month) - (first_cohort.year * 12 + first_cohort.month)
+      @current_cohort_label = today.strftime("%U/%Y")
+      @number_of_weeks = difference_in_days_between_now_and_first_cohort / 7
 
       @graphs = {
         activation: {
@@ -28,39 +28,68 @@ module RetentionMagic
       retention_models = RetentionMagic.retention_models.map { |class_name| class_name.constantize }
       activation_fields_for_query = RetentionMagic.activation_counter_columns.join(" + ")
 
-      0.upto(@number_of_months - 1) do |month|
-        cohort_start = @first_user.created_at.beginning_of_month + month.months
-        cohort_start_end = (cohort_start + 1.month).beginning_of_month
+      0.upto(@number_of_weeks) do |week|
+        cohort_start = first_cohort_week + week.weeks
+        cohort_start_end = (cohort_start + 1.week).beginning_of_week
 
         cohort_users = @user_class.where(created_at: cohort_start..cohort_start_end)
+        number_of_cohort_users = cohort_users.count
+
+        if number_of_cohort_users == 0
+          signups_without_activation = 0
+          one_activation = 0
+          five_activations = 0
+        else
+          signups_without_activation = cohort_users.where("#{activation_fields_for_query} = 0").count
+          one_activation = cohort_users.where("#{activation_fields_for_query} >= 1 AND #{activation_fields_for_query} < 5").count
+          five_activations = cohort_users.where("#{activation_fields_for_query} >= 5").count
+        end
+
+        if number_of_cohort_users > 0
+          @graphs[:activation][:one_activation][cohort_start] = (one_activation.to_f / number_of_cohort_users.to_f) * 100.0
+          @graphs[:activation][:five_activations][cohort_start] = (five_activations.to_f / number_of_cohort_users.to_f) * 100.0
+          @graphs[:activation][:signup_without_activation][cohort_start] = (signups_without_activation.to_f / number_of_cohort_users.to_f) * 100.0
+        else
+          @graphs[:activation][:one_activation][cohort_start] = 0
+          @graphs[:activation][:five_activations][cohort_start] = 0
+          @graphs[:activation][:signup_without_activation][cohort_start] = 0
+        end
 
-        @graphs[:activation][:signup_without_activation][cohort_start] = cohort_users.where("#{activation_fields_for_query} = 0").count
-        @graphs[:activation][:one_activation][cohort_start] = cohort_users.where("#{activation_fields_for_query} = 1").count
-        @graphs[:activation][:five_activations][cohort_start] = cohort_users.where("#{activation_fields_for_query} >= 5").count
 
-        cohort_start_label = cohort_start.strftime("%h %y")
+        cohort_start_label = cohort_start.strftime("w%U %Y")
         @graphs[:retention][cohort_start_label] = {}
         cohort_user_ids = cohort_users.pluck(:id)
+        cohort_size = cohort_users.count
+
+        difference_in_days_between_now_and_cohort_start = (today.beginning_of_week - cohort_start.to_date).to_i
+        number_of_weeks_in_this_cohort = difference_in_days_between_now_and_cohort_start / 7
+
+        0.upto(number_of_weeks_in_this_cohort) do |week|
+          retention_week = (cohort_start + week.weeks).beginning_of_week
+          if week == 0
+            @graphs[:retention][cohort_start_label][retention_week] = cohort_size
+          else
+            retention_week_end = (retention_week + 1.week).beginning_of_week
+
+            records_per_user = {}
+
+            retention_models.each do |model|
+              count_per_user = model.where(user_id: cohort_user_ids).where(created_at: retention_week..retention_week_end).group("user_id").count
+              count_per_user.each do |uid, count|
+                records_per_user[uid] ||= 0
+                records_per_user[uid] += count
+              end
+            end
 
-        -1.upto((Date.today.year * 12 + Date.today.month) - (cohort_start.year * 12 + cohort_start.month) - 1) do |month|
-          retention_month = (cohort_start + month.months).beginning_of_month
-          retention_month_end = (retention_month + 1.month).beginning_of_month
-
-          records_per_user = {}
-
-          retention_models.each do |model|
-            count_per_user = model.where(user_id: cohort_user_ids).where(created_at: retention_month..retention_month_end).group("user_id").count
-            count_per_user.each do |uid, count|
-              records_per_user[uid] ||= 0
-              records_per_user[uid] += count
+            if cohort_user_ids.empty?
+              @graphs[:retention][cohort_start_label][retention_week] = 0
+            else
+              @graphs[:retention][cohort_start_label][retention_week] = records_per_user.keys.size
             end
           end
-
-          @graphs[:retention][cohort_start_label][retention_month] = records_per_user.keys.size
         end
       end
 
-
     end
   end
 end

data/app/views/retention_magic/graphs/index.html.erb

@@ -24,15 +24,7 @@
       <div class="panel panel-default">
         <div class="panel-heading">Cohorts</div>
         <div class="panel-body">
-          <%= @number_of_months %>
-        </div>
-      </div>
-    </div>
-    <div class="col-xs-6 col-sm-3">
-      <div class="panel panel-default">
-        <div class="panel-heading">First Cohort</div>
-        <div class="panel-body">
-          <%= @first_cohort %>
+          <%= @number_of_weeks %> weeks
         </div>
       </div>
     </div>
@@ -40,7 +32,7 @@
       <div class="panel panel-default">
         <div class="panel-heading">Current Cohort</div>
         <div class="panel-body">
-          <%= @current_cohort %>
+          <%= @current_cohort_label %>
         </div>
       </div>
     </div>
@@ -61,7 +53,7 @@
           data: @graphs[:activation][:five_activations]
         },
         {
-          name: "One interaction",
+          name: "<= 5 interactions",
           data: @graphs[:activation][:one_activation]
         },
         {
@@ -78,7 +70,7 @@
       <h3 class="panel-title">Retention</h3>
     </div>
     <div class="panel-body">
-      <%= area_chart(@graphs[:retention].map { |k,v| {name: k, data: v}}, library: { legend: { position: "bottom" } } ) %>
+      <%= area_chart(@graphs[:retention].map { |k,v| {name: k, data: v}}, stacked: true, library: { bar: { groupWidth: "98%" }, legend: { position: "bottom" } } ) %>
 
     </div>
   </div>

data/lib/retention_magic/version.rb

@@ -1,3 +1,3 @@
 module RetentionMagic
-  VERSION = "0.1beta2"
+  VERSION = "0.1beta3"
 end

data/lib/retention_magic.rb

@@ -6,6 +6,7 @@ module RetentionMagic
   end
   mattr_accessor :activation_counter_columns do
     []
+  end
   mattr_accessor :retention_models do
     []
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retention_magic
 version: !ruby/object:Gem::Version
-  version: 0.1beta2
+  version: 0.1beta3
 platform: ruby
 authors:
 - Michiel Sikkes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails