vanity 3.1.0 → 4.0.0

data/test/vanity_test.rb

@@ -80,9 +80,7 @@ describe Vanity do
         connection_config = VanityTestHelpers::VANITY_CONFIGS["vanity.yml.redis"]
 
         FileUtils.mkpath "./config"
-        File.open("./config/vanity.yml", "w") do |f|
-          f.write(connection_config)
-        end
+        File.write("./config/vanity.yml", connection_config)
 
         Vanity::Connection.expects(:new).with("redis://:p4ssw0rd@10.0.1.1:6380/15")
         Vanity.disconnect!
@@ -91,9 +89,7 @@ describe Vanity do
 
       it "uses redis.yml" do
         FileUtils.mkpath "./config"
-        File.open("./config/redis.yml", "w") do |f|
-          f.write VanityTestHelpers::VANITY_CONFIGS["redis.yml.url"]
-        end
+        File.write("./config/redis.yml", VanityTestHelpers::VANITY_CONFIGS["redis.yml.url"])
 
         Vanity::Connection.expects(:new).with("localhost:6379/15")
         Vanity.disconnect!
@@ -104,9 +100,7 @@ describe Vanity do
         connection_config = VanityTestHelpers::VANITY_CONFIGS["vanity.yml.redis"]
 
         FileUtils.mkpath "./config"
-        File.open("./config/vanity.yml", "w") do |f|
-          f.write(connection_config)
-        end
+        File.write("./config/vanity.yml", connection_config)
 
         out, _err = capture_io do
           Vanity.reset!
@@ -148,7 +142,7 @@ describe Vanity do
     end
   end
 
-   describe "#playground" do
+  describe "#playground" do
     it "returns the same playground" do
       assert_same Vanity.playground, Vanity.playground
     end

data/test/web/rails/dashboard_test.rb

@@ -60,16 +60,16 @@ class RailsDashboardTest < ActionController::TestCase
   # --  Actions used in non-admin actions, e.g. in JS --
 
   def test_add_participant
-    params = { :v => 'food=0' }
-    post :add_participant, params, :xhr => true
+    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
-    params = { :v => 'food=0,drink=1' }
-    post :add_participant, params, :xhr => true
+    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
@@ -78,20 +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)'
-    params = { :v => 'food=0' }
-    post :add_participant, params, :xhr => true
+    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
-    post :add_participant, :xhr => true
+    post :add_participant, xhr: true
     assert_response :not_found
     assert @response.body.blank?
   end
 
   def test_add_participant_not_fail_for_unknown_experiment
-    params = { :e => 'unknown=0' }
-    post :add_participant, params, :xhr => true
+    params = { e: 'unknown=0' }
+    post :add_participant, params, xhr: true
     assert_response :not_found
     assert @response.body.blank?
   end
@@ -100,42 +100,42 @@ class RailsDashboardTest < ActionController::TestCase
 
   def test_participant_renders_experiment_for_id
     experiment(:food).choose
-    params = { :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}
+    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
-    params = { :id => "2" }
+    params = { id: "2" }
     get :participant, params
     assert_response :success
-    assert @response.body =~ %r{<ul class=\"experiments\">[\s]+</ul>}
+    assert @response.body =~ %r{<ul class="experiments">\s+</ul>}
   end
 
   def test_participant_renders_empty_for_no_id
     get :participant
     assert_response :success
-    assert @response.body =~ %r{<ul class=\"experiments\">[\s]+</ul>}
+    assert @response.body =~ %r{<ul class="experiments">\s+</ul>}
   end
 
   def test_complete_forces_confirmation
-    params = { :e => "food", :a => 0 }
-    post :complete, params, :xhr => true
+    params = { e: "food", a: 0 }
+    post :complete, params, xhr: true
     assert_response :success
-    assert @response.body =~ /#{ CGI.unescape({ :confirmed => 0 }.to_query) }/
+    assert @response.body =~ /#{CGI.unescape({ confirmed: 0 }.to_query)}/
   end
 
   def test_complete_with_confirmation_completes
-    params = { :e => "food", :a => 0, :confirmed => 'true' }
-    post :complete, params, :xhr => 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
-    params = { :e => "food", :a => 0 }
-    post :chooses, params, :xhr => true
+    params = { e: "food", a: 0 }
+    post :chooses, params, xhr: true
     assert_response :success
   end
 end

data/vanity.gemspec

@@ -1,4 +1,4 @@
-$: << File.dirname(__FILE__) + "/lib"
+$: << (File.dirname(__FILE__) + "/lib")
 require "vanity/version"
 
 Gem::Specification.new do |spec|
@@ -14,22 +14,23 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.extra_rdoc_files = "README.md", "CHANGELOG"
   spec.rdoc_options     = "--title", "Vanity #{spec.version}", "--main", "README.md",
                           "--webcvs", "http://github.com/assaf/#{spec.name}"
 
-  spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.add_runtime_dependency "i18n"
 
-  spec.add_development_dependency "bundler",  ">= 1.8.0"
-  spec.add_development_dependency "minitest", ">= 4.2"
   spec.add_development_dependency "appraisal", "~> 2.0"
-  spec.add_development_dependency "timecop"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "bundler", ">= 1.8.0"
   spec.add_development_dependency "fakefs"
+  spec.add_development_dependency "minitest", ">= 4.2"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "timecop"
+  spec.add_development_dependency "webmock"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Assaf Arkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -25,63 +25,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,8 +131,11 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG
 files:
+- ".github/workflows/linting.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Appraisals
 - CHANGELOG
 - Gemfile
@@ -167,12 +170,6 @@ files:
 - doc/metrics.textile
 - doc/rails.textile
 - doc/site.js
-- gemfiles/rails42.gemfile
-- gemfiles/rails42.gemfile.lock
-- gemfiles/rails42_protected_attributes.gemfile
-- gemfiles/rails42_protected_attributes.gemfile.lock
-- gemfiles/rails51.gemfile
-- gemfiles/rails51.gemfile.lock
 - gemfiles/rails52.gemfile
 - gemfiles/rails52.gemfile.lock
 - gemfiles/rails60.gemfile
@@ -291,11 +288,12 @@ files:
 homepage: http://vanity.labnotes.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: To get started run vanity --help
 rdoc_options:
 - "--title"
-- Vanity 3.1.0
+- Vanity 4.0.0
 - "--main"
 - README.md
 - "--webcvs"
@@ -306,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/rails42.gemfile

@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack"
-gem "redis", ">= 3.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", "4.2.9"
-gem "fastthread", platforms: :mri_20, git: "https://github.com/zoltankiss/fastthread.git"
-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/rails42.gemfile.lock

@@ -1,265 +0,0 @@
-GIT
-  remote: https://github.com/zoltankiss/fastthread.git
-  revision: cefbca3009b9c68df5e473d840462ebcc7fa1504
-  specs:
-    fastthread (1.0.7)
-
-PATH
-  remote: ..
-  specs:
-    vanity (3.1.0)
-      i18n
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.15)
-      activerecord (>= 2.2)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    appraisal (2.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (6.0.4)
-    blankslate (2.1.2.4)
-    bson (4.0.2)
-    bson (4.0.2-java)
-    builder (3.2.3)
-    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)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.4)
-    daemon_controller (1.2.0)
-    erubis (2.7.0)
-    execjs (2.5.2)
-    fakefs (0.6.7)
-    fast-stemmer (1.0.2)
-    ffi (1.15.5)
-    ffi (1.15.5-java)
-    garb (0.9.1)
-      activesupport (>= 2.2.0)
-      crack (>= 0.1.6)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    hitimes (1.2.2)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.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)
-    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)
-    loofah (2.2.2)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    mercenary (0.3.5)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.11.3)
-    mocha (1.7.0)
-      metaclass (~> 0.0.1)
-    mongo (2.2.3)
-      bson (~> 4.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    nokogiri (1.12.5-java)
-      racc (~> 1.4)
-    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)
-    posix-spawn (0.3.11)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.3-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    racc (1.6.0)
-    racc (1.6.0-java)
-    rack (1.6.10)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    redcarpet (3.2.3)
-    redis (3.3.3)
-    redis-namespace (1.6.0)
-      redis (>= 3.0.4)
-    rubystats (0.2.5)
-    safe_yaml (1.0.4)
-    sass (3.4.13)
-    slop (3.6.0)
-    spoon (0.0.6)
-      ffi
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.10)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    timecop (0.7.1)
-    timers (4.0.1)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    yajl-ruby (1.2.2)
-    yard (0.8.7.6)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  activerecord-jdbc-adapter
-  appraisal (~> 2.0)
-  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 (= 4.2.9)
-  rake
-  redis (>= 3.2.1)
-  redis-namespace (>= 1.1.0)
-  rubystats (>= 0.2.5)
-  sqlite3 (~> 1.3.10)
-  timecop
-  vanity!
-  webmock
-  yard
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/rails42_protected_attributes.gemfile

@@ -1,34 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack"
-gem "redis", ">= 3.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 "protected_attributes", "1.1.0"
-gem "mocha", "~> 1.0", require: false
-gem "rails", "4.2.9"
-gem "fastthread", platforms: :mri_20, git: "https://github.com/zoltankiss/fastthread.git"
-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: "../"