vanity 1.9.3 → 2.0.0.beta

data/lib/vanity/frameworks.rb

@@ -1,15 +1,8 @@
 # Automatically configure Vanity.
 if defined?(Rails)
-  if Rails.const_defined?(:Railtie) # Rails 3
-    class Plugin < Rails::Railtie # :nodoc:
-      initializer "vanity.require" do |app|
-        require 'vanity/frameworks/rails'  
-        Vanity::Rails.load!
-      end
-    end
-  else
-    Rails.configuration.after_initialize do
-      require 'vanity/frameworks/rails'  
+  class Plugin < Rails::Railtie # :nodoc:
+    initializer "vanity.require" do |app|
+      require 'vanity/frameworks/rails'
       Vanity::Rails.load!
     end
   end

data/lib/vanity/metric/active_record.rb

@@ -35,18 +35,21 @@ module Vanity
     # @since 1.2.0
     # @see Vanity::Metric::ActiveRecord
     def model(class_or_scope, options = nil)
-      options = options || {}
-      conditions = options.delete(:conditions)
-      @ar_scoped = conditions ? class_or_scope.scoped(:conditions=>conditions) : class_or_scope
-      @ar_aggregate = AGGREGATES.find { |key| options.has_key?(key) }
-      @ar_column = options.delete(@ar_aggregate)
-      fail "Cannot use multiple aggregates in a single metric" if AGGREGATES.find { |key| options.has_key?(key) }
-      @ar_timestamp = options.delete(:timestamp) || :created_at
-      @ar_timestamp, @ar_timestamp_table = @ar_timestamp.to_s.split('.').reverse
-      @ar_timestamp_table ||= @ar_scoped.table_name
-      fail "Unrecognized options: #{options.keys * ", "}" unless options.empty?
-      @ar_scoped.after_create self
-      extend ActiveRecord
+      ActiveSupport.on_load(:active_record, :yield=>true) do
+        class_or_scope = class_or_scope.constantize if class_or_scope.is_a?(String)
+        options = options || {}
+        conditions = options.delete(:conditions)
+        @ar_scoped = conditions ? class_or_scope.scoped(:conditions=>conditions) : class_or_scope
+        @ar_aggregate = AGGREGATES.find { |key| options.has_key?(key) }
+        @ar_column = options.delete(@ar_aggregate)
+        fail "Cannot use multiple aggregates in a single metric" if AGGREGATES.find { |key| options.has_key?(key) }
+        @ar_timestamp = options.delete(:timestamp) || :created_at
+        @ar_timestamp, @ar_timestamp_table = @ar_timestamp.to_s.split('.').reverse
+        @ar_timestamp_table ||= @ar_scoped.table_name
+        fail "Unrecognized options: #{options.keys * ", "}" unless options.empty?
+        @ar_scoped.after_create self
+        extend ActiveRecord
+      end
     end
 
     # Calling model method on a metric extends it with these modules, redefining
@@ -57,13 +60,11 @@ module Vanity
 
       # This values method queries the database.
       def values(sdate, edate)
-        begin
-          time = Time.now.in_time_zone
-          difference = time.to_date - Date.today
-          sdate = sdate + difference
-          edate = edate + difference
-        rescue NoMethodError #In Rails 2.3, if no time zone has been set this fails
-        end
+        time = Time.now.in_time_zone
+        difference = time.to_date - Date.today
+        sdate = sdate + difference
+        edate = edate + difference
+
         query = { :conditions=> { @ar_timestamp_table => { @ar_timestamp => (sdate.to_time...(edate + 1).to_time) } },
                   :group=>"date(#{@ar_scoped.quoted_table_name}.#{@ar_scoped.connection.quote_column_name @ar_timestamp})" }
         grouped = @ar_column ? @ar_scoped.send(@ar_aggregate, @ar_column, query) : @ar_scoped.count(query)

data/lib/vanity/playground.rb

@@ -492,9 +492,7 @@ module Vanity
 
     # Path to template.
     def template(name)
-      path = File.join(File.dirname(__FILE__), "templates/#{name}")
-      path << ".erb" unless name["."]
-      path
+      File.join(File.dirname(__FILE__), "templates/#{name}")
     end
   end
 end

data/lib/vanity/version.rb

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

data/test/adapters/redis_adapter_test.rb

@@ -1,15 +1,14 @@
-require 'test/test_helper'
+require "test_helper"
 
-class RedisAdapterTest < Test::Unit::TestCase
-  def setup
-    require "vanity/adapters/redis_adapter"
+describe Vanity::Adapters::RedisAdapter do
+  before do
     require "redis"
     require "redis/namespace"
   end
 
-  def test_warn_on_disconnect_error
+  it "warns on disconnect error" do
     if defined?(Redis)
-      assert_nothing_raised do
+      assert_silent do
         Redis.any_instance.stubs(:connect!)
         mocked_redis = stub("Redis")
         mocked_redis.expects(:client).raises(RuntimeError)
@@ -29,98 +28,98 @@ class RedisAdapterTest < Test::Unit::TestCase
     [redis_adapter, mocked_redis]
   end
 
-  def test_connect_to_existing_redis
+  it "connects to existing redis" do
     mocked_redis = stub("Redis")
     adapter = Vanity::Adapters.redis_connection(:redis => mocked_redis)
     assert_equal mocked_redis, adapter.redis
   end
 
-  def test_graceful_failure_metric_track
+  it "gracefully fails in #metric_track" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:incrby).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.metric_track("metric", Time.now.to_s, "3ff62e2fb51f0b22646a342a2d357aec", [1])
     end
   end
 
-  def test_graceful_failure_set_experiment_created_at
+  it "gracefully fails in #set experiment created at" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:setnx).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.set_experiment_created_at("price_options", Time.now)
     end
   end
 
-  def test_graceful_failure_is_experiment_completed?
+  it "gracefully fails in #is_experiment_completed?" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:exists).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.is_experiment_completed?("price_options")
     end
   end
 
-  def test_graceful_failure_ab_show
+  it "gracefully fails in #ab_show" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:[]=).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_show("price_options", "3ff62e2fb51f0b22646a342a2d357aec", 0)
     end
   end
 
-  def test_graceful_failure_ab_showing
+  it "gracefully fails in #ab_showing" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:[]).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_showing("price_options", "3ff62e2fb51f0b22646a342a2d357aec")
     end
   end
 
-  def test_graceful_failure_ab_not_showing
+  it "gracefully fails in #ab_not_showing" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:del).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_not_showing("price_options", "3ff62e2fb51f0b22646a342a2d357aec")
     end
   end
 
-  def test_graceful_failure_ab_add_participant
+  it "gracefully fails in #ab_add_participant" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:sadd).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_add_participant("price_options", "3ff62e2fb51f0b22646a342a2d357aec", 0)
     end
   end
 
-  def test_graceful_failure_ab_seen
+  it "gracefully fails in #ab_seen" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:sismember).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_seen("price_options", "3ff62e2fb51f0b22646a342a2d357aec", 0)
     end
   end
 
-  def test_graceful_failure_ab_assigned
+  it "gracefully fails in #ab_assigned" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:sismember).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_assigned("price_options", "3ff62e2fb51f0b22646a342a2d357aec")
     end
   end
 
-  def test_graceful_failure_ab_add_conversion
+  it "gracefully fails in #ab_add_conversion" do
     redis_adapter, mocked_redis = stub_redis
     mocked_redis.stubs(:sismember).raises(RuntimeError)
 
-    assert_nothing_raised do
+    assert_silent do
       redis_adapter.ab_add_conversion("price_options", 0, "3ff62e2fb51f0b22646a342a2d357aec")
     end
   end

data/test/autoconnect_test.rb

@@ -1,22 +1,24 @@
-require "test/test_helper"
+require "test_helper"
 
-context ".playground_should_autoconnect?" do
+describe Vanity::Autoconnect do
+  describe ".playground_should_autoconnect?" do
 
-  test "returns true by default" do
-    autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
-    assert autoconnect == true
-  end
+    it "returns true by default" do
+      autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
+      assert autoconnect == true
+    end
 
-  test "returns false if environment flag is set" do
-    ENV['VANITY_DISABLED'] = '1'
-    autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
-    assert autoconnect == false
-    ENV['VANITY_DISABLED'] = nil
-  end
+    it "returns false if environment flag is set" do
+      ENV['VANITY_DISABLED'] = '1'
+      autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
+      assert autoconnect == false
+      ENV['VANITY_DISABLED'] = nil
+    end
 
-  test "returns false if in assets:precompile rake task" do
-    Rake.expects(:application).returns(stub(:top_level_tasks => ['assets:precompile']))
-    autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
-    assert autoconnect == false
+    it "returns false if in assets:precompile rake task" do
+      Rake.expects(:application).returns(stub(:top_level_tasks => ['assets:precompile']))
+      autoconnect = Vanity::Autoconnect.playground_should_autoconnect?
+      assert autoconnect == false
+    end
   end
-end
+end

data/test/cli_test.rb

@@ -1,53 +1,46 @@
-require "test/test_helper"
+require "test_helper"
 
-class PlaygroundTest < Test::Unit::TestCase
+describe "bin/vanity" do
 
-  def test_responds_to_version
-    (RUBY_VERSION == "1.8.7" ? Object : IO).any_instance.expects(:puts)
-    ARGV.clear
-    ARGV << '--version'
-    load "bin/vanity"
-  rescue SystemExit => e
-    assert e.status == 0
+  it "responds to version" do
+    proc {
+      IO.any_instance.expects(:puts)
+      ARGV.clear
+      ARGV << '--version'
+      load "bin/vanity"
+    }.must_raise SystemExit
   end
 
-  def test_responds_to_help
-    (RUBY_VERSION == "1.8.7" ? Object : IO).any_instance.expects(:puts)
-    ARGV.clear
-    ARGV << '--help'
-    load "bin/vanity"
-  rescue SystemExit => e
-    assert e.status == 0
+  it "responds to help" do
+    proc {
+      IO.any_instance.expects(:puts)
+      ARGV.clear
+      ARGV << '--help'
+      load "bin/vanity"
+    }.must_raise SystemExit
   end
 
-  def test_responds_to_list
+  it "responds to list" do
     require "vanity/commands/list"
     Vanity::Commands.expects(:list)
     ARGV.clear
     ARGV << 'list'
     load "bin/vanity"
-  rescue SystemExit => e
-    assert e.status == 0
   end
 
-  def test_responds_to_report
+  it "responds to report" do
     require "vanity/commands/report"
     Vanity::Commands.expects(:report)
     ARGV.clear
     ARGV << 'report'
     load "bin/vanity"
-  rescue SystemExit => e
-    assert e.status == 0
   end
 
-  def test_responds_to_unknown_commands
+  it "responds to unknown commands" do
     require "vanity/commands/upgrade"
     Vanity::Commands.expects(:upgrade)
     ARGV.clear
     ARGV << 'upgrade'
     load "bin/vanity"
-  rescue SystemExit => e
-    assert e.status == 0
   end
-
 end

data/test/experiment/ab_test.rb

@@ -1,4 +1,4 @@
-require "test/test_helper"
+require "test_helper"
 
 class AbTestController < ActionController::Base
   use_vanity :current_user
@@ -13,11 +13,7 @@ class AbTestController < ActionController::Base
   end
 
   def test_capture
-    if defined?(Rails::Railtie)
-      render :inline=>"<%= ab_test :simple do |value| %><%= value %><% end %>"
-    else
-      render :inline=>"<% ab_test :simple do |value| %><%= value %><% end %>"
-    end
+    render :inline=>"<%= ab_test :simple do |value| %><%= value %><% end %>"
   end
 
   def track
@@ -35,15 +31,6 @@ class AbTestTest < ActionController::TestCase
     metric "Coolness"
   end
 
-  def teardown
-    super
-    if RUBY_VERSION == '1.8.7'
-      GC.enable
-      GC.start
-      GC.disable
-    end
-  end
-
   # --  Experiment definition --
 
   def test_requires_at_least_two_alternatives_per_experiment

data/test/experiment/base_test.rb

@@ -1,20 +1,19 @@
-require "test/test_helper"
+require "test_helper"
 
-class ExperimentTest < Test::Unit::TestCase
+describe Vanity::Experiment::Base do
 
-  def setup
-    super
+  before do
     metric "Happiness"
   end
 
   # -- Defining experiment --
 
-  def test_can_access_experiment_by_id
+  it "can access experiment by id" do
     exp = new_ab_test(:ice_cream_flavor) { metrics :happiness }
     assert_equal exp, experiment(:ice_cream_flavor)
   end
 
-  def test_fail_when_defining_same_experiment_twice
+  it "fails when defining same experiment twice" do
     File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
       f.write <<-RUBY
         ab_test "Ice Cream Flavor" do
@@ -33,13 +32,13 @@ class ExperimentTest < Test::Unit::TestCase
 
   # -- Loading experiments --
 
-  def test_fails_if_cannot_load_named_experiment
+  it "fails if cannot load named experiment" do
     assert_raises Vanity::NoExperimentError do
       experiment(:ice_cream_flavor)
     end
   end
 
-  def test_loading_experiment
+  it "loads the experiment" do
     File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
       f.write <<-RUBY
         ab_test "Ice Cream Flavor" do
@@ -53,7 +52,7 @@ class ExperimentTest < Test::Unit::TestCase
     assert_equal "x", experiment(:ice_cream_flavor).xmts
   end
 
-  def test_fails_if_error_loading_experiment
+  it "fails if error loading experiment" do
     File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
       f.write "fail 'yawn!'"
     end
@@ -62,7 +61,7 @@ class ExperimentTest < Test::Unit::TestCase
     end
   end
 
-  def test_complains_if_not_defined_where_expected
+  it "complains if not defined where expected" do
     File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
       f.write ""
     end
@@ -71,7 +70,7 @@ class ExperimentTest < Test::Unit::TestCase
     end
   end
 
-  def test_reloading_experiments
+  it "reloading experiments" do
     new_ab_test(:ab) { metrics :happiness }
     new_ab_test(:cd) { metrics :happiness }
     assert_equal 2, Vanity.playground.experiments.size
@@ -82,13 +81,13 @@ class ExperimentTest < Test::Unit::TestCase
 
   # -- Attributes --
 
-  def test_experiment_mapping_name_to_id
+  it "maps the experiment name to id" do
     experiment = new_ab_test("Ice Cream Flavor/Tastes") { metrics :happiness }
     assert_equal "Ice Cream Flavor/Tastes", experiment.name
     assert_equal :ice_cream_flavor_tastes, experiment.id
   end
 
-  def test_saving_experiment_after_definition
+  it "saves the experiment after definition" do
     File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
       f.write <<-RUBY
         ab_test "Ice Cream Flavor" do
@@ -100,19 +99,16 @@ class ExperimentTest < Test::Unit::TestCase
     Vanity.playground.experiment(:ice_cream_flavor)
   end
 
-  def test_experiment_has_created_timestamp
+  it "has created timestamp" do
     new_ab_test(:ice_cream_flavor) { metrics :happiness }
     assert_kind_of Time, experiment(:ice_cream_flavor).created_at
     assert_in_delta experiment(:ice_cream_flavor).created_at.to_i, Time.now.to_i, 1
   end
 
-  def test_experiment_keeps_created_timestamp_across_definitions
+  it "keeps created timestamp across definitions" do
     past = Date.today - 1
     Timecop.freeze past.to_time do
-      puts "timecop: #{Time.now.to_i}"
-      assert_equal past.to_time.to_i, Time.now.to_i
       new_ab_test(:ice_cream_flavor) { metrics :happiness }
-      assert_equal past.to_time.to_i, experiment(:ice_cream_flavor).created_at.to_i
     end
 
     new_playground
@@ -121,7 +117,7 @@ class ExperimentTest < Test::Unit::TestCase
     assert_equal past.to_time.to_i, experiment(:ice_cream_flavor).created_at.to_i
   end
 
-  def test_experiment_has_description
+  it "has a description" do
     new_ab_test :ice_cream_flavor do
       description "Because 31 is not enough ..."
       metrics :happiness
@@ -129,7 +125,7 @@ class ExperimentTest < Test::Unit::TestCase
     assert_equal "Because 31 is not enough ...", experiment(:ice_cream_flavor).description
   end
 
-  def test_experiment_stores_nothing_when_collection_disabled
+  it "stores nothing when collection disabled" do
     not_collecting!
     new_ab_test(:ice_cream_flavor) { metrics :happiness }
     experiment(:ice_cream_flavor).complete!
@@ -139,7 +135,7 @@ class ExperimentTest < Test::Unit::TestCase
 
   # check_completion is called by derived classes, but since it's
   # part of the base_test I'm testing it here.
-  def test_error_in_check_completion
+  it "handles error in check completion" do
     new_ab_test(:ab) { metrics :happiness }
     e = experiment(:ab)
     e.complete_if { true }
@@ -149,7 +145,7 @@ class ExperimentTest < Test::Unit::TestCase
     e.track!(:a, Time.now, 10)
   end
 
-  def test_complete_updates_completed_at
+  it "complete updates completed_at" do
     new_ab_test(:ice_cream_flavor) { metrics :happiness }
 
     time = Time.utc(2008, 9, 1, 12, 0, 0)