vanity 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e624cf4ffac44db90b2d87b2142487870e8d8313
-  data.tar.gz: d2f59e2b24bf57977ac7e6494416b5a8eab08c6b
+  metadata.gz: a239324275cb444df1667c84c26134d4cea832af
+  data.tar.gz: 3640a24cc2166d34f1211f629a6d5334bbcc1021
 SHA512:
-  metadata.gz: 4f7713ef88ad77be3d31a16767ea3e5bf5cc5bb50478208aa3bb506e8f316eec26d1fb3e1752b7b6cae73c918a98cf5ad1dae78513e9e6e7c5bb20e329569861
-  data.tar.gz: 3ff7a9e8f111e3aa83c56bcd7d4c3c834c76c9e0118ce6cacca8921362f78d1016c8c21555fd43f4a42f972557dac32e673becab80c1aacedfa2526fd00daba8
+  metadata.gz: b12cf807e8c67be3090a3d96bed156c8237dd8c127c3498a93c5ffc46ac9ebb70435cbf87a7b82f61f293b013fb10f5c4f0dd773e3fa4e9fb81364f90cbae817
+  data.tar.gz: 820e507831da2346e52f9589b1494cd30d6a83c3f508b6f5b67631e3f48ad5313e050ff04d5b09823116103ccc040d35e327a5b6412e4b975927d77ddb1d07e1

data/.travis.yml

@@ -11,7 +11,6 @@ services:
   - mongodb
   - redis-server
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.2.0
   - 2.3.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 2.2.0 (2016-3-26)
+* Update mongo integration for mongo ruby driver 2.x. (@phillbaker)
+* Centralize warnings to use `Vanity.logger` (@phillbaker)
+
 == 2.1.2 (2016-2-20)
 
 * Fix infinite loop on loading Vanity when using Redis and Redis fails to connect. #292 (@phillbaker)

data/Gemfile

@@ -7,7 +7,7 @@ gem "rack"
 # Persistence
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "mongo"
+gem "mongo", "~> 2.1"
 
 # Math libraries
 gem "integration", "<= 0.1.0"
@@ -22,7 +22,7 @@ gem "webmock", :require=>false
 gem "fakefs", :require => "fakefs/safe"
 
 platform :ruby do
-  gem "bson_ext"
+  # gem "bson_ext"
   gem "sqlite3", "~> 1.3.10"
 end
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.1.2)
+    vanity (2.2.0)
       i18n
 
 GEM
@@ -20,10 +20,8 @@ GEM
       rake
       thor (>= 0.14.0)
     blankslate (2.1.2.4)
-    bson (1.6.0)
-    bson (1.6.0-java)
-    bson_ext (1.6.0)
-      bson (= 1.6.0)
+    bson (4.0.2)
+    bson (4.0.2-java)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     classifier-reborn (2.0.3)
@@ -76,8 +74,8 @@ GEM
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
     minitest (4.7.5)
-    mongo (1.6.0)
-      bson (= 1.6.0)
+    mongo (2.2.3)
+      bson (~> 4.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.11)
@@ -117,7 +115,6 @@ DEPENDENCIES
   RedCloth
   activerecord-jdbc-adapter
   appraisal (~> 1.0.2)
-  bson_ext
   bundler (>= 1.8.0)
   fakefs
   garb (< 0.9.2)
@@ -125,7 +122,7 @@ DEPENDENCIES
   jdbc-sqlite3
   jekyll
   minitest (>= 4.2)
-  mongo
+  mongo (~> 2.1)
   rack
   rake
   redis (>= 2.1)

data/README.md

@@ -65,8 +65,7 @@ test:
 Add to your Gemfile:
 
 ```ruby
-gem "bson_ext"
-gem "mongo"
+gem "mongo", "~> 2.0" # For Mongo 1.x support see Vanity versions 2.1 and below.
 ```
 
 A sample `config/vanity.yml` might look like:
@@ -249,9 +248,6 @@ your view no participants will be recorded.
 
 Here's what's tested and known to work:
 
-    Ruby 2.0
-      Persistence: Redis, Mongo, ActiveRecord
-      Rails: 3.2, 4.1, 4.2
     Ruby 2.1
       Persistence: Redis, Mongo, ActiveRecord
       Rails: 3.2, 4.1, 4.2

data/gemfiles/rails32.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "rack"
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "mongo"
+gem "mongo", "~> 2.1"
 gem "integration", "<= 0.1.0"
 gem "rubystats", ">= 0.2.4"
 gem "garb", "< 0.9.2", :require => false
@@ -29,7 +29,6 @@ group :development do
 end
 
 platforms :ruby do
-  gem "bson_ext"
   gem "sqlite3", "~> 1.3.10"
 end
 

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.1.2)
+    vanity (2.2.0)
       i18n
 
 GEM
@@ -51,10 +51,7 @@ GEM
       thor (>= 0.14.0)
     arel (3.0.3)
     blankslate (2.1.2.4)
-    bson (1.6.0)
-    bson (1.6.0-java)
-    bson_ext (1.6.0)
-      bson (= 1.6.0)
+    bson (4.0.2)
     builder (3.0.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -121,8 +118,8 @@ GEM
     minitest (4.2.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongo (1.6.0)
-      bson (= 1.6.0)
+    mongo (2.2.3)
+      bson (~> 4.0)
     multi_json (1.11.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
@@ -205,7 +202,6 @@ DEPENDENCIES
   RedCloth
   activerecord-jdbc-adapter
   appraisal (~> 1.0.2)
-  bson_ext
   bundler (>= 1.8.0)
   fakefs
   fastthread!
@@ -216,7 +212,7 @@ DEPENDENCIES
   minitest (~> 4.2.0)
   minitest_tu_shim (~> 1.3.3)
   mocha (~> 1.0)
-  mongo
+  mongo (~> 2.1)
   passenger (~> 3.0)
   rack
   rails (= 3.2.22)

data/gemfiles/rails41.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "rack"
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "mongo"
+gem "mongo", "~> 2.1"
 gem "integration", "<= 0.1.0"
 gem "rubystats", ">= 0.2.4"
 gem "garb", "< 0.9.2", :require => false
@@ -26,7 +26,6 @@ group :development do
 end
 
 platforms :ruby do
-  gem "bson_ext"
   gem "sqlite3", "~> 1.3.10"
 end
 

data/gemfiles/rails41.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .././
   specs:
-    vanity (2.1.2)
+    vanity (2.2.0)
       i18n
 
 GEM
@@ -50,10 +50,7 @@ GEM
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
     blankslate (2.1.2.4)
-    bson (1.10.0)
-    bson (1.10.0-java)
-    bson_ext (1.10.0)
-      bson (~> 1.10.0)
+    bson (4.0.2)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -119,10 +116,8 @@ GEM
     minitest (5.5.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongo (1.10.0)
-      bson (~> 1.10.0)
-    mongo (1.10.0-java)
-      bson (~> 1.10.0)
+    mongo (2.2.3)
+      bson (~> 4.0)
     multi_json (1.10.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
@@ -199,7 +194,6 @@ DEPENDENCIES
   RedCloth
   activerecord-jdbc-adapter
   appraisal (~> 1.0.2)
-  bson_ext
   bundler (>= 1.8.0)
   fakefs
   fastthread!
@@ -209,7 +203,7 @@ DEPENDENCIES
   jekyll
   minitest (>= 4.2)
   mocha (~> 1.0)
-  mongo
+  mongo (~> 2.1)
   passenger (~> 3.0)
   rack
   rails (= 4.1.9)

data/gemfiles/rails42.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "rack"
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "mongo"
+gem "mongo", "~> 2.1"
 gem "integration", "<= 0.1.0"
 gem "rubystats", ">= 0.2.4"
 gem "garb", "< 0.9.2", :require => false
@@ -26,7 +26,6 @@ group :development do
 end
 
 platforms :ruby do
-  gem "bson_ext"
   gem "sqlite3", "~> 1.3.10"
 end
 

data/gemfiles/rails42.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.1.2)
+    vanity (2.2.0)
       i18n
 
 GEM
@@ -59,10 +59,7 @@ GEM
       thor (>= 0.14.0)
     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)
+    bson (4.0.2)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -133,10 +130,8 @@ GEM
     minitest (5.5.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongo (1.10.0)
-      bson (~> 1.10.0)
-    mongo (1.10.0-java)
-      bson (~> 1.10.0)
+    mongo (2.2.3)
+      bson (~> 4.0)
     multi_json (1.10.1)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
@@ -225,7 +220,6 @@ DEPENDENCIES
   RedCloth
   activerecord-jdbc-adapter
   appraisal (~> 1.0.2)
-  bson_ext
   bundler (>= 1.8.0)
   fakefs
   fastthread!
@@ -235,7 +229,7 @@ DEPENDENCIES
   jekyll
   minitest (>= 4.2)
   mocha (~> 1.0)
-  mongo
+  mongo (~> 2.1)
   passenger (~> 3.0)
   rack
   rails (= 4.2.0)

data/gemfiles/rails42_protected_attributes.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "rack"
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "mongo"
+gem "mongo", "~> 2.1"
 gem "integration", "<= 0.1.0"
 gem "rubystats", ">= 0.2.4"
 gem "garb", "< 0.9.2", :require => false
@@ -27,7 +27,6 @@ group :development do
 end
 
 platforms :ruby do
-  gem "bson_ext"
   gem "sqlite3", "~> 1.3.10"
 end
 

data/gemfiles/rails42_protected_attributes.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ../
   specs:
-    vanity (2.1.2)
+    vanity (2.2.0)
       i18n
 
 GEM
@@ -55,9 +55,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (6.0.3)
-    bson (1.12.5)
-    bson_ext (1.12.5)
-      bson (~> 1.12.5)
+    bson (4.0.2)
     builder (3.2.2)
     colorator (0.1)
     concurrent-ruby (1.0.0)
@@ -105,8 +103,8 @@ GEM
     minitest (5.8.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongo (1.12.5)
-      bson (= 1.12.5)
+    mongo (2.2.3)
+      bson (~> 4.0)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     passenger (3.0.21)
@@ -180,7 +178,6 @@ DEPENDENCIES
   RedCloth
   activerecord-jdbc-adapter
   appraisal (~> 1.0.2)
-  bson_ext
   bundler (>= 1.8.0)
   fakefs
   fastthread!
@@ -190,7 +187,7 @@ DEPENDENCIES
   jekyll
   minitest (>= 4.2)
   mocha (~> 1.0)
-  mongo
+  mongo (~> 2.1)
   passenger (~> 3.0)
   protected_attributes (= 1.1.0)
   rack

data/lib/vanity/adapters/abstract_adapter.rb

@@ -71,7 +71,7 @@ module Vanity
       def set_experiment_enabled(experiment, enabled)
         fail "Not implemented"
       end
-      
+
       # Returns true if experiment is enabled, the default (Vanity.configuration.experiments_start_enabled) is true.
       # (*except for mock_adapter, where default is true for testing)
       def is_experiment_enabled?(experiment)

data/lib/vanity/adapters/mock_adapter.rb

@@ -95,7 +95,7 @@ module Vanity
       def is_experiment_completed?(experiment)
         @experiments[experiment] && @experiments[experiment][:completed_at]
       end
-      
+
       def set_experiment_enabled(experiment, enabled)
         @experiments[experiment] ||= {}
         @experiments[experiment][:enabled] = enabled

data/lib/vanity/adapters/mongodb_adapter.rb

@@ -18,24 +18,13 @@ module Vanity
       attr_reader :mongo
 
       def initialize(options)
-        setup_connection(options)
         @options = options.clone
         @options[:database] ||= (@options[:path] && @options[:path].split("/")[1]) || "vanity"
         connect!
       end
 
-      def setup_connection(options = {})
-        if options[:hosts]
-          args = (options[:hosts].map{|host| [host, options[:port]] } << {:connect => false})
-          @mongo = Mongo::ReplSetConnection.new(*args)
-        else
-          @mongo = Mongo::Connection.new(options[:host], options[:port], :connect => false)
-        end
-        @mongo
-      end
-
       def active?
-        @mongo.connected?
+        !!@mongo
       end
 
       def disconnect!
@@ -50,16 +39,21 @@ module Vanity
       end
 
       def connect!
-        @mongo ||= setup_connection(@options)
-        @mongo.connect
-        database = @mongo.db(@options[:database])
-        database.authenticate @options[:username], @options[:password], true if @options[:username]
-        @metrics = database.collection("vanity.metrics")
-        @experiments = database.collection("vanity.experiments")
-        @participants = database.collection("vanity.participants")
-        @participants.create_index [[:experiment, 1], [:identity, 1]], :unique=>true
-        @participants.create_index [[:experiment, 1], [:seen, 1]]
-        @participants.create_index [[:experiment, 1], [:converted, 1]]
+        Mongo::Logger.logger = Vanity.logger
+        setup_connection(@options)
+
+        @metrics = @mongo["vanity.metrics"]
+        @metrics.create unless @mongo.database.collection_names.include?("vanity.metrics")
+        @experiments = @mongo["vanity.experiments"]
+        @experiments.create unless @mongo.database.collection_names.include?("vanity.experiments")
+        @participants = @mongo["vanity.participants"]
+        @participants.create unless @mongo.database.collection_names.include?("vanity.participants")
+        @participants.indexes.create_many(
+          { :key => { :experiment => 1, :identity => 1 }, :unique=>true },
+          { :key => { :experiment => 1, :seen => 1 } },
+          { :key => { :experiment => 1, :converted => 1 } }
+        )
+
         @mongo
       end
 
@@ -78,7 +72,7 @@ module Vanity
       # -- Metrics --
 
       def get_metric_last_update_at(metric)
-        record = @metrics.find_one(:_id=>metric)
+        record = @metrics.find(:_id=>metric).limit(1).first
         record && record["last_update_at"]
       end
 
@@ -87,55 +81,77 @@ module Vanity
         values.each_with_index do |v,i|
           inc["data.#{timestamp.to_date}.#{i}"] = v
         end
-        @metrics.update({ :_id=>metric }, { "$inc"=>inc, "$set"=>{ :last_update_at=>Time.now } }, :upsert=>true)
+        @metrics.find(:_id=>metric).find_one_and_replace(
+          {
+            "$inc"=>inc,
+            "$set"=>{ :last_update_at=>Time.now }
+          },
+          :upsert=>true
+        )
       end
 
       def metric_values(metric, from, to)
-        record = @metrics.find_one(:_id=>metric)
+        record = @metrics.find(:_id=>metric).limit(1).first
         data = record && record["data"] || {}
         (from.to_date..to.to_date).map { |date| (data[date.to_s] || {}).values }
       end
 
       def destroy_metric(metric)
-        @metrics.remove :_id=>metric
+        @metrics.find(:_id=>metric).delete_one
       end
 
 
       # -- Experiments --
 
       def experiment_persisted?(experiment)
-        !!@experiments.find_one({ :_id=>experiment })
+        !!@experiments.find(:_id=>experiment).limit(1).first
       end
 
       def set_experiment_created_at(experiment, time)
-        @experiments.insert(:_id=>experiment, :created_at=>time)
+        # @experiments.insert_one(:_id=>experiment, :created_at=>time)
+        @experiments.find(:_id=>experiment).find_one_and_replace(
+          {
+            "$setOnInsert"=>{ :created_at=>time }
+          },
+          :upsert=>true
+        )
       end
 
       def get_experiment_created_at(experiment)
-        record = @experiments.find_one({ :_id=>experiment }, { :fields=>[:created_at] })
+        record = @experiments.find(:_id=>experiment).limit(1).projection(:created_at=>1).first
         record && record["created_at"]
         #Returns nil if either the record or the field doesn't exist
       end
 
       def set_experiment_completed_at(experiment, time)
-        @experiments.update({ :_id=>experiment }, { "$set"=>{ :completed_at=>time } }, :upsert=>true)
+        @experiments.find(:_id=>experiment).find_one_and_replace(
+          {
+            "$set"=>{ :completed_at=>time }
+          },
+          :upsert=>true
+        )
       end
 
       def get_experiment_completed_at(experiment)
-        record = @experiments.find_one({ :_id=>experiment }, { :fields=>[:completed_at] })
+        record = @experiments.find(:_id=>experiment).limit(1).projection(:completed_at=>1).first
         record && record["completed_at"]
       end
 
       def is_experiment_completed?(experiment)
-        !!@experiments.find_one(:_id=>experiment, :completed_at=>{ "$exists"=>true })
+        !!@experiments.find(:_id=>experiment, :completed_at=>{ "$exists"=>true }).limit(1).first
       end
 
       def set_experiment_enabled(experiment, enabled)
-        @experiments.update({ :_id=>experiment }, { "$set"=>{ :enabled=>enabled } }, :upsert=>true)
+        @experiments.find(:_id=>experiment).find_one_and_replace(
+          {
+            "$set"=>{ :enabled=>enabled }
+          },
+          :upsert=>true
+        )
       end
 
       def is_experiment_enabled?(experiment)
-        record = @experiments.find_one({ :_id=>experiment}, { :fields=>[:enabled] })
+        record = @experiments.find(:_id=>experiment).limit(1).projection(:enabled=>1).first
         if Vanity.configuration.experiments_start_enabled
           record == nil || record["enabled"] != false
         else
@@ -144,7 +160,7 @@ module Vanity
       end
 
       def ab_counts(experiment, alternative)
-        record = @experiments.find_one({ :_id=>experiment }, { :fields=>[:conversions] })
+        record = @experiments.find(:_id=>experiment ).limit(1).projection(:conversions=>1).first
         conversions = record && record["conversions"]
         { :participants => @participants.find({ :experiment=>experiment, :seen=>alternative }).count,
           :converted    => @participants.find({ :experiment=>experiment, :converted=>alternative }).count,
@@ -152,56 +168,109 @@ module Vanity
       end
 
       def ab_show(experiment, identity, alternative)
-        @participants.update({ :experiment=>experiment, :identity=>identity }, { "$set"=>{ :show=>alternative } }, :upsert=>true)
+        @participants.find(:experiment=>experiment, :identity=>identity).find_one_and_replace(
+          {
+            "$set"=>{ :show=>alternative }
+          },
+          :upsert=>true
+        )
       end
 
       def ab_showing(experiment, identity)
-        participant = @participants.find_one({ :experiment=>experiment, :identity=>identity }, { :fields=>[:show] })
+        participant = @participants.find(:experiment=>experiment, :identity=>identity).limit(1).projection(:show=>1).first
         participant && participant["show"]
       end
 
       def ab_not_showing(experiment, identity)
-        @participants.update({ :experiment=>experiment, :identity=>identity }, { "$unset"=>:show })
+        @participants.find(:experiment=>experiment, :identity=>identity).find_one_and_replace(
+          {
+            "$unset"=> { :show => "" }
+          },
+          :upsert=>true
+        )
       end
 
       def ab_add_participant(experiment, alternative, identity)
-        @participants.update({ :experiment=>experiment, :identity=>identity }, { "$push"=>{ :seen=>alternative } }, :upsert=>true)
+        @participants.find(:experiment=>experiment, :identity=>identity).find_one_and_replace(
+          {
+            "$push"=>{ :seen=>alternative }
+          },
+          :upsert=>true
+        )
       end
 
       # Determines if a participant already has seen this alternative in this experiment.
       def ab_seen(experiment, identity, alternative)
-        participant = @participants.find_one({ :experiment=>experiment, :identity=>identity }, { :fields=>[:seen] })
+        participant = @participants.find(:experiment=>experiment, :identity=>identity).limit(1).projection(:seen=>1).first
         participant && participant["seen"].first == alternative.id
       end
 
       # Returns the participant's seen alternative in this experiment, if it exists
       def ab_assigned(experiment, identity)
-        participant = @participants.find_one({ :experiment=>experiment, :identity=>identity }, { :fields=>[:seen] })
+        participant = @participants.find(:experiment=>experiment, :identity=>identity).limit(1).projection(:seen=>1).first
         participant && participant["seen"].first
       end
 
       def ab_add_conversion(experiment, alternative, identity, count = 1, implicit = false)
         if implicit
-          @participants.update({ :experiment=>experiment, :identity=>identity }, { "$push"=>{ :seen=>alternative } }, :upsert=>true)
+          @participants.find(:experiment=>experiment, :identity=>identity).find_one_and_replace(
+            {
+              "$push"=>{ :seen=>alternative }
+            },
+            :upsert=>true
+          )
         else
-          participating = @participants.find_one(:experiment=>experiment, :identity=>identity, :seen=>alternative)
+          participating = @participants.find(:experiment=>experiment, :identity=>identity, :seen=>alternative).limit(1).first
+        end
+
+        if implicit || participating
+          @participants.find(:experiment=>experiment, :identity=>identity).find_one_and_replace(
+            {
+              "$push"=>{ :converted=>alternative }
+            },
+            :upsert=>true
+          )
         end
-        @participants.update({ :experiment=>experiment, :identity=>identity }, { "$push"=>{ :converted=>alternative } }, :upsert=>true) if implicit || participating
-        @experiments.update({ :_id=>experiment }, { "$inc"=>{ "conversions.#{alternative}"=>count } }, :upsert=>true)
+
+        @experiments.find(:_id=>experiment).find_one_and_replace(
+          {
+            "$inc"=>{ "conversions.#{alternative}"=>count }
+          },
+          :upsert=>true
+        )
       end
 
       def ab_get_outcome(experiment)
-        experiment = @experiments.find_one({ :_id=>experiment }, { :fields=>[:outcome] })
+        experiment = @experiments.find(:_id=>experiment).limit(1).projection(:outcome=>1).first
         experiment && experiment["outcome"]
       end
 
       def ab_set_outcome(experiment, alternative = 0)
-        @experiments.update({ :_id=>experiment }, { "$set"=>{ :outcome=>alternative } }, :upsert=>true)
+        @experiments.find(:_id=>experiment).find_one_and_replace(
+          {
+            "$set"=>{ :outcome=>alternative }
+          },
+          :upsert=>true
+        )
       end
 
       def destroy_experiment(experiment)
-        @experiments.remove :_id=>experiment
-        @participants.remove :experiment=>experiment
+        @experiments.find(:_id=>experiment).delete_one
+        @participants.find(:experiment=>experiment).delete_many
+      end
+
+      private
+
+      def setup_connection(options)
+        options[:user] = options[:username] if options[:username]
+
+        hosts = options.delete(:hosts) || [options.delete(:host)]
+        hosts.map! { |host| "#{host}:#{options.delete(:port)}" }
+
+        @mongo = Mongo::Client.new(
+          hosts,
+          options
+        )
       end
     end
   end

data/lib/vanity/adapters/redis_adapter.rb

@@ -44,7 +44,7 @@ module Vanity
           begin
             redis.client.disconnect
           rescue Exception => e
-            warn("Error while disconnecting from redis: #{e.message}")
+            Vanity.logger.warn("Error while disconnecting from redis: #{e.message}")
           end
         end
         @redis = nil

data/lib/vanity/configuration.rb

@@ -25,9 +25,9 @@ module Vanity
         nil
       end
 
-      # 
-      # Filter all User-Agents that have 'bot', 'crawler', 'spider', URL. 
-      # 
+      #
+      # Filter all User-Agents that have 'bot', 'crawler', 'spider', URL.
+      #
       def default_request_filter(request) # :nodoc:
         request &&
         request.env &&

data/lib/vanity/experiment/ab_test.rb

@@ -27,10 +27,10 @@ module Vanity
         @use_probabilities = nil
         @is_default_set = false
       end
-        
+
       # -- Default --
 
-      # Call this method once to set a default alternative. Call without 
+      # Call this method once to set a default alternative. Call without
       # arguments to obtain the current default. If default is not specified,
       # the first alternative is used.
       #
@@ -55,12 +55,12 @@ module Vanity
       end
 
       # -- Enabled --
-      
+
       # Returns true if experiment is enabled, false if disabled.
       def enabled?
         !@playground.collecting? || (active? && connection.is_experiment_enabled?(@id))
       end
-      
+
       # Enable or disable the experiment. Only works if the playground is collecting
       # and this experiment is enabled.
       #
@@ -70,8 +70,10 @@ module Vanity
       def enabled=(bool)
         return unless @playground.collecting? && active?
         if created_at.nil?
-          warn 'DB has no created_at for this experiment! This most likely means' + 
-               'you didn\'t call #save before calling enabled=, which you should.'
+          Vanity.logger.warn(
+            'DB has no created_at for this experiment! This most likely means' +
+            'you didn\'t call #save before calling enabled=, which you should.'
+          )
         else
           connection.set_experiment_enabled(@id, bool)
         end
@@ -187,9 +189,9 @@ module Vanity
         if @playground.collecting?
           if active?
             if enabled?
-              return assignment_for_identity(request)    
+              return assignment_for_identity(request)
             else
-              # Show the default if experiment is disabled. 
+              # Show the default if experiment is disabled.
               return default
             end
           else
@@ -340,13 +342,13 @@ module Vanity
           require "integration"
           require "rubystats"
         rescue LoadError
-          fail "to use bayes_bandit_score, install integration and rubystats gems"
+          fail("to use bayes_bandit_score, install integration and rubystats gems")
         end
 
         begin
           require "gsl"
         rescue LoadError
-          warn "for better integration performance, install gsl gem"
+          Vanity.logger.warn("for better integration performance, install gsl gem")
         end
 
         BayesianBanditScore.new(alternatives, outcome).calculate!
@@ -480,8 +482,8 @@ module Vanity
             begin
               result = @outcome_is.call
               outcome = result.id if Alternative === result && result.experiment == self
-            rescue
-              warn "Error in AbTest#complete!: #{$!}"
+            rescue => e
+              Vanity.logger.warn("Error in AbTest#complete!: #{e}")
             end
           else
             best = score.best
@@ -499,7 +501,7 @@ module Vanity
         connection.destroy_experiment(@id)
         super
       end
-      
+
       # clears all collected data for the experiment
       def reset
         return unless @playground.collecting?
@@ -524,7 +526,7 @@ module Vanity
       # and declared.
       def save
         if @saved
-          warn "Experiment #{name} has already been saved"
+          Vanity.logger.warn("Experiment #{name} has already been saved")
           return
         end
         @saved = true
@@ -532,21 +534,21 @@ module Vanity
         fail "Experiment #{name} needs at least two alternatives" unless @alternatives.size >= 2
         if !@is_default_set
           default(@alternatives.first)
-          warn "No default alternative specified; choosing #{@default} as default."
+          Vanity.logger.warn("No default alternative specified; choosing #{@default} as default.")
         elsif alternative(@default).nil?
-          #Specified a default that wasn't listed as an alternative; warn and override.
-          warn "Attempted to set unknown alternative #{@default} as default! Using #{@alternatives.first} instead."
-          #Set the instance variable directly since default(value) is no longer defined
+          # Specified a default that wasn't listed as an alternative; warn and override.
+          Vanity.logger.warn("Attempted to set unknown alternative #{@default} as default! Using #{@alternatives.first} instead.")
+          # Set the instance variable directly since default(value) is no longer defined
           @default = @alternatives.first
         end
         super
         if @metrics.nil? || @metrics.empty?
-          warn "Please use metrics method to explicitly state which metric you are measuring against."
+          Vanity.logger.warn("Please use metrics method to explicitly state which metric you are measuring against.")
           metric = @playground.metrics[id] ||= Vanity::Metric.new(@playground, name)
           @metrics = [metric]
         end
         @metrics.each do |metric|
-          metric.hook &method(:track!)
+          metric.hook(&method(:track!))
         end
       end
 
@@ -587,7 +589,7 @@ module Vanity
       end
 
       # Returns the assigned alternative, previously chosen alternative, or
-      # alternative_for for a given identity.  
+      # alternative_for for a given identity.
       def assignment_for_identity(request)
         identity = identity()
         if filter_visitor?(request, identity)
@@ -633,7 +635,7 @@ module Vanity
       end
 
       def filter_visitor?(request, identity)
-        @playground.request_filter.call(request) || 
+        @playground.request_filter.call(request) ||
           (@request_filter_block && @request_filter_block.call(request, identity))
       end
 

data/lib/vanity/experiment/base.rb

@@ -158,7 +158,7 @@ module Vanity
         return unless @playground.collecting?
         connection.set_experiment_created_at @id, Time.now
       end
-      
+
       # -- Filtering Particpants --
 
       # Define an experiment specific request filter.  For example:
@@ -191,8 +191,8 @@ module Vanity
         if @complete_block
           begin
             complete! if @complete_block.call
-          rescue
-            warn "Error in Vanity::Experiment::Base: #{$!}"
+          rescue => e
+            Vanity.logger.warn("Error in Vanity::Experiment::Base: #{e}")
           end
         end
       end

data/lib/vanity/metric/active_record.rb

@@ -106,7 +106,7 @@ module Vanity
         identity ||= if @ar_identity_block
           @ar_identity_block.call(record)
         end
-        
+
         call_hooks record.send(@ar_timestamp), identity, [count] if count > 0 && @ar_scoped.exists?(record.id)
       end
     end

data/lib/vanity/version.rb

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

data/test/adapters/redis_adapter_test.rb

@@ -14,7 +14,7 @@ describe Vanity::Adapters::RedisAdapter do
         mocked_redis.expects(:client).raises(RuntimeError)
         redis_adapter = Vanity::Adapters::RedisAdapter.new({})
         redis_adapter.stubs(:redis).returns(mocked_redis)
-        redis_adapter.expects(:warn).with("Error while disconnecting from redis: RuntimeError")
+        Vanity.logger.expects(:warn).with("Error while disconnecting from redis: RuntimeError")
         redis_adapter.disconnect!
       end
     end

data/test/experiment/ab_test.rb

@@ -181,28 +181,28 @@ class AbTestTest < ActionController::TestCase
     exp = experiment(:nil_default_default)
     assert_equal exp.default, exp.alternative(nil)
   end
-  
-  
+
+
   # -- Experiment Enabled/disabled --
-  
+
   # @example new test should be enabled regardless of collecting?
   #   regardless_of "Vanity.playground.collecting" do
   #     assert (new_ab_test :test).enabled?
   #   end
   def regardless_of(attr_name, &block)
     prev_val = eval "#{attr_name}?"
-    
+
     eval "#{attr_name}=true"
     block.call(eval "#{attr_name}?")
     nuke_playground
-    
+
     eval "#{attr_name}=false"
     block.call(eval "#{attr_name}?")
     nuke_playground
-    
+
     eval "#{attr_name}=prev_val"
   end
-  
+
   def test_new_test_is_disabled_when_experiments_start_enabled_is_false
     Vanity.configuration.experiments_start_enabled = false
     exp = new_ab_test :test, enable: false do
@@ -220,7 +220,7 @@ class AbTestTest < ActionController::TestCase
     end
     assert exp.enabled?
   end
-  
+
   def test_complete_sets_enabled_false
     Vanity.playground.collecting = true
     exp = new_ab_test :test do
@@ -248,14 +248,14 @@ class AbTestTest < ActionController::TestCase
       metrics :coolness
       default false
     end
-    
+
     exp.enabled = true
     assert exp.enabled?
-    
+
     exp.enabled = false
     assert !exp.enabled?
   end
-  
+
   def test_cannot_set_enabled_for_inactive
     Vanity.playground.collecting = true
     exp = new_ab_test :test do
@@ -278,19 +278,19 @@ class AbTestTest < ActionController::TestCase
     exp.enabled = false
     assert exp.enabled?
   end
-  
+
   def test_enabled_persists_across_definitions
     Vanity.configuration.experiments_start_enabled = false
     Vanity.playground.collecting = true
-    new_ab_test :test, :enable => false do 
+    new_ab_test :test, :enable => false do
       metrics :coolness
       default false
     end
     assert !experiment(:test).enabled? #starts off false
-    
+
     new_playground
     metric "Coolness"
-    
+
     new_ab_test :test, :enable => false do
       metrics :coolness
       default false
@@ -298,10 +298,10 @@ class AbTestTest < ActionController::TestCase
     assert !experiment(:test).enabled? #still false
     experiment(:test).enabled = true
     assert experiment(:test).enabled? #now true
-    
+
     new_playground
     metric "Coolness"
-    
+
     new_ab_test :test, :enable => false do
       metrics :coolness
       default false
@@ -314,15 +314,15 @@ class AbTestTest < ActionController::TestCase
   def test_enabled_persists_across_definitions_when_starting_enabled
     Vanity.configuration.experiments_start_enabled = true
     Vanity.playground.collecting = true
-    new_ab_test :test, :enable => false do 
+    new_ab_test :test, :enable => false do
       metrics :coolness
       default false
     end
     assert experiment(:test).enabled? #starts off true
-    
+
     new_playground
     metric "Coolness"
-    
+
     new_ab_test :test, :enable => false do
       metrics :coolness
       default false
@@ -330,10 +330,10 @@ class AbTestTest < ActionController::TestCase
     assert experiment(:test).enabled? #still true
     experiment(:test).enabled = false
     assert !experiment(:test).enabled? #now false
-    
+
     new_playground
     metric "Coolness"
-    
+
     new_ab_test :test, :enable => false do
       metrics :coolness
       default false
@@ -342,12 +342,12 @@ class AbTestTest < ActionController::TestCase
     experiment(:test).enabled = true
     assert experiment(:test).enabled? #now true again
   end
-  
+
   def test_choose_random_when_enabled
     regardless_of "Vanity.playground.collecting" do
       metric "Coolness"
 
-      exp = new_ab_test :test do 
+      exp = new_ab_test :test do
         metrics :coolness
         true_false
         default false
@@ -360,20 +360,20 @@ class AbTestTest < ActionController::TestCase
       assert_equal results, [true, false].to_set
     end
   end
-  
+
   def test_choose_default_when_disabled
     exp = new_ab_test :test do
       metrics :coolness
       alternatives 0, 1, 2, 3, 4, 5
       default 3
     end
-    
+
     exp.enabled = false
     100.times.each do
       assert_equal 3, exp.choose.value
     end
   end
-  
+
   def test_choose_outcome_when_finished
     exp = new_ab_test :test do
       metrics :coolness
@@ -386,7 +386,7 @@ class AbTestTest < ActionController::TestCase
       assert_equal 5, exp.choose.value
     end
   end
-  
+
   # -- Experiment metric --
 
   def test_explicit_metric
@@ -1247,7 +1247,7 @@ This experiment did not run long enough to find a clear winner.
       default false
     end
     e = experiment(:quick)
-    e.expects(:warn)
+    Vanity.logger.expects(:warn)
     assert_nothing_raised do
       e.complete!
     end
@@ -1448,9 +1448,9 @@ This experiment did not run long enough to find a clear winner.
     end
     assert_equal results, [:b].to_set
   end
-  
+
   # -- Reset --
-  
+
   def test_reset_clears_participants
     new_ab_test :simple do
       alternatives :a, :b, :c
@@ -1462,20 +1462,20 @@ 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
        default :a
-       metrics :coolness	
-     end	  	
-    experiment(:simple).reset	  	
-    assert_nil experiment(:simple).outcome  	
+       metrics :coolness
+     end
+    experiment(:simple).reset
+    assert_nil experiment(:simple).outcome
     assert_nil experiment(:simple).completed_at
   end
-  
+
   # -- Pick Winner --
-  
+
   def test_complete_with_argument_sets_outcome_and_completes
     new_ab_test :simple do
       alternatives :a, :b, :c

data/test/experiment/base_test.rb

@@ -146,7 +146,7 @@ describe Vanity::Experiment::Base do
     e = experiment(:ab)
     e.complete_if { true }
     e.stubs(:complete!).raises(RuntimeError, "A forced error")
-    e.expects(:warn)
+    Vanity.logger.expects(:warn)
     e.stubs(:identity).returns(:b)
     e.track!(:a, Time.now, 10)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -213,7 +213,7 @@ metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.1.2
+- Vanity 2.2.0
 - --main
 - README.md
 - --webcvs