abongo 1.0.6 → 1.0.7

data/lib/abongo.rb

@@ -243,7 +243,7 @@ class Abongo
   end
   
   def self.all_tests
-    Abongo.experiments.find.to_a
+    Abongo.experiments.find.sort(:final).to_a
   end
 
   def self.get_test(test)

data/lib/abongo.rb~

@@ -1,9 +1,15 @@
-class Abongo
-  @@VERSION = '1.0.0'
-  def self.VERSION; @@VERSION; end
-  @@MAJOR_VERSION = '1.0'
-  def self.MAJOR_VERSION; @@MAJOR_VERSION; end
+if defined? Rails
+  require 'abongo/sugar'
+  require 'abongo/view_helper'
+  require 'abongo/controller/dashboard'
+  ActionController::Base.send :include, Abongo::Sugar
+  ActionView::Base.send :include, Abongo::ViewHelper
+end
+
+require 'abongo/version'
+require 'abongo/statistics'
 
+class Abongo
   @@options ||= {}
   def self.options; @@options; end
   def self.options=(options); @@options = options; end
@@ -29,7 +35,6 @@ class Abongo
     @@identity ||= rand(10 ** 10)
   end
 
-  # TODO: add options
   def self.flip(test_name, options = {})
     if block_given?
       yield(self.test(test_name, [true, false], options))
@@ -65,6 +70,7 @@ class Abongo
       # Small timing issue in here
       if (!@@options[:count_humans_only] || participant['human'])
         Abongo.alternatives.update({:content => choice, :test => test['_id']}, {:$inc => {:participants => 1}})
+        Abongo.experiments.update({:_id => test['_id']}, {'$inc' => {:participants => 1}})
       end
     end
 
@@ -95,7 +101,6 @@ class Abongo
             self.score_conversion!(test)
           end
         else # No tests listening for this conversion. Assume it is just a test name
-          puts name.inspect
           if name.kind_of? BSON::ObjectId
             self.score_conversion!(name)
           else
@@ -117,6 +122,7 @@ class Abongo
             test = Abongo.experiments.find_one(:_id => test_name)
             viewed_alternative = Abongo.find_alternative_for_user(Abongo.identity, test)
             Abongo.alternatives.update({:content => viewed_alternative, :test => test['_id']}, {'$inc' => {:conversions => 1}})
+            Abongo.experiments.update({:_id => test_name}, {'$inc' => {:conversions => 1}})
           end
         end
       end 
@@ -153,16 +159,22 @@ class Abongo
     tests_and_alternatives
   end
 
+  def self.is_human?(identity = nil)
+    identity ||= Abongo.identity
+    participant = Abongo.participants.find_one(:identity => identity)
+    return !!(participant && participant["human"])
+  end
+
   def self.human!(identity = nil)
     identity ||= Abongo.identity
     begin
       previous = Abongo.participants.find_and_modify({'query' => {:identity => identity}, 'update' => {'$set' => {:human => true}}, 'upsert' => true})
     rescue Mongo::OperationFailure
-      Abongo.participants.update({:identity => identity}, {'$set' => {:human => true}}, :upsert => true, :safe => true)
+      Abongo.participants.update({:identity => identity}, {'$set' => {:human => true}}, :upsert => true)
       previous = Abongo.participants.find_one(:identity => identity)
     end
     
-    unless previous['human']
+    if !previous['human'] and options[:count_humans_only]
       if options[:expires_in_for_bots] and previous['tests']
         Abongo.set_expiration(Abongo.identity, expires_in(true))
       end
@@ -171,7 +183,8 @@ class Abongo
         previous['tests'].each do |test_id|
           test = Abongo.experiments.find_one(test_id)
           choice = Abongo.find_alternative_for_user(identity, test)
-          Abongo.alternatives.update({:content => choice, :test => test['_id']}, {:$inc => {:participants => 1}})
+          Abongo.alternatives.update({:content => choice, :test => test_id}, {:$inc => {:participants => 1}})
+          Abongo.experiments.update({:_id => test_id}, {'$inc' => {:participants => 1}})
         end
       end
 
@@ -179,7 +192,8 @@ class Abongo
         previous['conversions'].each do |test_id|
           test = Abongo.experiments.find_one(:_id => test_id)
           viewed_alternative = Abongo.find_alternative_for_user(identity, test)
-          Abongo.alternatives.update({:content => viewed_alternative, :test => test['_id']}, {'$inc' => {:conversions => 1}})
+          Abongo.alternatives.update({:content => viewed_alternative, :test => test_id}, {'$inc' => {:conversions => 1}})
+          Abongo.experiments.update({:_id => test_id}, {'$inc' => {:conversions => 1}})
         end
       end
     end
@@ -187,7 +201,9 @@ class Abongo
 
   def self.end_experiment!(test_name, final_alternative, conversion_name = nil)
     warn("conversion_name is deprecated") if conversion_name
-    Abongo.experiments.update({:name => test_name}, {:$set => { :final => final_alternative}}, :upsert => true, :safe => true)
+    test = get_test(test_name)
+    Abongo.experiments.update({:name => test_name}, {'$set' => { :final => final_alternative}}, :upsert => true, :safe => true)
+    Abongo.conversions.update({'tests' => test['_id']}, {'$pull' => {'tests' => test['_id']}}, :multi => true)
   end
 
   protected
@@ -230,8 +246,16 @@ class Abongo
     Abongo.experiments.find.to_a
   end
 
-  def self.get_test(test_name)
-    Abongo.experiments.find_one({:name => test_name}) || nil
+  def self.get_test(test)
+    Abongo.experiments.find_one({:name => test}) || Abongo.experiments.find_one({:_id => test}) || nil
+  end
+
+  def self.get_alternatives(test_id)
+    Abongo.alternatives.find({:test => test_id})
+  end
+
+  def self.get_alternative(alternative_id)
+    Abongo.alternatives.find_one({:_id => BSON::ObjectId(alternative_id)})
   end
 
   def self.tests_listening_to_conversion(conversion)
@@ -243,7 +267,7 @@ class Abongo
   def self.start_experiment!(test_name, alternatives_array, conversion_name = nil)
     conversion_name ||= test_name
 
-    Abongo.experiments.update({:name => test_name}, {:$set => { :alternatives => alternatives_array}}, :upsert => true, :safe => true)
+    Abongo.experiments.update({:name => test_name}, {:$set => {:alternatives => alternatives_array}, :$inc => {:participants => 0, :conversions => 0}}, :upsert => true, :safe => true)
     test = Abongo.experiments.find_one({:name => test_name})
 
     # This could be a lot more elegant
@@ -270,13 +294,13 @@ class Abongo
 
   def self.add_participation(identity, test_id, expires_in = nil)
     if expires_in.nil?
-      Abongo.participants.update({:identity => identity}, {'$addToSet' => {:tests => test_id}}, :upsert => true, :safe => true)
+      Abongo.participants.update({:identity => identity}, {'$addToSet' => {:tests => test_id}}, :upsert => true)
     else
-      Abongo.participants.update({:identity => identity}, {'$addToSet' => {:tests => test_id}, '$set' => {:expires => Time.now + expires_in}}, :upsert => true, :safe => true)
+      Abongo.participants.update({:identity => identity}, {'$addToSet' => {:tests => test_id}, '$set' => {:expires => Time.now + expires_in}}, :upsert => true)
     end
   end
 
   def self.set_expiration(identity, expires_in)
-    Abongo.participants.update({:identity => identity}, {'$set' => {:expires => Time.now + expires_in}}, :upsert => true, :safe => true)
+    Abongo.participants.update({:identity => identity}, {'$set' => {:expires => Time.now + expires_in}}, :upsert => true)
   end
 end

data/lib/abongo/version.rb

@@ -1,4 +1,4 @@
 class Abongo
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
   MAJOR_VERSION = '1'
 end

data/lib/abongo/version.rb~

@@ -0,0 +1,4 @@
+class Abongo
+  VERSION = '1.0.6'
+  MAJOR_VERSION = '1'
+end

data/lib/abongo/views/dashboard/_experiment.html.erb

@@ -1,4 +1,4 @@
-<h3><%= experiment['name'].titleize %> <%= %Q|(Test completed)| if experiment['final'] %> </h3>
+<h3><%= experiment['name'].titleize %> <%= %Q|(Test completed)| unless experiment['final'].nil? %> </h3>
 <table class="experiment" style="border: 1px black;">
   <tr class="header_row">
     <th>Name</th>
@@ -21,7 +21,7 @@
     <td><%= alternative['participants'] %></td>
     <td><%= alternative['conversions'] %> (<%= Abongo::Statistics.pretty_conversion_rate(alternative) %>)</td>
     <td>
-      <% unless experiment['final'] %>
+      <% if experiment['final'].nil? %>
       <%= link_to("End experiment, picking this.", url_for(:id => alternative['_id'],
       :action => "end_experiment"),
       :method => :post,

data/lib/abongo/views/dashboard/_experiment.html.erb~

@@ -0,0 +1,43 @@
+<h3><%= experiment['name'].titleize %> <%= %Q|(Test completed)| if experiment['final'] %> </h3>
+<table class="experiment" style="border: 1px black;">
+  <tr class="header_row">
+    <th>Name</th>
+    <th>Participants</th>
+    <th>Conversions</th>
+    <th>Notes</th>
+  </tr>
+  <tr class="experiment_row">
+    <td>Experiment Total: </td>
+    <td><%= experiment['participants'] %> </td>
+    <td><%= experiment['conversions'] %> (<%= Abongo::Statistics.pretty_conversion_rate(experiment) %>)</td>
+    <td></td>
+  </tr>
+  <% alternatives = Abongo.get_alternatives(experiment['_id']).to_a %>
+  <% alternatives.each do |alternative| %>
+    <tr class="alternative_row">
+    <td>
+        <%= h alternative['content'] %>
+    </td>
+    <td><%= alternative['participants'] %></td>
+    <td><%= alternative['conversions'] %> (<%= Abongo::Statistics.pretty_conversion_rate(alternative) %>)</td>
+    <td>
+      <% unless experiment['final'] %>
+      <%= link_to("End experiment, picking this.", url_for(:id => alternative['_id'],
+      :action => "end_experiment"),
+      :method => :post,
+      :confirm => "Are you sure you want to terminate this experiment?  This is not reversible."
+      ) %>
+      <% else %>
+        <% if alternative['content'] == experiment['final'] %>
+          <b>(All users seeing this.)</b>
+        <% end %>
+      <% end %>
+    </td>
+  </tr>
+  <% end %>
+  <tr>
+    <td colspan="4">
+      <b>Significance test results: </b><%= Abongo::Statistics.describe_result_in_words(experiment, alternatives) %>
+    </td>
+  </tr>
+</table>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Michael Fairley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 -07:00
+date: 2011-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,10 @@ files:
 - lib/abongo/statistics.rb
 - lib/abongo/sugar.rb
 - lib/abongo/version.rb
+- lib/abongo/version.rb~
 - lib/abongo/view_helper.rb
 - lib/abongo/views/dashboard/_experiment.html.erb
+- lib/abongo/views/dashboard/_experiment.html.erb~
 - lib/abongo/views/dashboard/index.html.erb
 - lib/abongo.rb
 - lib/abongo.rb~