vanity 1.6.1 → 1.7.0

data/test/myapp/log/test.log

@@ -0,0 +1,304 @@
+  Processing by VanityController#add_participant as JS
+Completed 404 Not Found in 253ms (Views: 252.4ms)
+  Processing by VanityController#chooses as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 355ms (Views: 354.4ms)
+  Processing by VanityController#add_participant as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Rendered text template (0.0ms)
+Completed 200 OK in 9ms (Views: 8.1ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#add_participant as JS
+Completed 404 Not Found in 0ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#chooses as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 16ms (Views: 14.7ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#add_participant as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Rendered text template (0.0ms)
+Completed 200 OK in 15ms (Views: 8.9ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#add_participant as JS
+Completed 404 Not Found in 0ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#chooses as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 26ms (Views: 25.3ms | ActiveRecord: 0.0ms)
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 18ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"aae9ff8081"}
+Completed 500 Internal Server Error in 2ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"567"}
+Redirected to http://test.host/use_vanity?foo=bar
+Completed 302 Found in 2ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_vanity"=>"aae9ff8081"}
+Redirected to http://test.host/use_vanity
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"123", "_track"=>"sugar_high"}
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 2ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"id_from_params"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 2ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"aae9ff8081"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"567"}
+Redirected to http://test.host/use_vanity?foo=bar
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_vanity"=>"aae9ff8081"}
+Redirected to http://test.host/use_vanity
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"123", "_track"=>"sugar_high"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"id_from_params"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 3ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 6ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 2ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 5ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 2ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 3ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 12ms
+  Processing by AbTestController#test_view as HTML
+Completed 500 Internal Server Error in 36ms
+  Processing by AbTestController#track as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by AbTestController#test_capture as HTML
+Completed 500 Internal Server Error in 2ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by VanityController#add_participant as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 36ms (Views: 34.6ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#add_participant as JS
+Completed 404 Not Found in 1ms (Views: 0.5ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#chooses as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 139ms (Views: 136.6ms | ActiveRecord: 0.0ms)
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"aae9ff8081"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"567"}
+Redirected to http://test.host/use_vanity?foo=bar
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_vanity"=>"aae9ff8081"}
+Redirected to http://test.host/use_vanity
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"123", "_track"=>"sugar_high"}
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"id_from_params"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by AbTestController#test_view as HTML
+Completed 500 Internal Server Error in 28ms
+  Processing by AbTestController#track as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by AbTestController#test_capture as HTML
+Completed 500 Internal Server Error in 2ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by VanityController#add_participant as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 33ms (Views: 31.5ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#add_participant as JS
+Completed 404 Not Found in 1ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#chooses as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 17ms (Views: 15.3ms | ActiveRecord: 0.0ms)
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"aae9ff8081"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"567"}
+Redirected to http://test.host/use_vanity?foo=bar
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_vanity"=>"aae9ff8081"}
+Redirected to http://test.host/use_vanity
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"123", "_track"=>"sugar_high"}
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"id_from_params"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by AbTestController#test_view as HTML
+Completed 500 Internal Server Error in 30ms
+  Processing by AbTestController#track as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by AbTestController#test_capture as HTML
+Completed 500 Internal Server Error in 3ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by AbTestController#test_render as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by VanityController#add_participant as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 13ms (Views: 11.6ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#add_participant as JS
+Completed 404 Not Found in 1ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+  Processing by VanityController#chooses as JS
+  Parameters: {"e"=>"food", "a"=>0}
+Completed 200 OK in 16ms (Views: 15.0ms | ActiveRecord: 0.0ms)
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"aae9ff8081"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"foo"=>"bar", "_vanity"=>"567"}
+Redirected to http://test.host/use_vanity?foo=bar
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_vanity"=>"aae9ff8081"}
+Redirected to http://test.host/use_vanity
+Completed 302 Found in 1ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"123", "_track"=>"sugar_high"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+  Parameters: {"_identity"=>"id_from_params"}
+Completed 500 Internal Server Error in 0ms
+  Processing by UseVanityController#index as HTML
+Completed 500 Internal Server Error in 0ms

data/test/passenger_test.rb

@@ -8,7 +8,7 @@ class PassengerTest < Test::Unit::TestCase
     @original = Vanity.playground.connection
     File.unlink "test/myapp/config/vanity.yml" rescue nil
     File.open("test/myapp/config/vanity.yml", "w") do |io|
-      io.write "production: #{Vanity.playground.connection}"
+      io.write YAML.dump({ "production"=>DATABASE })
     end
     @server = PhusionPassenger::SpawnManager.new
     @server.start

data/test/rails_helper_test.rb

@@ -25,4 +25,12 @@ class RailsHelperTest < ActionView::TestCase
       assert result == ab_test(:pie_or_cake)
     end
   end
+  
+  def test_vanity_track_url_for_returns_url_with_identity_and_metrics
+    assert_equal vanity_track_url_for("123", :sugar_high, :controller => "controller", :action => "action"), "/controller/action?_identity=123&amp;_track=sugar_high"
+  end
+  
+  def test_vanity_tracking_image
+    assert_equal vanity_tracking_image("123", :sugar_high, options = {}), image_tag("/vanity/image?_identity=123&amp;_track=sugar_high", :width => "1px", :height => "1px", :alt => "")
+  end
 end

data/test/rails_test.rb

@@ -85,7 +85,17 @@ class UseVanityTest < ActionController::TestCase
     get :index
     assert_equal "576", @controller.send(:vanity_identity)
   end
-
+  
+  def test_vanity_identity_set_with_indentity_paramater
+    get :index, :_identity => "id_from_params"
+    assert_equal "id_from_params", @controller.send(:vanity_identity)
+    
+    @request.cookies['vanity_id'] = "old_id"
+    get :index, :_identity => "id_from_params"
+    assert_equal "id_from_params", @controller.send(:vanity_identity)
+    assert cookies['vanity_id'], "id_from_params"
+  end
+  
   # query parameter filter
 
   def test_redirects_and_loses_vanity_query_parameter
@@ -113,6 +123,11 @@ class UseVanityTest < ActionController::TestCase
     assert !experiment(:pie_or_cake).showing?(first)
   end
 
+  def test_track_param_tracks_a_metric
+    get :index, :_identity => "123", :_track => "sugar_high"
+    assert_equal experiment(:pie_or_cake).alternatives[0].converted, 1
+  end
+  
   def test_cookie_domain_from_rails_configuration
     get :index
     assert_equal cookies["vanity_id"][:domain], '.foo.bar' if ::Rails.respond_to?(:application)
@@ -192,8 +207,7 @@ mongodb:
       YML
     end
 
-    ENV["RAILS_ENV"] = "mongodb"
-    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB)
+    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
 initializer.after_initialize
 $stdout << Vanity.playground.connection
     RB
@@ -214,14 +228,12 @@ mongodb:
       YML
     end
 
-    ENV["RAILS_ENV"] = "mongodb"
-    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB)
+    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
 initializer.after_initialize
 $stdout << Vanity.playground.connection
     RB
 
-    ENV["RAILS_ENV"] = "mongodb"
-    assert_equal "Mongo::ReplSetConnection", load_rails(<<-RB)
+    assert_equal "Mongo::ReplSetConnection", load_rails(<<-RB, "mongodb")
 initializer.after_initialize
 $stdout << Vanity.playground.connection.mongo.class
     RB
@@ -247,14 +259,13 @@ $stdout << Vanity.playground.connection
 
   def test_connection_from_yaml_missing
     FileUtils.mkpath "tmp/config"
-    ENV["RAILS_ENV"] = "development"
     File.open("tmp/config/vanity.yml", "w") do |io|
       io.write <<-YML
 production:
   adapter: redis
       YML
     end
-    assert_equal "No configuration for development", load_rails(<<-RB)
+    assert_equal "No configuration for development", load_rails(<<-RB, "development")
 initializer.after_initialize
 $stdout << (Vanity.playground.connection rescue $!.message)
     RB
@@ -283,7 +294,7 @@ $stdout << Vanity.playground.connection
   def test_connection_from_redis_yml
     FileUtils.mkpath "tmp/config"
     yml = File.open("tmp/config/redis.yml", "w")
-    yml << "development: internal.local:6379\n"
+    yml << "production: internal.local:6379\n"
     yml.flush
     assert_equal "redis://internal.local:6379/0", load_rails(<<-RB)
 initializer.after_initialize
@@ -295,10 +306,9 @@ $stdout << Vanity.playground.connection
   
   def test_collection_from_vanity_yaml
     FileUtils.mkpath "tmp/config"
-    ENV["RAILS_ENV"] = "development"
     File.open("tmp/config/vanity.yml", "w") do |io|
       io.write <<-YML
-development:
+production:
   collecting: false
       YML
     end
@@ -354,7 +364,7 @@ $stdout << Vanity.playground.collecting?
 $:.delete_if { |path| path[/gems\\/vanity-\\d/] }
 $:.unshift File.expand_path("../lib")
 RAILS_ROOT = File.expand_path(".")
-RAILS_ENV = "#{env}"
+RAILS_ENV = ENV['RACK_ENV'] = "#{env}"
 require "initializer"
 require "active_support"
 Rails.configuration = Rails::Configuration.new

data/test/test_helper.rb

@@ -1,5 +1,8 @@
+GC.disable
 $LOAD_PATH.delete_if { |path| path[/gems\/vanity-\d/] }
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
+ENV["RACK_ENV"] = "test"
+ENV["DB"] ||= "redis"
 
 RAILS_ROOT = File.expand_path("..")
 require "test/unit"
@@ -21,9 +24,22 @@ if $VERBOSE
   $logger.level = Logger::DEBUG
 end
 
+
 class Test::Unit::TestCase
   include WebMock::API
 
+  # We go destructive on the database at the end of each run, so make sure we
+  # don't use databases you care about. For Redis, we pick database 15
+  # (default is 0).
+  DATABASE = {
+    "redis"=>"redis://localhost/15",
+    "mongodb"=>"mongodb://localhost/vanity",
+    "mysql"=> { "adapter"=>"active_record", "active_record_adapter"=>"mysql", "database"=>"vanity_test" },
+    "postgres"=> { "adapter"=>"active_record", "active_record_adapter"=>"postgresql", "database"=>"vanity_test", "username"=>"postgres" },
+    "mock"=>"mock:/"
+  }[ENV["DB"]] or raise "No support yet for #{ENV["DB"]}"
+
+
   def setup
     FileUtils.mkpath "tmp/experiments/metrics"
     new_playground
@@ -39,18 +55,8 @@ class Test::Unit::TestCase
   # Call this if you need a new playground, e.g. to re-define the same experiment,
   # or reload an experiment (saved by the previous playground).
   def new_playground
-    adapter = ENV["ADAPTER"] || "redis"
-    # We go destructive on the database at the end of each run, so make sure we
-    # don't use databases you care about. For Redis, we pick database 15
-    # (default is 0).
-    spec = {
-      "redis"=>"redis://localhost/15",
-      "mongodb"=>"mongodb://localhost/vanity-test",
-      "mock"=>"mock:/"
-    }[adapter]
-    raise "No support yet for #{adapter}" unless spec
     Vanity.playground = Vanity::Playground.new(:logger=>$logger, :load_path=>"tmp/experiments")
-    Vanity.playground.establish_connection spec
+    Vanity.playground.establish_connection DATABASE
   end
 
   # Defines the specified metrics (one or more names).  Returns metric, or array
@@ -103,6 +109,12 @@ end
 ActiveRecord::Base.logger = $logger
 ActiveRecord::Base.establish_connection :adapter=>"mysql", :database=>"vanity_test"
 
+if ENV["DB"] == "mysql" || ENV["DB"] == "postgres"
+  require "generators/templates/vanity_migration"
+  VanityMigration.down rescue nil
+  VanityMigration.up
+end
+
 
 class Array
   # Not in Ruby 1.8.6.