vanity 2.0.0.beta5 → 2.0.0.beta6

data/.travis.yml

@@ -10,6 +10,7 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.0
+- 2.2.0
 - ruby-head
 env:
 - DB=mongodb
@@ -24,5 +25,7 @@ before_script:
 - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc' # skip installing docs for gems
 matrix:
   exclude:
+    - rvm: 2.2.0
+      gemfile: gemfiles/rails32.gemfile
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -8,14 +8,15 @@ end
 
 appraise "rails4" do
   gem "mocha",  "~> 1.0", :require=>false
-  gem "rails", "4.0.0"
+  gem "rails", "4.0.13"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
+  gem 'test-unit'
 end
 
 appraise "rails41" do
   gem "mocha",  "~> 1.0", :require=>false
-  gem "rails", "4.1.0"
+  gem "rails", "4.1.9"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.0.0.beta5)
+    vanity (2.0.0.beta6)
       i18n
 
 GEM
@@ -50,7 +50,7 @@ GEM
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.10)
     syntax (1.0.0)
     thor (0.18.1)
     timecop (0.3.5)

data/README.rdoc

@@ -35,6 +35,15 @@ Add to your Gemfile:
 
 By default Vanity is configured to use Redis on localhost port 6379 with database 0.
 
+A sample <code>config/vanity.yml</code> might look like:
+
+  test:
+    collecting: false
+  production:
+    adapter: redis
+    connection: redis://<%= ENV["REDIS_USER"] %>:<%= ENV["REDIS_PASSWORD"] %>@<%= ENV["REDIS_HOST"] %>:<%= ENV["REDIS_PORT"] %>/0
+
+
 ===== MongoDB Setup
 
 Add to your Gemfile:
@@ -70,10 +79,7 @@ A sample <code>config/vanity.yml</code> might look like:
     collecting: false
   production:
     adapter: active_record
-    active_record_adapter: mysql
-    database: vanity_test
-    pool: 5
-    timeout: 5000
+    active_record_adapter: default
 
 If you're going to store data in the database, run the generator and migrations to create the database schema:
 
@@ -86,7 +92,6 @@ Turn Vanity on, and pass a reference to a method that identifies a user. For exa
 
   class ApplicationController < ActionController::Base
     use_vanity :current_user
-    layout false  # exclude this if you want to use your application layout
   end
 
 For more information, please see the {identity documentation}[http://vanity.labnotes.org/identity.html].
@@ -141,12 +146,15 @@ In <code>config/routes.rb</code>, add:
   get '/vanity/participant/:id' => 'vanity#participant'
   post '/vanity/complete'
   post '/vanity/chooses'
+  post '/vanity/reset'
   post '/vanity/add_participant'
+  get '/vanity/image'
 
 The controller should look like:
 
   class VanityController < ApplicationController
     include Vanity::Rails::Dashboard
+    layout false  # exclude this if you want to use your application layout
   end
 
 == Registering participants with Javascript
@@ -165,10 +173,16 @@ Here's what's tested and known to work:
 
   Ruby 1.9.3
     Persistence: Redis, Mongo, ActiveRecord
-    Rails: 3.2, 4.0
+    Rails: 3.2, 4.x
   Ruby 2.0
     Persistence: Redis, Mongo, ActiveRecord
-    Rails: 3.2, 4.0
+    Rails: 3.2, 4.x
+  Ruby 2.1
+    Persistence: Redis, Mongo, ActiveRecord
+    Rails: 3.2, 4.x
+  Ruby 2.2
+    Persistence: Redis, Mongo, ActiveRecord
+    Rails: 4.0
 
 == Testing
 

data/config/locales/vanity.en.yml

@@ -15,6 +15,7 @@ en:
     converted_percentage: '%{alternative} converted at %{percentage}%.'
     currently_shown: 'currently shown'
     didnt_convert: '%{alternative} did not convert.'
+    experiment_has_been_reset: '%{name} experiment has been reset.'
     experiment_participants:
       one: 'There is one participant in this experiment.'
       other: 'There are %{count} participants in this experiment.'
@@ -32,6 +33,7 @@ en:
     participants:
       one: '1 participant'
       other: '%{count} participants'
+    reset: 'Reset'
     report: 'Vanity Report: %{timestamp}'
     result_isnt_significant: 'This result is not statistically significant, suggest you continue this experiment.'
     selected_as_best: '%{alternative} selected as the best alternative.'

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta5)
+    vanity (2.0.0.beta6)
       i18n
 
 GEM

data/gemfiles/rails4.gemfile

@@ -14,9 +14,10 @@ gem "garb", "< 0.9.2"
 gem "timecop", :require=>false
 gem "webmock", :require=>false
 gem "mocha", "~> 1.0", :require=>false
-gem "rails", "4.0.0"
+gem "rails", "4.0.13"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"
+gem "test-unit"
 
 group :development do
   gem "appraisal", ">= 1.0.0.beta2"

data/gemfiles/rails4.gemfile.lock

@@ -7,33 +7,33 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta5)
+    vanity (2.0.0.beta6)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
@@ -45,8 +45,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    arel (4.0.1)
-    atomic (1.1.14)
+    arel (4.0.2)
     bson (1.9.2)
     bson_ext (1.9.2)
       bson (~> 1.9.2)
@@ -63,7 +62,7 @@ GEM
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
     hike (1.2.3)
-    i18n (0.6.5)
+    i18n (0.7.0)
     integration (0.1.0)
     jekyll (0.11.2)
       albino (~> 1.3)
@@ -74,68 +73,65 @@ GEM
       maruku (~> 0.5)
     kramdown (0.13.5)
     liquid (2.3.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     maruku (0.6.0)
       syntax (>= 1.0.0)
     metaclass (0.0.4)
-    mime-types (1.25)
+    mime-types (2.4.3)
     minitest (4.7.5)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     mongo (1.9.2)
       bson (~> 1.9.2)
-    multi_json (1.8.2)
+    multi_json (1.10.1)
     passenger (3.0.21)
       daemon_controller (>= 1.0.0)
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.3)
     posix-spawn (0.3.6)
+    power_assert (0.2.2)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.4.2)
     redis (3.0.6)
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
     safe_yaml (0.9.7)
-    sprockets (2.10.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     syntax (1.0.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    test-unit (3.0.9)
+      power_assert
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.6.3)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.43)
     webmock (1.15.2)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -158,12 +154,13 @@ DEPENDENCIES
   mongo
   passenger (~> 3.0)
   rack
-  rails (= 4.0.0)
+  rails (= 4.0.13)
   rake
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
   sqlite3
+  test-unit
   timecop
   vanity!
   webmock

data/gemfiles/rails41.gemfile

@@ -14,7 +14,7 @@ gem "garb", "< 0.9.2"
 gem "timecop", :require=>false
 gem "webmock", :require=>false
 gem "mocha", "~> 1.0", :require=>false
-gem "rails", "4.1.0"
+gem "rails", "4.1.9"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"
 

data/gemfiles/rails41.gemfile.lock

@@ -7,34 +7,34 @@ GIT
 PATH
   remote: .././
   specs:
-    vanity (2.0.0.beta5)
+    vanity (2.0.0.beta6)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      mail (~> 2.5.4)
-    actionpack (4.1.0)
-      actionview (= 4.1.0)
-      activesupport (= 4.1.0)
+    actionmailer (4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.9)
+      actionview (= 4.1.9)
+      activesupport (= 4.1.9)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.0)
-      activesupport (= 4.1.0)
+    actionview (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
-    activerecord (4.1.0)
-      activemodel (= 4.1.0)
-      activesupport (= 4.1.0)
+    activerecord (4.1.9)
+      activemodel (= 4.1.9)
+      activesupport (= 4.1.9)
       arel (~> 5.0.0)
-    activesupport (4.1.0)
+    activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -67,7 +67,7 @@ GEM
       crack (>= 0.1.6)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     integration (0.1.0)
     jekyll (1.5.1)
       classifier (~> 1.3)
@@ -80,24 +80,23 @@ GEM
       redcarpet (~> 2.3.0)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    json (1.8.1)
+    json (1.8.2)
     liquid (2.5.5)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     maruku (0.7.0)
     metaclass (0.0.4)
-    mime-types (1.25.1)
-    minitest (5.3.3)
+    mime-types (2.4.3)
+    minitest (5.5.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mongo (1.10.0)
       bson (~> 1.10.0)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
     passenger (3.0.21)
@@ -105,30 +104,29 @@ GEM
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.4)
     posix-spawn (0.3.8)
     pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.0)
-      actionmailer (= 4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      activemodel (= 4.1.0)
-      activerecord (= 4.1.0)
-      activesupport (= 4.1.0)
+    rails (4.1.9)
+      actionmailer (= 4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      activemodel (= 4.1.9)
+      activerecord (= 4.1.9)
+      activesupport (= 4.1.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0)
+      railties (= 4.1.9)
       sprockets-rails (~> 2.0)
-    railties (4.1.0)
-      actionpack (= 4.1.0)
-      activesupport (= 4.1.0)
+    railties (4.1.9)
+      actionpack (= 4.1.9)
+      activesupport (= 4.1.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
@@ -139,27 +137,24 @@ GEM
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    safe_yaml (1.0.3)
-    sprockets (2.12.1)
+    safe_yaml (1.0.4)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.1)
     toml (0.1.1)
       parslet (~> 1.5.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     webmock (1.17.4)
       addressable (>= 2.2.7)
@@ -184,7 +179,7 @@ DEPENDENCIES
   mongo
   passenger (~> 3.0)
   rack
-  rails (= 4.1.0)
+  rails (= 4.1.9)
   rake
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)

data/gemfiles/rails42.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta5)
+    vanity (2.0.0.beta6)
       i18n
 
 GEM

data/lib/vanity.rb

@@ -15,7 +15,6 @@ module Vanity
 end
 
 require "vanity/version"
-require "vanity/backport" if RUBY_VERSION < "1.9"
 # Metrics.
 require "vanity/metric/base"
 require "vanity/metric/active_record"

data/lib/vanity/adapters/active_record_adapter.rb

@@ -27,16 +27,12 @@ module Vanity
         end
       end
 
-      # Schema model
-      class VanitySchema < VanityRecord
-        self.table_name = :vanity_schema
-      end
-
       # Metric model
       class VanityMetric < VanityRecord
         UPDATED_AT_GRACE_PERIOD = 1.minute
         self.table_name = :vanity_metrics
         has_many :vanity_metric_values
+        attr_accessible :metric_id if needs_attr_accessible?
 
         def self.retrieve(metric)
           rails_agnostic_find_or_create_by(:metric_id, metric.to_s)
@@ -113,7 +109,7 @@ module Vanity
       end
 
       def active?
-        VanityRecord.connected?
+        VanityRecord.connected? && VanityRecord.connection.active?
       end
 
       def disconnect!

data/lib/vanity/adapters/redis_adapter.rb

@@ -223,7 +223,6 @@ module Vanity
           end
         end
       end
-
     end
   end
 end

data/lib/vanity/commands/report.rb

@@ -28,6 +28,15 @@ module Vanity
       text
     end
 
+    class ProxyEmpty < String
+      def method_missing(method, *args, &block); self.class.new end
+    end
+
+    # prevent certain url helper methods from failing so we can run erb templates outside of rails for reports.
+    def method_missing(method, *args, &block)
+      %w(url_for flash).include?(method.to_s) ? ProxyEmpty.new : super
+    end
+
     # Dumbed down from Rails' simple_format.
     def vanity_simple_format(text, options={})
       open = "<p #{options.map { |k,v| "#{k}=\"#{CGI.escapeHTML v}\"" }.join(" ")}>"

data/lib/vanity/experiment/ab_test.rb

@@ -445,6 +445,14 @@ module Vanity
         connection.destroy_experiment @id
         super
       end
+      
+      # clears all collected data for the experiment
+      def reset
+        connection.destroy_experiment @id
+        connection.set_experiment_created_at @id, Time.now
+        @outcome = @completed_at = nil
+        self
+      end
 
       def save
         true_false unless @alternatives

data/lib/vanity/frameworks/rails.rb

@@ -39,6 +39,12 @@ module Vanity
       #     use_vanity { |controller| controller.params[:project_id] }
       #   end
       def use_vanity(symbol = nil, &block)
+        define_method :vanity_store_experiment_for_js do |name, alternative|
+          @_vanity_experiments ||= {}
+          @_vanity_experiments[name] ||= alternative
+          @_vanity_experiments[name].value
+        end
+        
         if block
           define_method(:vanity_identity) { block.call(self) }
         else
@@ -317,6 +323,13 @@ module Vanity
         exp.chooses(exp.alternatives[params[:a].to_i].value)
         render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
       end
+      
+      def reset
+        exp = Vanity.playground.experiment(params[:e].to_sym)
+        exp.reset
+        flash[:notice] = I18n.t 'vanity.experiment_has_been_reset', name: exp.name
+        render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
+      end
 
       # JS callback action used by vanity_js
       def add_participant

data/lib/vanity/helpers.rb

@@ -37,9 +37,7 @@ module Vanity
       # TODO refactor with Vanity::Rails::Helpers#ab_test
       request = respond_to?(:request) ? self.request : nil
       if Vanity.playground.using_js?
-        @_vanity_experiments ||= {}
-        @_vanity_experiments[name] ||= Vanity.playground.experiment(name).choose(request)
-        value = @_vanity_experiments[name].value
+        value = Vanity.context.vanity_store_experiment_for_js name, Vanity.playground.experiment(name).choose(request)
       else
         value = Vanity.playground.experiment(name).choose(request).value
       end

data/lib/vanity/metric/active_record.rb

@@ -99,7 +99,7 @@ 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)
+        call_hooks record.send(@ar_timestamp), nil, [count] if count > 0 && @ar_scoped.exists?(record.id)
       end
     end
   end

data/lib/vanity/templates/_experiment.erb

@@ -1,5 +1,11 @@
 <h3><%=vanity_h experiment.name %> <span class="type">(<%= experiment.class.friendly_name %>)</span></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>
+    <%= flash.notice %>
+  </p>
+<% end %>
+<a class="button reset" title="<%= I18n.t('vanity.reset') %>" href="#" data-id="<%= experiment.id %>" data-url="<%= url_for(:action=>:reset, :e=>experiment.id) %>"><%= I18n.t 'vanity.reset' %></a>
 <%= render :file => Vanity.template("_" + experiment.type), :locals => {:experiment => experiment} %>
 <p class="meta">
   <%= I18n.t('vanity.started_at', :timestamp=>I18n.l(experiment.created_at, :format=>'%a, %b %d')) %>

data/lib/vanity/templates/_experiments.erb

@@ -1,5 +1,5 @@
 <ul class="experiments">
-  <% experiments.sort_by { |id, experiment| experiment.created_at }.reverse.each do |id, experiment| %>
+  <% experiments.sort_by{|id, experiment| experiment.created_at}.sort_by{ |id, experiment| experiment.name }.reverse.each do |id, experiment| %>
     <li class="experiment <%= experiment.type %>" id="experiment_<%=vanity_h id.to_s %>">
     <%= render :file => Vanity.template("_experiment"), :locals => { :id => id, :experiment => experiment } %>
     </li>

data/lib/vanity/templates/vanity.js

@@ -79,4 +79,16 @@ $(function() {
     });
     return false;
   });
+  
+  $(".experiment a.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;
+  });
 });

data/lib/vanity/version.rb

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

data/test/cli_test.rb

@@ -2,6 +2,10 @@ require "test_helper"
 
 describe "bin/vanity" do
 
+  before do
+    not_collecting!
+  end
+
   it "responds to version" do
     proc {
       IO.any_instance.expects(:puts)

data/test/commands/report_test.rb

@@ -27,4 +27,4 @@ describe Vanity::Commands do
       end
     end
   end
-end
+end

data/test/dummy/config/database.yml

@@ -9,14 +9,6 @@
 # Set databases in all environments since we may test loading Rails in non-
 # test environments
 
-development:
-  adapter: sqlite3
-  database: ":memory:"
-
 test:
   adapter: sqlite3
-  database: ":memory:"
-
-production:
-  adapter: sqlite3
-  database: ":memory:"
+  database: vanity_test.sqlite3

data/test/experiment/ab_test.rb

@@ -609,7 +609,7 @@ class AbTestTest < ActionController::TestCase
     assert experiment(:abcd).score.alts.all? { |alt| alt.difference.nil? }
     assert_equal 1, experiment(:abcd).score.best.id
     assert_nil experiment(:abcd).score.choice
-    assert_equal 2, experiment(:abcd).score.base.id
+    assert_includes [0,2,3], experiment(:abcd).score.base.id
     assert_equal 1, experiment(:abcd).score.least.id
   end
 
@@ -1021,6 +1021,27 @@ This experiment did not run long enough to find a clear winner.
     assert [:a, :b, :c].include?(choice)
     assert_equal choice, experiment(:simple).choose.value
   end
+  
+  def test_reset_clears_participants
+    new_ab_test :simple do
+      alternatives :a, :b, :c
+      metrics :coolness
+    end
+    experiment(:simple).chooses(:b)
+    assert_equal experiment(:simple).alternatives[1].participants, 1
+    experiment(:simple).reset
+    assert_equal experiment(:simple).alternatives[1].participants, 0
+  end
+  
+  def test_clears_outcome_and_completed_at
+    new_ab_test :simple do
+      alternatives :a, :b, :c
+      metrics :coolness
+    end
+    experiment(:simple).reset
+    assert_nil experiment(:simple).outcome
+    assert_nil experiment(:simple).completed_at
+  end
 
 
   # -- Helper methods --

data/test/frameworks/rails/action_controller_test.rb

@@ -1,6 +1,13 @@
 require "test_helper"
 
+# Pages accessible to everyone, e.g. sign in, community search.
 class UseVanityController < ActionController::Base
+  class TestModel
+    def test_method
+      ab_test(:pie_or_cake)
+    end
+  end
+  
   attr_accessor :current_user
 
   def index
@@ -11,9 +18,37 @@ class UseVanityController < ActionController::Base
     ab_test(:pie_or_cake)
     render :inline => "<%= vanity_js -%>"
   end
+  
+  def model_js
+    TestModel.new.test_method
+    render :inline => "<%= vanity_js -%>"
+  end
 end
 
-# Pages accessible to everyone, e.g. sign in, community search.
+# class UseVanityControllerTest < ActionController::TestCase
+#   tests UseVanityController
+
+#   def setup
+#     super
+#     new_ab_test :pie_or_cake do
+#       metrics :sugar_high
+#     end
+
+#     # Class eval this instead of including in the controller to delay
+#     # execution until the request exists in the context of the test
+#     UseVanityController.class_eval do
+#       use_vanity :current_user
+#     end
+#   end
+
+#   def teardown
+#     super
+#   end
+
+#   def test_bootstraps_metric
+#   end
+# end
+
 class UseVanityControllerTest < ActionController::TestCase
   tests UseVanityController
 
@@ -23,19 +58,34 @@ class UseVanityControllerTest < ActionController::TestCase
     new_ab_test :pie_or_cake do
       metrics :sugar_high
     end
+
+    # Class eval this instead of including in the controller to delay
+    # execution until the request exists in the context of the test
     UseVanityController.class_eval do
       use_vanity :current_user
     end
-    if ::Rails.respond_to?(:application) # Rails 3 configuration
+
+    # Rails 3 configuration for cookies
+    if ::Rails.respond_to?(:application)
       ::Rails.application.config.session_options[:domain] = '.foo.bar'
     end
   end
 
+  def teardown
+    super
+  end
+
   def test_render_js_for_tests
     Vanity.playground.use_js!
     get :js
     assert_match /script.*v=pie_or_cake=.*script/m, @response.body
   end
+  
+  def test_render_model_js_for_tests
+    Vanity.playground.use_js!
+    get :model_js
+    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+  end
 
   def test_chooses_sets_alternatives_for_rails_tests
     experiment(:pie_or_cake).chooses(true)
@@ -109,7 +159,7 @@ class UseVanityControllerTest < ActionController::TestCase
     assert_equal "576", @controller.send(:vanity_identity)
   end
 
-  def test_vanity_identity_set_with_indentity_paramater
+  def test_vanity_identity_set_with_identity_paramater
     get :index, :_identity => "id_from_params"
     assert_equal "id_from_params", @controller.send(:vanity_identity)
   end
@@ -177,8 +227,4 @@ class UseVanityControllerTest < ActionController::TestCase
     assert_match /domain=.foo.bar/, @response["Set-Cookie"] if ::Rails.respond_to?(:application)
   end
 
-  def teardown
-    super
-  end
-
 end

data/test/metric/base_test.rb

@@ -63,6 +63,17 @@ describe "Metric via playground" do
     assert Vanity.playground.metrics.empty?
   end
 
+  it "bootstraps the metric" do
+    File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
+      f.write <<-RUBY
+        metric "yawns/hour" do
+        end
+      RUBY
+    end
+    Vanity.playground.track!(:yawns_sec)
+    Vanity.playground.track!(:yawns_sec)
+    assert Vanity.playground.connection.get_metric_last_update_at(:yawns_sec)
+  end
 end
 
 

data/test/templates_test.rb

@@ -1,6 +1,10 @@
 require "test_helper"
 
 describe Vanity::Templates do
+  before do
+    not_collecting!
+  end
+
   describe "template" do
     it "resolves templates from the gem by default" do
       custom_view_path = File.expand_path(File.join(Rails.root, 'app', 'views', 'vanity'))

data/test/test_helper.rb

@@ -49,7 +49,7 @@ module VanityTestHelpers
   DATABASE = {
     "redis"=>"redis://localhost/15",
     "mongodb"=>"mongodb://localhost/vanity",
-    "active_record"=> { "adapter"=>"active_record", "active_record_adapter"=>"sqlite3", "database"=>"vanity_test.sqlite3", "timeout" => 10000, "busy_timeout" => 1000 },
+    "active_record"=> { "adapter"=>"active_record", "active_record_adapter"=>"default" },
     "mock"=>"mock:/"
   }[ENV["DB"]] or raise "No support yet for #{ENV["DB"]}"
 
@@ -69,7 +69,8 @@ module VanityTestHelpers
   # or reload an experiment (saved by the previous playground).
   def new_playground
     Vanity.playground = Vanity::Playground.new(:logger=>$logger, :load_path=>"tmp/experiments")
-    Vanity.playground.establish_connection(DATABASE) unless Vanity.playground.connected?
+    ActiveRecord::Base.establish_connection
+    Vanity.playground.establish_connection(DATABASE)
   end
 
   # Defines the specified metrics (one or more names). Returns metric, or array
@@ -161,14 +162,10 @@ if defined?(ActionController::TestCase)
 end
 
 if ENV["DB"] == "active_record"
-  connection = {}
-  connection[:adapter] = VanityTestHelpers::DATABASE['active_record_adapter']
-  connection[:database] = VanityTestHelpers::DATABASE['database']
-  ActiveRecord::Base.establish_connection(connection)
+  ActiveRecord::Base.establish_connection
   ActiveRecord::Base.logger = $logger
 
   require "generators/templates/vanity_migration"
   VanityMigration.down rescue nil
   VanityMigration.up
-  ActiveRecord::Base.connection_pool.disconnect!
 end

metadata

@@ -1,55 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
+  prerelease: 6
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.2'
 description: Mirror, mirror on the wall ...
@@ -117,7 +124,6 @@ files:
 - lib/vanity/adapters/mongodb_adapter.rb
 - lib/vanity/adapters/redis_adapter.rb
 - lib/vanity/autoconnect.rb
-- lib/vanity/backport.rb
 - lib/vanity/commands/list.rb
 - lib/vanity/commands/report.rb
 - lib/vanity/experiment/ab_test.rb
@@ -196,11 +202,10 @@ files:
 homepage: http://vanity.labnotes.org
 licenses:
 - MIT
-metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta5
+- Vanity 2.0.0.beta6
 - --main
 - README.rdoc
 - --webcvs
@@ -208,20 +213,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Experience Driven Development framework for Ruby
 test_files:
 - test/adapters/redis_adapter_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 64da19676a0a785baf7a4fad506d4919282a4622
-  data.tar.gz: 4fde55bdf334eb8947891156e8ffa8e2c4db3d84
-SHA512:
-  metadata.gz: f363b4c0d159729aab12104b5c748437fab61eabdec113eca24c6eb6e9f0b5bfc3b6a8490f467e7158a19c97cd28303a97af0a8cce059b32ffec77599e4e056a
-  data.tar.gz: f4519c3151ff503cf5c329c528c6c55c7809342576739d66a2fb2cfa3d3bebb046a9d8e546569b744300867ee5b4519586adbbf8f57982ac89bd03613ac3dac0

data/lib/vanity/backport.rb

@@ -1,25 +0,0 @@
-class Time
-  unless method_defined?(:to_date)
-    # Backported from Ruby 1.9.
-    def to_date
-      jd = Date.__send__(:civil_to_jd, year, mon, mday, Date::ITALY)
-      Date.new!(Date.__send__(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
-    end
-  end
-end
-
-class Date
-  unless method_defined?(:to_date)
-    # Backported from Ruby 1.9.
-    def to_date
-      self
-    end
-  end
-
-  unless method_defined?(:to_time)
-    # Backported from Ruby 1.9.
-    def to_time
-      Time.local(year, mon, mday)
-    end
-  end
-end