vanity 2.2.9 → 3.0.2

data/lib/vanity/adapters/active_record_adapter.rb

@@ -102,12 +102,22 @@ module Vanity
         # passed then this will be passed to create if creating, or will be
         # used to update the found participant.
         def self.retrieve(experiment, identity, create = true, update_with = nil)
-          if record = VanityParticipant.where(:experiment_id=>experiment.to_s, :identity=>identity.to_s).first
-            record.update_attributes(update_with) if update_with
-          elsif create
-            record = VanityParticipant.create({ :experiment_id=>experiment.to_s, :identity=>identity.to_s }.merge(update_with || {}))
+          retried = false
+          begin
+            if record = VanityParticipant.where(:experiment_id => experiment.to_s, :identity => identity.to_s).first
+              record.update(update_with) if update_with
+            elsif create
+              record = VanityParticipant.create({ :experiment_id => experiment.to_s, :identity => identity.to_s }.merge(update_with || {}))
+            end
+            record
+          rescue ActiveRecord::RecordNotUnique => e
+            if retried
+              raise e
+            else
+              retried = true
+              retry
+            end
           end
-          record
         end
       end
 

data/lib/vanity/adapters/redis_adapter.rb

@@ -18,7 +18,7 @@ module Vanity
       end
 
       def valid_redis_namespace_version?
-        Gem.loaded_specs['redis'].version >= Gem::Version.create('1.1.0')
+        Gem.loaded_specs['redis-namespace'].version >= Gem::Version.create('1.1.0')
       end
     end
 
@@ -41,11 +41,7 @@ module Vanity
 
       def disconnect!
         if redis
-          begin
-            redis.client.disconnect
-          rescue Exception => e
-            Vanity.logger.warn("Error while disconnecting from redis: #{e.message}")
-          end
+          redis.disconnect!
         end
         @redis = nil
       end
@@ -72,7 +68,7 @@ module Vanity
       # -- Metrics --
 
       def get_metric_last_update_at(metric)
-        last_update_at = @metrics["#{metric}:last_update_at"]
+        last_update_at = @metrics.get("#{metric}:last_update_at")
         last_update_at && Time.at(last_update_at.to_i)
       end
 
@@ -81,7 +77,7 @@ module Vanity
           values.each_with_index do |v,i|
             @metrics.incrby "#{metric}:#{timestamp.to_date}:value:#{i}", v
           end
-          @metrics["#{metric}:last_update_at"] = Time.now.to_i
+          @metrics.set("#{metric}:last_update_at", Time.now.to_i)
         end
       end
 
@@ -98,7 +94,7 @@ module Vanity
       # -- Experiments --
 
       def experiment_persisted?(experiment)
-        !!@experiments["#{experiment}:created_at"]
+        !!@experiments.get("#{experiment}:created_at")
       end
 
       def set_experiment_created_at(experiment, time)
@@ -108,7 +104,7 @@ module Vanity
       end
 
       def get_experiment_created_at(experiment)
-        created_at = @experiments["#{experiment}:created_at"]
+        created_at = @experiments.get("#{experiment}:created_at")
         created_at && Time.at(created_at.to_i)
       end
 
@@ -117,7 +113,7 @@ module Vanity
       end
 
       def get_experiment_completed_at(experiment)
-        completed_at = @experiments["#{experiment}:completed_at"]
+        completed_at = @experiments.get("#{experiment}:completed_at")
         completed_at && Time.at(completed_at.to_i)
       end
 
@@ -134,7 +130,7 @@ module Vanity
       end
 
       def is_experiment_enabled?(experiment)
-        value = @experiments["#{experiment}:enabled"]
+        value = @experiments.get("#{experiment}:enabled")
         if Vanity.configuration.experiments_start_enabled
           value != 'false'
         else
@@ -145,20 +141,20 @@ module Vanity
       def ab_counts(experiment, alternative)
         {
           :participants => @experiments.scard("#{experiment}:alts:#{alternative}:participants").to_i,
-                :converted    => @experiments.scard("#{experiment}:alts:#{alternative}:converted").to_i,
-          :conversions  => @experiments["#{experiment}:alts:#{alternative}:conversions"].to_i
+          :converted    => @experiments.scard("#{experiment}:alts:#{alternative}:converted").to_i,
+          :conversions  => @experiments.get("#{experiment}:alts:#{alternative}:conversions").to_i
         }
       end
 
       def ab_show(experiment, identity, alternative)
         call_redis_with_failover do
-          @experiments["#{experiment}:participant:#{identity}:show"] = alternative
+          @experiments.set("#{experiment}:participant:#{identity}:show", alternative)
         end
       end
 
       def ab_showing(experiment, identity)
         call_redis_with_failover do
-          alternative = @experiments["#{experiment}:participant:#{identity}:show"]
+          alternative = @experiments.get("#{experiment}:participant:#{identity}:show")
           alternative && alternative.to_i
         end
       end
@@ -212,7 +208,7 @@ module Vanity
       end
 
       def ab_get_outcome(experiment)
-        alternative = @experiments["#{experiment}:outcome"]
+        alternative = @experiments.get("#{experiment}:outcome")
         alternative && alternative.to_i
       end
 
@@ -221,9 +217,13 @@ module Vanity
       end
 
       def destroy_experiment(experiment)
-        @experiments.del "#{experiment}:outcome", "#{experiment}:created_at", "#{experiment}:completed_at"
-        alternatives = @experiments.keys("#{experiment}:alts:*")
-        @experiments.del(*alternatives) unless alternatives.empty?
+        cursor = nil
+
+        while cursor != "0" do
+          cursor, keys = @experiments.scan(cursor || "0", match: "#{experiment}:*")
+
+          @experiments.del(*keys) unless keys.empty?
+        end
       end
 
       protected

data/lib/vanity/commands/report.rb

@@ -11,7 +11,7 @@ module Vanity
     def render(path_or_options, locals = {})
       if path_or_options.respond_to?(:keys)
         render_erb(
-          path_or_options[:file] || path_or_options[:partial],
+          path_or_options[:template] || path_or_options[:partial],
           path_or_options[:locals]
         )
       else
@@ -54,9 +54,10 @@ module Vanity
       struct = Struct.new(*keys)
       struct.send :include, Render
       locals = struct.new(*locals.values_at(*keys))
+      path = "#{Vanity.template(path)}.erb" unless path =~ /\/.*\.erb\z/
       dir, base = File.split(path)
       path = File.join(dir, partialize(base))
-      erb = ERB.new(File.read("#{path}.erb"), nil, '<>')
+      erb = ERB.new(File.read(path), nil, '<>')
       erb.filename = path
       erb.result(locals.instance_eval { binding })
     end
@@ -78,7 +79,7 @@ module Vanity
       # Generate an HTML report. Outputs to the named file, or stdout with no
       # arguments.
       def report(output = nil)
-        html = render(Vanity.template("report"),
+        html = render(Vanity.template("_report.erb"),
           :experiments=>Vanity.playground.experiments,
           :experiments_persisted=>Vanity.playground.experiments_persisted?,
           :metrics=>Vanity.playground.metrics

data/lib/vanity/experiment/ab_test.rb

@@ -601,9 +601,10 @@ module Vanity
       # identity, and randomly distributed alternatives for each identity (in the
       # same experiment).
       def alternative_for(identity)
+        existing_assignment = connection.ab_assigned @id, identity
+        return existing_assignment if existing_assignment
+
         if @use_probabilities
-          existing_assignment = connection.ab_assigned @id, identity
-          return existing_assignment if existing_assignment
           random_outcome = rand()
           @use_probabilities.each do |alternative, max_prob|
             return alternative.id if random_outcome < max_prob

data/lib/vanity/frameworks/rails.rb

@@ -251,7 +251,7 @@ module Vanity
       def vanity_js
         return if Vanity.context.vanity_active_experiments.nil? || Vanity.context.vanity_active_experiments.empty?
         javascript_tag do
-          render :file => Vanity.template("_vanity"), :formats => [:js]
+          render :file => Vanity.template("_vanity.js.erb"), :formats => [:js]
         end
       end
 
@@ -348,8 +348,13 @@ module Vanity
     #
     # Step 3: Open your browser to http://localhost:3000/vanity
     module Dashboard
+      def set_vanity_view_path
+        prepend_view_path Vanity.template('')
+      end
+
       def index
-        render :file=>Vanity.template("_report"),:content_type=>Mime[:html], :locals=>{
+        set_vanity_view_path
+        render :template=>"_report", :content_type=>Mime[:html], :locals=>{
           :experiments=>Vanity.playground.experiments,
           :experiments_persisted=>Vanity.playground.experiments_persisted?,
           :metrics=>Vanity.playground.metrics
@@ -357,46 +362,52 @@ module Vanity
       end
 
       def participant
-        render :file=>Vanity.template("_participant"), :locals=>{:participant_id => params[:id], :participant_info => Vanity.playground.participant_info(params[:id])}, :content_type=>Mime[:html]
+        set_vanity_view_path
+        render :template=>"_participant", :locals=>{:participant_id => params[:id], :participant_info => Vanity.playground.participant_info(params[:id])}, :content_type=>Mime[:html]
       end
 
       def complete
+        set_vanity_view_path
         exp = Vanity.playground.experiment(params[:e].to_sym)
         alt = exp.alternatives[params[:a].to_i]
         confirmed = params[:confirmed]
         # make the user confirm before completing an experiment
         if confirmed && confirmed.to_i==alt.id && exp.active?
           exp.complete!(alt.id)
-          render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
+          render :template=>"_experiment", :locals=>{:experiment=>exp}
         else
           @to_confirm = alt.id
-          render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
+          render :template=>"_experiment", :locals=>{:experiment=>exp}
         end
       end
 
       def disable
+        set_vanity_view_path
         exp = Vanity.playground.experiment(params[:e].to_sym)
         exp.enabled = false
-        render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
+        render :template=>"_experiment", :locals=>{:experiment=>exp}
       end
 
       def enable
+        set_vanity_view_path
         exp = Vanity.playground.experiment(params[:e].to_sym)
         exp.enabled = true
-        render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
+        render :template=>"_experiment", :locals=>{:experiment=>exp}
       end
 
       def chooses
+        set_vanity_view_path
         exp = Vanity.playground.experiment(params[:e].to_sym)
         exp.chooses(exp.alternatives[params[:a].to_i].value)
-        render :file=>Vanity.template("_experiment"), :locals=>{:experiment=>exp}
+        render :template=>"_experiment", :locals=>{:experiment=>exp}
       end
 
       def reset
+        set_vanity_view_path
         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}
+        render :template=>"_experiment", :locals=>{:experiment=>exp}
       end
 
       include AddParticipant

data/lib/vanity/locales/vanity.ru.yml

@@ -0,0 +1,50 @@
+ru:
+  vanity:
+    act_on_this_experiment:
+      enable: 'Включить этот эксперимент'
+      disable: 'Выключить этот эксперимент'
+    best_alternative: '(%{probability}% это лучшая альтернатива)'
+    best_alternative_is_significant: 'С %{probability}% вероятностью этот результат является статистически значимым.'
+    best_alternative_probability: 'С %{probability}% вероятностью этот результат является самым лучшим.'
+    best_alternative_measure: 'Самый лучший выбор %{best_alternative}: он конвертирован в %{measure}% %{better_than}.'
+    better_alternative_than: '(%{probability}% лучше чем %{alternative})'
+    choose_experiment: 'Показать мне этот вариант прямо сейчас'
+    complete_and_confirm_experiment: 'Подтвердите завершение эксперимента и назначение всех нынешних и будущих участников, %{name}'
+    complete_and_confirm_experiment_label: 'Завершить этот эксперимент и назначить всех нынешних и будущих участников %{name}?'
+    complete_experiment: 'Завершить эксперимент и назначить всех нынешних и будущих участников %{name}'
+    completed_at: 'Завершено %{timestamp}'
+    confirm: 'подтвердить'
+    converted: '%{count} конвертировано'
+    converted_percentage: '%{alternative} конвертировано в %{percentage}%.'
+    currently_shown: 'сейчас отображено'
+    default: '(Default)'
+    didnt_convert: '%{alternative} невозможно конвертировать.'
+    disable: 'Отключить'
+    disabled: 'Отключено'
+    enable: 'Включить'
+    enabled: 'Включено'
+    experiment_has_been_reset: '%{name} эксперимент был сброшен.'
+    experiment_has_been_disabled: 'Этот эксперимент в данное время отключен и всегда будет выбираться по умолчанию %{name}.'
+    experiment_participants:
+      one: 'В этом эксперименте один участник.'
+      other: 'В этом эксперименте %{count} участников.'
+    experiments: 'Эксперименты'
+    experiments_out_of_sync: "Кэшированные эксперименты Vanity не синхронизированы с экспериментами в файловой системе и / или в хранилище данных. Перезапустите сервер и / или включите сбор."
+    generated_by: 'Создан с помощью %{link}'
+    low_result_confidence: 'Полученный результат не является надежным, предлагаю продолжить этот эксперимент.'
+    make_permanent: 'сделать постоянным'
+    metrics: 'Метрики'
+    no_clear_winner: 'Этот эксперимент не длился достаточно долго, чтобы найти явного победителя.'
+    no_participants: 'В этом эксперименте пока нет участников.'
+    not_collecting_data: 'Vanity в данный момент не собирает данные и метрики. Чтобы включить сбор данных, установите %{setting} в %{file}.'
+    option_number: 'выбор %{char}'
+    participant_taking_part_on: 'Участник с идентификатором %{participant_id} принимает участие в следующих экспериментах:'
+    participants:
+      one: '1 участник'
+      other: '%{count} участников'
+    reset: 'Сбросить'
+    report: 'Отчет Vanity: %{timestamp}'
+    result_isnt_significant: 'Полученный результат не является статистически важным, предлагаю продолжить этот эксперимент.'
+    selected_as_best: '%{alternative} выбран в качестве лучшей альтернативы.'
+    show_me: 'показать мне'
+    started_at: 'Начато %{timestamp}'

data/lib/vanity/templates/_experiment.erb

@@ -9,13 +9,13 @@
   <% 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>
@@ -26,7 +26,7 @@
   </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} %>
+<%= render :template => "_" + experiment.type, :locals => {:experiment => experiment} %>
 <p class="meta">
   <%= I18n.t('vanity.started_at', :timestamp=>I18n.l(experiment.created_at, :format=>'%a, %b %d')) %>
   <%= ' | '+I18n.t('vanity.completed_at', :timestamp=>I18n.l(experiment.completed_at, :format=>'%a, %b %d')) unless experiment.active? %>

data/lib/vanity/templates/_experiments.erb

@@ -1,7 +1,7 @@
 <ul class="experiments">
   <% 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 } %>
+    <%= render :template=>"_experiment", :locals => { :id => id, :experiment => experiment } %>
     </li>
   <% end %>
 </ul>

data/lib/vanity/templates/_metrics.erb

@@ -1,7 +1,7 @@
 <ul class="metrics">
   <% metrics.sort_by { |id, metric| metric.name }.each do |id, metric| %>
     <li class="metric" id="metric_<%= id %>">
-      <%= render :file=>Vanity.template("_metric"), :locals=>{:id=>id, :metric=>metric} %>
+      <%= render :template=>"_metric", :locals=>{:id=>id, :metric=>metric} %>
     </li>
   <% end %>
 </ul>

data/lib/vanity/templates/_report.erb

@@ -22,12 +22,12 @@
       <% if experiments_persisted %>
         <% if experiments.present? %>
           <h2><%= I18n.t 'vanity.experiments' %></h2>
-          <%= render :file=>Vanity.template("_experiments"), :locals=>{:experiments=>experiments} %>
+          <%= render :template=>"_experiments", :locals=>{:experiments=>experiments} %>
         <% end %>
 
         <% unless metrics.empty? %>
           <h2><%= I18n.t 'vanity.metrics' %></h2>
-          <%= render :file=>Vanity.template("_metrics"), :locals=>{:metrics=>metrics, :experiments=>experiments} %>
+          <%= render :template=>"_metrics", :locals=>{:metrics=>metrics, :experiments=>experiments} %>
         <% end %>
       <% else %>
         <div class="alert persistance">

data/lib/vanity/templates/vanity.css

@@ -13,15 +13,15 @@
 .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 table { border-collapse: collapse; width: 100%; border-bottom: 1px solid #ccc; margin: 1em 0 0 0 }
+.vanity .ab_test td { padding: .5em; border-top: 1px solid #ccc; 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 caption .disabled_info { padding-top: .5em }
-.vanity .ab_test td.option { width: 5em; white-space: nowrap; overflow: hidden }
+.vanity .ab_test td.option { 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 td.value { white-space: nowrap; overflow: hidden }
+.vanity .ab_test td.action { 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 }

data/lib/vanity/version.rb

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

data/test/adapters/redis_adapter_test.rb

@@ -18,17 +18,13 @@ describe Vanity::Adapters::RedisAdapter do
 
   include Vanity::Adapters::SharedTests
 
-  it "warns on disconnect error" do
+  it "disconnects" do
     if defined?(Redis)
-      assert_silent do
-        Redis.any_instance.stubs(:connect!)
-        mocked_redis = stub("Redis")
-        mocked_redis.expects(:client).raises(RuntimeError)
-        redis_adapter = Vanity::Adapters::RedisAdapter.new({})
-        redis_adapter.stubs(:redis).returns(mocked_redis)
-        Vanity.logger.expects(:warn).with("Error while disconnecting from redis: RuntimeError")
-        redis_adapter.disconnect!
-      end
+      mocked_redis = stub("Redis")
+      mocked_redis.expects(:disconnect!)
+      redis_adapter = Vanity::Adapters::RedisAdapter.new({})
+      redis_adapter.stubs(:redis).returns(mocked_redis)
+      redis_adapter.disconnect!
     end
   end
 
@@ -75,7 +71,7 @@ describe Vanity::Adapters::RedisAdapter do
 
   it "gracefully fails in #ab_show" do
     redis_adapter, mocked_redis = stub_redis
-    mocked_redis.stubs(:[]=).raises(RuntimeError)
+    mocked_redis.stubs(:set).raises(RuntimeError)
 
     assert_silent do
       redis_adapter.ab_show("price_options", "3ff62e2fb51f0b22646a342a2d357aec", 0)
@@ -84,7 +80,7 @@ describe Vanity::Adapters::RedisAdapter do
 
   it "gracefully fails in #ab_showing" do
     redis_adapter, mocked_redis = stub_redis
-    mocked_redis.stubs(:[]).raises(RuntimeError)
+    mocked_redis.stubs(:get).raises(RuntimeError)
 
     assert_silent do
       redis_adapter.ab_showing("price_options", "3ff62e2fb51f0b22646a342a2d357aec")

data/test/adapters/shared_tests.rb

@@ -123,6 +123,10 @@ module Vanity::Adapters::SharedTests
             @subject.destroy_experiment(experiment)
 
             refute(@subject.experiment_persisted?(experiment))
+            assert_equal(
+              { :participants => 0, :converted => 0, :conversions => 0 },
+              @subject.ab_counts(experiment, alternative)
+            )
           end
         end
 
@@ -272,8 +276,7 @@ module Vanity::Adapters::SharedTests
           end
 
           it 'returns nil if the identity has no assignment' do
-            assert_equal(
-              nil,
+            assert_nil(
               @subject.ab_assigned(experiment, identity)
             )
           end
@@ -301,8 +304,7 @@ module Vanity::Adapters::SharedTests
           end
 
           it 'returns nil otherwise' do
-            assert_equal(
-              nil,
+            assert_nil(
               @subject.ab_get_outcome(experiment)
             )
           end
@@ -324,8 +326,7 @@ module Vanity::Adapters::SharedTests
             @subject.ab_show(experiment, identity, alternative)
             @subject.ab_not_showing(experiment, identity)
 
-            assert_equal(
-              nil,
+            assert_nil(
               @subject.ab_showing(experiment, identity)
             )
           end

data/test/commands/report_test.rb

@@ -6,6 +6,15 @@ describe Vanity::Commands do
     metric "Coolness"
   end
 
+  def with_captured_stdout
+    original_stdout = $stdout
+    $stdout = StringIO.new
+    yield
+    $stdout.string
+  ensure
+    $stdout = original_stdout
+  end
+
   describe ".report" do
     describe "given file" do
       let(:file) { "tmp/config/redis.yml" }
@@ -20,7 +29,10 @@ describe Vanity::Commands do
         experiment(:foobar).choose
 
         FileUtils.mkpath "tmp/config"
-        Vanity::Commands.report(file)
+
+        with_captured_stdout do
+          Vanity::Commands.report(file)
+        end
       end
 
       after do

data/test/configuration_test.rb

@@ -113,6 +113,19 @@ describe Vanity::Configuration do
   end
 
   describe "setup_locales" do
-    it "adds vanity locales to the gem"
+    it "adds vanity locales to the I18n gem" do
+      begin
+        original_load_path = I18n.load_path
+
+        config.setup_locales
+
+        assert_includes(
+          I18n.load_path,
+          File.expand_path(File.join(__FILE__, '..', '..', 'lib/vanity/locales/vanity.en.yml'))
+        )
+      ensure
+        I18n.load_path = original_load_path
+      end
+    end
   end
-end
+end

data/test/dummy/app/mailers/vanity_mailer.rb

@@ -12,8 +12,10 @@ class VanityMailer < ActionMailer::Base
   def ab_test_content(user)
     use_vanity_mailer user
 
+    image_html = view_context.vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000")
+
     mail do |format|
-      format.html { render :text=>view_context.vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000") }
+      format.html { render :html=>image_html.html_safe }
     end
   end
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -4,5 +4,8 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '33ccbc9a29f3b02e87c08904505b1c9a3a1e97dd01f02e598e65ee9e7b96fff2ca4a6d0dd7c4a8d3682d8c64f84d372661e141264e70697dc576c722c72d80d0'
-Dummy::Application.config.secret_key_base = 'secret' if Dummy::Application.config.respond_to?(:secret_key_base=)
+if Dummy::Application.config.respond_to?(:secret_key_base=)
+  Dummy::Application.config.secret_key_base = 'secret'
+else
+  Dummy::Application.config.secret_token = '33ccbc9a29f3b02e87c08904505b1c9a3a1e97dd01f02e598e65ee9e7b96fff2ca4a6d0dd7c4a8d3682d8c64f84d372661e141264e70697dc576c722c72d80d0'
+end

data/test/dummy/config/routes.rb

@@ -52,7 +52,21 @@ Dummy::Application.routes.draw do
 
   # See how all your routes lay out with "rake routes"
 
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  match ':controller(/:action(/:id(.:format)))', :via => [:get, :post]
+  get '/use_vanity(/:id(.:format))', controller: :use_vanity, action: :index
+
+  %w(js view_helper_ab_test_js global_ab_test_js model_js).each do |action|
+    get "/use_vanity/#{action}(/:id(.:format))", controller: :use_vanity, action: action
+  end
+
+  %w(track test_capture test_render test_view).each do |action|
+    get "/ab_test/#{action}(/:id(.:format))", controller: :ab_test, action: action
+  end
+
+  %w(reset disable enable chooses add_participant complete).each do |action|
+    post "/vanity(/#{action}(/:id(.:format)))", controller: :vanity, action: action
+  end
+
+  %w(index participant image).each do |action|
+    get "/vanity(/#{action}(/:id(.:format)))", controller: :vanity, action: action
+  end
 end

data/test/experiment/ab_test.rb

@@ -529,12 +529,12 @@ class AbTestTest < ActionController::TestCase
       identify { "6e98ec" }
       metrics :coolness
     end
-    assert_equal nil, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
+    assert_nil experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
     assert id = experiment(:foobar).choose.id
     assert_equal id, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
   end
 
-  def test_ab_assigned
+  def test_ab_assigned_object
     identity = { :a => :b }
     new_ab_test :foobar do
       alternatives "foo", "bar"
@@ -542,7 +542,7 @@ class AbTestTest < ActionController::TestCase
       identify { identity }
       metrics :coolness
     end
-    assert_equal nil, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
+    assert_nil experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
     assert id = experiment(:foobar).choose.id
     assert_equal id, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
   end