cohortly 0.0.5 → 0.0.6

data/app/controllers/cohortly/metrics_controller.rb

@@ -4,11 +4,18 @@ class Cohortly::MetricsController < Cohortly::CohortlyController
     
     scope = Cohortly::Metric.sort(:created_at.desc)
     if params[:cohortly_metric] && params[:cohortly_metric][:tags]
-      scope = scope.where(:tags => { :$all => @metric_search.tags })
+      scope = scope.where(:tags => { :$in => @metric_search.tags })
     end
-    if @metric_search.user_id
+    if params[:cohortly_metric] && params[:cohortly_metric][:groups]
+      groups = params[:cohortly_metric][:groups]
+      scope = scope.where(:$where => "function() { return #{ groups.collect {|x| 'this.tags.indexOf("' + x + '") >= 0'  }.join(' || ') }; }"      )
+    end    
+    if !@metric_search.user_id.blank?
       scope = scope.where(:user_id => @metric_search.user_id)
     end
+    if !@metric_search.username.blank?
+      scope = scope.where(:username => @metric_search.username)
+    end    
     @metrics = scope.paginate(:per_page => 200, :page => params[:page])
   end
 end

data/app/controllers/cohortly/reports_controller.rb

@@ -1,12 +1,16 @@
 class Cohortly::ReportsController < Cohortly::CohortlyController
   def index
+    Cohortly::Metric.send :attr_accessor, :groups
     @metric_search = Cohortly::Metric.new(params[:cohortly_metric])
     tags = @metric_search.tags.any? ? @metric_search.tags : nil
-    report_name =  Cohortly::Metric.report_table_name(tags)
-    unless Cohortly::Metric.database.collections.collect(&:name).include?( report_name )
-      Cohortly::Metric.cohort_chart_for_tag(tags)
-    end  
-    @report = Cohortly::Report.new( report_name )
+    groups = @metric_search.groups    
+    @report_name =  Cohortly::Metric.report_table_name(tags, groups, true)
+    # run this in background would be better
+    Cohortly::Metric.weekly_cohort_chart_for_tag(tags, groups)
+    @report = Cohortly::Report.new( tags, groups, true )
+    respond_to do |format|
+      format.html
+      format.js { render :json => @report }
+    end
   end
-
 end

data/app/models/cohortly/metric.rb

@@ -10,7 +10,7 @@ module Cohortly
     key :controller, String
     key :action, String
     timestamps!
-
+    
     ensure_index :tags
     
     def self.store!(args)
@@ -24,21 +24,62 @@ module Cohortly
       data[:tags] += data[:add_tags] if data[:add_tags]
       create(data)
     end
-
-    def self.cohort_chart_for_tag(tags = nil)
-      query = {}
-      query = { :tags => { :$all => tags } } if tags
-      self.collection.map_reduce(self.month_map,
+    
+    def self.cohort_chart(tags = nil, groups = nil, weekly = false)
+      query = { }
+      query = {:tags => { :$in => tags} } if tags
+      if groups      
+        query[:$where] = "function() { return #{ groups.collect {|x| 'this.tags.indexOf("' + x + '") >= 0'  }.join(' || ') }; }"
+      end      
+      collection_name = self.report_table_name(tags, groups, weekly)
+      # incremental map_reduce pattern
+      meta = Cohortly::ReportMeta.find_or_create_by_collection_name(collection_name)
+      query[:created_at] = { :$gt => meta.last_update_on.utc } if meta.last_update_on
+      self.collection.map_reduce(weekly ? self.week_map : self.month_map,
                                  self.reduce,
-                                 { :out => self.report_table_name(tags),
+                                 { :out => meta.last_update_on ? { :reduce => collection_name } : collection_name,
                                    :raw => true,
-                                   :query => query})  
+                                   :query => query})        
+      meta.last_update_on = Time.now.utc
+      meta.save        
     end
-
-    def self.report_table_name(tags = nil)
-      "cohort_report#{ tags ? "_#{ tags.sort.join('_') }" : '' }_#{ Time.now.strftime("%m-%d-%Y") }"
+    
+    def self.cohort_chart_for_tag(tags = nil, groups = nil)
+      self.cohort_chart(tags, groups, false)
     end
 
+    def self.weekly_cohort_chart_for_tag(tags = nil, groups = nil)
+      self.cohort_chart(tags, groups, true)      
+    end
+    
+    def self.report_table_name(tags = nil, groups = nil, weekly = true)
+      "cohortly_report#{ tags ? "-tags=#{ tags.sort.join(':') }" : '' }#{ groups ? "-groups=#{ groups.sort.join(':') }" : '' }#{ weekly ? '-weekly' : '-monthly'}"
+    end
+    
+    def self.report_name_to_args(name)
+      name = name.gsub(/^cohortly_report/, '')
+      if name =~ /-weekly$/
+        weekly = true
+        name = name.gsub(/-weekly$/, '')
+      else
+        weekly = false
+        name = name.gsub(/-monthly$/, '')        
+      end
+      tags = nil
+      groups = nil
+      if name.length > 0
+        name = name.gsub(/-tags/, 'tags')
+        tags, groups = name.split('-')        
+        tags = tags.gsub(/tags=/, '').split(':')
+        tags = tags.any? ? tags : nil        
+        if groups
+          groups = groups.gsub(/groups=/,'').split(':')              
+          groups = groups.any? ? groups : nil                      
+        end
+      end
+      [tags, groups, weekly] 
+    end
+    
     def self.month_map
       <<-JS
         function() {
@@ -58,6 +99,19 @@ module Cohortly
       JS
     end
 
+     def self.week_map
+      <<-JS
+        function() {
+          var start_date = week_key(this.user_start_date);
+          var happened_on = week_key(this.created_at);
+          var payload = {};
+          payload[happened_on] = {};
+          payload[happened_on][this.user_id] = 1;
+          emit( start_date, payload );
+        }
+      JS
+    end
+
     def self.reduce
       <<-JS
         function(key, values) {
@@ -77,6 +131,5 @@ module Cohortly
         }
       JS
     end
-
   end
 end

data/app/models/cohortly/report.rb

@@ -1,60 +1,78 @@
 module Cohortly
   class Report
     # this is the reduced collection
-    attr_accessor :collection
-    def initialize(collection)
-      self.collection = collection
+    attr_accessor :collection, :weekly, :key_pattern, :groups, :tags
+    def initialize( tags = nil, groups = nil, weekly = true )
+      self.collection = Cohortly::Metric.report_table_name(tags, groups, weekly)
+      self.groups = groups
+      self.tags = tags
+      self.weekly = weekly
+      self.key_pattern = self.weekly ? "%Y-%W" : "%Y-%m"
     end
 
     def data
       @data ||= (Cohortly::Metric.database[self.collection].find().collect {|x| x}).sort_by {|x| x['_id'] }
     end
 
-    def start_month
+    def fix_data_lines
+      data.each do |line|
+        period_cohorts_from(line['_id']).collect do |key|
+          if line["value"][key].nil?
+            line["value"][key] = { }
+          end
+        end        
+      end
+    end
+    
+    def offset
+      self.weekly ? 1.week : 1.month
+    end
+    
+    def start_key
       data.first['_id']
     end
 
-    def end_month
-      time_to_month(Time.now)
+    def end_key
+      time_to_key(Time.now.utc)
     end
 
-    def time_to_month(time)
-      time.strftime('%Y-%m')
+    def time_to_key(time)
+      time.strftime(self.key_pattern)
     end
 
-    def month_to_time(str_month)
-      year, month = str_month.split('-')
-      Time.utc(year.to_i, month.to_i)
+    def key_to_time(report_key)
+      DateTime.strptime(report_key, self.key_pattern).to_time.utc
     end
 
-    def user_count_in_cohort(str_month)
-      Cohortly::Metric.collection.distinct(:user_id,
-                                           { :user_start_date => { :$gt => month_to_time(str_month),
-                                                                   :$lt => (month_to_time(str_month) + 1.month)}}).length
+    def user_count_in_cohort(report_key)
+      params = { :user_start_date => { :$gt => key_to_time(report_key),
+                                       :$lt => (key_to_time(report_key) + self.offset)}}
+      params[:tags] = { :$in => groups } if self.groups
+      Cohortly::Metric.collection.distinct(:user_id, params).length
     end
 
-    def month_cohorts
+    def period_cohorts
       return [] unless data.first
-      start_time = month_to_time(start_month)
-      end_time = month_to_time(end_month)
+      start_time = key_to_time(start_key)
+      end_time = key_to_time(end_key)
       cur_time = start_time
       res = []
       while(cur_time <= end_time) do
-        res << time_to_month(cur_time)
-        cur_time += 1.month
+        res << time_to_key(cur_time)
+        cur_time += self.offset
       end
       res
     end
-
-    def month_cohorts_from(cohort_key)
-      index = month_cohorts.index(cohort_key)
-      month_cohorts[index..-1]
+    
+    def period_cohorts_from(cohort_key)
+      index = period_cohorts.index(cohort_key)
+      period_cohorts[index..-1]
     end
 
     def report_line(cohort_key)
       line = data.find {|x| x['_id'] == cohort_key}
       return [] unless line
-      month_cohorts_from(cohort_key).collect do |key|
+      period_cohorts_from(cohort_key).collect do |key|
         if line["value"][key]
           line["value"][key].keys.length
         else
@@ -70,9 +88,20 @@ module Cohortly
     end
     
     def report_totals
-      month_cohorts.collect do |cohort_key|
+      period_cohorts.collect do |cohort_key|
         report_line(cohort_key)
       end
     end
+    
+    def base_n
+      @base_n ||= self.period_cohorts.inject({ }) { |accum, key| accum[key] = user_count_in_cohort(key); accum  }
+    end
+    
+    def as_json(*args)
+      fix_data_lines
+      { :data => data,
+        :base_n => base_n 
+      }
+    end
   end
 end

data/app/models/cohortly/report_meta.rb

@@ -0,0 +1,8 @@
+module Cohortly
+  class ReportMeta
+    include MongoMapper::Document
+
+    key :collection_name, String
+    key :last_update_on, Time
+  end
+end

data/app/models/cohortly/stored_procedures.rb

@@ -0,0 +1,54 @@
+module Cohortly
+  class StoredProcedures
+    PROCS = [:day_of_year,
+             :week_of_year,
+             :week_key]
+    
+    def self.eval_js(javascript)
+      Cohortly::Metric.database.eval(javascript)
+    end
+
+    def self.day_of_year
+      <<-JS
+      function(date) {
+        var ms = date - new Date('' + date.getUTCFullYear() + '/1/1 UTC');
+        return parseInt(ms / 60000 / 60 / 24, 10) + 1;
+      }
+    JS
+    end
+
+    def self.week_of_year
+      <<-JS
+      function(date) {
+         var doy = day_of_year(date);
+         var dow = date.getUTCDay();
+         dow = ((dow === 0) ? 7 : dow);
+         var rdow = 7 - dow;
+         var woy = parseInt((doy + rdow) / 7, 10);
+         return woy;
+      }
+    JS
+    end
+
+    def self.week_key
+      <<-JS
+      function(date) {
+        var year = date.getYear() + 1900;
+        var week = week_of_year(date);
+        if(week < 10) { week = '0' + week }
+        return year + '-' + week;                
+      }
+    JS
+    end
+
+    def self.store_procedures()
+      PROCS.each do |proc_name|
+        Cohortly::Metric.database.add_stored_function(proc_name.to_s, self.send(proc_name))
+      end
+    end
+
+    def self.execute(proc_name, *args)
+      Cohortly::Metric.database.eval(self.send(proc_name), *args)
+    end
+  end
+end

data/app/views/cohortly/metrics/_groups.html.erb

@@ -0,0 +1,9 @@
+<div class="groups">
+  <% Cohortly::TagConfig.all_groups.each do |group| %>
+    <span class"group">
+      <%= check_box_tag 'cohortly_metric[groups][]', group,
+      params[:cohortly_metric] && params[:cohortly_metric][:groups] &&
+      params[:cohortly_metric][:groups].include?(group) %><label><%= group %></label>
+    </span>
+  <% end %>
+</div>

data/app/views/cohortly/metrics/_tags.html.erb

@@ -1,9 +1,14 @@
 <div class="tags">
-  <% Cohortly::Metric.collection.distinct(:tags).each do |tag| %>
-    <span class"tag">
-      <%= check_box_tag 'cohortly_metric[tags][]', tag,
-      params[:cohortly_metric] && params[:cohortly_metric][:tags] &&
-      params[:cohortly_metric][:tags].include?(tag) %><label><%= tag %></label>
-    </span>
+  <% (Cohortly::Metric.collection.distinct(:tags) - Cohortly::TagConfig.all_groups).each_slice(8) do |tags| %>
+    <div class="tag_group" style="float:left; padding: 10px;">
+      <% tags.each do |tag| %>
+        <div class"tag">
+          <%= check_box_tag 'cohortly_metric[tags][]', tag,
+          params[:cohortly_metric] && params[:cohortly_metric][:tags] &&
+          params[:cohortly_metric][:tags].include?(tag) %><label><%= tag %></label>
+        </div>
+      <% end %>
+    </div>
   <% end %>
+  <div style="clear:both;"></div>
 </div>

data/app/views/cohortly/metrics/index.html.erb

@@ -3,9 +3,16 @@
 <%= form_for(@metric_search, :url => cohortly_metrics_path, :html => {
 :method =>:get }) do |f| %>
   <div class="field">
-    <%= f.label :user_id %>
+    <%= f.label 'User id' %>
     <%= f.text_field :user_id %>
   </div>
+  <div class="field">
+    <%= f.label :username %>
+    <%= f.text_field :username %>
+  </div>
+  <h3>Groups</h3>
+  <%= render :partial => 'cohortly/metrics/groups' %>
+  <h3>Tags</h3>
   <%= render :partial => 'cohortly/metrics/tags' %>
   <%= f.submit "filter" %>
 <% end %>

data/app/views/cohortly/reports/index.html.erb

@@ -1,32 +1,12 @@
 <h2>Cohort Reports</h2>
 
 <%= form_for @metric_search, :url => cohortly_reports_path, :html =>
-{:method => :get} do |f| %>
+{:method => :get, :class => 'cohortly_report_form'} do |f| %>
+  <h3>Groups</h3>
+  <%= render :partial => 'cohortly/metrics/groups' %>
+  <h3>Tags</h3>
   <%= render :partial => 'cohortly/metrics/tags' %>
   <%= f.submit 'Get Report'%>
+  <div class="result_table">
+  </div>
 <% end %>
-
-
-<table class="one-column-emphasis">
-  <colgroup>
-    <col class="oce-first">
-  </colgroup>
-  <thead>
-    <tr>
-      <th>Month</th>
-      <th>N</th>
-      <% 12.times do |month| %>
-        <th>M<%= month + 1 %></th>
-      <% end %>
-    </tr>
-  </thead>
-  <% @report.month_cohorts.each do |cohort_key| %>
-    <tr class="<%= cycle('odd', 'even') %>">
-      <td><%= cohort_key %></td>
-      <% @report.percent_line(cohort_key)[0,13].each do |val| %>
-        <td style="text-align: right;"><%= val %></td>
-      <% end %>
-    </tr>
-  <% end %>
-</table>
-

data/app/views/layouts/cohortly/#application.html.erb#

@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Cohortly</title>
+  <%= csrf_meta_tag %>
+
+  <%= javascript_include_tag 'https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js' %>
+  <%= javascript_include_tag 'http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.1.7/underscore-min.js' %>
+  <%= javascript_include_tag 'http://cdnjs.cloudflare.com/ajax/libs/backbone.js/0.5.3/backbone-min.js' %>
+  
+  <script type="text/javascript">
+    var Cohortly = {};
+    Cohortly.Report = Backbone.Model.extend({
+      
+    });
+    Cohortly.ReportQuery  = Backbone.Model.extend({});
+    Cohortly.ReportView = Backbone.View.extend({
+      initialize: function() {
+        _.bindAll(this, 'submitQuery', 'render', 'render_rows', 'render_row', 'render_cells');
+        this.model = new Cohortly.Report();
+        this.model.bind('change', this.render)
+      },
+      events: {
+        'click input[type=submit]': 'submitQuery'
+      },
+      submitQuery: function(e) {
+        $.get( '/cohortly/reports.js?' + $(this.el).serialize(), _(function(data) {
+          this.model.set(data);
+        }).bind(this), 'json')
+        e.preventDefault();
+      },
+      render: function() {
+        $('.result_table', this.el).html(
+           ['<table class="one-column-emphasis">',
+            '<colgroup><col class="oce-first"></colgroup>',
+            this.render_header(),
+            this.render_rows(), 
+            '</table>'
+           ].join(''));
+      },
+      render_header: function() {
+        return [
+          '<thead><tr>',
+            '<th>Month</th>',
+            '<th>N</th>',
+            _.range(1,13).map(function(x){ return '<th>M' + x + '</th>'; }).join(''),
+          '</tr></thead>'
+        ].join('');
+      },
+      render_rows: function() {
+        return _(this.model.get('data')).map(this.render_row).join('');
+      },
+      render_row: function(row) {
+        var row_key = row['_id'];
+        var base_n = this.model.get('base_n')[row_key];
+        return [
+          '<tr>',
+            '<td>' + row['_id']+ '</td>',
+            '<td>' + base_n + '</td>',
+            this.render_cells(row, base_n),
+          '</tr>'
+        ].join('');
+      },
+      render_cells: function(row, base_n) {
+        return _(_(row.value).keys()).sortBy(function(x){return x}).slice(0,12).map(function(key) {
+          var num_users = _(row.value[key]).keys().length;
+          var percent = (base_n > 0) ? (num_users / base_n) : 0;
+          return [
+            '<td style="text-align:right;">',
+              Math.floor(percent * 100),   
+            '</td>'
+          ].join('');
+        }).join('');
+      }
+
+    });
+
+    $(function() {
+      Cohortly.report_view = new Cohortly.ReportView({ el: $('form') });
+    });
+  </script>
+
+  <style>
+
+    body {
+      font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;
+      font-size: 12px;
+      margin: 0;
+      color: #666699;
+    }
+    form {
+
+    }
+    .field, .tags {
+      margin-bottom: 1em;
+    }
+    .field label {
+     display:block;
+    }
+    .header {
+      background-color: #E8EDFF;
+      height: 50px;
+    }
+    .header h1 {
+      padding-top: 12px;
+      margin: 0;
+      color: #669;
+    } 
+    .container {
+      position: relative;
+      margin:0 auto;
+      width: 960px;
+    }
+    .hor-zebra {
+      border-collapse: collapse;
+      font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;
+      font-size: 12px;
+      text-align: left;
+      width: 960px;
+    }
+    .hor-zebra th {
+      color: #003399;
+      font-size: 14px;
+      font-weight: normal;
+      padding: 10px 8px;
+    }
+    .hor-zebra td {
+      color: #666699;
+      padding: 8px;
+    }
+    .hor-zebra .odd {
+      background: none repeat scroll 0 0 #E8EDFF;
+    }
+
+    .one-column-emphasis {
+      border-collapse: collapse;
+      font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;
+      font-size: 12px;
+      text-align: left;
+      position: relative;
+      left: -4px;
+      margin-top: 20px;
+    }
+    .one-column-emphasis th {
+      color: #003399;
+      font-size: 14px;
+      font-weight: normal;
+      padding: 12px 15px;
+    }
+    .one-column-emphasis td {
+      border-top: 1px solid #E8EDFF;
+      color: #666699;
+      padding: 10px 15px;
+    }
+    .oce-first {
+      background: none repeat scroll 0 0 #D0DAFD;
+      border-left: 10px solid transparent;
+      border-right: 10px solid transparent;
+    }
+    .one-column-emphasis tr:hover td {
+      background: none repeat scroll 0 0 #EFF2FF;
+      color: #333399;
+    }
+    .navigation {
+      position: absolute;
+      bottom: -3px;
+      right: 0;
+     }
+
+
+    .navigation ul {
+       list-style: none;
+       margin: 0;
+       padding: 0;
+    }
+    
+
+    .navigation ul li {
+      display: inline;
+      margin-right: .75em;
+      background-color: #FFF;
+      color: #669;
+      border-radius: 4px; 
+   }
+
+   .navigation ul li.last {
+      margin-right: 0;
+  }
+  .navigation li {
+     padding: 5px 1em;
+   }
+   .navigation li a {
+     color: #669;
+     text-decoration: none;
+   }
+   .paginate {
+     margin-top: 1em;
+     margin-bottom: 1em;
+     text-align: right;
+   }
+
+   .paginate a, span {
+
+     text-decoration: none;
+     padding-left: 5px;
+     color: #666699;
+   }
+   .paginate span {
+     color: red;
+   }
+  </style>
+
+</head>
+<body>
+  <div class="header">
+  <div class="container">
+    <h1>Cohortly</h1>
+    <div class="navigation">
+      <ul>
+        <li><span><%= link_to "Metrics", cohortly_metrics_path %></span></li>
+        <li><%= link_to "Cohort Reports", cohortly_reports_path %></span></li>
+      </ul>
+    </div>
+  </div>
+  </div>
+  <div class="content">
+    <div class="container">
+      <%= yield %>
+    </div>
+  </div>
+  <div class="footer">
+    <div class="container">
+    </div>
+  </div>
+</body>
+</html>