vanity 2.0.0.beta → 2.0.0.beta2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.0.0.beta)
+    vanity (2.0.0.beta2)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta)
+    vanity (2.0.0.beta2)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/rails4.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta)
+    vanity (2.0.0.beta2)
 
 GEM
   remote: https://rubygems.org/

data/lib/vanity/playground.rb

@@ -18,7 +18,6 @@ module Vanity
     # First argument is connection specification (see #redis=), last argument is
     # a set of options, both are optional. Supported options are:
     # - connection -- Connection specification
-    # - namespace -- Namespace to use
     # - load_path -- Path to load experiments/metrics from
     # - logger -- Logger to use
     # - redis -- A Redis object that will be used for the connection
@@ -41,7 +40,6 @@ module Vanity
 
       @options = defaults.merge(config).merge(options)
 
-      warn "Deprecated: namespace option no longer supported directly" if @options[:namespace]
       @load_path = @options[:load_path] || DEFAULTS[:load_path]
       unless @logger = @options[:logger]
         @logger = Logger.new(STDOUT)
@@ -57,9 +55,6 @@ module Vanity
       @collecting = !!@options[:collecting]
     end
 
-    # Deprecated. Use redis.server instead.
-    attr_accessor :host, :port, :db, :password, :namespace
-
     # Path to load experiment files from.
     attr_accessor :load_path
 
@@ -417,39 +412,10 @@ module Vanity
       establish_connection(@spec)
     end
 
-    # Deprecated. Use Vanity.playground.collecting = true/false instead.
-    def test!
-      warn "Deprecated: use collecting = false instead"
-      self.collecting = false
-    end
-
-    # Deprecated. Use establish_connection or configuration file instead.
-    def redis=(spec_or_connection)
-      warn "Deprecated: use establish_connection method instead"
-      case spec_or_connection
-      when String
-        establish_connection "redis://" + spec_or_connection
-      when ::Redis
-        @connection = Adapters::RedisAdapter.new(spec_or_connection)
-      when :mock
-        establish_connection :adapter=>:mock
-      else
-        raise "I don't know what to do with #{spec_or_connection.inspect}"
-      end
-    end
-
-    def redis
-      warn "Deprecated: use connection method instead"
-      connection
-    end
-
     protected
 
     def autoconnect(options, arguments)
-      if options[:host] == 'redis' && options.values_at(:host, :port, :db).any?
-        warn "Deprecated: please specify Redis connection as URL (\"redis://host:port/db\")"
-        establish_connection :adapter=>"redis", :host=>options[:host], :port=>options[:port], :database=>options[:db] || options[:database]
-      elsif options[:redis]
+      if options[:redis]
         @adapter = RedisAdapter.new(:redis=>options[:redis])
       else
         connection_spec = arguments.shift || options[:connection]
@@ -496,19 +462,3 @@ module Vanity
     end
   end
 end
-
-
-class Object
-
-  # Use this method to access an experiment by name.
-  #
-  # @example
-  #   puts experiment(:text_size).alternatives
-  #
-  # @see Vanity::Playground#experiment
-  # @deprecated
-  def experiment(name)
-    warn "Deprecated. Please call Vanity.playground.experiment directly."
-    Vanity.playground.experiment(name)
-  end
-end

data/lib/vanity/templates/vanity.css

@@ -13,7 +13,7 @@
 .vanity .ab_test .choice td { font-weight: bold; background: #f0f0f8 }
 .vanity .ab_test caption { caption-side: bottom; padding: .5em; background: transparent; text-align: left }
 .vanity .ab_test td.option { width: 5em; white-space: nowrap; overflow: hidden }
-.vanity .ab_test td.value { width: 8em; white-space: nowrap; overflow: hidden }
+.vanity .ab_test td.value { width: 8em; overflow: hidden }
 .vanity .ab_test td.action { width: 6em; overflow: hidden; text-align: 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.0.0.beta"
+  VERSION = "2.0.0.beta2"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/frameworks/rails/action_mailer_test.rb

@@ -5,27 +5,17 @@ class VanityMailer < ActionMailer::Base
   include ActionView::Helpers::AssetTagHelper
   include ActionView::Helpers::TagHelper
 
-  def ab_test_subject(user, forced_outcome=true)
+  def ab_test_subject(user)
     use_vanity_mailer user
-    experiment(:pie_or_cake).chooses(forced_outcome)
 
-    if defined?(Rails::Railtie)
-      mail :subject =>ab_test(:pie_or_cake).to_s, :body => ""
-    else
-      subject ab_test(:pie_or_cake).to_s
-      body ""
-    end
+    mail :subject =>ab_test(:pie_or_cake).to_s, :body => ""
   end
 
   def ab_test_content(user)
     use_vanity_mailer user
 
-    if defined?(Rails::Railtie)
-      mail do |format|
-        format.html { render :text=>view_context.vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000") }
-      end
-    else
-      body 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") }
     end
   end
 end
@@ -43,17 +33,24 @@ class UseVanityMailerTest < ActionMailer::TestCase
 
   def test_js_enabled_still_adds_participant
     Vanity.playground.use_js!
-    VanityMailer.ab_test_subject(nil, true)
+    experiment(:pie_or_cake).identify { }
+    experiment(:pie_or_cake).chooses(true)
+    VanityMailer.ab_test_subject(nil)
+
 
     alts = experiment(:pie_or_cake).alternatives
     assert_equal 1, alts.map(&:participants).sum
   end
 
   def test_returns_different_alternatives
-    email = VanityMailer.ab_test_subject(nil, true)
+    experiment(:pie_or_cake).identify { }
+
+    experiment(:pie_or_cake).chooses(true)
+    email = VanityMailer.ab_test_subject(nil)
     assert_equal 'true', email.subject
 
-    email = VanityMailer.ab_test_subject(nil, false)
+    experiment(:pie_or_cake).chooses(false)
+    email = VanityMailer.ab_test_subject(nil)
     assert_equal 'false', email.subject
   end
 

data/test/frameworks/rails/rails_test.rb

@@ -211,13 +211,6 @@ $stdout << Vanity.playground.collecting?
     RB
   end
 
-  def test_collection_false_after_test!
-    assert_equal "false", load_rails("", <<-RB)
-Vanity.playground.test!
-$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

data/test/playground_test.rb

@@ -1,98 +1,114 @@
 require "test_helper"
 
-class PlaygroundTest < Test::Unit::TestCase
+describe Vanity::Playground do
 
-  def test_has_one_global_instance
+  it "has one global instance" do
     assert instance = Vanity.playground
     assert_equal instance, Vanity.playground
   end
 
-  def test_be_use_js
-    assert !Vanity.playground.using_js?
-    Vanity.playground.use_js!
-    assert Vanity.playground.using_js?
+  describe "#use_js!" do
+    it "sets via use_js" do
+      assert !Vanity.playground.using_js?
+      Vanity.playground.use_js!
+      assert Vanity.playground.using_js?
+    end
   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?
+  describe "#failover_on_datastore_error" do
+    it "sets failover_on_datastore_error" do
+      assert !Vanity.playground.failover_on_datastore_error?
+      Vanity.playground.failover_on_datastore_error!
+      assert Vanity.playground.failover_on_datastore_error?
+    end
   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])
+  describe "#on_datastore_error" do
+    it "has a default failover_on_datastore_error" do
+      proc = Vanity.playground.on_datastore_error
+      assert proc.respond_to?(:call)
+      assert_silent do
+        proc.call(Exception.new("datastore error"), self.class, caller[0][/`.*'/][1..-2], [1, 2, 3])
+      end
     end
   end
 
-  def test_request_filter
-    proc = Vanity.playground.request_filter
-    assert proc.respond_to?(:call)
-    assert_nothing_raised do
-      proc.call(dummy_request)
+  describe "#request_filter" do
+    it "sets request_filter" do
+      proc = Vanity.playground.request_filter
+      assert proc.respond_to?(:call)
+      assert_silent do
+        proc.call(dummy_request)
+      end
     end
   end
 
-  def test_chooses_path_sets_default
-    assert_equal Vanity.playground.add_participant_path, Vanity::Playground::DEFAULT_ADD_PARTICIPANT_PATH
+  describe "#add_participant_path" do
+    it "sets a default add participant path" do
+      assert_equal Vanity.playground.add_participant_path, Vanity::Playground::DEFAULT_ADD_PARTICIPANT_PATH
+    end
   end
 
-  def test_reconnects_with_existing_connection
-    Vanity.playground.establish_connection "mock:/"
-    Vanity.playground.reconnect!
-    assert_equal Vanity.playground.connection.to_s, "mock:/"
-  end
+  describe "autoconnect" do
+    it "reconnects with existing connection" do
+      Vanity.playground.establish_connection "mock:/"
+      Vanity.playground.reconnect!
+      assert_equal Vanity.playground.connection.to_s, "mock:/"
+    end
 
-  def test_autoconnect_establishes_connection_by_default_with_connection
-    instance = Vanity::Playground.new(:connection=>"mock:/")
-    assert instance.connected?
-  end
+    it "establishes connection by default with connection" do
+      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
+    it "establishes connection by default" do
+      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?
+    it "can skip connection" do
+      Vanity::Autoconnect.stubs(:playground_should_autoconnect?).returns(false)
+      instance = Vanity::Playground.new(:connection=>"mock:/")
+      assert !instance.connected?
+    end
   end
 
-  def test_experiments_persisted_returns_true
-    metric "Coolness"
-    new_ab_test :foobar do
-      alternatives "foo", "bar"
-      identify { "abcdef" }
-      metrics :coolness
-    end
+  describe "experiments_persisted?" do
+    it "returns true" do
+      metric "Coolness"
+      new_ab_test :foobar do
+        alternatives "foo", "bar"
+        identify { "abcdef" }
+        metrics :coolness
+      end
 
-    assert Vanity.playground.experiments_persisted?
-  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
+    it "returns false" do
+      name = 'Price'
+      id = :price
+      experiment = Vanity::Experiment::AbTest.new(Vanity.playground, id, name)
+      Vanity.playground.experiments[id] = experiment
 
-    assert !Vanity.playground.experiments_persisted?
+      assert !Vanity.playground.experiments_persisted?
 
-    Vanity.playground.experiments.delete(id)
+      Vanity.playground.experiments.delete(id)
+    end
   end
 
-  def test_participant_info
-    assert_equal [], Vanity.playground.participant_info("abcdef")
-    metric "Coolness"
-    new_ab_test :foobar do
-      alternatives "foo", "bar"
-      identify { "abcdef" }
-      metrics :coolness
+  describe "participant_info" do
+    it "returns participant's experiments" do
+      assert_equal [], Vanity.playground.participant_info("abcdef")
+      metric "Coolness"
+      new_ab_test :foobar do
+        alternatives "foo", "bar"
+        identify { "abcdef" }
+        metrics :coolness
+      end
+      alt = experiment(:foobar).choose
+      assert_equal [[Vanity.playground.experiment(:foobar), alt]], Vanity.playground.participant_info("abcdef")
     end
-    alt = experiment(:foobar).choose
-    assert_equal [[Vanity.playground.experiment(:foobar), alt]], Vanity.playground.participant_info("abcdef")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta
+- Vanity 2.0.0.beta2
 - --main
 - README.rdoc
 - --webcvs