vanity 2.2.9 → 3.0.2

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/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.9
+  version: 3.0.2
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2022-01-28 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,21 +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_unique_indexes_migration.rb
-- lib/generators/templates/vanity_migration.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
@@ -206,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
@@ -292,7 +295,7 @@ metadata: {}
 post_install_message: To get started run vanity --help
 rdoc_options:
 - "--title"
-- Vanity 2.2.9
+- Vanity 3.0.2
 - "--main"
 - README.md
 - "--webcvs"
@@ -310,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
@@ -374,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

data/gemfiles/rails32.gemfile.lock

@@ -1,242 +0,0 @@
-GIT
-  remote: git://github.com/zoltankiss/fastthread.git
-  revision: 56e6ce7c1780797a354d5befe9a9a9869bbc7e3e
-  specs:
-    fastthread (1.0.7)
-
-PATH
-  remote: ..
-  specs:
-    vanity (2.2.9)
-      i18n
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    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.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    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)
-    appraisal (1.0.3)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    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)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coderay (1.1.1)
-    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)
-    erubis (2.7.0)
-    execjs (2.5.2)
-    fakefs (0.6.7)
-    fast-stemmer (1.0.2)
-    ffi (1.9.8)
-    garb (0.9.1)
-      activesupport (>= 2.2.0)
-      crack (>= 0.1.6)
-    hike (1.2.3)
-    hitimes (1.2.2)
-    i18n (0.7.0)
-    integration (0.1.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)
-    mercenary (0.3.5)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (4.2.0)
-    minitest_tu_shim (1.3.3)
-      minitest (~> 4.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongo (2.2.3)
-      bson (~> 4.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.5)
-    posix-spawn (0.3.11)
-    power_assert (0.2.2)
-    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 (1.4.7)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    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.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, < 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.5)
-    safe_yaml (1.0.4)
-    sass (3.4.13)
-    slop (3.6.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
-    test-unit (3.0.9)
-      power_assert
-    thor (0.19.1)
-    tilt (1.4.1)
-    timecop (0.3.5)
-    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.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
-  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.0)
-  minitest_tu_shim (~> 1.3.3)
-  mocha (~> 1.0)
-  mongo (~> 2.1)
-  passenger (~> 3.0)
-  pry
-  rack
-  rails (= 3.2.22)
-  rake
-  redis (>= 2.1)
-  redis-namespace (>= 1.1.0)
-  rubystats (>= 0.2.5)
-  sqlite3 (~> 1.3.10)
-  test-unit (~> 3.0)
-  timecop
-  vanity!
-  webmock
-  yard
-
-BUNDLED WITH
-   1.11.2