From e49e1672d7675dd4e1f193bcf3cb1f17939464d4 Mon Sep 17 00:00:00 2001 From: Peter Bhat Harkins Date: Wed, 23 Mar 2022 09:35:50 -0500 Subject: [PATCH] bump deps for cve, rubocop --- Gemfile | 2 +- Gemfile.lock | 147 ++++++++++++++++++++------------------- bin/rubocop | 2 +- spec/routing/tag_spec.rb | 20 ++++-- 4 files changed, 93 insertions(+), 78 deletions(-) diff --git a/Gemfile b/Gemfile index b214aaed..f16112cb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "~> 6.1.4.6" +gem "rails", "~> 6.1.4.7" gem "mysql2" diff --git a/Gemfile.lock b/Gemfile.lock index 0e235e75..4f3dd6db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,64 +2,64 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actioncable (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + actioncable (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.6) - actionpack (= 6.1.4.6) - activejob (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionmailbox (6.1.4.7) + actionpack (= 6.1.4.7) + activejob (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (>= 2.7.1) - actionmailer (6.1.4.6) - actionpack (= 6.1.4.6) - actionview (= 6.1.4.6) - activejob (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionmailer (6.1.4.7) + actionpack (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.6) - actionview (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionpack (6.1.4.7) + actionview (= 6.1.4.7) + activesupport (= 6.1.4.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (6.1.4.6) - actionpack (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + actiontext (6.1.4.7) + actionpack (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) nokogiri (>= 1.8.5) - actionview (6.1.4.6) - activesupport (= 6.1.4.6) + actionview (6.1.4.7) + activesupport (= 6.1.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.6) - activesupport (= 6.1.4.6) + activejob (6.1.4.7) + activesupport (= 6.1.4.7) globalid (>= 0.3.6) - activemodel (6.1.4.6) - activesupport (= 6.1.4.6) - activerecord (6.1.4.6) - activemodel (= 6.1.4.6) - activesupport (= 6.1.4.6) + activemodel (6.1.4.7) + activesupport (= 6.1.4.7) + activerecord (6.1.4.7) + activemodel (= 6.1.4.7) + activesupport (= 6.1.4.7) activerecord-typedstore (1.4.0) activerecord (>= 5.2) - activestorage (6.1.4.6) - actionpack (= 6.1.4.6) - activejob (= 6.1.4.6) - activerecord (= 6.1.4.6) - activesupport (= 6.1.4.6) + activestorage (6.1.4.7) + actionpack (= 6.1.4.7) + activejob (= 6.1.4.7) + activerecord (= 6.1.4.7) + activesupport (= 6.1.4.7) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.6) + activesupport (6.1.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -69,7 +69,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) ast (2.4.2) - bcrypt (3.1.16) + bcrypt (3.1.17) builder (3.2.4) byebug (11.1.3) capybara (3.36.0) @@ -83,7 +83,7 @@ GEM xpath (~> 3.2) chunky_png (1.4.0) commonmarker (0.23.4) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crack (0.4.5) rexml crass (1.0.6) @@ -100,13 +100,13 @@ GEM actionmailer (>= 5.2, < 8) activesupport (>= 5.2, < 8) execjs (2.8.1) - factory_bot (6.2.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.19.0) - i18n (>= 1.6, < 2) + faker (2.20.0) + i18n (>= 1.8.11, < 2) ffi (1.15.5) flamegraph (0.9.5) globalid (1.0.0) @@ -114,7 +114,7 @@ GEM hashdiff (1.0.1) hashery (2.1.2) htmlentities (4.3.4) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) jquery-rails (4.4.0) @@ -125,7 +125,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.14.0) + loofah (2.15.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -142,11 +142,13 @@ GEM nokogiri (1.13.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.3-x86_64-linux) + racc (~> 1.4) oauth (0.5.8) - parallel (1.21.0) - parser (3.1.0.0) + parallel (1.22.0) + parser (3.1.1.0) ast (~> 2.4.1) - pdf-reader (2.9.1) + pdf-reader (2.9.2) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -159,33 +161,33 @@ GEM rack (2.2.3) rack-attack (6.6.0) rack (>= 1.0, < 3) - rack-mini-profiler (2.3.3) + rack-mini-profiler (3.0.0) rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4.6) - actioncable (= 6.1.4.6) - actionmailbox (= 6.1.4.6) - actionmailer (= 6.1.4.6) - actionpack (= 6.1.4.6) - actiontext (= 6.1.4.6) - actionview (= 6.1.4.6) - activejob (= 6.1.4.6) - activemodel (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + rails (6.1.4.7) + actioncable (= 6.1.4.7) + actionmailbox (= 6.1.4.7) + actionmailer (= 6.1.4.7) + actionpack (= 6.1.4.7) + actiontext (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activemodel (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) bundler (>= 1.15.0) - railties (= 6.1.4.6) + railties (= 6.1.4.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + railties (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) method_source rake (>= 0.13) thor (~> 1.0) @@ -195,7 +197,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb-readline (0.5.5) - regexp_parser (2.2.0) + regexp_parser (2.2.1) rexml (3.2.5) rotp (6.2.0) rqrcode (2.1.1) @@ -210,7 +212,7 @@ GEM rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.0) + rspec-rails (5.1.1) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -237,7 +239,7 @@ GEM ruby-rc4 (0.1.5) ruumba (0.1.17) rubocop - scenic (1.5.5) + scenic (1.6.0) activerecord (>= 4.0.0) railties (>= 4.0.0) scenic-mysql_adapter (1.0.1) @@ -248,7 +250,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) + simplecov_json_formatter (0.1.4) sitemap_generator (6.2.1) builder (~> 3.0) sprockets (3.7.2) @@ -258,7 +260,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - stackprof (0.2.17) + stackprof (0.2.19) svg-graph (2.2.1) thor (1.2.1) transaction_isolation (1.0.5) @@ -272,7 +274,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.8.0) - vcr (6.0.0) + vcr (6.1.0) webmock (3.14.0) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -286,6 +288,7 @@ GEM PLATFORMS ruby + x86_64-linux DEPENDENCIES actionpack-page_caching @@ -312,7 +315,7 @@ DEPENDENCIES puma (>= 5.6.2) rack-attack rack-mini-profiler - rails (~> 6.1.4.6) + rails (~> 6.1.4.7) rb-readline rotp rqrcode @@ -334,4 +337,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 2.2.0 diff --git a/bin/rubocop b/bin/rubocop index de840016..d0c48829 100755 --- a/bin/rubocop +++ b/bin/rubocop @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby2.7 +#!/usr/bin/env ruby # frozen_string_literal: true # diff --git a/spec/routing/tag_spec.rb b/spec/routing/tag_spec.rb index 316e8282..54ea1e04 100644 --- a/spec/routing/tag_spec.rb +++ b/spec/routing/tag_spec.rb @@ -6,20 +6,32 @@ describe 'tag routing' do end it 'routes a single tag rss feed' do - assert_recognizes({ controller: 'home', action: 'single_tag', tag: 'foo', format: 'rss' }, '/t/foo.rss') + assert_recognizes( + { controller: 'home', action: 'single_tag', tag: 'foo', format: 'rss' }, + '/t/foo.rss' + ) end it 'routes multiple tags' do - assert_recognizes({ controller: 'home', action: 'multi_tag', tag: 'foo,bar' }, '/t/foo,bar') + assert_recognizes( + { controller: 'home', action: 'multi_tag', tag: 'foo,bar' }, + '/t/foo,bar' + ) end it 'routes multiple tags rss feed' do - assert_recognizes({ controller: 'home', action: 'multi_tag', tag: 'foo,bar', format: 'rss' }, '/t/foo,bar.rss') + assert_recognizes( + { controller: 'home', action: 'multi_tag', tag: 'foo,bar', format: 'rss' }, + '/t/foo,bar.rss' + ) end # ONE tag has gotta be clever it 'routes the c++ tag' do assert_recognizes({ controller: 'home', action: 'single_tag', tag: 'c++' }, '/t/c++') - assert_recognizes({ controller: 'home', action: 'single_tag', tag: 'c++', format: 'rss' }, '/t/c++.rss') + assert_recognizes( + { controller: 'home', action: 'single_tag', tag: 'c++', format: 'rss' }, + '/t/c++.rss' + ) end end