metry 2.0.5 → 2.1.0

data/lib/metry/cohort.rb

@@ -0,0 +1,19 @@
+module Metry
+  class Cohort
+    include MongoMapper::Document
+    
+    key :name, String
+    key :visitor_ids, Array
+    
+    belongs_to :experiment
+    
+    def visitors
+      [(visitor_ids.empty? ? nil : Visitor.find(visitor_ids))].flatten
+    end
+    
+    def reached_goal(goal)
+      goal_visitor_ids = goal.visitors.collect{|e| e.id}
+      (goal_visitor_ids & visitor_ids).size.to_f/visitor_ids.size.to_f
+    end
+  end
+end

data/lib/metry/event.rb

@@ -0,0 +1,26 @@
+module Metry
+  class Event
+    include MongoMapper::Document
+    
+    key :event, String
+    key :path, String
+    key :created_at, Time
+    key :ip, String
+    key :host, String
+    key :method, String
+    key :referrer, String
+    key :user_agent, String
+    key :status, String
+    key :extra, Hash
+    
+    belongs_to :visitor, :class_name => "Metry::Visitor"
+    
+    def ignore?
+      @ignore
+    end
+    
+    def ignore!
+      @ignore = true
+    end
+  end
+end

data/lib/metry/experiment.rb

@@ -1,23 +1,46 @@
 module Metry
   class Experiment
+    include MongoMapper::Document
     METHODS = {
-      "rand" => proc{|list, visitor| list.sort_by{rand}.first},
-      "mod_visitor" => proc{|list, visitor| list[(visitor['_id'].to_i-1)%list.size]}, # mod_visitor will only work with predictable_keys = true
+      "rand" => proc{|list, experiment| list.sort_by{rand}.first},
+      "sequential" => proc do |list, experiment|
+        r = list[experiment.counter%list.size]
+        experiment.counter += 1
+        experiment.save
+        r
+      end
     }
-
-    def initialize(name, event, visitor)
-      @key = "experiment:#{name}"
-      @event = event
-      @visitor = visitor
+    
+    key :name, String
+    key :counter, Integer, :default => 0
+    
+    many :cohorts, :class_name => 'Metry::Cohort', :foreign_key => 'experiment_id'
+    many :goals, :class_name => "Metry::Goal", :foreign_key => "experiment_id"
+    
+    def self.find_or_create_by_name(name)
+      find(:first, :conditions => {:name => name}) || create(:name => name)
+    end
+        
+    def lookup_cohort(name)
+      cohort = cohorts.find(:first, :conditions => {:name => name})
+      unless cohort
+        cohort = Cohort.create(:name => name)
+        cohorts << cohort
+      end
+      cohort
+    end
+    
+    def cohort_for(visitor)
+      cohorts.detect{|e| e.visitor_ids.include?(visitor.id)}
     end
     
-    def choose(options, method=nil)
-      unless choice = @visitor[@key]
-        choice = METHODS[method || "rand"][options.keys, @visitor]
-        @visitor[@key] = choice
+    def choose(options, method, event, visitor)
+      cohort = cohort_for(visitor)
+      unless cohort
+        cohort = lookup_cohort(METHODS[method||'rand'][options, self])
+        visitor.in_cohort(cohort)
       end
-      @event[@key] = choice
-      options[choice]
+      cohort.name
     end
   end
 end

data/lib/metry/goal.rb

@@ -0,0 +1,18 @@
+module Metry
+  class Goal
+    include MongoMapper::Document
+    
+    key :name, String
+    key :path, String
+    
+    belongs_to :experiment
+
+    def path_regexp
+      Regexp.new("^#{path}$")
+    end
+    
+    def visitors
+      Event.find(:all, :conditions => {:path => path_regexp}).inject({}){|a,e| a[e.visitor_id] = e.visitor; a}.values
+    end
+  end
+end

data/lib/metry/psycho.rb

@@ -14,7 +14,7 @@ module Metry
         
         before do
           if unescape(@request.path_info) =~ /^#{path}/
-            @env["metry.event"]["ignore"] = "true"
+            @env["metry.event"].ignore!
             if !auth.call(env)
               reply = on_deny.call(env)
               status reply.first
@@ -25,41 +25,50 @@ module Metry
         end
 
         get "#{path}/?" do
-          @visitors = Visitor.all
-          @goals = Goal.all
+          @visitors = Visitor.find(:all, :limit => 10)
+          @experiments = Experiment.find(:all)
           erb :dashboard
         end
+        
+        get "#{path}/visitors" do
+          @visitors = Visitor.find(:all)
+        end
       
         get "#{path}/visitors/:id" do
           @visitor = Visitor.find(params["id"])
           erb :visitor
         end
         
-        post "#{path}/goals" do
-          goal = Goal.create!(params[:name], params[:path])
-          redirect url("/goals/#{goal.id}")
+        post "#{path}/experiments/:experiment_id/goals" do
+          experiment = Experiment.find(params[:experiment_id])
+          experiment.goals << Goal.create(params)
+          redirect url("/experiments/#{experiment.id}")
         end
         
-        get "#{path}/goals/new" do
+        get "#{path}/experiments/:experiment_id/goals/new" do
+          @experiment = Experiment.find(params[:experiment_id])
           erb :new_goal
         end
         
-        get "#{path}/goals/:id" do
-          @goal = Goal.find(params[:id])
-          erb :goal
-        end
-        
-        get "#{path}/goals/:id/edit" do
+        get "#{path}/experiments/:experiment_id/goals/:id/edit" do
+          @experiment = Experiment.find(params[:experiment_id])
           @goal = Goal.find(params[:id])
           erb :edit_goal
         end
         
-        post "#{path}/goals/:id" do
+        post "#{path}/experiments/:experiment_id/goals/:id" do
           goal = Goal.find(params[:id])
           goal.name = params[:name]
           goal.path = params[:path]
           goal.save
-          redirect url("/goals/#{goal.id}")
+          redirect url("/experiments/#{params[:experiment_id]}")
+        end
+        
+        get "#{path}/experiments/:id" do
+          @experiment = Experiment.find(params[:id])
+          @goals = @experiment.goals
+          @cohorts = @experiment.cohorts
+          erb :experiment
         end
       
         helpers do
@@ -72,83 +81,5 @@ module Metry
         end
       end
     end
-    
-    class Goal
-      def self.find(id)
-        new(Metry.current.goal(id))
-      end
-      
-      def self.create!(name, path)
-        new(Metry.current.add_goal('name' => name, 'path' => path))
-      end
-      
-      def self.all
-        Metry.current.goals.collect{|e| new(e)}
-      end
-      
-      attr_accessor :path, :id, :name
-      
-      def initialize(hash)
-        @id = hash['_id'].to_s
-        @name = hash['name']
-        @path = hash['path']
-      end
-      
-      def save
-        Metry.current.save_goal({'_id' => id, 'name' => name, 'path' => path})
-      end
-      
-      def path_regexp
-        Regexp.new("^#{path}$")
-      end
-      
-      def visits
-        events.size
-      end
-      
-      def events
-        Metry.current.all_events({'path' => path_regexp})
-      end
-      
-      def visitors
-        events.collect{|e| e['visitor']}.uniq.collect{|e| Visitor.find(e)}
-      end
-    end
-    
-    class Visitor
-      def self.all
-        Metry.current.visitors.collect{|e| new(e)}.select{|e| e.has_events?}
-      end
-      
-      def self.find(id)
-        new(Metry.current.visitor(id))
-      end
-
-      def initialize(visitor)
-        @visitor = visitor
-      end
-      
-      def id
-        @visitor['_id'].to_s
-      end
-      
-      def events
-        Metry.current.events_for(id).collect{|e| Event.new(e)}
-      end
-      
-      def has_events?
-        !events.empty?
-      end
-    end
-    
-    class Event
-      def initialize(event)
-        @event = event
-      end
-      
-      def path
-        @event["path"]
-      end
-    end
   end
 end

data/lib/metry/psycho/dashboard.erb

@@ -1,10 +1,9 @@
-<h1>Goals</h1>
-<ul id="goals">
-  <% @goals.each do |goal| %>
-    <li class="goal"><a href="<%= url "/goals/#{goal.id}" %>"><%= goal.name %></a>: <%= goal.visits %> visits</li>
+<h1>Experiments</h1>
+<ul id="experiments">
+  <% @experiments.each do |experiment| %>
+    <li class="experiment"><a href="<%= url "/experiments/#{experiment.id}" %>"><%= experiment.name %></a></li>
   <% end %>
 </ul>
-<p><a href="<%= url "/goals/new" %>">New Goal</a></p>
 
 <h1>Recent Visitors</h1>
 <ul>
@@ -12,3 +11,4 @@
     <li><a href="<%= url "/visitors/#{v.id}" %>">Visitor <%= v.id %></a> (<%= v.events.size %> events)</li>
   <% end %>
 </ul>
+<p><a href="<%= url "/visitors" %>">More</a></p>

data/lib/metry/psycho/edit_goal.erb

@@ -1,6 +1,6 @@
 <h1>Edit Goal</h1>
 
-<form action="<%= url "/goals/#{@goal.id}" %>" method="post">
+<form action="<%= url "/experiments/#{@experiment.id}/goals/#{@goal.id}" %>" method="post">
   <fieldset>
     <p><label for="name">Name</label> <input type="text" name="name" value="<%= @goal.name %>"/></p>
     <p><label for="path">Path</label> <input type="text" name="path" value="<%= @goal.path %>"/></p>

data/lib/metry/psycho/experiment.erb

@@ -0,0 +1,25 @@
+<h1>Experiment <%= @experiment.name %></h1>
+
+<% @goals.each do |goal| %>
+  <p>Name: <%= goal.name %></p>
+  <p>Path: <%=h goal.path %></p>
+  <p><a href="<%= url "/experiments/#{@experiment.id}/goals/#{goal.id}/edit" %>">Edit</a></p>
+<% end %>
+<p><a href="<%= url "/experiments/#{@experiment.id}/goals/new" %>">New Goal</a></p>
+
+<table>
+  <tr>
+    <th>Goal</th>
+    <% @cohorts.each do |cohort| %>
+      <th><%= cohort.name %></th>
+    <% end %>
+  </tr>
+  <% @goals.each do |goal| %>
+    <tr>
+      <td><%= goal.name %></td>
+      <% @cohorts.each do |cohort| %>
+        <td><%= (cohort.reached_goal(goal)*100).to_i %>%</td>
+      <% end %>
+    </tr>
+  <% end %>
+</table>

data/lib/metry/psycho/new_goal.erb

@@ -1,6 +1,6 @@
 <h1>New Goal</h1>
 
-<form action="<%= url "/goals" %>" method="post">
+<form action="<%= url "/experiments/#{@experiment.id}/goals" %>" method="post">
   <fieldset>
     <p><label for="name">Name</label> <input type="text" name="name" /></p>
     <p><label for="path">Path</label> <input type="text" name="path" /></p>

data/lib/metry/psycho/visitor.erb

@@ -1,7 +1,10 @@
 <h1>Visitor <%= @visitor.id %></h1>
 
+<p>Last IP: <%= @visitor.last_ip %></p>
+<p>User agent: <%= @visitor.user_agent %></p>
+
 <ol>
   <% @visitor.events.each do |event| %>
-    <li><%= event.path %></li>
+    <li><%= event.path %> from <%= event.referrer %></li>
   <% end %>
 </ol>

data/lib/metry/psycho/visitors.erb

@@ -0,0 +1,6 @@
+<h1>Visitors</h1>
+<ul>
+  <% @visitors.each do |v| %>
+    <li><a href="<%= url "/visitors/#{v.id}" %>">Visitor <%= v.id %></a> (<%= v.events.size %> events)</li>
+  <% end %>
+</ul>

data/lib/metry/rack/tracking.rb

@@ -5,14 +5,12 @@ module Metry
 
       def initialize(app)
         @app = app
-        @storage = Metry.current
       end
     
       def call(env)
         request = ::Rack::Request.new(env)
-        visitor = find_or_create_visitor(request)
-        env["metry.visitor"] = visitor
         env["metry.event"] = event = build_event(request)
+        env["metry.visitor"] = visitor = find_or_create_visitor(request)
 
         status, headers, body = @app.call(env)
 
@@ -20,34 +18,37 @@ module Metry
 
         save_visitor(response, visitor)
 
-        unless event["ignore"] == "true"
-          event["status"] = status.to_s
-          event["visitor"] = visitor['_id'].to_s
-          @storage.add_event(event)
+        unless event.ignore?
+          event.visitor = visitor
+          event.status = status.to_s
+          event.save
         end
 
         response.to_a
       end
     
       def build_event(request)
-        { "event" => "pageview",
-          "path" => request.fullpath,
-          "time" => Time.now.to_f,
-          "ip" => request.ip,
-          "host" => request.host,
-          "method" => request.request_method,
-          "referrer" => request.env["HTTP_REFERER"],
-          "user_agent" => request.env["HTTP_USER_AGENT"] }
+        Event.new("event" => "pageview",
+          :path => request.fullpath,
+          :ip => request.ip,
+          :host => request.host,
+          :method => request.request_method,
+          :referrer => request.env["HTTP_REFERER"],
+          :user_agent => request.env["HTTP_USER_AGENT"])
       end
     
       def find_or_create_visitor(request)
-        @storage.visitor(request.cookies[COOKIE]) || @storage.new_visitor
+        visitor = nil
+        if id = request.cookies[COOKIE]
+          visitor = Visitor.find(id)
+        end
+        (visitor || Visitor.create)
       end
     
       def save_visitor(response, visitor)
-        @storage.save_visitor(visitor)
+        visitor.save
         response.set_cookie(COOKIE,
-          :value => visitor['_id'].to_s,
+          :value => visitor.id.to_s,
           :expires => (Time.now+(60*60*24*365*20)),
           :path => '/')
       end

data/lib/metry/visitor.rb

@@ -0,0 +1,30 @@
+module Metry
+  class Visitor
+    include MongoMapper::Document
+    
+    key :created_at, Time
+    key :updated_at, Time
+    key :cohort_ids, Array
+    
+    many :events, :class_name => "Metry::Event", :foreign_key => "visitor_id"
+
+    def last_ip
+      (events.last ? events.last.ip : nil)
+    end
+    
+    def user_agent
+      (events.last ? events.last.user_agent : nil)
+    end
+    
+    def in_cohort(cohort)
+      cohort_ids << cohort.id
+      cohort.visitor_ids << self.id
+      save
+      cohort.save
+    end
+
+    def cohorts
+      [(cohort_ids.empty? ? nil : Cohort.find(cohort_ids))].flatten
+    end
+  end
+end