vanity 1.8.1 → 1.8.2

data/.travis.yml

@@ -1,23 +1,65 @@
 language: ruby
 bundler_args: --without development
-script: 'rake appraisal test'
+script: 'bundle exec rake test'
 services:
   - mongodb
 rvm:
 - 1.8.7
 - 1.9.3
 - 2.0.0
-- ruby-head
 env:
 - DB=mongodb
 - DB=redis
 - DB=mysql
 #- DB=postgres
+gemfile:
+  - Gemfile
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile
 before_script:
+- if [[ "`basename $BUNDLE_GEMFILE`" == "Gemfile" ]]; then rvm rubygems 1.8.25; fi # Rubygems 2.0.x fails with Rails 2.3
 - "mysql -e 'create database vanity_test;' >/dev/null"
-- "rake appraisal:install"
-#- "psql -c 'create database vanity_test;' -U postgres >/dev/null"
+#- if [[ "$DB" == "pgsql" ]]; then psql -c 'create database vanity_test;' -U postgres >/dev/null; fi
 matrix:
-  allow_failures:
+  exclude:
+    # Rails 2 is not officially supported on Ruby 1.9.3
+    - rvm: 1.9.3
+      env: DB=mongodb
+      gemfile: Gemfile
+    - rvm: 1.9.3
+      env: DB=redis
+      gemfile: Gemfile
+    - rvm: 1.9.3
+      env: DB=mysql
+      gemfile: Gemfile
+    # Rails <= 3.2 is not officially supported on Ruby 2.0.0
+    - rvm: 2.0.0
+      env: DB=mongodb
+      gemfile: Gemfile
+    - rvm: 2.0.0
+      env: DB=redis
+      gemfile: Gemfile
+    - rvm: 2.0.0
+      env: DB=mysql
+      gemfile: Gemfile
+    - rvm: 2.0.0
+      env: DB=mongodb
+      gemfile: gemfiles/rails3.gemfile
     - rvm: 2.0.0
+      env: DB=redis
+      gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.0.0
+      env: DB=mysql
+      gemfile: gemfiles/rails3.gemfile
+  allow_failures:
     - rvm: ruby-head
+    - rvm: 2.0.0
+      env: DB=mongodb
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: 2.0.0
+      env: DB=redis
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: 2.0.0
+      env: DB=mysql
+      gemfile: gemfiles/rails31.gemfile

data/Appraisals

@@ -1,15 +1,17 @@
 appraise "rails3" do
   gem "rails", "3.0.11"
+  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
 
 appraise "rails31" do
   gem "rails", "3.1.3"
+  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
 
 appraise "rails32" do
   gem "rails", "3.2.1"
+  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
-

data/CHANGELOG

@@ -1,8 +1,14 @@
+== 1.8.2 (2013-10-27)
+
+Optimize metric_values query (@zawaideh).
+Add an on_assignment hook for experiments which is called when an identity is given an assignment in ab_test (@lotze)
+Finish Ruby 2.0 compatiblity with testing setup and add ActionMailer test coverage (@phillbaker).
+
 == 1.8.1 (2013-10-05)
 
 Added vanity_experiments helper for rails to return read only copy of active experiments (@iceberg901).
 Fixed support for Mass Assignment on Rails 3.2 (@hcarver).
-Fixed commandlin usage (@phillbaker).
+Fixed commandline usage (@phillbaker).
 
 
 == 1.8.0 (2012-03-12)

data/Gemfile

@@ -1,22 +1,33 @@
 source 'https://rubygems.org'
 gemspec
 
-gem "appraisal"
+# Frameworks
+gem "rack"
+gem "rails", "~>2.3.8"
+
+# Servers
+gem "passenger", "~>2.0"
+
+# Persistence
 gem "bson_ext"
-gem "garb"
-gem "mocha"
 gem "mongo"
-gem "bson_ext"
 gem "mysql"
-gem "passenger", "~>2.0"
 gem "pg"
-gem "rails", "~>2.3.8"
-gem "rack"
-gem "shoulda"
-gem "timecop"
-gem "webmock"
+
+# APIs
+gem "garb"
+
+# Compatibility
 gem "SystemTimer", "1.2.3", :platforms => :mri_18
 
+# Testing
+gem "appraisal"
+
+gem "mocha", :require=>false
+gem "shoulda", :require=>false # Requires test/unit
+gem "timecop", :require=>false
+gem "webmock", :require=>false
+
 group :development do
   gem "jekyll"
   gem "rake"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (1.8.1)
+    vanity (1.8.2)
       redis (~> 2.0)
       redis-namespace (~> 1.0.0)
 

data/README.rdoc

@@ -1,5 +1,5 @@
 = Vanity
-{<img src="https://travis-ci.org/assaf/vanity.png?branch=feature/readme-update" alt="Build Status" />}[https://travis-ci.org/assaf/vanity]
+{<img src="https://travis-ci.org/assaf/vanity.png?branch=master" alt="Build Status" />}[https://travis-ci.org/assaf/vanity]
 
 Vanity is an Experiment Driven Development framework for Rails.
 
@@ -96,13 +96,16 @@ If robots or spiders make up a significant portion of your sites traffic they ca
 
 == Compatibility Matrix
 
-Running Rails 2 on Ruby 2? Vanity probably won't work for you. But here's what does:
+Here's what's tested and known to work:
 
-  Persistence: Redis, Mongo, ActiveRecord
-  Rails: 2.3, 3, 3.1, 3.2
-  Ruby: 1.8.7, 1.9.3
+  Ruby 1.8.7, 1.9.3
+    Persistence: Redis, Mongo, ActiveRecord
+    Rails: 2.3, 3, 3.1, 3.2
+  Ruby 2.0
+    Persistence: Redis, Mongo, ActiveRecord
+    Rails: 3.2
 
-NOTE: Support for Rails 4 and Ruby 2.0 are coming soon!
+NOTE: Support for Rails 4 is coming soon!
 
 == Contributing
 

data/gemfiles/rails3.gemfile

@@ -2,19 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "garb"
-gem "mocha"
-gem "mongo"
+gem "rack"
 gem "bson_ext"
+gem "mongo"
 gem "mysql"
 gem "pg"
-gem "rack"
-gem "shoulda"
-gem "timecop"
-gem "webmock"
+gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
+gem "appraisal"
+gem "mocha", :require=>false
+gem "shoulda", :require=>false
+gem "timecop", :require=>false
+gem "webmock", :require=>false
 gem "rails", "3.0.11"
+gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"
 
 gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: git://github.com/zoltankiss/fastthread.git
+  revision: 56e6ce7c1780797a354d5befe9a9a9869bbc7e3e
+  specs:
+    fastthread (1.0.7)
+
 PATH
   remote: /Users/phill/Development/ruby/vanity
   specs:
-    vanity (1.8.1)
+    vanity (1.8.2)
       redis (~> 2.0)
       redis-namespace (~> 1.0.0)
 
@@ -49,7 +55,6 @@ GEM
     daemon_controller (1.0.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    fastthread (1.0.7)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
@@ -121,6 +126,7 @@ DEPENDENCIES
   SystemTimer (= 1.2.3)
   appraisal
   bson_ext
+  fastthread!
   garb
   mocha
   mongo

data/gemfiles/rails31.gemfile

@@ -2,19 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "garb"
-gem "mocha"
-gem "mongo"
+gem "rack"
 gem "bson_ext"
+gem "mongo"
 gem "mysql"
 gem "pg"
-gem "rack"
-gem "shoulda"
-gem "timecop"
-gem "webmock"
+gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
+gem "appraisal"
+gem "mocha", :require=>false
+gem "shoulda", :require=>false
+gem "timecop", :require=>false
+gem "webmock", :require=>false
 gem "rails", "3.1.3"
+gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"
 
 gemspec :path=>"../"

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: git://github.com/zoltankiss/fastthread.git
+  revision: 56e6ce7c1780797a354d5befe9a9a9869bbc7e3e
+  specs:
+    fastthread (1.0.7)
+
 PATH
   remote: /Users/phill/Development/ruby/vanity
   specs:
-    vanity (1.8.1)
+    vanity (1.8.2)
       redis (~> 2.0)
       redis-namespace (~> 1.0.0)
 
@@ -49,7 +55,6 @@ GEM
     crack (0.3.1)
     daemon_controller (1.0.0)
     erubis (2.7.0)
-    fastthread (1.0.7)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
@@ -132,6 +137,7 @@ DEPENDENCIES
   SystemTimer (= 1.2.3)
   appraisal
   bson_ext
+  fastthread!
   garb
   mocha
   mongo

data/gemfiles/rails32.gemfile

@@ -2,19 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "garb"
-gem "mocha"
-gem "mongo"
+gem "rack"
 gem "bson_ext"
+gem "mongo"
 gem "mysql"
 gem "pg"
-gem "rack"
-gem "shoulda"
-gem "timecop"
-gem "webmock"
+gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
+gem "appraisal"
+gem "mocha", :require=>false
+gem "shoulda", :require=>false
+gem "timecop", :require=>false
+gem "webmock", :require=>false
 gem "rails", "3.2.1"
+gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"
 
 gemspec :path=>"../"

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: git://github.com/zoltankiss/fastthread.git
+  revision: 56e6ce7c1780797a354d5befe9a9a9869bbc7e3e
+  specs:
+    fastthread (1.0.7)
+
 PATH
   remote: /Users/phill/Development/ruby/vanity
   specs:
-    vanity (1.8.1)
+    vanity (1.8.2)
       redis (~> 2.0)
       redis-namespace (~> 1.0.0)
 
@@ -48,7 +54,6 @@ GEM
     crack (0.3.1)
     daemon_controller (1.0.0)
     erubis (2.7.0)
-    fastthread (1.0.7)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
@@ -130,6 +135,7 @@ DEPENDENCIES
   SystemTimer (= 1.2.3)
   appraisal
   bson_ext
+  fastthread!
   garb
   mocha
   mongo

data/lib/vanity.rb

@@ -31,6 +31,7 @@ require "vanity/adapters/mongodb_adapter"
 require "vanity/adapters/mock_adapter"
 # Playground.
 require "vanity/playground"
+require "vanity/autoconnect"
 require "vanity/helpers"
 # Integration with various frameworks.
 require "vanity/frameworks"

data/lib/vanity/adapters/abstract_adapter.rb

@@ -110,6 +110,11 @@ module Vanity
         fail "Not implemented"
       end
 
+      # Determines if a participant already has seen this alternative in this experiment.
+      def ab_seen(experiment, identity, assignment)
+	fail "Not implemented"
+      end
+
       # Records a conversion in this experiment for the given alternative.
       # Associates a value with the conversion (default to 1). If implicit is
       # true, add particpant if not already recorded for this experiment. If

data/lib/vanity/adapters/active_record_adapter.rb

@@ -42,7 +42,7 @@ module Vanity
       class VanityExperiment < VanityRecord
         self.table_name = :vanity_experiments
         has_many :vanity_conversions, :dependent => :destroy
-	attr_accessible :experiment_id if respond_to?(:attr_accessible)
+        attr_accessible :experiment_id if respond_to?(:attr_accessible)
 
         # Finds or creates the experiment
         def self.retrieve(experiment)
@@ -64,7 +64,7 @@ module Vanity
       # Participant model
       class VanityParticipant < VanityRecord
         self.table_name = :vanity_participants
-	attr_accessible :experiment_id, :identity, :seen, :shown, :converted if respond_to?(:attr_accessible)
+        attr_accessible :experiment_id, :identity, :seen, :shown, :converted if respond_to?(:attr_accessible)
 
         # Finds the participant by experiment and identity. If
         # create is true then it will create the participant
@@ -127,7 +127,7 @@ module Vanity
         connection = VanityMetric.connection
         record = VanityMetric.retrieve(metric)
         dates = (from.to_date..to.to_date).map(&:to_s)
-        conditions = [connection.quote_column_name('date') + ' IN (?)', dates]
+        conditions = [connection.quote_column_name('date') + ' BETWEEN ? AND ?', from.to_date, to.to_date]
         order = "#{connection.quote_column_name('date')}"
         select = "sum(#{connection.quote_column_name('value')}) AS value, #{connection.quote_column_name('date')}"
         group_by = "#{connection.quote_column_name('date')}"
@@ -216,12 +216,19 @@ module Vanity
         VanityParticipant.retrieve(experiment, identity, true, :seen => alternative)
       end
 
+      # Determines if a participant already has seen this alternative in this experiment.
+      def ab_seen(experiment, identity, alternative)
+      	participant = VanityParticipant.retrieve(experiment, identity, false)
+      	participant && participant.seen == alternative.id
+      end
+
       # Records a conversion in this experiment for the given alternative.
       # Associates a value with the conversion (default to 1). If implicit is
-      # true, add particpant if not already recorded for this experiment. If
-      # implicit is false (default), only add conversion is participant
+      # true, add participant if not already recorded for this experiment. If
+      # implicit is false (default), only add conversion if participant
       # previously recorded as participating in this experiment.
       def ab_add_conversion(experiment, alternative, identity, count = 1, implicit = false)
+        participant = VanityParticipant.retrieve(experiment, identity, false)
         VanityParticipant.retrieve(experiment, identity, implicit, :converted => alternative)
         VanityExperiment.retrieve(experiment).increment_conversion(alternative, count)
       end

data/lib/vanity/adapters/mongodb_adapter.rb

@@ -150,6 +150,12 @@ module Vanity
         @participants.update({ :experiment=>experiment, :identity=>identity }, { "$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 && participant["seen"].first == alternative.id
+      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)