vanity 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 843eb11cbc6e68d0c354f22405f3e3184ed8c4e6
-  data.tar.gz: a419f3516e37ec3c8a4028cdee22286a7b0251c0
+  metadata.gz: 63e3e69d3a1d79cb7f36548e9b7c5a2ddf626b17
+  data.tar.gz: 645fa9b2a710b2f0b7f631747bda160aed94c9eb
 SHA512:
-  metadata.gz: 258d933e1eabd33b645083f25f70a1075fbfcf6086f3f388da1519ed11015ad1af7cd960e88276687b103f8776f607095505137f73bb48015362c2b1651b85ce
-  data.tar.gz: d85493029ebc5e913accb04a2dbafb505f6809bf72103303d4f4948656a308052f2e56716962c2cdc44a0fa785721ff31cacc0937dd0a06fa0fcf1d3d22eb6c5
+  metadata.gz: 1aba836ab77005465669a51695f8eb6fb01ac76841eea6cff3e5202b9c8275eb7777bf0c0dc1ff2c5f623d6e981bc161dcb8689b19f985f74a2a86bfe0c0b84e
+  data.tar.gz: 8e134db0be9cc68e9effd93170fa931bf03787cdc57bb438842ee5399aab8f549f33ca90c7afbe462da7d50bf3c2dacc7ab6a01bbf3af6506d7b0848df05c3ed

data/.travis.yml

@@ -24,3 +24,10 @@ gemfile:
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
   - gemfiles/rails42_protected_attributes.gemfile
+  - gemfiles/rails5.gemfile
+matrix:
+  exclude:
+    - rvm: 2.1
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails5.gemfile

data/Appraisals

@@ -29,3 +29,10 @@ appraise "rails42-protected_attributes" do
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
+
+appraise "rails5" do
+  gem "mocha",  "~> 1.0", :require=>false
+  gem "rails", "5.0.0"
+  gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
+  gem "passenger", "~>3.0"
+end

data/CHANGELOG

@@ -1,4 +1,10 @@
-== 2.2.4 (2016-7-21)
+== 2.2.6 (2016-10-04)
+* Fixes for `Vanity.ab_test()` vs.  view helper `ab_test` (@phillbaker)
+
+== 2.2.5 (2016-9-23)
+* Updates for rails5 compatbility (@phillbaker)
+
+== 2.2.4 (2016-9-21)
 * Fix typo in template (@arthurxaud)
 
 == 2.2.3 (2016-6-25)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.2.4)
+    vanity (2.2.6)
       i18n
 
 GEM

data/README.md

@@ -19,7 +19,9 @@ Vanity is an A/B testing framework for Rails that is datastore agnostic.
 
 Add to your Gemfile:
 
-    gem "vanity"
+```ruby
+gem "vanity"
+```
 
 (For support for older versions of Rails and Ruby 1.8, please see the [1.9.x
 branch](https://github.com/assaf/vanity/tree/1-9-stable).)
@@ -35,8 +37,10 @@ Datastores should be configured using a `config/vanity.yml`.
 
 Add to your Gemfile:
 
-    gem "redis", ">= 2.1"
-    gem "redis-namespace", ">= 1.1.0"
+```ruby
+gem "redis", ">= 2.1"
+gem "redis-namespace", ">= 1.1.0"
+```
 
 By default Vanity is configured to use Redis on localhost port 6379 with
 database 0.
@@ -62,7 +66,7 @@ test:
 
 To re-use an existing redis connection, you can call `Vanity.connect!` explicitly, for example:
 
-```
+```ruby
 Vanity.connect!(
   adapter: :redis,
   redis: $redis
@@ -134,7 +138,7 @@ $ rake db:migrate
 If you're using a forking server (like Passenger or Unicorn), you should
 reconnect after a new worker is created:
 
-```
+```ruby
 # unicorn.rb
 after_fork do |server, worker|
   defined?(Vanity) && Vanity.reconnect!
@@ -153,7 +157,7 @@ end
 
 If you're using explicit options with `Vanity.connect!`, you should call `disconnect!` first, for example:
 
-```
+```ruby
 Vanity.disconnect!
 Vanity.connect!(
   adapter: 'redis',
@@ -294,8 +298,11 @@ Here's what's tested and known to work:
       Rails: 3.2, 4.1, 4.2
     Ruby 2.2
       Persistence: Redis, Mongo, ActiveRecord
-      Rails: 3.2, 4.1, 4.2
+      Rails: 3.2, 4.1, 4.2, 5
     Ruby 2.3
+      Persistence: Redis, Mongo, ActiveRecord
+      Rails: 3.2, 4.1, 4.2, 5
+    JRuby 1.9
       Persistence: Redis, Mongo, ActiveRecord
       Rails: 3.2, 4.1, 4.2
 

data/Rakefile

@@ -69,6 +69,7 @@ Rake::TestTask.new(:test) do |task|
   task.libs << "test"
   task.pattern = "test/**/*_test.rb"
   task.verbose = false
+  task.warning = false
 end
 
 task :default=>:test

data/bin/vanity

@@ -3,7 +3,7 @@ if File.exist?("config/boot.rb") && File.exist?("config/environment.rb")
   require "./config/environment"
 else
   path = File.expand_path("../lib", File.dirname(__FILE__))
-  $LOAD_PATH.unshift path unless $LOAD_PATH.include?(path)
+  $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
   require "vanity"
 end
 
@@ -11,7 +11,7 @@ require "optparse"
 
 playground = Vanity.playground
 options = Struct.new(:output).new
-opts = OptionParser.new("", 24, "  ") do |opts|
+parser = OptionParser.new("", 24, "  ") do |opts|
   opts.banner = "Usage: #{File.basename($0)} [options] command\n"
   opts.banner << "Commands:\n"
   opts.banner << "  list    List all experiments and metrics\n"
@@ -19,17 +19,17 @@ opts = OptionParser.new("", 24, "  ") do |opts|
 
   opts.separator ""
   opts.separator "Reporting options:"
-  opts.on "--output FILE", "Write report to this file (default: stdout)" do |path|
-    options.output = path
+  opts.on "--output FILE", "Write report to this file (default: stdout)" do |report_path|
+    options.output = report_path
   end
 
   opts.separator ""
   opts.separator "Common options:"
-  opts.on "--load_path PATH", "Path to experiments directory (default: #{playground.load_path})" do |path|
-    playground.load_path = path
+  opts.on "--load_path PATH", "Path to experiments directory (default: #{playground.load_path})" do |load_path|
+    playground.load_path = load_path
   end
   opts.on "-d", "--database url", "Database connection URL (e.g. redis://localhost:6379)" do |conn|
-    playground.establish_connection conn
+    playground.establish_connection(conn)
   end
   opts.on_tail "-h", "--help", "Show this message" do
     puts opts.to_s.gsub(/^.*DEPRECATED.*$/s, '')
@@ -41,9 +41,9 @@ opts = OptionParser.new("", 24, "  ") do |opts|
   end
 end
 
-opts.parse!(ARGV)
+parser.parse!(ARGV)
 if ARGV.empty?
-  puts opts.banner
+  puts parser.banner
   exit
 end
 

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.2.4)
+    vanity (2.2.6)
       i18n
 
 GEM
@@ -52,6 +52,7 @@ GEM
     arel (3.0.3)
     blankslate (2.1.2.4)
     bson (4.0.2)
+    bson (4.0.2-java)
     builder (3.0.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)

data/gemfiles/rails41.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .././
   specs:
-    vanity (2.2.4)
+    vanity (2.2.6)
       i18n
 
 GEM
@@ -51,6 +51,7 @@ GEM
     arel (5.0.1.20140414130214)
     blankslate (2.1.2.4)
     bson (4.0.2)
+    bson (4.0.2-java)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)

data/gemfiles/rails42.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.2.4)
+    vanity (2.2.6)
       i18n
 
 GEM
@@ -60,6 +60,7 @@ GEM
     arel (6.0.0)
     blankslate (2.1.2.4)
     bson (4.0.2)
+    bson (4.0.2-java)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)

data/gemfiles/rails42_protected_attributes.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ../
   specs:
-    vanity (2.2.4)
+    vanity (2.2.6)
       i18n
 
 GEM

data/gemfiles/rails5.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack"
+gem "redis", ">= 2.1"
+gem "redis-namespace", ">= 1.1.0"
+gem "mongo", "~> 2.1"
+gem "integration", "<= 0.1.0"
+gem "rubystats", ">= 0.2.5"
+gem "garb", "< 0.9.2", :require => false
+gem "mocha", "~> 1.0", :require => false
+gem "rails", "5.0.0"
+gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
+gem "passenger", "~>3.0"
+
+group :development do
+  gem "rake"
+  gem "RedCloth"
+  gem "yard"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.10"
+  gem "jekyll", "~> 2.5.3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "jdbc-sqlite3"
+end
+
+gemspec :development_group => :test, :path => "../"

data/gemfiles/rails5.gemfile.lock

@@ -0,0 +1,256 @@
+GIT
+  remote: git://github.com/zoltankiss/fastthread.git
+  revision: cefbca3009b9c68df5e473d840462ebcc7fa1504
+  specs:
+    fastthread (1.0.7)
+
+PATH
+  remote: ../
+  specs:
+    vanity (2.2.6)
+      i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.3.0)
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    appraisal (1.0.3)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.0.0)
+    blankslate (2.1.2.4)
+    bson (4.1.1)
+    builder (3.2.2)
+    classifier-reborn (2.0.4)
+      fast-stemmer (~> 1.0)
+    coderay (1.1.1)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
+    colorator (0.1)
+    concurrent-ruby (1.0.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    daemon_controller (1.2.0)
+    erubis (2.7.0)
+    execjs (2.6.0)
+    fakefs (0.8.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    fast-stemmer (1.0.2)
+    ffi (1.9.10)
+    garb (0.9.1)
+      activesupport (>= 2.2.0)
+      crack (>= 0.1.6)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    hashdiff (0.3.0)
+    i18n (0.7.0)
+    integration (0.1.0)
+    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.4.0)
+      octokit (~> 4.2)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.4.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.11.1)
+    liquid (2.6.3)
+    listen (3.0.7)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mercenary (0.3.6)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    mongo (2.2.5)
+      bson (~> 4.0)
+    multipart-post (2.0.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    passenger (3.0.21)
+      daemon_controller (>= 1.0.0)
+      fastthread (>= 1.0.1)
+      rack
+      rake (>= 0.8.1)
+    pkg-config (1.1.7)
+    posix-spawn (0.3.11)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    redcarpet (3.3.4)
+    redis (3.3.0)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    rubystats (0.2.5)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+    slop (3.6.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    timecop (0.8.1)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    webmock (2.0.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+    yajl-ruby (1.2.1)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  activerecord-jdbc-adapter
+  appraisal (~> 1.0.2)
+  bundler (>= 1.8.0)
+  fakefs
+  fastthread!
+  garb (< 0.9.2)
+  integration (<= 0.1.0)
+  jdbc-sqlite3
+  jekyll (~> 2.5.3)
+  minitest (>= 4.2)
+  mocha (~> 1.0)
+  mongo (~> 2.1)
+  passenger (~> 3.0)
+  pry
+  rack
+  rails (= 5.0.0)
+  rake
+  redis (>= 2.1)
+  redis-namespace (>= 1.1.0)
+  rubystats (>= 0.2.5)
+  sqlite3 (~> 1.3.10)
+  timecop
+  vanity!
+  webmock
+  yard
+
+BUNDLED WITH
+   1.10.6

data/lib/vanity/adapters/redis_adapter.rb

@@ -91,7 +91,7 @@ module Vanity
       end
 
       def destroy_metric(metric)
-        @metrics.del *@metrics.keys("#{metric}:*")
+        @metrics.del(*@metrics.keys("#{metric}:*"))
       end
 
 
@@ -221,7 +221,7 @@ module Vanity
       def destroy_experiment(experiment)
         @experiments.del "#{experiment}:outcome", "#{experiment}:created_at", "#{experiment}:completed_at"
         alternatives = @experiments.keys("#{experiment}:alts:*")
-        @experiments.del *alternatives unless alternatives.empty?
+        @experiments.del(*alternatives) unless alternatives.empty?
       end
 
       protected

data/lib/vanity/autoconnect.rb

@@ -62,7 +62,7 @@ module Vanity
 
       def current_rake_tasks
         ::Rake.application.top_level_tasks
-      rescue => e
+      rescue
         []
       end
     end

data/lib/vanity/configuration.rb

@@ -208,7 +208,7 @@ module Vanity
       file_name ||= config_file
       file_path = File.join(config_path, file_name)
 
-      if File.exists?(file_path)
+      if File.exist?(file_path)
         config = YAML.load(ERB.new(File.read(file_path)).result)
         config ||= {}
         params_for_environment = config[environment.to_s]

data/lib/vanity/experiment/ab_test.rb

@@ -460,7 +460,7 @@ module Vanity
       #   end
       def outcome_is(&block)
         raise ArgumentError, "Missing block" unless block
-        raise "outcome_is already called on this experiment" if @outcome_is
+        raise "outcome_is already called on this experiment" if defined?(@outcome_is)
         @outcome_is = block
       end
 
@@ -478,7 +478,7 @@ module Vanity
         super
 
         unless outcome
-          if @outcome_is
+          if defined?(@outcome_is)
             begin
               result = @outcome_is.call
               outcome = result.id if Alternative === result && result.experiment == self
@@ -511,26 +511,18 @@ module Vanity
         self
       end
 
-      # clears all collected data for the experiment
-      def reset
-        connection.destroy_experiment(@id)
-        connection.set_experiment_created_at(@id, Time.now)
-        @outcome = @completed_at = nil
-        self
-      end
-
       # Set up tracking for metrics and ensure that the attributes of the ab_test
       # are valid (e.g. has alternatives, has a default, has metrics).
       # If collecting, this method will also store this experiment into the db.
       # In most cases, you call this method right after the experiment's been instantiated
       # and declared.
       def save
-        if @saved
+        if defined?(@saved)
           Vanity.logger.warn("Experiment #{name} has already been saved")
           return
         end
         @saved = true
-        true_false unless @alternatives
+        true_false unless defined?(@alternatives)
         fail "Experiment #{name} needs at least two alternatives" unless @alternatives.size >= 2
         if !@is_default_set
           default(@alternatives.first)
@@ -542,10 +534,10 @@ module Vanity
           @default = @alternatives.first
         end
         super
-        if @metrics.nil? || @metrics.empty?
+        if !defined?(@metrics) || @metrics.nil? || @metrics.empty?
           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]
+          default_metric = @playground.metrics[id] ||= Vanity::Metric.new(@playground, name)
+          @metrics = [default_metric]
         end
         @metrics.each do |metric|
           metric.hook(&method(:track!))
@@ -636,12 +628,12 @@ module Vanity
 
       def filter_visitor?(request, identity)
         @playground.request_filter.call(request) ||
-          (@request_filter_block && @request_filter_block.call(request, identity))
+          (defined?(@request_filter_block) && @request_filter_block && @request_filter_block.call(request, identity))
       end
 
       def call_on_assignment_if_available(identity, index)
         # if we have an on_assignment block, call it on new assignments
-        if @on_assignment_block
+        if defined?(@on_assignment_block) && @on_assignment_block
           assignment = alternatives[index]
           if !connection.ab_seen @id, identity, assignment
             @on_assignment_block.call(Vanity.context, identity, assignment, self)
@@ -651,7 +643,7 @@ module Vanity
 
       def rebalance_if_necessary!
         # if we are rebalancing probabilities, keep track of how long it has been since we last rebalanced
-        if @rebalance_frequency
+        if defined?(@rebalance_frequency) && @rebalance_frequency
           @assignments_since_rebalancing += 1
           if @assignments_since_rebalancing >= @rebalance_frequency
             @assignments_since_rebalancing = 0
@@ -661,7 +653,7 @@ module Vanity
       end
 
       def has_alternative_weights?(args)
-        @alternatives.nil? && args.size == 1 && args[0].is_a?(Hash)
+        (!defined?(@alternatives) || @alternatives.nil?) && args.size == 1 && args[0].is_a?(Hash)
       end
 
       def build_alternatives_with_weights(args)
@@ -688,10 +680,10 @@ module Vanity
       end
 
       begin
-        a = 50.0
+        avg = 50.0
         # Returns array of [z-score, percentage]
         norm_dist = []
-        (0.0..3.1).step(0.01) { |x| norm_dist << [x, a += 1 / Math.sqrt(2 * Math::PI) * Math::E ** (-x ** 2 / 2)] }
+        (0.0..3.1).step(0.01) { |x| norm_dist << [x, avg += 1 / Math.sqrt(2 * Math::PI) * Math::E ** (-x ** 2 / 2)] }
         # We're really only interested in 90%, 95%, 99% and 99.9%.
         Z_TO_PROBABILITY = [90, 95, 99, 99.9].map { |pct| [norm_dist.find { |x,a| a >= pct }.first, pct] }.reverse
       end

data/lib/vanity/experiment/alternative.rb

@@ -25,21 +25,21 @@ module Vanity
 
       # Number of participants who viewed this alternative.
       def participants
-        load_counts unless @participants
+        load_counts unless defined?(@participants)
         @participants
       end
 
       # Number of participants who converted on this alternative (a
       # participant is counted only once).
       def converted
-        load_counts unless @converted
+        load_counts unless defined?(@converted)
         @converted
       end
 
       # Number of conversions for this alternative (same participant may be
       # counted more than once).
       def conversions
-        load_counts unless @conversions
+        load_counts unless defined?(@conversions)
         @conversions
       end
 

data/lib/vanity/experiment/base.rb

@@ -59,9 +59,6 @@ module Vanity
         @created_at ||= connection.get_experiment_created_at(@id)
       end
 
-      # Time stamp when experiment was completed.
-      attr_reader :completed_at
-
       # Returns the type of this experiment as a symbol (e.g. :ab_test).
       def type
         self.class.type
@@ -109,7 +106,7 @@ module Vanity
       #   puts "Just defined: " + experiment(:simple).description
       def description(text = nil)
         @description = text if text
-        @description
+        @description if defined?(@description)
       end
 
 
@@ -121,7 +118,7 @@ module Vanity
       #   end
       def complete_if(&block)
         raise ArgumentError, "Missing block" unless block
-        raise "complete_if already called on this experiment" if @complete_block
+        raise "complete_if already called on this experiment" if defined?(@complete_block)
         @complete_block = block
       end
 
@@ -188,7 +185,7 @@ module Vanity
       # Derived classes call this after state changes that may lead to
       # experiment completing.
       def check_completion!
-        if @complete_block
+        if defined?(@complete_block) && @complete_block
           begin
             complete! if @complete_block.call
           rescue => e

data/lib/vanity/experiment/definition.rb

@@ -17,7 +17,7 @@ module Vanity
         fail "Experiment #{@experiment_id} already defined in playground" if playground.experiments[@experiment_id]
         klass = Experiment.const_get(type.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase })
         experiment = klass.new(playground, @experiment_id, name, options)
-        experiment.instance_eval &block
+        experiment.instance_eval(&block)
         experiment.save
         playground.experiments[@experiment_id] = experiment
       end

data/lib/vanity/frameworks/rails.rb

@@ -41,12 +41,6 @@ module Vanity
       #     use_vanity { |controller| controller.params[:project_id] }
       #   end
       def use_vanity(method_name = nil, &block)
-        define_method :vanity_store_experiment_for_js do |name, alternative|
-          @_vanity_experiments ||= {}
-          @_vanity_experiments[name] ||= alternative
-          @_vanity_experiments[name].value
-        end
-
         define_method(:vanity_identity_block) { block }
         define_method(:vanity_identity_method) { method_name }
 
@@ -61,7 +55,7 @@ module Vanity
     module Identity
       def vanity_identity # :nodoc:
         return vanity_identity_block.call(self) if vanity_identity_block
-        return @vanity_identity if @vanity_identity
+        return @vanity_identity if defined?(@vanity_identity) && @vanity_identity
 
         # With user sign in, it's possible to visit not-logged in, get
         # cookied and shown alternative A, then sign in and based on
@@ -162,20 +156,22 @@ module Vanity
       # :null_abc experiment is chosen and the user redirected to
       # http://example.com/.
       def vanity_query_parameter_filter
-        if request.get? && params[:_vanity]
-          hashes = Array(params.delete(:_vanity))
+        query_params = request.query_parameters
+        if request.get? && query_params[:_vanity]
+          hashes = Array(query_params.delete(:_vanity))
           Vanity.playground.experiments.each do |id, experiment|
             if experiment.respond_to?(:alternatives)
               experiment.alternatives.each do |alt|
-                if hash = hashes.delete(experiment.fingerprint(alt))
-                  experiment.chooses alt.value
+                if hashes.delete(experiment.fingerprint(alt))
+                  experiment.chooses(alt.value)
                   break
                 end
               end
             end
             break if hashes.empty?
           end
-          redirect_to url_for(params)
+          path_parts = [url_for, query_params.to_query]
+          redirect_to(path_parts.join('?'))
         end
       end
 
@@ -224,7 +220,8 @@ module Vanity
       #     <%= count %> features to choose from!
       #   <% end %>
       def ab_test(name, &block)
-        value = setup_experiment(name)
+        current_request = respond_to?(:request) ? self.request : nil
+        value = Vanity.ab_test(name, current_request)
 
         if block
           content = capture(value, &block)
@@ -251,7 +248,7 @@ module Vanity
       end
 
       def vanity_js
-        return if @_vanity_experiments.nil? || @_vanity_experiments.empty?
+        return if Vanity.context.vanity_active_experiments.nil? || Vanity.context.vanity_active_experiments.empty?
         javascript_tag do
           render :file => Vanity.template("_vanity"), :formats => [:js]
         end
@@ -291,25 +288,14 @@ module Vanity
       #     </script>
       #   <% end %>
       def vanity_experiments
-        @_vanity_experiments ||= {}
-        experiments = {}
+        edit_safe_experiments = {}
 
-        @_vanity_experiments.each do |name, alternative|
-          experiments[name] = alternative.clone
+        Vanity.context.vanity_active_experiments.each do |name, alternative|
+          edit_safe_experiments[name] = alternative.clone
         end
 
-        experiments
-      end
-
-      protected
-
-      def setup_experiment(name)
-        @_vanity_experiments ||= {}
-        request = respond_to?(:request) ? self.request : nil
-        @_vanity_experiments[name] ||= Vanity.playground.experiment(name.to_sym).choose(request)
-        @_vanity_experiments[name].value
+        edit_safe_experiments
       end
-
     end
 
 

data/lib/vanity/helpers.rb

@@ -1,5 +1,5 @@
 module Vanity
-  # Helper methods available on Object.
+  # Helper methods available on the Vanity module.
   #
   # @example From ERB template
   #   <%= ab_test(:greeting) %> <%= current_user.name %>
@@ -17,7 +17,6 @@ module Vanity
   #     end
   #   end
   module Helpers
-
     # This method returns one of the alternative values in the named A/B test.
     #
     # @example A/B two alternatives for a page
@@ -33,21 +32,15 @@ module Vanity
     #     render action: Vanity.ab_test(:new_page)
     #   end
     # @since 1.2.0
-    def ab_test(name, &block)
-      # TODO refactor with Vanity::Rails::Helpers#ab_test, however that's used
-      # within Rails views
-      request = respond_to?(:request) ? self.request : nil
-      if Vanity.playground.using_js?
-        value = Vanity.context.vanity_store_experiment_for_js name, Vanity.playground.experiment(name).choose(request)
-      else
-        value = Vanity.playground.experiment(name).choose(request).value
-      end
+    def ab_test(name, request=nil, &block)
+      request ||= Vanity.context.respond_to?(:request) ? Vanity.context.request : nil
+
+      alternative = Vanity.playground.experiment(name).choose(request)
+      Vanity.context.vanity_add_to_active_experiments(name, alternative)
+
+      Vanity.logger.warn("Deprecated: This method used to accept a block, however, calling it with a block would result in an exception. The block will be removed from the signature in an upcoming version.") if block
 
-      if block
-        content = capture(value, &block)
-      else
-        value
-      end
+      alternative.value
     end
 
     # Tracks an action associated with a metric. Useful for calling from a
@@ -64,7 +57,7 @@ module Vanity
     #   of options passed (eventually) to AbTest#track!.
     # @since 1.2.0
     def track!(name, count_or_options = 1)
-      Vanity.playground.track! name, count_or_options
+      Vanity.playground.track!(name, count_or_options)
     end
   end
 end

data/lib/vanity/metric/active_record.rb

@@ -88,7 +88,7 @@ module Vanity
       # This track! method stores nothing, but calls the hooks.
       def track!(args = nil)
         return unless @playground.collecting?
-        call_hooks *track_args(args)
+        call_hooks(*track_args(args))
       end
 
       def last_update_at

data/lib/vanity/metric/base.rb

@@ -27,7 +27,7 @@ module Vanity
       def metric(name, &block)
         fail "Metric #{@metric_id} already defined in playground" if playground.metrics[@metric_id]
         metric = Metric.new(playground, name.to_s, @metric_id)
-        metric.instance_eval &block
+        metric.instance_eval(&block)
         playground.metrics[@metric_id] = metric
       end
 
@@ -191,7 +191,7 @@ module Vanity
     alias :to_s :name
 
     # Human readable description. Use two newlines to break paragraphs.
-    attr_accessor :description
+    attr_writer :description
 
     # Sets or returns description. For example
     #   metric "Yawns/sec" do
@@ -201,7 +201,7 @@ module Vanity
     #   puts "Just defined: " + metric(:boring).description
     def description(text = nil)
       @description = text if text
-      @description
+      @description if defined?(@description)
     end
 
     # Given two arguments, a start date and an end date (inclusive), returns an

data/lib/vanity/templates.rb

@@ -23,7 +23,7 @@ module Vanity
     # dotfiles in the directory.
     def custom_template_path_valid?
       Vanity.playground.custom_templates_path &&
-        File.exists?(Vanity.playground.custom_templates_path) &&
+        File.exist?(Vanity.playground.custom_templates_path) &&
         !Dir[File.join(Vanity.playground.custom_templates_path, '*')].empty?
     end
 

data/lib/vanity/templates/_vanity.js.erb

@@ -1,5 +1,5 @@
 var httpRequest;
-var params = "v=<%= @_vanity_experiments.map{|name, alternative| "#{name}=#{alternative.id}" }.join(',') %>&authenticity_token=<%= CGI.escape(form_authenticity_token) %>";
+var params = "v=<%= Vanity.context.vanity_active_experiments.map{|name, alternative| "#{name}=#{alternative.id}" }.join(',') %>&authenticity_token=<%= CGI.escape(form_authenticity_token) %>";
 if (window.XMLHttpRequest) { // Mozilla, Safari, ...
   httpRequest = new XMLHttpRequest();
 } else if (window.ActiveXObject) { // IE

data/lib/vanity/vanity.rb

@@ -9,7 +9,7 @@ module Vanity
   # @see Vanity::Configuration
   # @since 2.0.0
   def self.configuration(set_if_needed=true)
-    if @configuration
+    if defined?(@configuration) && @configuration
       @configuration
     elsif set_if_needed
       configure!
@@ -53,6 +53,21 @@ module Vanity
   # set by the set_vanity_context before filter (via Vanity::Rails#use_vanity).
   def self.context=(context)
     Thread.current[:vanity_context] = context
+
+    if context
+      context.class.send(:define_method, :vanity_add_to_active_experiments) do |name, alternative|
+        @_vanity_experiments ||= {}
+        @_vanity_experiments[name] ||= alternative
+        @_vanity_experiments[name].value
+      end
+      context.class.send(:alias_method, :vanity_store_experiment_for_js, :vanity_add_to_active_experiments)
+
+      context.class.send(:define_method, :vanity_active_experiments) do
+        @_vanity_experiments ||= {}
+      end
+    end
+
+    context
   end
 
   #
@@ -63,7 +78,7 @@ module Vanity
   #
   # @since 2.0.0
   def self.connection(connect_if_needed=true)
-    if @connection
+    if defined?(@connection) && @connection
       @connection
     elsif connect_if_needed
       connect!

data/lib/vanity/version.rb

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

data/test/dummy/app/controllers/use_vanity_controller.rb

@@ -8,7 +8,8 @@ class UseVanityController < ActionController::Base
   attr_accessor :current_user
 
   def index
-    render :text=>Vanity.ab_test(:pie_or_cake)
+    text = Vanity.ab_test(:pie_or_cake)
+    render :plain=>text, :text=>text
   end
 
   def js
@@ -16,6 +17,20 @@ class UseVanityController < ActionController::Base
     render :inline => "<%= vanity_js -%>"
   end
 
+  def view_helper_ab_test_js
+    render :inline => <<-EOS
+    <% ab_test(:pie_or_cake) %>
+    <%= vanity_js -%>
+EOS
+  end
+
+  def global_ab_test_js
+    render :inline => <<-EOS
+    <% Vanity.ab_test(:pie_or_cake) %>
+    <%= vanity_js -%>
+EOS
+  end
+
   def model_js
     TestModel.new.test_method
     render :inline => "<%= vanity_js -%>"

data/test/experiment/ab_test.rb

@@ -5,7 +5,8 @@ class AbTestController < ActionController::Base
   attr_accessor :current_user
 
   def test_render
-    render :text=>Vanity.ab_test(:simple)
+    text = Vanity.ab_test(:simple)
+    render :plain=>text, :text=>text
   end
 
   def test_view
@@ -18,7 +19,7 @@ class AbTestController < ActionController::Base
 
   def track
     Vanity.track!(:coolness)
-    render :text=>""
+    render :plain=>"", :text=>""
   end
 end
 
@@ -604,7 +605,7 @@ class AbTestTest < ActionController::TestCase
     end
     class <<experiment(:foobar)
       def times_called
-        @times_called || 0
+        @times_called ||= 0
       end
       def rebalance!
         @times_called = times_called + 1
@@ -801,6 +802,7 @@ class AbTestTest < ActionController::TestCase
   def test_ab_test_chooses_in_render
     new_ab_test :simple do
       metrics :coolness
+      identify { rand }
       default false
     end
     responses = Array.new(100) do
@@ -814,6 +816,7 @@ class AbTestTest < ActionController::TestCase
   def test_ab_test_chooses_view_helper
     new_ab_test :simple do
       metrics :coolness
+      identify { rand }
       default false
     end
     responses = Array.new(100) do
@@ -827,6 +830,7 @@ class AbTestTest < ActionController::TestCase
   def test_ab_test_with_capture
     new_ab_test :simple do
       metrics :coolness
+      identify { rand }
       default false
     end
     responses = Array.new(100) do
@@ -883,13 +887,13 @@ class AbTestTest < ActionController::TestCase
       default :a
       metrics :coolness
     end
-    responses = Array.new(100) { |i|
+    responses = Array.new(100) do |i|
       @controller = nil ; setup_controller_request_and_response
       experiment(:simple).chooses(:b)
       experiment(:simple).chooses(nil)
       get :test_render
       @response.body
-    }
+    end
     assert responses.uniq.size == 3
   end
 

data/test/frameworks/rails/action_controller_test.rb

@@ -34,6 +34,18 @@ class UseVanityControllerTest < ActionController::TestCase
     assert_match /script.*v=pie_or_cake=.*script/m, @response.body
   end
 
+  def test_view_helper_ab_test_js_for_tests
+    Vanity.playground.use_js!
+    get :view_helper_ab_test_js
+    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+  end
+
+  def test_global_ab_test_js_for_tests
+    Vanity.playground.use_js!
+    get :global_ab_test_js
+    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+  end
+
   def test_render_model_js_for_tests
     Vanity.playground.use_js!
     get :model_js

data/test/frameworks/rails/action_view_test.rb

@@ -5,6 +5,7 @@ class RailsHelperTest < ActionView::TestCase
 
   def setup
     super
+    Vanity.context = self
     metric :sugar_high
     new_ab_test :pie_or_cake do
       metrics :sugar_high

data/test/test_helper.rb

@@ -31,7 +31,7 @@ require "webmock/minitest"
 require 'vanity/frameworks/rails'
 Vanity::Rails.load!
 
-if $VERBOSE
+if $DEBUG
   $logger = Logger.new(STDOUT)
   $logger.level = Logger::DEBUG
 else
@@ -119,7 +119,7 @@ module VanityTestHelpers
     enable = options.fetch(:enable, true)
     id = name.to_s.downcase.gsub(/\W/, "_").to_sym
     experiment = Vanity::Experiment::AbTest.new(Vanity.playground, id, name)
-    experiment.instance_eval &block if block
+    experiment.instance_eval(&block) if block
     experiment.save
     # new experiments start off as disabled, enable them for testing
     experiment.enabled = true if enable
@@ -140,7 +140,12 @@ module VanityTestHelpers
   end
 
   def dummy_request
-    ActionDispatch::TestRequest.new()
+    # Rails 5 compatibility
+    if ActionDispatch::TestRequest.respond_to?(:create)
+      ActionDispatch::TestRequest.create()
+    else
+      ActionDispatch::TestRequest.new()
+    end
   end
 
   # Defining setup/tear down in a module and including it below doesn't
@@ -194,6 +199,11 @@ if defined?(ActionController::TestCase)
   end
 end
 
+if defined?(ActionDispatch::IntegrationTest)
+  class ActionDispatch::IntegrationTest
+  end
+end
+
 if ENV["DB"] == "active_record"
   ActiveRecord::Base.establish_connection
   ActiveRecord::Base.logger = $logger

data/test/web/rails/dashboard_test.rb

@@ -116,7 +116,7 @@ class RailsDashboardTest < ActionController::TestCase
   def test_complete_forces_confirmation
     xhr :post, :complete, :e => "food", :a => 0
     assert_response :success
-    assert_equal 0, assigns(:to_confirm)
+    assert @response.body =~ /#{ CGI.unescape({ :confirmed => 0 }.to_query) }/
   end
 
   def test_complete_with_confirmation_completes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.6
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -175,6 +175,8 @@ files:
 - gemfiles/rails42.gemfile.lock
 - gemfiles/rails42_protected_attributes.gemfile
 - gemfiles/rails42_protected_attributes.gemfile.lock
+- gemfiles/rails5.gemfile
+- gemfiles/rails5.gemfile.lock
 - lib/generators/templates/vanity_migration.rb
 - lib/generators/vanity/views_generator.rb
 - lib/generators/vanity_generator.rb
@@ -284,7 +286,7 @@ metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - "--title"
-- Vanity 2.2.4
+- Vanity 2.2.6
 - "--main"
 - README.md
 - "--webcvs"