vanity 1.9.3 → 2.0.0.beta

data/test/metric/active_record_test.rb

@@ -1,4 +1,4 @@
-require "test/test_helper"
+require "test_helper"
 
 class Sky < ActiveRecord::Base
   if connected?
@@ -9,18 +9,20 @@ class Sky < ActiveRecord::Base
     end
   end
 
-  if defined?(Rails::Railtie)
-    scope :high, lambda { { :conditions=>"height >= 4" } }
-  else
-    named_scope :high, lambda { { :conditions=>"height >= 4" } }
-  end
+  scope :high, lambda { { :conditions=>"height >= 4" } }
 end
 
 if ActiveRecord::Base.connected?
 
-context "ActiveRecord Metric" do
+describe "ActiveRecord Metric" do
+
+  after do
+    Sky.delete_all
+    Sky.reset_callbacks(:create)
+    Sky.reset_callbacks(:save)
+  end
 
-  test "record count" do
+  it "record count" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -34,7 +36,7 @@ context "ActiveRecord Metric" do
     assert_equal 1, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "record sum" do
+  it "record sum" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -48,7 +50,7 @@ context "ActiveRecord Metric" do
     assert_equal 6, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "record average" do
+  it "record average" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -62,7 +64,7 @@ context "ActiveRecord Metric" do
     assert_equal 5, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "record minimum" do
+  it "record minimum" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -76,7 +78,7 @@ context "ActiveRecord Metric" do
     assert_equal 2, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "record maximum" do
+  it "record maximum" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -90,7 +92,7 @@ context "ActiveRecord Metric" do
     assert_equal 4, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "with conditions" do
+  it "with conditions" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -111,7 +113,7 @@ context "ActiveRecord Metric" do
     assert_equal 11, high_skies
   end
 
-  test "with scope" do
+  it "with scope" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -130,7 +132,7 @@ context "ActiveRecord Metric" do
     assert_equal 1, total
   end
 
-  test "with timestamp" do
+  it "with timestamp" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -144,7 +146,7 @@ context "ActiveRecord Metric" do
     assert_equal 1, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "with timestamp and table" do
+  it "with timestamp and table" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -158,7 +160,7 @@ context "ActiveRecord Metric" do
     assert_equal 1, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "hooks" do
+  it "hooks" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -177,7 +179,7 @@ context "ActiveRecord Metric" do
     assert_equal 4, total
   end
 
-  test "no hooks when metrics disabled" do
+  it "no hooks when metrics disabled" do
     not_collecting!
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
@@ -195,7 +197,7 @@ context "ActiveRecord Metric" do
     assert_equal 0, total
   end
 
-  test "after_create not after_save" do
+  it "after_create not after_save" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -213,25 +215,14 @@ context "ActiveRecord Metric" do
     Sky.last.update_attributes :height=>4
   end
 
-  test "with after_save" do
-    if rails3?
-      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-        f.write <<-RUBY
-          metric "Sky is limit" do
-            model Sky, :conditions=>["height > 3"]
-            Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
-          end
-        RUBY
-      end
-    else
-      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-        f.write <<-RUBY
-          metric "Sky is limit" do
-            model Sky, :conditions=>["height > 3"]
-            Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
-          end
-        RUBY
-      end
+  it "with after_save" do
+    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+      f.write <<-RUBY
+        metric "Sky is limit" do
+          model Sky, :conditions=>["height > 3"]
+          Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+        end
+      RUBY
     end
     Vanity.playground.metrics
     times = 0
@@ -245,23 +236,13 @@ context "ActiveRecord Metric" do
     assert_equal 2, times
   end
 
-  test "do it youself" do
-    if rails3?
-      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-        f.write <<-RUBY
-          metric "Sky is limit" do
-            Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
-          end
-        RUBY
-      end
-    else
-      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-        f.write <<-RUBY
-          metric "Sky is limit" do
-            Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
-          end
-        RUBY
-      end
+  it "do it youself" do
+    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+      f.write <<-RUBY
+        metric "Sky is limit" do
+          Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+        end
+      RUBY
     end
     Vanity.playground.metrics
     Sky.create!
@@ -272,7 +253,7 @@ context "ActiveRecord Metric" do
     assert_equal 3, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
 
-  test "last update for new metric" do
+  it "last update for new metric" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -283,7 +264,7 @@ context "ActiveRecord Metric" do
     assert_nil metric(:sky_is_limit).last_update_at
   end
 
-  test "last update with records" do
+  it "last update with records" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -298,16 +279,19 @@ context "ActiveRecord Metric" do
     assert_in_delta metric(:sky_is_limit).last_update_at.to_i, (Time.now + 1.day).to_i, 1
   end
 
-  teardown do
-    Sky.delete_all
-    if rails3?
-      Sky.reset_callbacks(:create)
-      Sky.reset_callbacks(:save)
-    else
-      Sky.after_create.clear
-      Sky.after_save.clear
+  it "metric is specifiable with a string" do
+    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+      f.write <<-RUBY
+        metric "Sky is limit" do
+          model 'Sky'
+        end
+      RUBY
     end
+    Vanity.playground.metrics
+    Sky.create!
+    assert_equal 1, Vanity::Metric.data(metric(:sky_is_limit)).last.last
   end
+
 end
 
-end
+end

data/test/metric/base_test.rb

@@ -1,15 +1,14 @@
-require "test/test_helper"
+require "test_helper"
 
+describe "Metric via playground" do
 
-context "Metric via playground" do
-
-  test "knows all loaded metrics" do
+  it "knows all loaded metrics" do
     metric "Yawns/sec", "Cheers/sec"
     assert Vanity.playground.metrics.keys.include?(:yawns_sec)
     assert Vanity.playground.metrics.keys.include?(:cheers_sec)
   end
 
-  test "loads metric definitions" do
+  it "loads metric definitions" do
     File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
       f.write <<-RUBY
         metric "Yawns/sec" do
@@ -22,7 +21,7 @@ context "Metric via playground" do
     assert_equal "x", Vanity.playground.metric(:yawns_sec).xmts
   end
 
-  test "bubbles up loaded metrics" do
+  it "bubbles up loaded metrics" do
     File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
       f.write "fail 'yawn!'"
     end
@@ -31,7 +30,7 @@ context "Metric via playground" do
     end
   end
 
-  test "map identifier from file name" do
+  it "map identifier from file name" do
     File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
       f.write <<-RUBY
         metric "yawns/hour" do
@@ -41,13 +40,13 @@ context "Metric via playground" do
     assert Vanity.playground.metric(:yawns_sec)
   end
 
-  test "fails tracking unknown metric" do
+  it "fails tracking unknown metric" do
     assert_raises NameError do
       Vanity.playground.track! :yawns_sec
     end
   end
 
-  test "reloading metrics" do
+  it "reloading metrics" do
     metric "Yawns/sec", "Cheers/sec"
     Vanity.playground.metric(:yawns_sec)
     Vanity.playground.metric(:cheers_sec)
@@ -55,10 +54,10 @@ context "Metric via playground" do
     metrics = Vanity.playground.metrics.values
     Vanity.playground.reload!
     assert_equal 0, Vanity.playground.metrics.size
-    assert_not_equal metrics, Vanity.playground.metrics.values
+    refute_equal metrics, Vanity.playground.metrics.values
   end
 
-  test "ignores undefined metrics in database" do
+  it "ignores undefined metrics in database" do
     metric "Yawns/sec"
     Vanity.playground.reload!
     assert Vanity.playground.metrics.empty?
@@ -67,15 +66,15 @@ context "Metric via playground" do
 end
 
 
-context "Metric tracking" do
-  test "disabled when metrics are disabled" do
+describe "Metric tracking" do
+  it "disabled when metrics are disabled" do
     not_collecting!
     metric "Yawns/sec", "Cheers/sec"
     Vanity.playground.track! :yawns_sec
     Vanity.playground.track! :cheers_sec
   end
 
-  test "can count" do
+  it "can count" do
     metric "Yawns/sec", "Cheers/sec"
     4.times { Vanity.playground.track! :yawns_sec }
     2.times { Vanity.playground.track! :cheers_sec }
@@ -84,7 +83,7 @@ context "Metric tracking" do
     assert yawns == 2 * cheers
   end
 
-  test "can tell the time" do
+  it "can tell the time" do
     metric "Yawns/sec"
     Timecop.freeze((today - 4).to_time) { 4.times { Vanity.playground.track! :yawns_sec } }
     Timecop.freeze((today - 2).to_time) { 2.times { Vanity.playground.track! :yawns_sec } }
@@ -93,7 +92,7 @@ context "Metric tracking" do
     assert_equal [0,4,0,2,0,1], boredom
   end
 
-  test "with no value" do
+  it "with no value" do
     metric "Yawns/sec", "Cheers/sec", "Looks"
     Vanity.playground.track! :yawns_sec, 0
     Vanity.playground.track! :cheers_sec
@@ -101,7 +100,7 @@ context "Metric tracking" do
     assert_equal 1, Vanity.playground.metric(:cheers_sec).values(today, today).sum
   end
 
-  test "with count" do
+  it "with count" do
     metric "Yawns/sec"
     Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
     Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
@@ -110,7 +109,7 @@ context "Metric tracking" do
     assert_equal [0,4,0,2,0,1], boredom
   end
 
-  test "runs hook" do
+  it "runs hook" do
     metric "Many Happy Returns"
     total = 0
     Vanity.playground.metric(:many_happy_returns).hook do |metric_id, timestamp, count|
@@ -122,7 +121,7 @@ context "Metric tracking" do
     assert_equal 6, total
   end
 
-  test "doesn't runs hook when metrics disabled" do
+  it "doesn't runs hook when metrics disabled" do
     not_collecting!
     metric "Many Happy Returns"
     total = 0
@@ -133,7 +132,7 @@ context "Metric tracking" do
     assert_equal 0, total
   end
 
-  test "runs multiple hooks" do
+  it "runs multiple hooks" do
     metric "Many Happy Returns"
     returns = 0
     Vanity.playground.metric(:many_happy_returns).hook { returns += 1 }
@@ -143,7 +142,7 @@ context "Metric tracking" do
     assert_equal 3, returns
   end
 
-  test "destroy wipes metrics" do
+  it "destroy wipes metrics" do
     metric "Many Happy Returns"
     Vanity.playground.track! :many_happy_returns, 3
     assert_equal [3], Vanity.playground.metric(:many_happy_returns).values(today, today)
@@ -153,8 +152,8 @@ context "Metric tracking" do
 end
 
 
-context "Metric name" do
-  test "can be whatever" do
+describe "Metric name" do
+  it "can be whatever" do
     File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
       f.write <<-RUBY
         metric "Yawns per second" do
@@ -166,8 +165,8 @@ context "Metric name" do
 end
 
 
-context "Metric description" do
-  test "metric with description" do
+describe "Metric description" do
+  it "metric with description" do
     File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
       f.write <<-RUBY
         metric "Yawns/sec" do
@@ -178,7 +177,7 @@ context "Metric description" do
     assert_equal "Am I that boring?", Vanity::Metric.description(Vanity.playground.metric(:yawns_sec))
   end
 
-  test "metric without description" do
+  it "metric without description" do
     File.open "tmp/experiments/metrics/yawns_sec.rb", "w" do |f|
       f.write <<-RUBY
         metric "Yawns/sec" do
@@ -188,15 +187,15 @@ context "Metric description" do
     assert_nil Vanity::Metric.description(Vanity.playground.metric(:yawns_sec))
   end
 
-  test "metric with no method description" do
+  it "metric with no method description" do
     metric = Object.new
     assert_nil Vanity::Metric.description(metric)
   end
 end
 
 
-context "Metric bounds" do
-  test "metric with bounds" do
+describe "Metric bounds" do
+  it "metric with bounds" do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
@@ -209,26 +208,26 @@ context "Metric bounds" do
     assert_equal [6,12], Vanity::Metric.bounds(Vanity.playground.metric(:sky_is_limit))
   end
 
-  test "metric without bounds" do
+  it "metric without bounds" do
     metric "Sky is limit"
     assert_equal [nil, nil], Vanity::Metric.bounds(Vanity.playground.metric(:sky_is_limit))
   end
 
-  test "metric with no method bounds" do
+  it "metric with no method bounds" do
     metric = Object.new
     assert_equal [nil, nil], Vanity::Metric.bounds(metric)
   end
 end
 
 
-context "Metric last_update_at" do
-  test "for new metric" do
+describe "Metric last_update_at" do
+  it "for new metric" do
     metric "Coolness"
     metric = Vanity.playground.metric(:coolness)
     assert_nil metric.last_update_at
   end
 
-  test "with data point" do
+  it "with data point" do
     metric "Coolness"
     metric = Vanity.playground.metric(:coolness)
     metric.track!
@@ -240,8 +239,8 @@ context "Metric last_update_at" do
 end
 
 
-context "Metric data" do
-  test "explicit dates" do
+describe "Metric data" do
+  it "explicit dates" do
     metric "Yawns/sec"
     Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
     Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
@@ -250,7 +249,7 @@ context "Metric data" do
     assert_equal [[today - 5, 0], [today - 4, 4], [today - 3, 0], [today - 2, 2], [today - 1, 0], [today, 1]], boredom
   end
 
-  test "start date only" do
+  it "start date only" do
     metric "Yawns/sec"
     Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
     Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
@@ -259,7 +258,7 @@ context "Metric data" do
     assert_equal [[today - 4, 4], [today - 3, 0], [today - 2, 2], [today - 1, 0], [today, 1]], boredom
   end
 
-  test "start date and duration" do
+  it "start date and duration" do
     metric "Yawns/sec"
     Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
     Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
@@ -268,7 +267,7 @@ context "Metric data" do
     assert_equal [[today - 4, 4], [today - 3, 0], [today - 2, 2], [today - 1, 0], [today, 1]], boredom
   end
 
-  test "no data" do
+  it "no data" do
     metric "Yawns/sec"
     boredom = Vanity::Metric.data(Vanity.playground.metric(:yawns_sec))
     assert_equal 90, boredom.size
@@ -276,7 +275,7 @@ context "Metric data" do
     assert_equal [today, 0], boredom.last
   end
 
-  test "using custom values method" do
+  it "using custom values method" do
     File.open "tmp/experiments/metrics/hours_in_day.rb", "w" do |f|
       f.write <<-RUBY
         metric "Hours in day" do
@@ -289,5 +288,4 @@ context "Metric data" do
     data = Vanity::Metric.data(Vanity.playground.metric(:hours_in_day))
     assert_equal [24] * 90, data.map(&:last)
   end
-
 end

data/test/metric/google_analytics_test.rb

@@ -1,9 +1,7 @@
-require "test/test_helper"
+require "test_helper"
 
-
-context "Google Analytics" do
-
-  setup do
+describe "Google Analytics" do
+  before do
     File.open "tmp/experiments/metrics/ga.rb", "w" do |f|
       f.write <<-RUBY
         metric "GA" do
@@ -16,7 +14,7 @@ context "Google Analytics" do
   GA_RESULT = Struct.new(:date, :pageviews, :visits)
   GA_PROFILE = Struct.new(:web_property_id)
 
-  test "fail if Garb not available" do
+  it "fail if Garb not available" do
     File.open "tmp/experiments/metrics/ga.rb", "w" do |f|
       f.write <<-RUBY
         metric "GA" do
@@ -25,28 +23,28 @@ context "Google Analytics" do
         end
       RUBY
     end
-    assert_raise LoadError do
+    assert_raises LoadError do
       Vanity.playground.metrics
     end
   end
 
-  test "constructs a report" do
+  it "constructs a report" do
     Vanity.playground.metrics
     assert metric(:ga).report
   end
 
-  test "default to pageviews metric" do
+  it "default to pageviews metric" do
     Vanity.playground.metrics
     assert_equal [:pageviews], metric(:ga).report.metrics.elements
   end
 
-  test "apply data dimension and sort" do
+  it "apply data dimension and sort" do
     Vanity.playground.metrics
     assert_equal [:date], metric(:ga).report.dimensions.elements
     assert_equal [:date], metric(:ga).report.sort.elements
   end
 
-  test "accept other metrics" do
+  it "accept other metrics" do
     File.open "tmp/experiments/metrics/ga.rb", "w" do |f|
       f.write <<-RUBY
         metric "GA" do
@@ -58,14 +56,14 @@ context "Google Analytics" do
     assert_equal [:visitors], metric(:ga).report.metrics.elements
   end
 
-  test "does not support hooks" do
+  it "does not support hooks" do
     Vanity.playground.metrics
     assert_raises RuntimeError do
       metric(:ga).hook
     end
   end
 
-  test "should find matching profile" do
+  it "should find matching profile" do
     Vanity.playground.metrics
     Garb::Profile.expects(:all).returns(Array.new(3) { |i| GA_PROFILE.new("UA#{i + 1}") })
     metric(:ga).report.stubs(:send_request_for_body).returns(nil)
@@ -74,7 +72,7 @@ context "Google Analytics" do
     assert_equal "UA2", metric(:ga).report.profile.web_property_id
   end
 
-  test "should map results from report" do
+  it "should map results from report" do
     Vanity.playground.metrics
     today = Date.today
     response = mock(:results=>Array.new(3) { |i| GA_RESULT.new("2010021#{i}", i + 1) })
@@ -84,7 +82,7 @@ context "Google Analytics" do
     assert_equal [1,2,3], metric(:ga).values(Date.parse("2010-02-10"), Date.parse("2010-02-12"))
   end
 
-  test "mapping GA metrics to single value" do
+  it "mapping GA metrics to single value" do
     File.open "tmp/experiments/metrics/ga.rb", "w" do |f|
       f.write <<-RUBY
         metric "GA" do
@@ -100,5 +98,4 @@ context "Google Analytics" do
     metric(:ga).report.stubs(:send_request_for_body).returns(nil)
     assert_equal [1,4,9], metric(:ga).values(Date.parse("2010-02-10"), Date.parse("2010-02-12"))
   end
-
 end