vanity 2.0.0.beta7 → 2.0.0.beta8

data/.travis.yml

@@ -7,15 +7,15 @@ services:
   - mongodb
   - redis-server
 rvm:
-- 1.9.3
-- 2.0.0
-- 2.1.0
-- 2.2.0
-- ruby-head
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - jruby-19mode
 env:
-- DB=mongodb
-- DB=redis
-- DB=active_record
+  - DB=mongodb
+  - DB=redis
+  - DB=active_record
 gemfile:
   - gemfiles/rails32.gemfile
   - gemfiles/rails4.gemfile
@@ -23,9 +23,3 @@ gemfile:
   - gemfiles/rails42.gemfile
 before_script:
 - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc' # skip installing docs for gems
-matrix:
-  exclude:
-    - rvm: 2.2.0
-      gemfile: gemfiles/rails32.gemfile
-  allow_failures:
-    - rvm: ruby-head

data/Appraisals

@@ -1,7 +1,8 @@
 appraise "rails32" do
-  gem "mocha",  "~> 0.12.8", :require=>false
+  gem "mocha",  "~> 1.0", :require=>false
   gem "minitest", "~>4.2.0"
-  gem "rails", "3.2.1"
+  gem "test-unit", "~> 3.0"
+  gem "rails", "3.2.22"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
@@ -26,4 +27,4 @@ appraise "rails42" do
   gem "rails", "4.2.0"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
-end
+end

data/Gemfile

@@ -7,9 +7,7 @@ gem "rack"
 # Persistence
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "bson_ext"
 gem "mongo"
-gem "sqlite3"
 
 # Math libraries
 gem "integration", "<= 0.1.0"
@@ -22,10 +20,20 @@ gem "garb", "< 0.9.2" # API changes at this version
 gem "timecop", :require=>false
 gem "webmock", :require=>false
 
+platform :ruby do
+  gem "bson_ext"
+  gem "sqlite3", "~> 1.3.10"
+end
+
+platform :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "jdbc-sqlite3"
+end
+
 group :development do
-  gem "appraisal", ">= 1.0.0.beta2" # For setting up test Gemfiles
+  gem "appraisal", "~> 1.0.2" # For setting up test Gemfiles
 
-  gem "jekyll"
+  gem "jekyll", platform: :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"

data/Gemfile.lock

@@ -1,74 +1,126 @@
 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)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activerecord-jdbc-adapter (1.3.15)
+      activerecord (>= 2.2)
     activesupport (2.3.14)
     addressable (2.2.7)
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
-    appraisal (1.0.0.beta2)
+    appraisal (1.0.3)
       bundler
       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)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.3)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1)
+    colorator (0.1)
     crack (0.3.1)
-    directory_watcher (1.4.1)
-    fast-stemmer (1.0.0)
+    execjs (2.5.2)
+    fast-stemmer (1.0.2)
+    ffi (1.9.8)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
+    hitimes (1.2.2)
     i18n (0.7.0)
     integration (0.1.0)
-    jekyll (0.11.2)
-      albino (~> 1.3)
-      classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.13)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-    kramdown (0.13.5)
-    liquid (2.3.0)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
+    jdbc-sqlite3 (3.8.7)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.2.1)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-watch (1.2.1)
+      listen (~> 2.7)
+    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)
+    mercenary (0.3.5)
     minitest (4.7.5)
     mongo (1.6.0)
       bson (= 1.6.0)
-    posix-spawn (0.3.6)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.11)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
     rack (1.1.3)
     rake (10.1.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    redcarpet (3.2.3)
     redis (3.0.6)
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
+    safe_yaml (1.0.4)
+    sass (3.4.13)
     sqlite3 (1.3.10)
-    syntax (1.0.0)
-    thor (0.18.1)
+    thor (0.19.1)
     timecop (0.3.5)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
+      parslet (~> 1.5.0)
     webmock (1.8.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
+    yajl-ruby (1.2.1)
     yard (0.7.5)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   RedCloth
-  appraisal (>= 1.0.0.beta2)
+  activerecord-jdbc-adapter
+  appraisal (~> 1.0.2)
   bson_ext
   bundler (>= 1.0.0)
   garb (< 0.9.2)
   integration (<= 0.1.0)
+  jdbc-sqlite3
   jekyll
   minitest (>= 4.2)
   mongo
@@ -77,7 +129,7 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  sqlite3
+  sqlite3 (~> 1.3.10)
   timecop
   vanity!
   webmock

data/README.rdoc

@@ -6,7 +6,7 @@ Vanity is an A/B testing framework for Rails that is datastore agnostic.
 * All about Vanity: http://vanity.labnotes.org
 * On Github: http://github.com/assaf/vanity
 
-{<img src="https://raw.githubusercontent.com/assaf/vanity/bugfix/readme/doc/images/sidebar_test.png" alt="Dashbarod" />}[http://github.com/assaf/vanity]
+{<img src="https://raw.githubusercontent.com/assaf/vanity/master/doc/images/sidebar_test.png" alt="Dashbarod" />}[http://github.com/assaf/vanity]
 
 == A/B Testing With Rails
 
@@ -43,6 +43,11 @@ A sample <code>config/vanity.yml</code> might look like:
     adapter: redis
     connection: redis://<%= ENV["REDIS_USER"] %>:<%= ENV["REDIS_PASSWORD"] %>@<%= ENV["REDIS_HOST"] %>:<%= ENV["REDIS_PORT"] %>/0
 
+If you want to use your test environment with RSpec you will need to add an adapter to test:
+
+  test:
+  adapter: redis
+  collecting: false
 
 ===== MongoDB Setup
 
@@ -182,7 +187,9 @@ Here's what's tested and known to work:
     Rails: 3.2, 4.x
   Ruby 2.2
     Persistence: Redis, Mongo, ActiveRecord
-    Rails: 4.0
+    Rails: 3.2, 4.x
+
+If you receive 'a warning: circular argument reference - score' this was fixed in [2.0.7 beta](https://github.com/assaf/vanity/commit/1b5bf18636caa5eae279e2aef2e24c923e63b141)
 
 == Testing
 
@@ -190,6 +197,17 @@ For view tests/specs or integration testing, it's handy to set the outcome of an
 
   Vanity.playground.experiment(:price_options).chooses(19)
 
+== Updating documentation
+
+Documenation is written in the textile format in the [docs](docs/) directory, and is hosted on Github Pages. To update the docs commit changes to the master branch in this repository, then:
+
+  bundle exec rake docs # output HTML files into html/
+  git checkout gh-pages
+  mv html/* . # Move generated html to the top of the repo
+  git commit # Add, commit and push any changes!
+
+Go ahead and target a pull request against the `gh-pages` branch.
+
 == Contributing
 
 * Fork the project

data/Rakefile

@@ -8,7 +8,7 @@ desc "Test everything"
 task "test:all"=>"test:adapters"
 
 # Ruby versions we're testing with.
-RUBIES = %w{1.9.3 2.0.0}
+RUBIES = %w{1.9.3 2.0.0 jruby-1.7.13}
 
 # Use rake test:rubies to run all combination of tests (see test:adapters) using
 # all the versions of Ruby specified in RUBIES. Or to test a specific version of
@@ -24,10 +24,10 @@ task "test:rubies", :ruby do |t, args|
   rubies.each do |ruby|
     puts "** Setup #{ruby}"
     sh "env rvm_install_on_use_flag=1 rvm_gemset_create_on_use_flag=1 rvm use #{ruby}@vanity"
-    sh "rvm #{ruby}@vanity rake test:setup"
+    sh "rvm #{ruby}@vanity do rake test:setup"
     puts
     puts "** Test using #{ruby}"
-    sh "rvm #{ruby}@vanity -S bundle exec rake test:adapters #{'--trace' if Rake.application.options.trace}"
+    sh "rvm #{ruby}@vanity do rake test:adapters #{'--trace' if Rake.application.options.trace}"
   end
 end
 
@@ -38,11 +38,11 @@ task "test:setup" do
   rescue LoadError
     sh "gem install bundler"
   end
-  begin # Make sure we got all the dependencies
-    sh "bundle exec ruby -e puts > /dev/null"
-  rescue
-    sh "bundle install"
-  end
+
+  # Make sure we got all the dependencies
+  sh "bundle check || bundle install"
+
+  sh "appraisal install" # Make sure that all of the gemsets are set up
 end
 
 # These are all the adapters we're going to test with.

data/gemfiles/rails32.gemfile

@@ -5,26 +5,35 @@ source "https://rubygems.org"
 gem "rack"
 gem "redis", ">= 2.1"
 gem "redis-namespace", ">= 1.1.0"
-gem "bson_ext"
 gem "mongo"
-gem "sqlite3"
 gem "integration", "<= 0.1.0"
 gem "rubystats"
 gem "garb", "< 0.9.2"
-gem "timecop", :require=>false
-gem "webmock", :require=>false
-gem "mocha", "~> 0.12.8", :require=>false
+gem "timecop", :require => false
+gem "webmock", :require => false
+gem "mocha", "~> 1.0", :require => false
 gem "minitest", "~>4.2.0"
-gem "rails", "3.2.1"
-gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
+gem "test-unit", "~> 3.0"
+gem "rails", "3.2.22"
+gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
 gem "passenger", "~>3.0"
 
 group :development do
-  gem "appraisal", ">= 1.0.0.beta2"
-  gem "jekyll"
+  gem "appraisal", "~> 1.0.2"
+  gem "jekyll", :platform => :ruby
   gem "rake"
   gem "RedCloth"
   gem "yard"
 end
 
-gemspec :path=>".././"
+platforms :ruby do
+  gem "bson_ext"
+  gem "sqlite3", "~> 1.3.10"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "jdbc-sqlite3"
+end
+
+gemspec :path => "../"

data/gemfiles/rails32.gemfile.lock

@@ -7,167 +7,222 @@ 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)
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    RedCloth (4.2.9-java)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
+      mail (~> 2.5.4)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
+    activerecord-jdbc-adapter (1.3.15)
+      activerecord (>= 2.2)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.2.7)
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
-    appraisal (1.0.0.beta2)
+    appraisal (1.0.3)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (3.0.2)
+    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)
-    builder (3.0.0)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
+    builder (3.0.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.3)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1)
+    colorator (0.1)
     crack (0.3.1)
     daemon_controller (1.0.0)
-    directory_watcher (1.4.1)
     erubis (2.7.0)
-    fast-stemmer (1.0.0)
+    execjs (2.5.2)
+    fast-stemmer (1.0.2)
+    ffi (1.9.8)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
-    hike (1.2.1)
-    i18n (0.6.0)
+    hike (1.2.3)
+    hitimes (1.2.2)
+    i18n (0.7.0)
     integration (0.1.0)
-    jekyll (0.11.2)
-      albino (~> 1.3)
-      classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.13)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-    journey (1.0.3)
-    json (1.6.5)
-    kramdown (0.13.5)
-    liquid (2.3.0)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
+    jdbc-sqlite3 (3.8.7)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.2.1)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-watch (1.2.1)
+      listen (~> 2.7)
+    journey (1.0.4)
+    json (1.8.3)
+    json (1.8.3-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)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
+    mercenary (0.3.5)
     metaclass (0.0.4)
-    mime-types (1.17.2)
+    mime-types (1.25.1)
     minitest (4.2.0)
-    mocha (0.12.10)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mongo (1.6.0)
       bson (= 1.6.0)
-    multi_json (1.1.0)
+    multi_json (1.11.1)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     passenger (3.0.11)
       daemon_controller (>= 0.2.5)
       fastthread (>= 1.0.1)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.3)
-    posix-spawn (0.3.6)
-    rack (1.4.1)
-    rack-cache (1.1)
+    polyglot (0.3.5)
+    posix-spawn (0.3.11)
+    power_assert (0.2.2)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
+    rack (1.4.7)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (3.12.2)
       json (~> 1.4)
+    redcarpet (3.2.3)
     redis (3.0.6)
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    sprockets (2.1.2)
+    safe_yaml (1.0.4)
+    sass (3.4.13)
+    sprockets (2.2.3)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
-    syntax (1.0.0)
-    thor (0.14.6)
-    tilt (1.3.3)
+    sqlite3 (1.3.10)
+    test-unit (3.0.9)
+      power_assert
+    thor (0.19.1)
+    tilt (1.4.1)
     timecop (0.3.5)
-    treetop (1.4.10)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.44)
     webmock (1.8.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
+    yajl-ruby (1.2.1)
     yard (0.7.5)
 
 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.0)
-  mocha (~> 0.12.8)
+  mocha (~> 1.0)
   mongo
   passenger (~> 3.0)
   rack
-  rails (= 3.2.1)
+  rails (= 3.2.22)
   rake
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  sqlite3
+  sqlite3 (~> 1.3.10)
+  test-unit (~> 3.0)
   timecop
   vanity!
   webmock