vanity 1.0.0 → 1.1.0

data/test/playground_test.rb

@@ -1,89 +1,10 @@
 require "test/test_helper"
 
-class PlaygroundTest < MiniTest::Unit::TestCase
-  def setup
-    @namespace = "vanity:0"
-  end
+class PlaygroundTest < Test::Unit::TestCase
 
   def test_has_one_global_instance
     assert instance = Vanity.playground
     assert_equal instance, Vanity.playground
   end
 
-  def test_playground_namespace
-    assert @namespace, Vanity.playground.namespace
-  end
-
-
-  # -- Loading experiments --
-
-  def test_fails_if_cannot_load_named_experiment
-    assert_raises LoadError do
-      experiment("Green button")
-    end
-  end
-
-  def test_loading_experiment
-    Vanity.playground.load_path = Dir.tmpdir
-    File.open File.join(Dir.tmpdir, "green_button.rb"), "w" do |f|
-      f.write <<-RUBY
-        ab_test "Green Button" do
-          def xmts
-            "x"
-          end
-        end
-      RUBY
-    end
-    assert_equal "x", experiment(:green_button).xmts
-  end
-
-  def test_fails_if_error_loading_experiment
-    Vanity.playground.load_path = Dir.tmpdir
-    File.open File.join(Dir.tmpdir, "green_button.rb"), "w" do |f|
-      f.write "fail 'yawn!'"
-    end
-    assert_raises LoadError do
-      experiment(:green_button)
-    end
-  end
-
-  def test_complains_if_not_defined_where_expected
-    Vanity.playground.load_path = Dir.tmpdir
-    File.open File.join(Dir.tmpdir, "green_button.rb"), "w" do |f|
-      f.write ""
-    end
-    assert_raises LoadError do
-      experiment("Green button")
-    end
-  end
-
-  def test_reloading_experiments
-    Vanity.playground.define(:ab, :ab_test) {}
-    Vanity.playground.define(:cd, :ab_test) {}
-    assert 2, Vanity.playground.experiments.count
-    Vanity.playground.reload!
-    assert_empty Vanity.playground.experiments
-  end
-
-  # -- Defining experiment --
-  
-  def test_can_access_experiment_by_name_or_id
-    exp = Vanity.playground.define(:green_button, :ab_test) { }
-    assert_equal exp, experiment("Green Button")
-    assert_equal exp, experiment(:green_button)
-  end
-
-  def test_fail_when_defining_same_experiment_twice
-    Vanity.playground.define("Green Button", :ab_test) { }
-    assert_raises RuntimeError do
-      Vanity.playground.define("Green Button", :ab_test) { }
-    end
-  end
-
-  def test_uses_playground_namespace_for_experiment
-    Vanity.playground.define(:green_button, :ab_test) { }
-    assert_equal "#{@namespace}:green_button", experiment(:green_button).send(:key)
-    assert_equal "#{@namespace}:green_button:participants", experiment(:green_button).send(:key, "participants")
-  end
-
 end

data/test/rails_test.rb

@@ -4,7 +4,7 @@ class UseVanityController < ActionController::Base
   attr_accessor :current_user
 
   def index
-    render text: ab_test(:simple)
+    render :text=>ab_test(:pie_or_cake)
   end
 end
 
@@ -13,7 +13,10 @@ class UseVanityTest < ActionController::TestCase
   tests UseVanityController
 
   def setup
-    Vanity.playground.define :simple, :ab_test do
+    super
+    metric :sugar_high
+    Vanity.playground.define :pie_or_cake, :ab_test do
+      metrics :sugar_high
     end
     UseVanityController.class_eval do
       use_vanity :current_user
@@ -29,7 +32,7 @@ class UseVanityTest < ActionController::TestCase
 
   def test_vanity_cookie_default_id
     get :index
-    assert_match cookies['vanity_id'], /^[a-f0-9]{32}$/
+    assert cookies['vanity_id'] =~ /^[a-f0-9]{32}$/
   end
 
   def test_vanity_cookie_retains_id
@@ -45,7 +48,7 @@ class UseVanityTest < ActionController::TestCase
   end
 
   def test_vanity_identity_set_from_user
-    @controller.current_user = mock("user", id: "user_id")
+    @controller.current_user = mock("user", :id=>"user_id")
     get :index
     assert_equal "user_id", @controller.send(:vanity_identity)
   end
@@ -56,7 +59,7 @@ class UseVanityTest < ActionController::TestCase
     end
     @controller.current_user = Object.new
     get :index
-    assert_match cookies['vanity_id'], /^[a-f0-9]{32}$/
+    assert cookies['vanity_id'] =~ /^[a-f0-9]{32}$/
   end
 
   def test_vanity_identity_set_with_block
@@ -70,7 +73,7 @@ class UseVanityTest < ActionController::TestCase
   end
 
   def teardown
+    super
     UseVanityController.send(:filter_chain).clear
-    nuke_playground
   end
 end

data/test/test_helper.rb

@@ -1,35 +1,66 @@
 $LOAD_PATH.delete_if { |path| path[/gems\/vanity-\d/] }
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 RAILS_ROOT = File.expand_path("..")
-require "minitest/spec"
+require "test/unit"
 require "mocha"
 require "action_controller"
 require "action_controller/test_case"
 require "initializer"
 require "lib/vanity/rails"
-MiniTest::Unit.autorun
+require "timecop"
+
+
+class Test::Unit::TestCase
+
+  def setup
+    FileUtils.mkpath "tmp/experiments/metrics"
+    new_playground
+  end
 
-class MiniTest::Unit::TestCase
   # Call this on teardown. It wipes put the playground and any state held in it
   # (mostly experiments), resets vanity ID, and clears Redis of all experiments.
   def nuke_playground
-    Vanity.playground.redis.flushdb
     new_playground
+    Vanity.playground.redis.flushdb
   end
 
   # 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
-    Vanity.instance_variable_set :@playground, Vanity::Playground.new
+    logger = Logger.new("/dev/null") unless $VERBOSE
+    Vanity.playground = Vanity::Playground.new(:logger=>logger, :load_path=>"tmp/experiments", :db=>15)
+    Vanity.playground.mock! unless ENV["REDIS"]
   end
 
+  # 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|
+      id = name.to_s.downcase.gsub(/\W+/, '_').to_sym
+      Vanity.playground.metrics[id] ||= Vanity::Metric.new(Vanity.playground, name)
+    end
+    names.size == 1 ? metrics.first : metrics
+  end
+  
   def teardown
-    nuke_playground
     Vanity.context = nil
+    FileUtils.rm_rf "tmp"
+    Vanity.playground.redis.flushdb
   end
+
 end
 
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
 end
 Rails.configuration = Rails::Configuration.new
+
+class Array
+  # Not in Ruby 1.8.6.
+  unless method_defined?(:shuffle)
+    def shuffle
+      copy = clone
+      Array.new(size) { copy.delete_at(Kernel.rand(copy.size)) } 
+    end
+  end
+end

data/vanity.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = "vanity"
-  spec.version        = "1.0.0"
+  spec.version        = "1.1.0"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://vanity.labnotes.org"

data/vendor/redis-rb/bench.rb

@@ -0,0 +1,44 @@
+require 'benchmark'
+$:.push File.join(File.dirname(__FILE__), 'lib')
+require 'redis'
+
+times = 20000
+
+@r = Redis.new#(:debug => true)
+@r['foo'] = "The first line we sent to the server is some text"
+
+Benchmark.bmbm do |x|
+  x.report("set") do
+    20000.times do |i|
+      @r["set#{i}"] = "The first line we sent to the server is some text"; @r["foo#{i}"]
+    end
+  end
+  
+  x.report("set (pipelined)") do
+    @r.pipelined do |pipeline|
+      20000.times do |i|
+        pipeline["set_pipelined#{i}"] = "The first line we sent to the server is some text"; @r["foo#{i}"]
+      end
+    end
+  end
+  
+  x.report("push+trim") do
+    20000.times do |i|
+      @r.push_head "push_trim#{i}", i
+      @r.list_trim "push_trim#{i}", 0, 30
+    end
+  end
+  
+  x.report("push+trim (pipelined)") do
+    @r.pipelined do |pipeline|
+      20000.times do |i|
+        pipeline.push_head "push_trim_pipelined#{i}", i
+        pipeline.list_trim "push_trim_pipelined#{i}", 0, 30
+      end
+    end
+  end
+end
+
+@r.keys('*').each do |k|
+  @r.delete k
+end

data/vendor/redis-rb/benchmarking/suite.rb

@@ -0,0 +1,24 @@
+require 'fileutils'
+
+def run_in_background(command)
+  fork { system command }
+end
+
+def with_all_segments(&block)
+  0.upto(9) do |segment_number|
+    block_size = 100000
+    start_index = segment_number * block_size
+    end_index = start_index + block_size - 1
+    block.call(start_index, end_index)
+  end
+end
+
+#with_all_segments do |start_index, end_index|
+#  puts "Initializing keys from #{start_index} to #{end_index}"
+#  system "ruby worker.rb initialize #{start_index} #{end_index} 0"
+#end
+
+with_all_segments do |start_index, end_index|
+  run_in_background "ruby worker.rb write #{start_index} #{end_index} 10"
+  run_in_background "ruby worker.rb read #{start_index} #{end_index} 1"
+end

data/vendor/redis-rb/benchmarking/worker.rb

@@ -0,0 +1,71 @@
+BENCHMARK_ROOT = File.dirname(__FILE__)
+REDIS_ROOT = File.join(BENCHMARK_ROOT, "..", "lib")
+
+$: << REDIS_ROOT
+require 'redis'
+require 'benchmark'
+
+def show_usage
+  puts <<-EOL
+    Usage: worker.rb [read:write] <start_index> <end_index> <sleep_msec>
+  EOL
+end
+
+def shift_from_argv
+  value = ARGV.shift
+  unless value
+    show_usage
+    exit -1
+  end
+  value
+end
+
+operation = shift_from_argv.to_sym
+start_index = shift_from_argv.to_i
+end_index = shift_from_argv.to_i
+sleep_msec = shift_from_argv.to_i
+sleep_duration = sleep_msec/1000.0
+
+redis = Redis.new
+
+case operation
+  when :initialize
+
+    start_index.upto(end_index) do |i|
+      redis[i] = 0
+    end
+
+  when :clear
+
+    start_index.upto(end_index) do |i|
+      redis.delete(i)
+    end
+
+  when :read, :write
+
+    puts "Starting to #{operation} at segment #{end_index + 1}"
+
+    loop do
+      t1 = Time.now
+      start_index.upto(end_index) do |i|
+        case operation
+          when :read
+            redis.get(i)
+          when :write
+            redis.incr(i)
+          else
+            raise "Unknown operation: #{operation}"
+        end
+        sleep sleep_duration
+      end
+      t2 = Time.now
+
+      requests_processed = end_index - start_index
+      time = t2 - t1
+      puts "#{t2.strftime("%H:%M")} [segment #{end_index + 1}] : Processed #{requests_processed} requests in #{time} seconds - #{(requests_processed/time).round} requests/sec"
+    end
+
+  else
+    raise "Unknown operation: #{operation}"
+end
+

data/vendor/redis-rb/bin/distredis

@@ -0,0 +1,33 @@
+require 'fileutils'
+
+class RedisCluster
+  
+  def initialize(opts={})
+    opts = {:port => 6379, :host => 'localhost', :basedir => "#{Dir.pwd}/rdsrv" }.merge(opts)
+    FileUtils.mkdir_p opts[:basedir]
+    opts[:size].times do |i|
+      port = opts[:port] + i
+      FileUtils.mkdir_p "#{opts[:basedir]}/#{port}"
+      File.open("#{opts[:basedir]}/#{port}.conf", 'w'){|f| f.write(make_config(port, "#{opts[:basedir]}/#{port}", "#{opts[:basedir]}/#{port}.log"))}
+      system(%Q{#{File.join(File.expand_path(File.dirname(__FILE__)), "../redis/redis-server #{opts[:basedir]}/#{port}.conf &" )}})
+    end  
+  end
+
+  def make_config(port=6379, data=port, logfile='stdout', loglevel='debug')
+    config = %Q{
+timeout 300
+save 900 1
+save 300 10
+save 60 10000
+dir #{data}
+loglevel #{loglevel}
+logfile #{logfile}
+databases 16
+port #{port}
+    }
+  end
+  
+end
+
+
+RedisCluster.new :size => 4

data/vendor/redis-rb/examples/basic.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'redis'
+
+r = Redis.new
+
+r.delete('foo')
+
+puts 
+
+p'set foo to "bar"'
+r['foo'] = 'bar'
+
+puts
+
+p 'value of foo'
+p r['foo']

data/vendor/redis-rb/examples/incr-decr.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'redis'
+
+r = Redis.new
+
+puts
+p 'incr'
+r.delete 'counter'
+
+p r.incr('counter')
+p r.incr('counter')
+p r.incr('counter')
+
+puts
+p 'decr'
+p r.decr('counter')
+p r.decr('counter')
+p r.decr('counter')