vanity 2.0.1 → 2.1.0

data/lib/vanity/metric/active_record.rb

@@ -49,6 +49,8 @@ module Vanity
         @ar_timestamp, @ar_timestamp_table = @ar_timestamp.to_s.split('.').reverse
         @ar_timestamp_table ||= @ar_scoped.table_name
 
+        @ar_identity_block = options.delete(:identity)
+
         fail "Unrecognized options: #{options.keys * ", "}" unless options.empty?
 
         @ar_scoped.after_create(self)
@@ -99,7 +101,13 @@ module Vanity
       def after_create(record)
         return unless @playground.collecting?
         count = @ar_column ? (record.send(@ar_column) || 0) : 1
-        call_hooks record.send(@ar_timestamp), nil, [count] if count > 0 && @ar_scoped.exists?(record.id)
+
+        identity = Vanity.context.vanity_identity rescue nil
+        identity ||= if @ar_identity_block
+          @ar_identity_block.call(record)
+        end
+        
+        call_hooks record.send(@ar_timestamp), identity, [count] if count > 0 && @ar_scoped.exists?(record.id)
       end
     end
   end

data/lib/vanity/templates/_ab_test.erb

@@ -2,10 +2,17 @@
 <table>
   <caption>
     <%= experiment.conclusion(score).join(" ") %>
+    <% if experiment.active? && !experiment.enabled? %>
+      <div class='disabled_info'><%=I18n.t('vanity.experiment_has_been_disabled', name: experiment.default.name)%></div>
+    <% end %>
   </caption>
   <% score.alts.each do |alt| %>
     <tr class="<%= "choice" if score.choice == alt %>">
-      <td class="option"><%= alt.name.gsub(/^o/, "O") %>:</td>
+      <td class="option"><%= alt.name.gsub(/^o/, "O") %>:
+        <% if alt.default? %>
+          <div class='default'><%=I18n.t('vanity.default')%></div>
+        <% end %>
+      </td>
       <td class="value"><code><%=vanity_h alt.value.to_s %></code></td>
       <td class="value"><%= I18n.t 'vanity.participants', :count=>alt.participants %></td>
       <td class="value"><%= I18n.t 'vanity.converted', :count=>alt.converted %></td>
@@ -14,7 +21,7 @@
         <%= I18n.t('vanity.best_alternative', :probabilty=>alt.probability.to_i) if score.method == :bayes_score %>
         <%= I18n.t('vanity.better_alternative_than', :probability=>alt.difference.to_i, :alternative=>score.least.name) if alt.difference && alt.difference >= 1 %>
       </td>
-      <% if experiment.active? && respond_to?(:url_for) %>
+      <% if experiment.enabled? && experiment.active? && respond_to?(:url_for) %>
         <td class="action">
           <small>
             <% if experiment.showing?(alt) %>

data/lib/vanity/templates/_experiment.erb

@@ -1,4 +1,24 @@
-<h3><%=vanity_h experiment.name %> <span class="type">(<%= experiment.class.friendly_name %>)</span></h3>
+<% if experiment.active? %>
+  <% status = experiment.enabled? ? 'status_enabled' : 'status_disabled' %>
+<% else %>
+  <% status = 'status_completed' %>
+<% end %>
+<div class="inner <%= status %>">
+<h3>
+  <%=vanity_h experiment.name %><span class="type">(<%= experiment.class.friendly_name %>)</span>
+  <% if experiment.type == 'ab_test' && experiment.active? && experiment.playground.collecting? %>
+    <span class='enabled-links'>
+      <% action = experiment.enabled? ? :disable : :enable %>
+      
+      <% if experiment.enabled? %> <%= I18n.t( 'vanity.enabled' ) %> | <% end %>
+      <a title='<%=I18n.t( action, scope: 'vanity.act_on_this_experiment' )%>' href='#'
+         data-id='<%= experiment.id %>' data-url='<%= url_for(:action=>action, :e => experiment.id) %>'>
+        <%= action %></a>
+      <% if !experiment.enabled? %> | <%= I18n.t( 'vanity.disabled' ) %> <% end %>
+      
+    </span>
+  <% end %>
+</h3>
 <%= experiment.description.to_s.split(/\n\s*\n/).map { |para| vanity_html_safe(%{<p class="description">#{vanity_h para}</p>}) }.join.html_safe %>
 <% if flash.notice %>
   <p>

data/lib/vanity/templates/vanity.css

@@ -7,14 +7,22 @@
 .vanity .experiments { list-style: none; margin: 0; padding: 0 }
 .vanity .experiment { margin: 1em 0 2em 0; border-bottom: 1px solid #ddd }
 .vanity .experiment .type { margin-left: .3em; color: #bbb; font-size: .8em; font-weight: normal }
+.vanity .experiment .inner {padding: 1em}
+.vanity .experiment .status_completed { background: #EEF }
+.vanity .experiment .status_enabled { background: #EFE }
+.vanity .experiment .status_disabled { background: #FEE }
+.vanity .experiment .enabled-links { float: right; font-weight: normal }
 
 .vanity .ab_test table { border-collapse: collapse; table-layout: fixed; width: 100%; border-bottom: 1px solid #ccc; margin: 1em 0 0 0 }
 .vanity .ab_test td { padding: .5em; border-top: 1px solid #ccc; width: 2em; overflow: hidden }
 .vanity .ab_test .choice td { font-weight: bold; background: #f0f0f8 }
 .vanity .ab_test caption { caption-side: bottom; padding: .5em; background: transparent; text-align: left }
-.vanity .ab_test td.option { width: 5em; white-space: nowrap; }
-.vanity .ab_test td.value { width: 8em;  }
-.vanity .ab_test td.action { width: 6em; text-align: right }
+.vanity .ab_test caption .disabled_info { padding-top: .5em }
+.vanity .ab_test td.option { width: 5em; white-space: nowrap; overflow: hidden }
+.vanity .ab_test td.option .default { font-size: 75% }
+.vanity .ab_test td.value { width: 8em; white-space: nowrap; overflow: hidden }
+.vanity .ab_test td.action { width: 6em; overflow: hidden; text-align: right }
+.vanity .ab_test button.reset { float: right }
 
 .vanity .metrics { list-style: none; margin: 0; padding: 0; border-bottom: 1px solid #ddd }
 .vanity .metric { margin: 2em 0 }

data/lib/vanity/templates/vanity.js

@@ -70,13 +70,42 @@ $(function() {
     });
   });
 
-  $(".experiment.ab_test a.button.chooses").live("click", function() {
-    var link = $(this);
-    $.ajax({
-      data: 'authenticity_token=' + encodeURIComponent(document.auth_token),
-      success: function(request){ $('#experiment_' + link.attr("data-id")).html(request) },
-      url: link.attr("data-url"), type: 'post'
+  function post_on_click(sel) {
+    $(sel).live("click", function() {
+      var link = $(this);
+      $.ajax({
+        data: 'authenticity_token=' + encodeURIComponent(document.auth_token),
+        success: function(request){ $('#experiment_' + link.attr("data-id")).html(request) },
+        url: link.attr("data-url"), type: 'post'
+      });
+      return false;
     });
+  }
+
+  post_on_click(".experiment.ab_test a.button.chooses");
+  post_on_click(".experiment.ab_test .enabled-links a");
+
+  $(".experiment button.reset").live("click", function() {
+    if (confirm('Are you sure you want to reset the experiment? This will clear all collected data so far and restart the experiment from scratch. This cannot be undone.')){
+      var link = $(this);
+      $.ajax({
+        data: 'authenticity_token=' + encodeURIComponent(document.auth_token),
+        success: function(request){ $('#experiment_' + link.attr("data-id")).html(request) },
+        url: link.attr("data-url"), type: 'post'
+      });
+    }
+    return false;
+  });
+  
+  $(".experiment button.finish").live("click", function() {
+    var link = $(this);
+    if (confirm('Are you sure you want to complete the experiment and set ' + link.attr("alt-name") + ' as the outcome?')){
+      $.ajax({
+        data: 'authenticity_token=' + encodeURIComponent(document.auth_token),
+        success: function(request){ $('#experiment_' + link.attr("data-id")).html(request) },
+        url: link.attr("data-url"), type: 'post'
+      });
+    }
     return false;
   });
   

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/commands/report_test.rb

@@ -15,6 +15,7 @@ describe Vanity::Commands do
           alternatives "foo", "bar"
           identify { "me" }
           metrics :coolness
+          default "foo"
         end
         experiment(:foobar).choose
 

data/test/dummy/config/application.rb

@@ -40,6 +40,7 @@ module Dummy
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
     config.active_record.whitelist_attributes = true if ActiveRecord::Base.respond_to?(:whitelist_attributes=)
+    config.active_record.mass_assignment_sanitizer = :strict if defined?(ProtectedAttributes)
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"