vanity 2.2.10 → 3.1.0

data/test/experiment/ab_test.rb

@@ -520,6 +520,46 @@ class AbTestTest < ActionController::TestCase
     end
   end
 
+  def test_calls_default_on_assignment
+    on_assignment_called_times = 0
+
+    Vanity.configuration.on_assignment = proc do |_controller, _identity, _assignment|
+      on_assignment_called_times += 1
+    end
+
+    new_ab_test :foobar do
+      alternatives "foo", "bar"
+      default "foo"
+      identify { "6e98ec" }
+      metrics :coolness
+    end
+
+    2.times { experiment(:foobar).chooses("foo") }
+    assert_equal 1, on_assignment_called_times
+  end
+
+  def test_calls_on_assignment_defined_in_experiment
+    expected_value = 0
+
+    Vanity.configuration.on_assignment = proc do |_controller, _identity, _assignment|
+      expected_value = 1
+    end
+
+    new_ab_test :foobar do
+      alternatives "foo", "bar"
+      default "foo"
+      identify { "6e98ec" }
+      metrics :coolness
+
+      on_assignment do |_controller, _identity, _assignment|
+        expected_value = 20
+      end
+    end
+
+    2.times { experiment(:foobar).chooses("foo") }
+    assert_equal 20, expected_value
+  end
+
   # -- ab_assigned --
 
   def test_ab_assigned
@@ -529,12 +569,12 @@ class AbTestTest < ActionController::TestCase
       identify { "6e98ec" }
       metrics :coolness
     end
-    assert_equal nil, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
+    assert_nil experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
     assert id = experiment(:foobar).choose.id
     assert_equal id, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
   end
 
-  def test_ab_assigned
+  def test_ab_assigned_object
     identity = { :a => :b }
     new_ab_test :foobar do
       alternatives "foo", "bar"
@@ -542,7 +582,7 @@ class AbTestTest < ActionController::TestCase
       identify { identity }
       metrics :coolness
     end
-    assert_equal nil, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
+    assert_nil experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
     assert id = experiment(:foobar).choose.id
     assert_equal id, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
   end

data/test/frameworks/rails/action_controller_test.rb

@@ -138,7 +138,8 @@ class UseVanityControllerTest < ActionController::TestCase
   end
 
   def test_vanity_identity_set_with_identity_paramater
-    get :index, :_identity => "id_from_params"
+    params = { :_identity => "id_from_params" }
+    get :index, params
     assert_equal "id_from_params", @controller.send(:vanity_identity)
   end
 
@@ -156,7 +157,8 @@ class UseVanityControllerTest < ActionController::TestCase
 
     def test_vanity_identity_prefers_parameter_over_cookie
     @request.cookies['vanity_id'] = "old_id"
-    get :index, :_identity => "id_from_params"
+    params = { :_identity => "id_from_params" }
+    get :index, params
     assert_equal "id_from_params", @controller.send(:vanity_identity)
     assert cookies['vanity_id'], "id_from_params"
   end
@@ -171,7 +173,8 @@ class UseVanityControllerTest < ActionController::TestCase
   # query parameter filter
 
   def test_redirects_and_loses_vanity_query_parameter
-    get :index, :foo=>"bar", :_vanity=>"567"
+    params = { :foo=>"bar", :_vanity=>"567" }
+    get :index, params
     assert_redirected_to "/use_vanity?foo=bar"
   end
 
@@ -180,7 +183,8 @@ class UseVanityControllerTest < ActionController::TestCase
     fingerprint = experiment(:pie_or_cake).fingerprint(first)
     10.times do
       @controller = nil ; setup_controller_request_and_response
-      get :index, :_vanity => fingerprint
+      params = { :_vanity => fingerprint }
+      get :index, params
       assert_equal experiment(:pie_or_cake).choose, experiment(:pie_or_cake).alternatives.first
       assert experiment(:pie_or_cake).showing?(first)
     end
@@ -190,13 +194,15 @@ class UseVanityControllerTest < ActionController::TestCase
     experiment(:pie_or_cake).chooses(experiment(:pie_or_cake).alternatives.last.value)
     first = experiment(:pie_or_cake).alternatives.first
     fingerprint = experiment(:pie_or_cake).fingerprint(first)
-    post :index, :foo => "bar", :_vanity => fingerprint
+    params = { :foo => "bar", :_vanity => fingerprint }
+    post :index, params
     assert_response :success
     assert !experiment(:pie_or_cake).showing?(first)
   end
 
   def test_track_param_tracks_a_metric
-    get :index, :_identity => "123", :_track => "sugar_high"
+    params = { :_identity => "123", :_track => "sugar_high" }
+    get :index, params
     assert_equal experiment(:pie_or_cake).alternatives[0].converted, 1
   end
 

data/test/frameworks/rails/action_mailer_test.rb

@@ -19,7 +19,6 @@ class UseVanityMailerTest < ActionMailer::TestCase
     experiment(:pie_or_cake).chooses(:pie)
     VanityMailer.ab_test_subject(nil)
 
-
     alts = experiment(:pie_or_cake).alternatives
     assert_equal 1, alts.map(&:participants).sum
   end

data/test/metric/active_record_test.rb

@@ -234,7 +234,13 @@ describe Vanity::Metric::ActiveRecord do
       f.write <<-RUBY
         metric "Sky is limit" do
           model Sky, :conditions=>["height > 3"]
-          Sky.after_save { |sky| Vanity.track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          Sky.after_save do |sky|
+            if sky.respond_to?(:saved_change_to_height?) && sky.saved_change_to_height? && sky.height > 3
+              Vanity.track!(:sky_is_limit)
+            elsif sky.height_changed? && sky.height > 3
+              Vanity.track!(:sky_is_limit)
+            end
+          end
         end
       RUBY
     end
@@ -295,7 +301,7 @@ describe Vanity::Metric::ActiveRecord do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
-          Sky.after_save { |sky| Vanity.track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          Sky.after_save { |sky| Vanity.track!(:sky_is_limit) if sky.height && sky.height > 3 }
         end
       RUBY
     end

data/test/playground_test.rb

@@ -130,5 +130,4 @@ describe Vanity::Playground do
       assert_equal [[Vanity.playground.experiment(:foobar), alt]], Vanity.playground.participant_info("abcdef")
     end
   end
-
 end

data/test/test_helper.rb

@@ -20,7 +20,7 @@ require "rails/test_help"
 
 require "vanity"
 require "timecop"
-require "mocha/mini_test"
+require "mocha/minitest"
 require "fakefs/safe"
 require "webmock/minitest"
 
@@ -186,11 +186,53 @@ if defined?(ActiveSupport::TestCase)
 
     self.use_instantiated_fixtures = false if respond_to?(:use_instantiated_fixtures)
     self.use_transactional_fixtures = false if respond_to?(:use_transactional_fixtures)
+    self.use_transactional_tests = false if respond_to?(:use_transactional_tests)
+  end
+end
+
+# Shim for pre-5.0 tests
+module LegacyTestRequests
+  def rails4?
+    ActiveRecord::VERSION::MAJOR <= 4
+  end
+
+  def get(path, params={}, headers={})
+    if rails4?
+      process(path, 'GET', params, headers)
+    else
+      process(path, method: 'GET', params: params, **headers)
+    end
+  end
+
+  def post(path, params={}, headers={})
+    if rails4?
+      process(path, 'POST', params, headers)
+    else
+      process(path, method: 'POST', params: params, **headers)
+    end
+  end
+
+  def put(path, params={}, headers={})
+    if rails4?
+      process(path, 'PUT', params, headers)
+    else
+      process(path, method: 'PUT', params: params, **headers)
+    end
+  end
+
+  def delete(path, params={}, headers={})
+    if rails4?
+      process(path, 'DELETE', params, headers)
+    else
+      process(path, method: 'DELETE', params: params, **headers)
+    end
   end
 end
 
 if defined?(ActionController::TestCase)
   class ActionController::TestCase
+    include LegacyTestRequests
+
     alias :setup_controller_request_and_response_without_vanity :setup_controller_request_and_response
     # Sets Vanity.context to the current controller, so you can do things like:
     #   experiment(:simple).chooses(:green)
@@ -211,14 +253,19 @@ if ENV["DB"] == "active_record"
   ActiveRecord::Base.logger = $logger
 
   Vanity.connect!(VanityTestHelpers::DATABASE)
-  require "generators/templates/vanity_migration"
-  if defined?(ActiveRecord::Tasks)
-    config = Vanity::Adapters::ActiveRecordAdapter::VanityRecord.connection_config
-    ActiveRecord::Tasks::DatabaseTasks.drop(config.with_indifferent_access)
-  else # Rails 3.2 fallback
-    klasses = Vanity::Adapters::ActiveRecordAdapter::VanityRecord.descendants
-    klasses.each { |k| k.connection.drop_table(k.table_name) if k.connection.table_exists?(k.table_name) }
-  end
 
-  VanityMigration.new.migrate(:up)
+  config = Vanity::Adapters::ActiveRecordAdapter::VanityRecord.connection_config
+  ActiveRecord::Tasks::DatabaseTasks.drop(config.with_indifferent_access)
+
+  # use generator to create the migration
+  require "rails/generators"
+  require "generators/vanity/migration_generator"
+  Rails::Generators.invoke "vanity"
+
+  migrate_path = File.expand_path("../dummy/db/migrate/", __FILE__)
+  if defined?(ActiveRecord::MigrationContext)
+    ActiveRecord::MigrationContext.new(migrate_path).migrate
+  else
+    ActiveRecord::Migrator.migrate(migrate_path)
+  end
 end

data/test/web/rails/dashboard_test.rb

@@ -60,14 +60,16 @@ class RailsDashboardTest < ActionController::TestCase
   # --  Actions used in non-admin actions, e.g. in JS --
 
   def test_add_participant
-    xhr :post, :add_participant, :v => 'food=0'
+    params = { :v => 'food=0' }
+    post :add_participant, params, :xhr => true
     assert_response :success
     assert @response.body.blank?
     assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
   end
 
   def test_add_participant_multiple_experiments
-    xhr :post, :add_participant, :v => 'food=0,drink=1'
+    params = { :v => 'food=0,drink=1' }
+    post :add_participant, params, :xhr => true
     assert_response :success
     assert @response.body.blank?
     assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
@@ -76,18 +78,20 @@ class RailsDashboardTest < ActionController::TestCase
 
   def test_add_participant_with_invalid_request
     @request.user_agent = 'Googlebot/2.1 ( http://www.google.com/bot.html)'
-    xhr :post, :add_participant, :v => 'food=0'
+    params = { :v => 'food=0' }
+    post :add_participant, params, :xhr => true
     assert_equal 0, experiment(:food).alternatives.map(&:participants).sum
   end
 
   def test_add_participant_no_params
-    xhr :post, :add_participant
+    post :add_participant, :xhr => true
     assert_response :not_found
     assert @response.body.blank?
   end
 
   def test_add_participant_not_fail_for_unknown_experiment
-    xhr :post, :add_participant, :e => 'unknown=0'
+    params = { :e => 'unknown=0' }
+    post :add_participant, params, :xhr => true
     assert_response :not_found
     assert @response.body.blank?
   end
@@ -96,13 +100,15 @@ class RailsDashboardTest < ActionController::TestCase
 
   def test_participant_renders_experiment_for_id
     experiment(:food).choose
-    get :participant, :id => "1"
+    params = { :id => "1" }
+    get :participant, params
     assert_response :success
     assert @response.body =~ %r{id 1 is taking part in the following experiments:\n<ul class=\"experiments\">[\s]+<li class=\"experiment ab_test}
   end
 
   def test_participant_renders_empty_for_bad_id
-    get :participant, :id => "2"
+    params = { :id => "2" }
+    get :participant, params
     assert_response :success
     assert @response.body =~ %r{<ul class=\"experiments\">[\s]+</ul>}
   end
@@ -114,19 +120,22 @@ class RailsDashboardTest < ActionController::TestCase
   end
 
   def test_complete_forces_confirmation
-    xhr :post, :complete, :e => "food", :a => 0
+    params = { :e => "food", :a => 0 }
+    post :complete, params, :xhr => true
     assert_response :success
     assert @response.body =~ /#{ CGI.unescape({ :confirmed => 0 }.to_query) }/
   end
 
   def test_complete_with_confirmation_completes
-    xhr :post, :complete, :e => "food", :a => 0, :confirmed => 'true'
+    params = { :e => "food", :a => 0, :confirmed => 'true' }
+    post :complete, params, :xhr => true
     assert_response :success
     assert !Vanity.playground.experiment(:food).active?
   end
 
   def test_chooses
-    xhr :post, :chooses, :e => "food", :a => 0
+    params = { :e => "food", :a => 0 }
+    post :chooses, params, :xhr => true
     assert_response :success
   end
 end

data/vanity.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler",  ">= 1.8.0"
   spec.add_development_dependency "minitest", ">= 4.2"
-  spec.add_development_dependency "appraisal", "~> 1.0.2"
+  spec.add_development_dependency "appraisal", "~> 2.0"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "fakefs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 3.1.0
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -131,8 +131,8 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG
 - Gemfile
@@ -167,23 +167,23 @@ files:
 - doc/metrics.textile
 - doc/rails.textile
 - doc/site.js
-- gemfiles/rails32.gemfile
-- gemfiles/rails32.gemfile.lock
-- gemfiles/rails41.gemfile
-- gemfiles/rails41.gemfile.lock
 - gemfiles/rails42.gemfile
 - 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/add_participants_unique_index_migration.rb
-- lib/generators/templates/add_unique_indexes_migration.rb
-- lib/generators/templates/vanity_migration.rb
-- lib/generators/vanity/add_participants_unique_index_generator.rb
-- lib/generators/vanity/add_unique_indexes_generator.rb
+- gemfiles/rails51.gemfile
+- gemfiles/rails51.gemfile.lock
+- gemfiles/rails52.gemfile
+- gemfiles/rails52.gemfile.lock
+- gemfiles/rails60.gemfile
+- gemfiles/rails60.gemfile.lock
+- gemfiles/rails61.gemfile
+- gemfiles/rails61.gemfile.lock
+- lib/generators/templates/add_participants_unique_index_migration.rb.erb
+- lib/generators/templates/add_unique_indexes_migration.rb.erb
+- lib/generators/templates/vanity_migration.rb.erb
+- lib/generators/vanity/migration_generator.rb
 - lib/generators/vanity/views_generator.rb
-- lib/generators/vanity_generator.rb
 - lib/vanity.rb
 - lib/vanity/adapters.rb
 - lib/vanity/adapters/abstract_adapter.rb
@@ -208,6 +208,7 @@ files:
 - lib/vanity/locales/vanity.en.yml
 - lib/vanity/locales/vanity.nb.yml
 - lib/vanity/locales/vanity.pt-BR.yml
+- lib/vanity/locales/vanity.ru.yml
 - lib/vanity/metric/active_record.rb
 - lib/vanity/metric/base.rb
 - lib/vanity/metric/google_analytics.rb
@@ -294,7 +295,7 @@ metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - "--title"
-- Vanity 2.2.10
+- Vanity 3.1.0
 - "--main"
 - README.md
 - "--webcvs"
@@ -312,8 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.3.6
 signing_key: 
 specification_version: 4
 summary: Experience Driven Development framework for Ruby
@@ -376,4 +376,3 @@ test_files:
 - test/test_helper.rb
 - test/vanity_test.rb
 - test/web/rails/dashboard_test.rb
-has_rdoc: 

data/.travis.yml

@@ -1,33 +0,0 @@
-sudo: false
-cache: bundler
-language: ruby
-before_script:
-  - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc' # skip installing docs for gems
-before_install:
-  - gem install bundler -v "~> 1.8.0" # Minimum version of bundler required
-bundler_args: --without development --jobs=3
-script: 'bundle exec rake test'
-services:
-  - mongodb
-  - redis-server
-rvm:
-  - 2.1
-  - 2.2.2
-  - 2.3.0
-  - jruby-9.1.7.0
-env:
-  - DB=mongodb
-  - DB=redis
-  - DB=active_record
-gemfile:
-  - gemfiles/rails32.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-9.1.7.0
-      gemfile: gemfiles/rails5.gemfile