vanity 2.0.0.beta7 → 2.0.0.beta8

data/gemfiles/rails42.gemfile.lock

@@ -7,13 +7,14 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta7)
+    vanity (2.0.0.beta8)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     actionmailer (4.2.0)
       actionpack (= 4.2.0)
       actionview (= 4.2.0)
@@ -43,6 +44,8 @@ GEM
       activemodel (= 4.2.0)
       activesupport (= 4.2.0)
       arel (~> 6.0)
+    activerecord-jdbc-adapter (1.3.15)
+      activerecord (>= 2.2)
     activesupport (4.2.0)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -57,6 +60,7 @@ GEM
     arel (6.0.0)
     blankslate (2.1.2.4)
     bson (1.10.0)
+    bson (1.10.0-java)
     bson_ext (1.10.0)
       bson (~> 1.10.0)
     builder (3.2.2)
@@ -64,18 +68,18 @@ GEM
       timers (~> 4.0.0)
     classifier-reborn (2.0.3)
       fast-stemmer (~> 1.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     colorator (0.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     daemon_controller (1.2.0)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.5.2)
     fast-stemmer (1.0.2)
-    ffi (1.9.6)
+    ffi (1.9.8)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
@@ -85,6 +89,7 @@ GEM
     hitimes (1.2.2)
     i18n (0.7.0)
     integration (0.1.0)
+    jdbc-sqlite3 (3.8.7)
     jekyll (2.5.3)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
@@ -102,17 +107,18 @@ GEM
       toml (~> 0.1.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-gist (1.1.0)
+    jekyll-gist (1.2.1)
     jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-watch (1.2.0)
+    jekyll-watch (1.2.1)
       listen (~> 2.7)
     json (1.8.2)
-    kramdown (1.5.0)
-    liquid (2.6.1)
-    listen (2.8.5)
-      celluloid (>= 0.15.2)
+    json (1.8.2-java)
+    kramdown (1.6.0)
+    liquid (2.6.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.1)
@@ -128,9 +134,12 @@ GEM
       metaclass (~> 0.0.1)
     mongo (1.10.0)
       bson (~> 1.10.0)
+    mongo (1.10.0-java)
+      bson (~> 1.10.0)
     multi_json (1.10.1)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
+    nokogiri (1.6.5-java)
     parslet (1.5.0)
       blankslate (~> 2.0)
     passenger (3.0.21)
@@ -138,10 +147,10 @@ GEM
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
-    posix-spawn (0.3.9)
-    pygments.rb (0.6.0)
+    posix-spawn (0.3.11)
+    pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -173,13 +182,13 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.2.2)
+    redcarpet (3.2.3)
     redis (3.2.0)
     redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     rubystats (0.2.3)
     safe_yaml (1.0.4)
-    sass (3.4.10)
+    sass (3.4.13)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -192,6 +201,7 @@ GEM
     sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
     timecop (0.7.1)
     timers (4.0.1)
@@ -203,20 +213,23 @@ GEM
     webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.2.1)
     yard (0.8.7.6)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   RedCloth
-  appraisal (>= 1.0.0.beta2)
+  activerecord-jdbc-adapter
+  appraisal (~> 1.0.2)
   bson_ext
   bundler (>= 1.0.0)
   fastthread!
   garb (< 0.9.2)
   integration (<= 0.1.0)
+  jdbc-sqlite3
   jekyll
   minitest (>= 4.2)
   mocha (~> 1.0)
@@ -228,7 +241,7 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  sqlite3
+  sqlite3 (~> 1.3.10)
   timecop
   vanity!
   webmock

data/lib/vanity/experiment/ab_test.rb

@@ -59,22 +59,12 @@ module Vanity
       #   alts = experiment(:background_color).alternatives
       #   puts "#{alts.count} alternatives, with the colors: #{alts.map(&:value).join(", ")}"
       def alternatives(*args)
-        @alternatives = args.empty? ? [true, false] : args.clone
-        class << self
-          define_method :alternatives, instance_method(:_alternatives)
+        @alternatives ||= args.empty? ? [true, false] : args.clone
+        @alternatives.each_with_index.map do |value, i|
+          Alternative.new(self, i, value)
         end
-        nil
       end
 
-      def _alternatives
-        alts = []
-        @alternatives.each_with_index do |value, i|
-          alts << Alternative.new(self, i, value)
-        end
-        alts
-      end
-      private :_alternatives
-
       # Returns an Alternative with the specified value.
       #
       # @example
@@ -137,7 +127,7 @@ module Vanity
         if @playground.collecting?
           if active?
             identity = identity()
-            index = connection.ab_showing(@id, identity)
+            index = connection.ab_showing(@id, identity) || connection.ab_assigned(@id, identity)
             unless index
               index = alternative_for(identity).to_i
               save_assignment_if_valid_visitor(identity, index, request) unless @playground.using_js?
@@ -151,6 +141,7 @@ module Vanity
           @showing[identity] ||= alternative_for(identity)
           index = @showing[identity]
         end
+
         alternatives[index.to_i]
       end
 
@@ -414,7 +405,7 @@ module Vanity
       def outcome
         return unless @playground.collecting?
         outcome = connection.ab_get_outcome(@id)
-        outcome && _alternatives[outcome]
+        outcome && alternatives[outcome]
       end
 
       def complete!(outcome = nil)
@@ -445,7 +436,7 @@ module Vanity
         connection.destroy_experiment @id
         super
       end
-      
+
       # clears all collected data for the experiment
       def reset
         connection.destroy_experiment @id
@@ -471,12 +462,12 @@ module Vanity
       # Called via a hook by the associated metric.
       def track!(metric_id, timestamp, count, *args)
         return unless active?
-        identity = identity() rescue nil
-        identity ||= args.last[:identity] if args.last.is_a?(Hash) && args.last[:identity]
+        identity = args.last[:identity] if args.last.is_a?(Hash)
+        identity ||= identity() rescue nil
         if identity
           return if connection.ab_showing(@id, identity)
           index = alternative_for(identity)
-          connection.ab_add_conversion @id, index, identity, count
+          connection.ab_add_conversion(@id, index, identity, count)
           check_completion!
         end
       end
@@ -517,7 +508,8 @@ module Vanity
             return alternative.id if random_outcome < max_prob
           end
         end
-        return Digest::MD5.hexdigest("#{name}/#{identity}").to_i(17) % @alternatives.size
+
+        Digest::MD5.hexdigest("#{name}/#{identity}").to_i(17) % @alternatives.size
       end
 
       # Saves the assignment of an alternative to a person and performs the

data/lib/vanity/version.rb

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

data/test/cli_test.rb

@@ -7,21 +7,23 @@ describe "bin/vanity" do
   end
 
   it "responds to version" do
-    proc {
-      IO.any_instance.expects(:puts)
-      ARGV.clear
-      ARGV << '--version'
-      load "bin/vanity"
-    }.must_raise SystemExit
+    assert_output(nil) do
+      proc {
+        ARGV.clear
+        ARGV << '--version'
+        load "bin/vanity"
+      }.must_raise SystemExit
+    end
   end
 
   it "responds to help" do
-    proc {
-      IO.any_instance.expects(:puts)
-      ARGV.clear
-      ARGV << '--help'
-      load "bin/vanity"
-    }.must_raise SystemExit
+    assert_output(nil) do
+      proc {
+        ARGV.clear
+        ARGV << '--help'
+        load "bin/vanity"
+      }.must_raise SystemExit
+    end
   end
 
   it "responds to list" do
@@ -47,4 +49,4 @@ describe "bin/vanity" do
       load "bin/vanity"
     end
   end
-end
+end

data/test/experiment/ab_test.rb

@@ -118,6 +118,23 @@ class AbTestTest < ActionController::TestCase
     assert_equal 1, experiment(:abcd).alternatives.sum(&:conversions)
   end
 
+  # -- track! --
+
+  def test_track_with_identity_overrides_default
+    identities = ["quux"]
+    new_ab_test :foobar do
+      alternatives "foo", "bar"
+      identify { identities.pop || "6e98ec" }
+      metrics :coolness
+    end
+    2.times { experiment(:foobar).choose }
+    assert_equal 0, experiment(:foobar).alternatives.sum(&:converted)
+    experiment(:foobar).track!(:coolness, Time.now, 1)
+    assert_equal 1, experiment(:foobar).alternatives.sum(&:converted)
+    experiment(:foobar).track!(:coolness, Time.now, 1, :identity=>"quux")
+    assert_equal 2, experiment(:foobar).alternatives.sum(&:converted)
+  end
+
   # -- use_js! --
 
   def test_choose_does_not_record_participant_when_using_js
@@ -327,6 +344,24 @@ class AbTestTest < ActionController::TestCase
     end
   end
 
+  def test_respects_out_of_band_assignment
+    new_ab_test :foobar do
+      alternatives "a", "b", "c"
+      identify { "6e98ec" }
+      metrics :coolness
+    end
+    # Note that this is explicitly not the alternative id that alternative_for
+    # would assign based on identity
+    assigned_alternative_id = 1
+    Vanity.playground.connection.ab_add_participant(
+      experiment(:foobar).id,
+      assigned_alternative_id,
+      "6e98ec"
+    )
+    chosen_alternative_id = experiment(:foobar).choose.id
+    assert_equal assigned_alternative_id, chosen_alternative_id
+  end
+
   def test_returns_different_alternatives_for_each_participant
     new_ab_test :foobar do
       alternatives "foo", "bar"
@@ -1021,7 +1056,7 @@ This experiment did not run long enough to find a clear winner.
     assert [:a, :b, :c].include?(choice)
     assert_equal choice, experiment(:simple).choose.value
   end
-  
+
   def test_reset_clears_participants
     new_ab_test :simple do
       alternatives :a, :b, :c
@@ -1032,7 +1067,7 @@ This experiment did not run long enough to find a clear winner.
     experiment(:simple).reset
     assert_equal experiment(:simple).alternatives[1].participants, 0
   end
-  
+
   def test_clears_outcome_and_completed_at
     new_ab_test :simple do
       alternatives :a, :b, :c

data/test/helper_test.rb

@@ -8,10 +8,20 @@ describe Object do
         alternatives "foo", "bar"
         metrics :coolness
       end
-      track! :coolness, :identity=>'quux', :values=>[2]
+      track!(:coolness, :identity=>'quux')
+
+      assert_equal 1, experiment(:foobar).alternatives.sum(&:conversions)
+    end
+
+    it "accepts value for conversion" do
+      metric "Coolness"
+      new_ab_test :foobar do
+        alternatives "foo", "bar"
+        metrics :coolness
+      end
+      track!(:coolness, :identity=>'quux', :values=>[2])
 
-      # experiment(:foobar).alternatives.sum(&:conversions).must_equal 2
       assert_equal 2, experiment(:foobar).alternatives.sum(&:conversions)
     end
   end
-end
+end

data/test/test_helper.rb

@@ -20,12 +20,7 @@ require "rails/test_help"
 
 require "vanity"
 require "timecop"
-
-if defined?(Mocha::VERSION) && Mocha::VERSION < "0.13.0"
-  require "mocha"
-else
-  require "mocha/mini_test"
-end
+require "mocha/mini_test"
 require "webmock/minitest"
 
 # Due to load order differences in Rails boot and test requires we have to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 2.0.0.beta8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -205,7 +205,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta7
+- Vanity 2.0.0.beta8
 - --main
 - README.rdoc
 - --webcvs