cohortly 0.0.9.1 → 0.0.92

data/app/controllers/cohortly/reports_controller.rb

@@ -1,25 +1,58 @@
 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
-    groups = @metric_search.groups    
+    Cohortly::Metric.send :attr_accessor, :groups_intersect    
+    @metric_search = Cohortly::Metric.new(params[:cohortly_metric])    
+    json_res = { }
+    
+    if params[:cohortly_metric]
+      tags = @metric_search.tags.any? ? @metric_search.tags : ['upload']
+      groups = @metric_search.groups
+      groups_intersect = @metric_search.groups_intersect          
+  
+      reports = Cohortly::TagReport.where(:tags => tags).all       
+
+      @tag_report = reports.inject(Cohortly::TagReport.new) { |accum, tag_report| accum.merge(tag_report) }  
+
+      user_base_func = lambda { |user_ids| user_ids.length }
+
+      if groups || groups_intersect
+        users_constraint = false
+        if groups && groups.any?
+          users_constraint = Cohortly::UserCohort.union(Cohortly::GroupCohort.where(:name => groups).all)
+        end
+        if groups_intersect && groups_intersect.any?
+          group_intersect_users =  Cohortly::UserCohort.intersect(Cohortly::GroupCohort.where(:name => groups_intersect).all)
+          users_constraint = users_constraint ? users_constraint & group_intersect_users : group_intersect_users
+        end
+        if users_constraint
+          user_base_func = lambda { |user_ids| (users_constraint & user_ids).length }
+          @tag_report.intersect(users_constraint.map(&:to_s))          
+        end
+      end
       
-    @report_name =  Cohortly::Metric.report_table_name(tags, groups, true)        
-    # run this in background would be better
+      @base_n = Cohortly::PeriodCohort.all.inject({ }) do |base_n, per_coh|
+        base_n.merge( per_coh.name => {
+                        :count => user_base_func.call(per_coh.user_ids),
+                        :pretty_date => DateTime.strptime( per_coh.name, '%Y-%W').beginning_of_week.strftime('%m-%d-%Y') } )
+      end        
     
-    if Cohortly::Metric.respond_to? :delay
-      Cohortly::Metric.delay.weekly_cohort_chart_for_tag(tags, groups)      
-    else
-      Cohortly::Metric.weekly_cohort_chart_for_tag(tags, groups)
+      json_res = {
+        :groups => groups,
+        :groups_intersect => groups_intersect,        
+        :tags => tags,
+        :weekly => true,
+        :data => @tag_report.data_without_empty_rows,
+        :base_n => @base_n
+      }
     end
-    @report = Cohortly::Report.new( tags, groups, true )
-    
+
     respond_to do |format|
       format.html
       format.js {
-        render :json => @report
+        render :json => json_res
       }
     end
   end
+
 end

data/app/models/cohortly/cohorts.rb

@@ -0,0 +1,8 @@
+module Cohortly
+  class Cohorts
+    def self.cohort_names; end
+    def self.first_user_start_date(group_name = nil); end
+    def self.range(time_range); end
+    def self.group(group_name); end
+  end
+end

data/app/models/cohortly/group_cohort.rb

@@ -0,0 +1,9 @@
+module Cohortly
+  class GroupCohort < Cohortly::UserCohort
+    def store!
+      return unless self.name
+      self.user_ids = Cohortly::Cohorts.group_name(self.name)
+      self.save        
+    end
+  end
+end

data/app/models/cohortly/metric.rb

@@ -51,7 +51,7 @@ module Cohortly
                                    :raw => true,
                                    :query => query})        
     end
-    
+
     def self.cohort_chart_for_tag(tags = nil, groups = nil)
       self.cohort_chart(tags, groups, false)
     end

data/app/models/cohortly/period_cohort.rb

@@ -0,0 +1,24 @@
+module Cohortly
+  class PeriodCohort < Cohortly::UserCohort
+    key :start_time, Time
+    key :weekly, Boolean
+
+    def end_time
+      self.start_time + period
+    end
+
+    def period
+      self.weekly ? 1.week : 1.month
+    end
+
+    def key_pattern
+      self.weekly ? "%Y-%W" : "%Y-%m"
+    end
+
+    def store!
+      self.user_ids = Cohortly::Cohorts.range(self.start_time..self.end_time)
+      self.name = (self.start_time + 3.days).strftime(key_pattern)
+      self.save        
+    end
+  end
+end

data/app/models/cohortly/tag_report.rb

@@ -0,0 +1,126 @@
+module Cohortly
+  class TagReport
+    include MongoMapper::Document
+    
+    key :collection_name, String
+    key :last_update_on, Time
+    key :data, Hash
+    key :tags, Array
+
+    def run
+      if self.last_update_on.nil?
+        self.recalc_table 
+      else
+        self.update_table
+      end
+    end
+    
+    def tag_query
+      self.tags.any? ? { :tags => self.tags.first } : { }  
+    end
+    
+    def cell_query(cohort_range, cell_range)
+      { :created_at => {
+          :$gt => cell_range.begin,
+          :$lt => cell_range.end},
+        :user_start_date => {
+          :$gt => cohort_range.begin,
+          :$lt => cohort_range.end } }.tap { |x|
+        self.tags ? x.merge!( tag_query ) : x  
+      }
+    end
+
+    def start_time
+      Cohortly::Metric.where(tag_query).sort(:user_start_date).limit(1).first.user_start_date.utc.beginning_of_week
+    end
+
+    def cohort_iter(starting_time)
+      cohort_time = starting_time
+      while cohort_time <= Time.now
+        yield cohort_time..(cohort_time + 1.week)
+        cohort_time += 1.week
+      end
+    end
+    
+    def cell_iter(cell_starting_time)
+      cohort_time = start_time
+      while cohort_time <= Time.now
+        cell_time = [cohort_time, cell_starting_time].max
+        while cell_time <= Time.now
+          yield cohort_time..(cohort_time + 1.week), cell_time..(cell_time + 1.week)
+          cell_time += 1.week
+        end
+        cohort_time += 1.week
+      end
+    end
+
+    def recalc_table
+      self.data = { }
+      self.last_update_on = Time.now
+      self.cell_iter(self.start_time) { |cohort_range, cell_range| self.store_cell(cohort_range, cell_range)}
+    end
+
+    def update_table
+      starting_time = self.last_update_on.utc.beginning_of_week
+      self.last_update_on = Time.now      
+      self.cell_iter(starting_time)
+    end
+
+    def store_cell(cohort_range, cell_range)
+      cohort_key = cohort_range.begin.strftime('%Y-%W')
+      cell_key = cell_range.begin.strftime('%Y-%W')        
+      p cohort_key + " " + cell_key 
+      self.data[cohort_key] ||= { }
+      self.data[cohort_key][cell_key] ||= { }
+      Cohortly::Metric.collection.distinct( :user_id, cell_query(cohort_range, cell_range) ).each do |user_id|
+        self.data[cohort_key][cell_key][user_id.to_s] = 1
+      end
+    end
+    
+    def merge(tag_report)
+      TagReport::Product.new(:tag_report => self, :tags => self.tags, :data => self.data).merge(tag_report)
+    end
+    
+    class Product
+      attr_accessor :tag_report, :tags, :data
+      def initialize(options = { })
+        self.tags = options[:tags]
+        self.tag_report = options[:tag_report]
+        self.data = options[:data]        
+      end
+
+      def merge(tag_report)
+        TagReport::Product.new(:tag_report => self.tag_report,
+                               :tags => self.tags | tag_report.tags,
+                               :data => self.deep_merge(self.data, tag_report.data))
+      end
+
+      def deep_merge(data1, data2)
+        (data1.keys + data2.keys).uniq.inject({}) do |accum, key|
+          if (data1[key] || data2[key]).is_a?(Hash)
+            accum[key] = deep_merge(data1[key] || { }, data2[key] || { })  
+          else
+            accum[key] = data1[key] || data2[key] 
+          end
+          accum
+        end
+      end
+      
+      # user_ids need to be strings
+      def intersect(user_ids)
+        self.tag_report.cell_iter(self.tag_report.start_time) do |cohort_range, cell_range|
+          cohort_key = cohort_range.begin.strftime('%Y-%W')
+          cell_key = cell_range.begin.strftime('%Y-%W')
+          cell = self.data[cohort_key][cell_key]
+          intersected_ids = cell.keys & user_ids
+          self.data[cohort_key][cell_key] = intersected_ids.inject({ }) { |accum, user_id| accum.merge!(user_id => 1); accum }
+        end
+      end
+      
+      def data_without_empty_rows
+        self.data.keys.sort.inject({ }) { |new_data, key| puts ; self.data[key].values.collect(&:length).sum > 0 ? new_data.merge(key => self.data[key]) : new_data }
+      end
+      
+    end
+  end
+end

data/app/models/cohortly/user_cohort.rb

@@ -0,0 +1,18 @@
+module Cohortly
+  class UserCohort
+    include MongoMapper::Document
+    key :user_ids, Array
+    key :name,      String
+    key :_type,    String    
+    timestamps!
+    
+    def self.intersect(cohorts)
+      cohorts.inject(cohorts.first.user_ids) { |user_ids, cohort| user_ids & cohort.user_ids }
+    end
+
+    def self.union(cohorts)
+      cohorts.inject([]) { |user_ids, cohort| user_ids | cohort.user_ids }
+    end    
+    
+  end
+end

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

@@ -1,5 +1,5 @@
 <div class="tags">
-  <% Cohortly::TagConfig.all_groups.sort.each_slice(3) do |groups| %>
+  <% Cohortly::Cohorts.group_names.sort.each_slice(3) do |groups| %>
     <div class="tag_group" style="float:left; padding: 10px;">
       <% groups.sort.each do |group| %>
         <div class"tag">

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

@@ -0,0 +1,14 @@
+<div class="tags">
+  <% Cohortly::Cohorts.group_names.sort.each_slice(3) do |groups| %>
+    <div class="tag_group" style="float:left; padding: 10px;">
+      <% groups.sort.each do |group| %>
+        <div class"tag">
+          <%= check_box_tag 'cohortly_metric[groups_intersect][]', group,
+          params[:cohortly_metric] && params[:cohortly_metric][:groups_intersect] &&
+          params[:cohortly_metric][:groups_intersect].include?(group) %><label><%= group %></label>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+  <div style="clear:both;"></div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="tags">
-  <% (Cohortly::Metric.collection.distinct(:tags) - Cohortly::TagConfig.all_groups).sort.each_slice(8) do |tags| %>
+  <% Cohortly::TagReport.collection.distinct(:tags).sort.each_slice(8) do |tags| %>
     <div class="tag_group" style="float:left; padding: 10px;">
       <% tags.sort.each do |tag| %>
         <div class"tag">

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

@@ -2,8 +2,10 @@
 
 <%= form_for @metric_search, :url => cohortly_reports_path, :html =>
 {:method => :get, :class => 'cohortly_report_form'} do |f| %>
-  <h3>Groups</h3>
+  <h3>Groups Union</h3>
   <%= render :partial => 'cohortly/metrics/groups' %>
+  <h3>Groups Intersect</h3>
+  <%= render :partial => 'cohortly/metrics/groups_intersect' %>
   <h3>Tags</h3>
   <%= render :partial => 'cohortly/metrics/tags' %>
   <%= f.submit 'Get Report'%>

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

@@ -34,9 +34,11 @@
       render: function() {
         $('.result_table', this.el).html(
            ['<h3>',
-             this.model.get('groups') ? 'Groups: ' + this.model.get('groups').join(', ') + ' | ':  'Groups: __ | ',
+            this.model.get('groups') ? 'Groups: ' + this.model.get('groups').join(', ') + ' | ':  'Groups: __ | ',
             '',
-             this.model.get('tags') ? 'Tags: ' + this.model.get('tags').join(', ') :  'Tags: __ ',
+            this.model.get('groups_intersect') ? 'Groups Int: ' + this.model.get('groups_intersect').join(', ') + ' | ':  'Groups Int: __ |',
+            '',
+            this.model.get('tags') ? 'Tags: ' + this.model.get('tags').join(', ') :  'Tags: __ ',
             '</h3>',
             '<table class="one-column-emphasis">',
             '<colgroup><col class="oce-first"></colgroup>',
@@ -55,22 +57,23 @@
         ].join('');
       },
       render_rows: function() {
-        return _(this.model.get('data')).map(this.render_row).join('');
+        return _(_(this.model.get('data')).keys()).sortBy(function(x)
+    { return x }).map(this.render_row).join('');
       },
-      render_row: function(row) {
-        var row_key = row['_id'];
-        var base_n = this.model.get('base_n')[row_key];
+      render_row: function(row_key) {
+        var base_n_data = this.model.get('base_n')[row_key];
         return [
           '<tr>',
-            '<td>' + row['_id']+ '</td>',
-            '<td>' + base_n + '</td>',
-            this.render_cells(row, base_n),
+            '<td>' + base_n_data.pretty_date + '</td>',
+            '<td>' + base_n_data.count + '</td>',
+            this.render_cells(row_key, base_n_data.count),
           '</tr>'
         ].join('');
       },
-      render_cells: function(row, base_n) {
-        return _(_(row.value).keys()).sortBy(function(x){return x}).slice(0,14).map(function(key) {
-          var num_users = _(row.value[key]).keys().length;
+      render_cells: function(row_key, base_n) {
+        var row = this.model.get('data')[row_key];
+        return _(_(row).keys()).sortBy(function(x){return x}).slice(0,14).map(function(key) {
+          var num_users = _(row[key]).keys().length;
           var percent = (base_n > 0) ? (num_users / base_n) : 0;
           return [
             '<td style="text-align:right;">',
@@ -79,7 +82,6 @@
           ].join('');
         }).join('');
       }
-
     });
 
     $(function() {

data/lib/cohortly/engine.rb

@@ -9,8 +9,10 @@ module Cohortly
           Cohortly::Metric.connection Mongo::Connection.new(cfg.host, cfg.port)
           Cohortly::Metric.set_database_name cfg.database
           Cohortly::Metric.database.authenticate(cfg.username, cfg.password) if(cfg.password)
-          Cohortly::ReportMeta.connection Cohortly::Metric.connection
-          Cohortly::ReportMeta.set_database_name cfg.database
+          Cohortly::TagReport.connection Cohortly::Metric.connection
+          Cohortly::TagReport.set_database_name cfg.database
+          Cohortly::UserCohort.connection Cohortly::Metric.connection
+          Cohortly::UserCohort.set_database_name cfg.database                    
         end        
       end
       Cohortly::StoredProcedures.store_procedures

data/lib/cohortly/version.rb

@@ -1,3 +1,3 @@
 module Cohortly
-  VERSION = "0.0.9.1"
+  VERSION = "0.0.92"
 end

data/lib/tasks/run_reports.rake

@@ -1,28 +1,55 @@
 namespace :cohortly do
   namespace :run do
     desc "run the reports for all the tags"
-    task :reseed_reports => :environment do
-      Cohortly::ReportMeta.delete_all
-      Cohortly::Metric.cohort_chart(nil, nil, true)
-      puts "main report"
-      real_tags = (Cohortly::Metric.collection.distinct(:tags) - Cohortly::TagConfig.all_groups)
+    task :recalc_reports => :environment do
+      real_tags = Cohortly::Metric.collection.distinct(:tags)
       real_tags.each do |tag|
-        Cohortly::Metric.cohort_chart([tag], nil, true)
-        puts "tag: #{tag}"
-      end
-      Cohortly::TagConfig.all_groups.each do |group|
-        real_tags.each do |tag|
-          puts "tag: #{tag} group: #{group}"          
-          Cohortly::Metric.cohort_chart([tag], [group], true)
-        end        
+        report = Cohortly::TagReport.where(:tags => tag).first
+        report ||= Cohortly::TagReport.new(:tags => [tag])
+        report.recalc_table
+        report.save
       end
+
+      # the empty report
+      report = Cohortly::TagReport.where(:tags => []).first
+      report ||= Cohortly::TagReport.new(:tags => [])
+      report.recalc_table
+      report.save
     end
 
     desc "update all existing reports"
     task :updates => :environment do
-      Cohortly::ReportMeta.all.each do |rep|
-        puts rep.collection_name
-        rep.run
+      real_tags = Cohortly::Metric.collection.distinct(:tags)
+      real_tags.each do |tag|
+        report = Cohortly::TagReport.where(:tags => tag).first
+        report ||= Cohortly::TagReport.new(:tags => [tag])
+        report.run
+        report.save
+      end
+      
+      # the empty report
+      report = Cohortly::TagReport.where(:tags => []).first
+      report ||= Cohortly::TagReport.new(:tags => [])
+      report.run
+      report.save      
+    end
+
+    desc "build cohorts"
+    task :build_cohorts => :environment do
+      Cohortly::Cohorts.group_names.each do |name|
+        cohort = Cohortly::GroupCohort.find_or_create_by_name(name)
+        cohort.store!
+      end
+
+      #weekly cohort
+      cur_time = Cohortly::Cohorts.first_user_start_date.utc.beginning_of_week
+      while(cur_time < Time.now) do
+        time_key = (cur_time + 3.days).strftime("%Y-%W")
+        cohort = Cohortly::PeriodCohort.find_or_create_by_name(time_key)
+        cohort.start_time = cur_time
+        cohort.weekly = true
+        cohort.store!
+        cur_time += 1.week
       end
     end
   end

data/test/dummy/app/models/cohortly/cohorts.rb

@@ -0,0 +1,15 @@
+module Cohortly
+  class Cohorts
+    def group_names
+      [:rand_1, :rand_2, :rand_3]
+    end
+
+    def group_name(name)
+      Cohortly::Metric.collection.distinct(:user_id, :tag => [name])
+    end
+
+    def range(time_range)
+      Cohortly::Metric.collection.distinct(:user_id, :user_start_time => { :$gte => time_range.begin, :lt => time_range.end })
+    end  
+  end
+end

data/test/dummy/log/development.log

@@ -9997,3 +9997,160 @@ Started GET "/cohortly/reports.js?utf8=%E2%9C%93" for 127.0.0.1 at 2011-10-27 00
   Processing by Cohortly::ReportsController#index as JS
   Parameters: {"utf8"=>"✓"}
 Completed 200 OK in 166ms (Views: 112.0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-30 14:52:13 -0400
+  Processing by StuffController#index as HTML
+Rendered stuff/index.html.erb within layouts/application (1.5ms)
+Completed 200 OK in 101ms (Views: 95.9ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 14:52:16 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Completed   in 56ms
+
+ArgumentError (wrong number of arguments (0 for 1)):
+  
+
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.1ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (68.4ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (76.5ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 14:54:50 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Completed   in 64ms
+
+NameError (undefined local variable or method `cohort' for #<Cohortly::ReportsController:0x00000100e57a80>):
+  
+
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.1ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (56.9ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (61.4ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 14:55:07 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Completed   in 75ms
+
+NoMethodError (undefined method `stftime' for 2011-04-25 00:00:00 UTC:Time):
+  
+
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.1ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (65.4ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (70.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 14:55:18 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Completed   in 52ms
+
+NoMethodError (undefined method `start' for 2011-04-25 00:00:00 UTC..2011-05-02 00:00:00 UTC:Range):
+  
+
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.0ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (51.4ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (55.7ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 14:55:28 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_groups.html.erb (1.3ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1183.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (1213.2ms)
+Completed   in 3077ms
+
+ActionView::Template::Error (comparison of String with Array failed):
+    1: <div class="tags">
+    2:   <% (Cohortly::Metric.collection.distinct(:tags) - Cohortly::TagConfig.all_groups).sort.each_slice(8) do |tags| %>
+    3:     <div class="tag_group" style="float:left; padding: 10px;">
+    4:       <% tags.sort.each do |tag| %>
+    5:         <div class"tag">
+  
+
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.1ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (75.2ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/template_error.erb within rescues/layout (80.2ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 15:06:30 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Completed   in 55ms
+
+NoMethodError (undefined method `utc' for nil:NilClass):
+  
+
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.0ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (50.8ms)
+Rendered /Users/bhauman/.rvm/gems/ruby-1.9.2-p136@cohortly/gems/actionpack-3.0.4/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (55.3ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 15:09:32 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_groups.html.erb (0.7ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1129.6ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (1136.1ms)
+Completed 200 OK in 2988ms (Views: 1140.6ms)
+
+
+Started GET "/cohortly/reports.js?utf8=%E2%9C%93" for 127.0.0.1 at 2011-10-30 15:09:43 -0400
+  Processing by Cohortly::ReportsController#index as JS
+  Parameters: {"utf8"=>"✓"}
+Completed 200 OK in 2108ms (Views: 285.1ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 15:10:28 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_groups.html.erb (0.7ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1147.7ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (1179.5ms)
+Completed 200 OK in 3007ms (Views: 1184.0ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 15:11:45 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_groups.html.erb (0.7ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1181.6ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (1188.1ms)
+Completed 200 OK in 3150ms (Views: 1193.9ms)
+
+
+Started GET "/cohortly/reports.js?utf8=%E2%9C%93" for 127.0.0.1 at 2011-10-30 15:11:52 -0400
+  Processing by Cohortly::ReportsController#index as JS
+  Parameters: {"utf8"=>"✓"}
+Completed 200 OK in 2224ms (Views: 299.9ms)
+
+
+Started GET "/cohortly/reports" for 127.0.0.1 at 2011-10-30 15:12:48 -0400
+  Processing by Cohortly::ReportsController#index as HTML
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_groups.html.erb (0.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/metrics/_tags.html.erb (1193.8ms)
+Rendered /Users/bhauman/workspace/cohortly/app/views/cohortly/reports/index.html.erb within layouts/cohortly/application (1200.4ms)
+Completed 200 OK in 3060ms (Views: 1204.8ms)
+
+
+Started GET "/cohortly/reports.js?utf8=%E2%9C%93" for 127.0.0.1 at 2011-10-30 15:13:09 -0400
+  Processing by Cohortly::ReportsController#index as JS
+  Parameters: {"utf8"=>"✓"}
+Completed 200 OK in 2218ms (Views: 391.1ms)
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-30 15:15:58 -0400
+  Processing by StuffController#index as HTML
+Rendered stuff/index.html.erb within layouts/application (1.4ms)
+Completed 200 OK in 22ms (Views: 5.5ms)
+
+
+Started GET "/cohortly/reports.js?utf8=%E2%9C%93" for 127.0.0.1 at 2011-10-30 15:16:02 -0400
+  Processing by Cohortly::ReportsController#index as JS
+  Parameters: {"utf8"=>"✓"}
+Completed 200 OK in 2273ms (Views: 298.8ms)
+DEPRECATION WARNING: ActionController::Routing::Routes is deprecated. Instead, use Rails.application.routes. (called from block in irb_binding at (irb):15)
+DEPRECATION WARNING: RAILS_DEFAULT_LOGGER is deprecated. Please use ::Rails.logger. (called from block in irb_binding at (irb):15)
+DEPRECATION WARNING: RAILS_ENV is deprecated. Please use ::Rails.env. (called from block in irb_binding at (irb):15)
+DEPRECATION WARNING: RAILS_ROOT is deprecated. Please use ::Rails.root.to_s. (called from block in irb_binding at (irb):15)
+DEPRECATION WARNING: ActiveSupport::JSON::CircularReferenceError is deprecated! Use ActiveSupport::JSON::Encoding::CircularReferenceError instead. (called from block in irb_binding at (irb):15)
+DEPRECATION WARNING: ActiveSupport::JSON::CircularReferenceError is deprecated! Use ActiveSupport::JSON::Encoding::CircularReferenceError instead. (called from block in irb_binding at (irb):15)
+DEPRECATION WARNING: ActionController::Routing::Routes is deprecated. Instead, use Rails.application.routes. (called from block in irb_binding at (irb):20)
+DEPRECATION WARNING: ActiveSupport::JSON::CircularReferenceError is deprecated! Use ActiveSupport::JSON::Encoding::CircularReferenceError instead. (called from block in irb_binding at (irb):20)
+DEPRECATION WARNING: ActiveSupport::JSON::CircularReferenceError is deprecated! Use ActiveSupport::JSON::Encoding::CircularReferenceError instead. (called from block in irb_binding at (irb):20)

metadata

@@ -2,7 +2,7 @@
 name: cohortly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9.1
+  version: 0.0.92
 platform: ruby
 authors: 
 - Bruce Hauman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -07:00
+date: 2011-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,11 +29,15 @@ files:
 - app/controllers/cohortly/cohortly_controller.rb
 - app/controllers/cohortly/metrics_controller.rb
 - app/controllers/cohortly/reports_controller.rb
+- app/models/cohortly/cohorts.rb
+- app/models/cohortly/group_cohort.rb
 - app/models/cohortly/metric.rb
-- app/models/cohortly/report.rb
-- app/models/cohortly/report_meta.rb
+- app/models/cohortly/period_cohort.rb
 - app/models/cohortly/stored_procedures.rb
+- app/models/cohortly/tag_report.rb
+- app/models/cohortly/user_cohort.rb
 - app/views/cohortly/metrics/_groups.html.erb
+- app/views/cohortly/metrics/_groups_intersect.html.erb
 - app/views/cohortly/metrics/_metric.html.erb
 - app/views/cohortly/metrics/_pagination.html.erb
 - app/views/cohortly/metrics/_tags.html.erb
@@ -58,6 +62,7 @@ files:
 - test/dummy/app/controllers/stuff_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/stuff_helper.rb
+- test/dummy/app/models/cohortly/cohorts.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/stuff/index.html.erb
 - test/dummy/app/views/stuff/my_stuff.html.erb
@@ -97,7 +102,6 @@ files:
 - test/dummy/public/javascripts/vendor/underscore.js
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/dummy/tmp/pids/server.pid
 - test/integration/navigation_test.rb
 - test/support/integration_case.rb
 - test/support/test_tag_config.rb
@@ -136,6 +140,7 @@ test_files:
 - test/dummy/app/controllers/stuff_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/stuff_helper.rb
+- test/dummy/app/models/cohortly/cohorts.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/stuff/index.html.erb
 - test/dummy/app/views/stuff/my_stuff.html.erb
@@ -175,7 +180,6 @@ test_files:
 - test/dummy/public/javascripts/vendor/underscore.js
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/dummy/tmp/pids/server.pid
 - test/integration/navigation_test.rb
 - test/support/integration_case.rb
 - test/support/test_tag_config.rb

data/app/models/cohortly/report.rb

@@ -1,118 +0,0 @@
-module Cohortly
-  class Report
-    # this is the reduced collection
-    attr_accessor :collection, :weekly, :key_pattern, :groups, :tags, :report_meta
-    def initialize( tags = nil, groups = nil, weekly = true )
-      self.collection = Cohortly::Metric.report_table_name(tags, groups, weekly)
-      self.report_meta = ReportMeta.find_or_create_by_collection_name(self.collection)
-      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.report_meta.store_name].find().collect {|x| x}).sort_by {|x| x['_id'] }
-    end
-
-    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_key
-      time_to_key(Time.now.utc)
-    end
-
-    def time_to_key(time)
-      time.strftime(self.key_pattern)
-    end
-
-    def key_to_time(report_key)
-      DateTime.strptime(report_key, self.key_pattern).to_time.utc
-    end
-
-    def user_count_in_cohort(report_key)
-      params = { :user_start_date => { :$gt => key_to_time(report_key) - 1.week,
-                                       :$lt => (key_to_time(report_key) )}}
-      params[:tags] = { :$in => groups } if self.groups
-      Cohortly::Metric.collection.distinct(:user_id, params).length
-    end
-
-    def period_cohorts
-      return [] unless data.first
-      start_time = key_to_time(start_key)
-      end_time = key_to_time(end_key)
-      cur_time = start_time
-      res = [start_key]
-      cur_time += self.offset
-      while(cur_time < end_time) do
-        res << time_to_key(cur_time)
-        cur_time += self.offset
-      end
-      res
-    end
-    
-    def period_cohorts_from(cohort_key)
-      index = period_cohorts.index(cohort_key)
-      if index 
-        period_cohorts[index..-1]  
-      else
-        []
-      end
-    end
-
-    def report_line(cohort_key)
-      line = data.find {|x| x['_id'] == cohort_key}
-      return [] unless line
-      period_cohorts_from(cohort_key).collect do |key|
-        if line["value"][key]
-          line["value"][key].keys.length
-        else
-          0
-        end
-      end
-    end
-
-    def percent_line(cohort_key)
-      line = report_line(cohort_key)
-      base = user_count_in_cohort(cohort_key)
-      line.collect { |x| (x && base > 0.0 ) ? (x/base.to_f * 100).round : 0 }.unshift base
-    end
-    
-    def report_totals
-      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
-      { :name => report_meta.collection_name,
-        :store_name => report_meta.store_name,
-        :groups => self.groups,
-        :tags   => self.tags,
-        :weekly => self.weekly,
-        :data => data,
-        :base_n => base_n 
-      }
-    end
-  end
-end

data/app/models/cohortly/report_meta.rb

@@ -1,17 +0,0 @@
-module Cohortly
-  class ReportMeta
-    include MongoMapper::Document
-
-    key :collection_name, String
-    key :last_update_on, Time
-
-    def store_name
-      "cohortly_report_#{self.id}"
-    end
-
-    def run
-      args = Metric.report_name_to_args(self.collection_name)
-      Cohortly::Metric.cohort_chart(*args)
-    end
-  end
-end

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-5601