vanity 1.8.4 → 1.9.0.beta

data/test/playground_test.rb

@@ -13,6 +13,28 @@ class PlaygroundTest < Test::Unit::TestCase
     assert Vanity.playground.using_js?
   end
 
+  def test_be_failover_on_datastore_error
+    assert !Vanity.playground.failover_on_datastore_error?
+    Vanity.playground.failover_on_datastore_error!
+    assert Vanity.playground.failover_on_datastore_error?
+  end
+
+  def test_default_failover_on_datastore_error
+    proc = Vanity.playground.on_datastore_error
+    assert proc.respond_to?(:call)
+    assert_nothing_raised do
+      proc.call(Exception.new("datastore error"), self.class, caller[0][/`.*'/][1..-2], [1, 2, 3])
+    end
+  end
+
+  def test_request_filter
+    proc = Vanity.playground.request_filter
+    assert proc.respond_to?(:call)
+    assert_nothing_raised do
+      proc.call(dummy_request)
+    end
+  end
+
   def test_chooses_path_sets_default
     assert_equal Vanity.playground.add_participant_path, Vanity::Playground::DEFAULT_ADD_PARTICIPANT_PATH
   end
@@ -23,17 +45,44 @@ class PlaygroundTest < Test::Unit::TestCase
     assert_equal Vanity.playground.connection.to_s, "mock:/"
   end
 
-  def test_autoconnect_establishes_connection_by_default
+  def test_autoconnect_establishes_connection_by_default_with_connection
     instance = Vanity::Playground.new(:connection=>"mock:/")
     assert instance.connected?
   end
 
+  def test_autoconnect_establishes_connection_by_default
+    Vanity::Playground.any_instance.expects(:establish_connection)
+    Vanity::Playground.new
+  end
+
   def test_autoconnect_can_skip_connection
     Vanity::Autoconnect.stubs(:playground_should_autoconnect?).returns(false)
     instance = Vanity::Playground.new(:connection=>"mock:/")
     assert !instance.connected?
   end
 
+  def test_experiments_persisted_returns_true
+    metric "Coolness"
+    new_ab_test :foobar do
+      alternatives "foo", "bar"
+      identify { "abcdef" }
+      metrics :coolness
+    end
+
+    assert Vanity.playground.experiments_persisted?
+  end
+
+  def test_experiments_persisted_finds_returns_false
+    name = 'Price'
+    id = :price
+    experiment = Vanity::Experiment::AbTest.new(Vanity.playground, id, name)
+    Vanity.playground.experiments[id] = experiment
+
+    assert !Vanity.playground.experiments_persisted?
+
+    Vanity.playground.experiments.delete(id)
+  end
+
   def test_participant_info
     assert_equal [], Vanity.playground.participant_info("abcdef")
     metric "Coolness"

data/test/rails_dashboard_test.rb

@@ -17,12 +17,49 @@ class RailsDashboardTest < ActionController::TestCase
     end
   end
 
-  # --  Actions accessible to everyone, e.g. sign in, community search --
+  # --  Test dashboard --
+
+  def test_index
+    get :index
+    assert_response :success
+    assert @response.body =~ %r{div class="vanity"}
+  end
+
+  def test_assigns_experiments
+    get :index
+    experiments = assigns(:experiments).with_indifferent_access
+
+    assert experiments.respond_to?(:keys)
+    assert experiments.keys.include?("food")
+    assert experiments.values.first.name == :food
+  end
+
+  def test_assigns_metrics
+    get :index
+    metrics = assigns(:metrics).with_indifferent_access
+    assert metrics.respond_to?(:keys)
+    assert metrics.keys.include?("sugar_high")
+    assert metrics.values.first.name == "sugar_high"
+  end
+
+  def test_assigns_experiments_persisted
+    get :index
+    assert assigns(:experiments_persisted)
+  end
+
+  # --  Actions used in non-admin actions --
 
   def test_add_participant
     xhr :post, :add_participant, :e => "food", :a => 0
     assert_response :success
     assert @response.body.blank?
+    assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
+  end
+
+  def test_add_participant_with_invalid_request
+    @request.user_agent = "Googlebot/2.1 ( http://www.google.com/bot.html)"
+    xhr :post, :add_participant, :e => "food", :a => 0
+    assert_equal 0, experiment(:food).alternatives.map(&:participants).sum
   end
 
   def test_add_participant_no_params

data/test/rails_helper_test.rb

@@ -26,6 +26,11 @@ class RailsHelperTest < ActionView::TestCase
     end
   end
 
+  def test_ab_test_adds_participant_to_experiment
+    ab_test(:pie_or_cake)
+    assert_equal 1, experiment(:pie_or_cake).alternatives.map(&:participants).sum
+  end
+
   def test_vanity_track_url_for_returns_url_with_identity_and_metrics
     self.expects(:url_for).with(:controller => "controller", :action => "action", :_identity => '123', :_track => :sugar_high)
     vanity_track_url_for("123", :sugar_high, :controller => "controller", :action => "action")

data/test/rails_test.rb

@@ -47,6 +47,16 @@ class UseVanityControllerTest < ActionController::TestCase
     assert_equal 'false', @response.body
   end
 
+  def test_adds_participant_to_experiment
+    get :index
+    assert_equal 1, experiment(:pie_or_cake).alternatives.map(&:participants).sum
+  end
+
+  def test_does_not_add_invalid_participant_to_experiment
+    @request.user_agent = "Googlebot/2.1 ( http://www.google.com/bot.html)"
+    get :index
+    assert_equal 0, experiment(:pie_or_cake).alternatives.map(&:participants).sum
+  end
 
   def test_vanity_cookie_is_persistent
     get :index
@@ -59,17 +69,19 @@ class UseVanityControllerTest < ActionController::TestCase
 
   def test_vanity_cookie_default_id
     get :index
-    assert cookies['vanity_id'] =~ /^[a-f0-9]{32}$/
+    assert cookies["vanity_id"] =~ /^[a-f0-9]{32}$/
   end
 
   def test_vanity_cookie_retains_id
-    @request.cookies['vanity_id'] = "from_last_time"
+    @request.cookies["vanity_id"] = "from_last_time"
     get :index
-    assert_equal "from_last_time", cookies['vanity_id']
+    # Rails 2 funkieness: if the cookie isn't explicitly set in the response,
+    # cookies[] is empty. Just make sure it's not re-set.
+    assert_equal rails3? ? "from_last_time" : nil,  cookies["vanity_id"]
   end
 
   def test_vanity_identity_set_from_cookie
-    @request.cookies['vanity_id'] = "from_last_time"
+    @request.cookies["vanity_id"] = "from_last_time"
     get :index
     assert_equal "from_last_time", @controller.send(:vanity_identity)
   end
@@ -86,7 +98,7 @@ class UseVanityControllerTest < ActionController::TestCase
     end
     @controller.current_user = Object.new
     get :index
-    assert cookies['vanity_id'] =~ /^[a-f0-9]{32}$/
+    assert cookies["vanity_id"] =~ /^[a-f0-9]{32}$/
   end
 
   def test_vanity_identity_set_with_block
@@ -102,13 +114,34 @@ class UseVanityControllerTest < ActionController::TestCase
   def test_vanity_identity_set_with_indentity_paramater
     get :index, :_identity => "id_from_params"
     assert_equal "id_from_params", @controller.send(:vanity_identity)
+  end
 
+  def test_vanity_identity_prefers_block_over_symbol
+    UseVanityController.class_eval do
+      attr_accessor :project_id
+      use_vanity(:current_user) { |controller| controller.project_id }
+    end
+    @controller.project_id = "576"
+    @controller.current_user = stub(:id=>"user_id")
+
+    get :index
+    assert_equal "576", @controller.send(:vanity_identity)
+  end
+
+    def test_vanity_identity_prefers_parameter_over_cookie
     @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
 
+  def test_vanity_identity_prefers_cookie_over_object
+    @request.cookies['vanity_id'] = "from_last_time"
+    @controller.current_user = stub(:id=>"user_id")
+    get :index
+    assert_equal "from_last_time", @controller.send(:vanity_identity)
+  end
+
   # query parameter filter
 
   def test_redirects_and_loses_vanity_query_parameter
@@ -234,9 +267,11 @@ $stdout << Vanity.playground.load_path
   end
 
   def test_absolute_load_path
-    assert_equal File.expand_path("/tmp/var"), load_rails(%Q{\nVanity.playground.load_path = "/tmp/var"\n}, <<-RB)
+    Dir.mktmpdir do |dir|
+      assert_equal dir, load_rails(%Q{\nVanity.playground.load_path = "#{dir}"\n}, <<-RB)
 $stdout << Vanity.playground.load_path
-    RB
+      RB
+    end
   end
 
   if ENV['DB'] == 'redis'
@@ -321,8 +356,6 @@ $stdout << Vanity.playground.connection
     ensure
       File.unlink yml.path
     end
-
-
   end
 
   if ENV['DB'] == 'mongo'
@@ -345,7 +378,7 @@ $stdout << Vanity.playground.connection
       File.unlink "tmp/config/vanity.yml"
     end
 
-    unless ENV['CI'] == 'true'
+    unless ENV['CI'] == 'true' #TODO this doesn't get tested on CI
       def test_mongodb_replica_set_connection
         FileUtils.mkpath "tmp/config"
         File.open("tmp/config/vanity.yml", "w") do |io|
@@ -380,9 +413,12 @@ production:
   adapter: redis
       YML
     end
-    assert_equal "No configuration for development", load_rails("", <<-RB, "development")
-$stdout << (Vanity.playground.connection rescue $!.message)
-    RB
+
+     assert_equal "No configuration for development", load_rails("\nbegin\n", <<-RB, "development")
+rescue RuntimeError => e
+  $stdout << e.message
+end
+      RB
   ensure
     File.unlink "tmp/config/vanity.yml"
   end
@@ -393,6 +429,7 @@ $stdout << (Vanity.playground.connection rescue $!.message)
       io.write <<-YML
 production:
   collecting: false
+  adapter: mock
       YML
     end
     assert_equal "false", load_rails("", <<-RB)
@@ -414,8 +451,8 @@ $stdout << Vanity.playground.collecting?
     RB
   end
 
-  def test_collection_false_in_development_by_default
-    assert_equal "false", load_rails("", <<-RB, "development")
+  def test_collection_true_in_development_by_default
+    assert_equal "true", load_rails("", <<-RB, "development")
 $stdout << Vanity.playground.collecting?
     RB
   end
@@ -433,6 +470,20 @@ $stdout << Vanity.playground.collecting?
     RB
   end
 
+  def test_playground_loads_if_connected
+    assert_equal "{}", load_rails("", <<-RB)
+$stdout << Vanity.playground.instance_variable_get(:@experiments).inspect
+    RB
+  end
+
+  def test_playground_does_not_load_if_not_connected
+    ENV['VANITY_DISABLED'] = '1'
+    assert_equal "nil", load_rails("", <<-RB)
+$stdout << Vanity.playground.instance_variable_get(:@experiments).inspect
+    RB
+    ENV['VANITY_DISABLED'] = nil
+  end
+
   def load_rails(before_initialize, after_initialize, env="production")
     tmp = Tempfile.open("test.rb")
     begin

data/test/test_helper.rb

@@ -5,6 +5,7 @@ ENV["RACK_ENV"] = "test"
 ENV["DB"] ||= "redis"
 
 require "test/unit"
+require "tmpdir"
 require "mocha"
 require "action_controller"
 require "action_controller/test_case"
@@ -43,6 +44,9 @@ Vanity::Rails.load!
 if $VERBOSE
   $logger = Logger.new(STDOUT)
   $logger.level = Logger::DEBUG
+else
+  $logger = Logger.new(STDOUT)
+  $logger.level = Logger::FATAL
 end
 
 module VanityTestHelpers
@@ -87,7 +91,7 @@ module VanityTestHelpers
     Vanity.playground.establish_connection DATABASE
   end
 
-  # Defines the specified metrics (one or more names).  Returns metric, or array
+  # Defines the specified metrics (one or more names). Returns metric, or array
   # of metric (if more than one argument).
   def metric(*names)
     metrics = names.map do |name|
@@ -120,6 +124,10 @@ module VanityTestHelpers
     Vanity.playground.stubs(:connection).returns(stub(:flushdb=>nil))
   end
 
+  def dummy_request
+    defined?(ActionDispatch) ? ActionDispatch::TestRequest.new() : ActionController::TestRequest.new()
+  end
+
   # Defining setup/tear down in a module and including it below doesn't
   # override the built-in setup/teardown methods, so we alias_method_chain
   # them to run.
@@ -146,9 +154,23 @@ if defined?(ActiveSupport::TestCase)
   end
 end
 
+if defined?(ActionController::TestCase)
+  module ActionController
+    class TestCase
+      alias :setup_controller_request_and_response_without_vanity :setup_controller_request_and_response
+      # Sets Vanity.context to the current controller, so you can do things like:
+      #   experiment(:simple).chooses(:green)
+      def setup_controller_request_and_response
+        setup_controller_request_and_response_without_vanity
+        Vanity.context = @controller
+      end
+    end
+  end
+end
+
 if ENV["DB"] == "postgres"
   ActiveRecord::Base.establish_connection :adapter=>"postgresql", :database=>"vanity_test"
-else
+elsif ENV["DB"] == "mysql"
   ActiveRecord::Base.establish_connection :adapter=>"mysql", :database=>"vanity_test"
 end
 ActiveRecord::Base.logger = $logger

data/vanity.gemspec

@@ -22,6 +22,4 @@ Gem::Specification.new do |spec|
                           "--webcvs", "http://github.com/assaf/#{spec.name}"
 
   spec.required_ruby_version = ">= 1.8.7"
-  spec.add_dependency "redis", ">= 2.1"
-  spec.add_dependency "redis-namespace", ">= 1.1.0"
 end

metadata

@@ -1,57 +1,34 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vanity
-version: !ruby/object:Gem::Version
-  version: 1.8.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 1752004685
+  prerelease: 6
+  segments: 
+  - 1
+  - 9
+  - 0
+  - beta
+  version: 1.9.0.beta
 platform: ruby
-authors:
+authors: 
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+
+date: 2014-01-18 00:00:00 Z
+dependencies: []
+
 description: Mirror, mirror on the wall ...
 email: assaf@labnotes.org
-executables:
+executables: 
 - vanity
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - CHANGELOG
-files:
+files: 
 - .autotest
 - .gitignore
 - .travis.yml
@@ -191,37 +168,48 @@ files:
 - test/test_helper.rb
 - vanity.gemspec
 homepage: http://vanity.labnotes.org
-licenses:
+licenses: 
 - MIT
 post_install_message: To get started run vanity --help
-rdoc_options:
+rdoc_options: 
 - --title
-- Vanity 1.8.4
+- Vanity 1.9.0.beta
 - --main
 - README.rdoc
 - --webcvs
 - http://github.com/assaf/vanity
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Experience Driven Development framework for Ruby
-test_files:
+test_files: 
 - test/adapters/redis_adapter_test.rb
 - test/autoconnect_test.rb
 - test/cli_test.rb