From 98863943e1a52ad1ca551f19bd9b141c1fc8565a Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Wed, 11 Oct 2023 20:11:52 -0500 Subject: [PATCH 1/7] Update appraisals --- Appraisals | 4 + Gemfile.lock | 2 +- gemfiles/rails_5_2.gemfile.lock | 165 +++++++++------ gemfiles/rails_6.gemfile.lock | 267 +++++++++++++----------- gemfiles/rails_6_1.gemfile.lock | 275 +++++++++++++----------- gemfiles/rails_7.gemfile.lock | 276 ++++++++++++------------ gemfiles/rails_7_1.gemfile | 12 ++ gemfiles/rails_7_1.gemfile.lock | 311 +++++++++++++++++++++++++++ gemfiles/rails_master.gemfile.lock | 323 ++++++++++++++++------------- 9 files changed, 1049 insertions(+), 586 deletions(-) create mode 100644 gemfiles/rails_7_1.gemfile create mode 100644 gemfiles/rails_7_1.gemfile.lock diff --git a/Appraisals b/Appraisals index 00188dcc..3eb2eb8c 100644 --- a/Appraisals +++ b/Appraisals @@ -14,6 +14,10 @@ appraise "rails-7" do gem "rails", "~> 7.0.0" end +appraise "rails-7-1" do + gem "rails", "~> 7.1.0" +end + appraise "rails-master" do gem "rails", github: "rails/rails", branch: "main" end diff --git a/Gemfile.lock b/Gemfile.lock index 04488f6d..46a2f3b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,4 +263,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.4.20 diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index 592d97a8..eeaee867 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -49,48 +49,49 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - apnotic (1.7.0) + apnotic (1.7.1) connection_pool (~> 2) net-http2 (>= 0.18.3, < 2) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) arel (9.0.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.10) - connection_pool (2.3.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) - digest (3.1.0) + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) - faraday (2.5.2) + erubi (1.12.0) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) - ffi (1.15.5) + faraday-net_http (3.0.2) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) - googleauth (1.2.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.0.1) http-2 (0.11.0) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -98,47 +99,55 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.2) - jwt (2.5.0) + json (2.6.3) + jwt (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) - memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) multi_json (1.15.0) - mysql2 (0.5.4) - net-http2 (0.18.4) + mysql2 (0.5.5) + net-http2 (0.18.5) http-2 (~> 0.11) - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-imap (0.4.1) + date + net-protocol + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - nio4r (2.5.8) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + net-smtp (0.4.0) + net-protocol + nio4r (2.5.9) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pg (1.4.3) - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) - rack-test (2.0.2) + racc + pg (1.5.4) + public_suffix (5.0.3) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) rack (>= 1.3) rails (5.2.8.1) actioncable (= 5.2.8.1) @@ -153,11 +162,13 @@ GEM bundler (>= 1.3.0) railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) railties (5.2.8.1) actionpack (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -166,61 +177,77 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) - rexml (3.2.5) - rubocop (1.35.1) + regexp_parser (2.8.2) + rexml (3.2.6) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sprockets (4.1.1) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.5.0) + sqlite3 (1.6.7) mini_portile2 (~> 2.8.0) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) - thor (1.2.1) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + thor (1.2.2) thread_safe (0.3.6) - timeout (0.3.0) - tzinfo (1.2.10) + timeout (0.4.0) + tzinfo (1.2.11) thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) - webmock (3.18.1) + unicode-display_width (2.5.0) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) PLATFORMS - ruby + arm64-darwin-21 + arm64-darwin-22 + x86_64-darwin-19 + x86_64-darwin-20 + x86_64-darwin-21 + x86_64-linux DEPENDENCIES apnotic (~> 1.7) @@ -237,4 +264,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.4.20 diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index 96f300df..9c5496e2 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -8,102 +8,103 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.6) - actionpack (= 6.0.6) + actioncable (6.0.6.1) + actionpack (= 6.0.6.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actionmailbox (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) mail (>= 2.7.1) - actionmailer (6.0.6) - actionpack (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) + actionmailer (6.0.6.1) + actionpack (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.6) - actionpack (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + actiontext (6.0.6.1) + actionpack (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) nokogiri (>= 1.8.5) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.6) - activesupport (= 6.0.6) + activejob (6.0.6.1) + activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activemodel (6.0.6) - activesupport (= 6.0.6) - activerecord (6.0.6) - activemodel (= 6.0.6) - activesupport (= 6.0.6) - activestorage (6.0.6) - actionpack (= 6.0.6) - activejob (= 6.0.6) - activerecord (= 6.0.6) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) + activestorage (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) marcel (~> 1.0) - activesupport (6.0.6) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - apnotic (1.7.0) + apnotic (1.7.1) connection_pool (~> 2) net-http2 (>= 0.18.3, < 2) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.10) - connection_pool (2.3.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) - digest (3.1.0) + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) - faraday (2.5.2) + erubi (1.12.0) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) - ffi (1.15.5) + faraday-net_http (3.0.2) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) - googleauth (1.2.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.0.1) http-2 (0.11.0) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -111,132 +112,158 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.2) - jwt (2.5.0) + json (2.6.3) + jwt (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) - memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) multi_json (1.15.0) - mysql2 (0.5.4) - net-http2 (0.18.4) + mysql2 (0.5.5) + net-http2 (0.18.5) http-2 (~> 0.11) - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-imap (0.4.1) + date + net-protocol + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - nio4r (2.5.8) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + net-smtp (0.4.0) + net-protocol + nio4r (2.5.9) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pg (1.4.3) - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) - rack-test (2.0.2) + racc + pg (1.5.4) + public_suffix (5.0.3) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) rack (>= 1.3) - rails (6.0.6) - actioncable (= 6.0.6) - actionmailbox (= 6.0.6) - actionmailer (= 6.0.6) - actionpack (= 6.0.6) - actiontext (= 6.0.6) - actionview (= 6.0.6) - activejob (= 6.0.6) - activemodel (= 6.0.6) - activerecord (= 6.0.6) - activestorage (= 6.0.6) - activesupport (= 6.0.6) + rails (6.0.6.1) + actioncable (= 6.0.6.1) + actionmailbox (= 6.0.6.1) + actionmailer (= 6.0.6.1) + actionpack (= 6.0.6.1) + actiontext (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) + activemodel (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) bundler (>= 1.3.0) - railties (= 6.0.6) + railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) - rexml (3.2.5) - rubocop (1.35.1) + regexp_parser (2.8.2) + rexml (3.2.6) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sprockets (4.1.1) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.5.0) + sqlite3 (1.6.7) mini_portile2 (~> 2.8.0) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) - thor (1.2.1) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + thor (1.2.2) thread_safe (0.3.6) - timeout (0.3.0) - tzinfo (1.2.10) + timeout (0.4.0) + tzinfo (1.2.11) thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) - webmock (3.18.1) + unicode-display_width (2.5.0) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.0) + zeitwerk (2.6.12) PLATFORMS - ruby + arm64-darwin-21 + arm64-darwin-22 + x86_64-darwin-19 + x86_64-darwin-20 + x86_64-darwin-21 + x86_64-linux DEPENDENCIES apnotic (~> 1.7) @@ -253,4 +280,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.4.20 diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock index 7a0e209f..49e55200 100644 --- a/gemfiles/rails_6_1.gemfile.lock +++ b/gemfiles/rails_6_1.gemfile.lock @@ -8,106 +8,107 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - apnotic (1.7.0) + apnotic (1.7.1) connection_pool (~> 2) net-http2 (>= 0.18.3, < 2) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.10) - connection_pool (2.3.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) - digest (3.1.0) + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) - faraday (2.5.2) + erubi (1.12.0) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) - ffi (1.15.5) + faraday-net_http (3.0.2) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - globalid (1.0.0) - activesupport (>= 5.0) - googleauth (1.2.0) + globalid (1.2.1) + activesupport (>= 6.1) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.0.1) http-2 (0.11.0) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -115,131 +116,157 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.2) - jwt (2.5.0) + json (2.6.3) + jwt (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) - memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) multi_json (1.15.0) - mysql2 (0.5.4) - net-http2 (0.18.4) + mysql2 (0.5.5) + net-http2 (0.18.5) http-2 (~> 0.11) - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-imap (0.4.1) + date + net-protocol + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - nio4r (2.5.8) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + net-smtp (0.4.0) + net-protocol + nio4r (2.5.9) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pg (1.4.3) - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) - rack-test (2.0.2) + racc + pg (1.5.4) + public_suffix (5.0.3) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) bundler (>= 1.15.0) - railties (= 6.1.7) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) - rexml (3.2.5) - rubocop (1.35.1) + regexp_parser (2.8.2) + rexml (3.2.6) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sprockets (4.1.1) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.5.0) + sqlite3 (1.6.7) mini_portile2 (~> 2.8.0) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) - thor (1.2.1) - timeout (0.3.0) - tzinfo (2.0.5) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + thor (1.2.2) + timeout (0.4.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) - webmock (3.18.1) + unicode-display_width (2.5.0) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.0) + zeitwerk (2.6.12) PLATFORMS - ruby + arm64-darwin-21 + arm64-darwin-22 + x86_64-darwin-19 + x86_64-darwin-20 + x86_64-darwin-21 + x86_64-linux DEPENDENCIES apnotic (~> 1.7) @@ -256,4 +283,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.4.20 diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index 12fd8f1e..b7399782 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -8,112 +8,113 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - apnotic (1.7.0) + apnotic (1.7.1) connection_pool (~> 2) net-http2 (>= 0.18.3, < 2) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.10) - connection_pool (2.3.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) - digest (3.1.0) + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) - faraday (2.5.2) + erubi (1.12.0) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) - ffi (1.15.5) + faraday-net_http (3.0.2) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - globalid (1.0.0) - activesupport (>= 5.0) - googleauth (1.2.0) + globalid (1.2.1) + activesupport (>= 6.1) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.0.1) http-2 (0.11.0) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -121,136 +122,149 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.2) - jwt (2.5.0) + json (2.6.3) + jwt (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) - memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.16.3) + mini_mime (1.1.5) + minitest (5.20.0) multi_json (1.15.0) - mysql2 (0.5.4) - net-http2 (0.18.4) + mysql2 (0.5.5) + net-http2 (0.18.5) http-2 (~> 0.11) - net-imap (0.2.3) - digest + net-imap (0.4.1) + date net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-smtp (0.4.0) net-protocol - timeout - nio4r (2.5.8) - nokogiri (1.13.8-arm64-darwin) + nio4r (2.5.9) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-darwin) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pg (1.4.3) - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) - rack-test (2.0.2) + racc + pg (1.5.4) + public_suffix (5.0.3) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 7.0.4) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.0.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) - rexml (3.2.5) - rubocop (1.35.1) + regexp_parser (2.8.2) + rexml (3.2.6) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sqlite3 (1.5.0-arm64-darwin) - sqlite3 (1.5.0-x86_64-darwin) - sqlite3 (1.5.0-x86_64-linux) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) - strscan (3.0.4) - thor (1.2.1) - timeout (0.3.0) - tzinfo (2.0.5) + sqlite3 (1.6.7-arm64-darwin) + sqlite3 (1.6.7-x86_64-darwin) + sqlite3 (1.6.7-x86_64-linux) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + thor (1.2.2) + timeout (0.4.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) - webmock (3.18.1) + unicode-display_width (2.5.0) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.0) + zeitwerk (2.6.12) PLATFORMS arm64-darwin-21 + arm64-darwin-22 x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 @@ -271,4 +285,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.4.20 diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile new file mode 100644 index 00000000..501c622c --- /dev/null +++ b/gemfiles/rails_7_1.gemfile @@ -0,0 +1,12 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "byebug", group: [:development, :test] +gem "appraisal" +gem "net-smtp" +gem "apnotic", "~> 1.7" +gem "googleauth", "~> 1.1" +gem "rails", "~> 7.1.0" + +gemspec path: "../" diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock new file mode 100644 index 00000000..0ef3aa99 --- /dev/null +++ b/gemfiles/rails_7_1.gemfile.lock @@ -0,0 +1,311 @@ +PATH + remote: .. + specs: + noticed (1.6.0) + http (>= 4.0.0) + rails (>= 5.2.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.1) + actionpack (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activesupport (= 7.1.1) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.1) + actionview (= 7.1.1) + activesupport (= 7.1.1) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.1) + actionpack (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.1) + activesupport (= 7.1.1) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.1) + activesupport (= 7.1.1) + globalid (>= 0.3.6) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) + timeout (>= 0.4.0) + activestorage (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activesupport (= 7.1.1) + marcel (~> 1.0) + activesupport (7.1.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + apnotic (1.7.1) + connection_pool (~> 2) + net-http2 (>= 0.18.3, < 2) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + bigdecimal (3.1.4) + builder (3.2.4) + byebug (11.1.3) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crack (0.4.5) + rexml + crass (1.0.6) + date (3.3.3) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + drb (2.1.1) + ruby2_keywords + erubi (1.12.0) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.16.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + globalid (1.2.1) + activesupport (>= 6.1) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + hashdiff (1.0.1) + http-2 (0.11.0) + http (5.1.1) + addressable (~> 2.8) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + llhttp-ffi (~> 0.4.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + http-form_data (2.3.0) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.8.1) + rdoc + reline (>= 0.3.8) + json (2.6.3) + jwt (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + loofah (2.21.4) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + mini_mime (1.1.5) + minitest (5.20.0) + multi_json (1.15.0) + mutex_m (0.1.2) + mysql2 (0.5.5) + net-http2 (0.18.5) + http-2 (~> 0.11) + net-imap (0.4.1) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.5.9) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + pg (1.5.4) + psych (5.1.1) + stringio + public_suffix (5.0.3) + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.1) + actioncable (= 7.1.1) + actionmailbox (= 7.1.1) + actionmailer (= 7.1.1) + actionpack (= 7.1.1) + actiontext (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activemodel (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) + bundler (>= 1.15.0) + railties (= 7.1.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.0.6) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.2) + reline (0.3.9) + io-console (~> 0.5) + rexml (3.2.6) + rubocop (1.56.4) + base64 (~> 0.1.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + signet (0.18.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + sqlite3 (1.6.7-arm64-darwin) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + stringio (3.0.8) + thor (1.2.2) + timeout (0.4.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.5.0) + webmock (3.19.1) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + x86_64-darwin-19 + x86_64-darwin-20 + x86_64-darwin-21 + x86_64-linux + +DEPENDENCIES + apnotic (~> 1.7) + appraisal + byebug + googleauth (~> 1.1) + mysql2 + net-smtp + noticed! + pg + rails (~> 7.1.0) + sqlite3 + standard + webmock + +BUNDLED WITH + 2.4.20 diff --git a/gemfiles/rails_master.gemfile.lock b/gemfiles/rails_master.gemfile.lock index ddb427a1..6f27255a 100644 --- a/gemfiles/rails_master.gemfile.lock +++ b/gemfiles/rails_master.gemfile.lock @@ -1,95 +1,102 @@ GIT remote: https://github.com/rails/rails.git - revision: 93b2a2c05fb1211a92944add06ce85c380ee2b88 + revision: 90a6f3663b937cf90a7f642a10dfb36f8710ce6d branch: main specs: - actioncable (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actioncable (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activestorage (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionmailbox (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activejob (= 7.2.0.alpha) + activerecord (= 7.2.0.alpha) + activestorage (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - actionview (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionmailer (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + actionview (= 7.2.0.alpha) + activejob (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.1.0.alpha) - actionview (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.2.0.alpha) + actionview (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activestorage (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activerecord (= 7.2.0.alpha) + activestorage (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionview (7.2.0.alpha) + activesupport (= 7.2.0.alpha) builder (~> 3.1) erubi (~> 1.11) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.1.0.alpha) - activesupport (= 7.1.0.alpha) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.0.alpha) + activesupport (= 7.2.0.alpha) globalid (>= 0.3.6) - activemodel (7.1.0.alpha) - activesupport (= 7.1.0.alpha) - activerecord (7.1.0.alpha) - activemodel (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) - activestorage (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + activemodel (7.2.0.alpha) + activesupport (= 7.2.0.alpha) + activerecord (7.2.0.alpha) + activemodel (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + timeout (>= 0.4.0) + activestorage (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activejob (= 7.2.0.alpha) + activerecord (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.1.0.alpha) + activesupport (7.2.0.alpha) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - rails (7.1.0.alpha) - actioncable (= 7.1.0.alpha) - actionmailbox (= 7.1.0.alpha) - actionmailer (= 7.1.0.alpha) - actionpack (= 7.1.0.alpha) - actiontext (= 7.1.0.alpha) - actionview (= 7.1.0.alpha) - activejob (= 7.1.0.alpha) - activemodel (= 7.1.0.alpha) - activerecord (= 7.1.0.alpha) - activestorage (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + rails (7.2.0.alpha) + actioncable (= 7.2.0.alpha) + actionmailbox (= 7.2.0.alpha) + actionmailer (= 7.2.0.alpha) + actionpack (= 7.2.0.alpha) + actiontext (= 7.2.0.alpha) + actionview (= 7.2.0.alpha) + activejob (= 7.2.0.alpha) + activemodel (= 7.2.0.alpha) + activerecord (= 7.2.0.alpha) + activestorage (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) bundler (>= 1.15.0) - railties (= 7.1.0.alpha) - railties (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) - method_source + railties (= 7.2.0.alpha) + railties (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) + thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) PATH @@ -102,47 +109,51 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - apnotic (1.7.0) + apnotic (1.7.1) connection_pool (~> 2) net-http2 (>= 0.18.3, < 2) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) + bigdecimal (3.1.4) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.10) - connection_pool (2.3.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) - digest (3.1.0) + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) - faraday (2.5.2) + drb (2.1.1) + ruby2_keywords + erubi (1.12.0) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) - ffi (1.15.5) + faraday-net_http (3.0.2) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - globalid (1.0.0) - activesupport (>= 5.0) - googleauth (1.2.0) + globalid (1.2.1) + activesupport (>= 6.1) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) hashdiff (1.0.1) http-2 (0.11.0) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -150,115 +161,145 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.2) - jwt (2.5.0) + io-console (0.6.0) + irb (1.8.1) + rdoc + reline (>= 0.3.8) + json (2.6.3) + jwt (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.21.4) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) - memoist (0.16.2) - method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.16.3) + mini_mime (1.1.5) + minitest (5.20.0) multi_json (1.15.0) - mysql2 (0.5.4) - net-http2 (0.18.4) + mutex_m (0.1.2) + mysql2 (0.5.5) + net-http2 (0.18.5) http-2 (~> 0.11) - net-imap (0.2.3) - digest + net-imap (0.4.1) + date net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-smtp (0.4.0) net-protocol - timeout - nio4r (2.5.8) - nokogiri (1.13.8-arm64-darwin) + nio4r (2.5.9) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-darwin) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pg (1.4.3) - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) - rack-test (2.0.2) + racc + pg (1.5.4) + psych (5.1.1) + stringio + public_suffix (5.0.3) + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) - rexml (3.2.5) - rubocop (1.35.1) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.2) + reline (0.3.9) + io-console (~> 0.5) + rexml (3.2.6) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sqlite3 (1.5.0-arm64-darwin) - sqlite3 (1.5.0-x86_64-darwin) - sqlite3 (1.5.0-x86_64-linux) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) - strscan (3.0.4) - thor (1.2.1) - timeout (0.3.0) - tzinfo (2.0.5) + sqlite3 (1.6.7-arm64-darwin) + sqlite3 (1.6.7-x86_64-darwin) + sqlite3 (1.6.7-x86_64-linux) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + stringio (3.0.8) + thor (1.2.2) + timeout (0.4.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) - webmock (3.18.1) + unicode-display_width (2.5.0) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + webrick (1.8.1) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.0) + zeitwerk (2.6.12) PLATFORMS arm64-darwin-21 + arm64-darwin-22 x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 @@ -279,4 +320,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.4.20 From ff9184195b75c614250bf173396de8b34b8f097a Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Wed, 11 Oct 2023 20:13:45 -0500 Subject: [PATCH 2/7] Test against Ruby 3.2 and Rails 7.1 --- .github/workflows/ci.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 042d6475..75c352cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,18 +12,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ['2.7', '3.0', '3.1'] + ruby: ['2.7', '3.0', '3.1', '3.2'] gemfile: - rails_5_2 - rails_6 - rails_6_1 - rails_7 + - rails_7_1 - rails_master exclude: - ruby: '3.0' gemfile: 'rails_5_2' - ruby: '3.1' gemfile: 'rails_5_2' + - ruby: '3.2' + gemfile: 'rails_5_2' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile BUNDLE_PATH_RELATIVE_TO_CWD: true @@ -53,18 +56,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ['2.7', '3.0', '3.1'] + ruby: ['2.7', '3.0', '3.1', '3.2'] gemfile: - rails_5_2 - rails_6 - rails_6_1 - rails_7 + - rails_7_1 - rails_master exclude: - ruby: '3.0' gemfile: 'rails_5_2' - ruby: '3.1' gemfile: 'rails_5_2' + - ruby: '3.2' + gemfile: 'rails_5_2' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile BUNDLE_PATH_RELATIVE_TO_CWD: true @@ -103,18 +109,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ['2.7', '3.0', '3.1'] + ruby: ['2.7', '3.0', '3.1', '3.2'] gemfile: - rails_5_2 - rails_6 - rails_6_1 - rails_7 + - rails_7_1 - rails_master exclude: - ruby: '3.0' gemfile: 'rails_5_2' - ruby: '3.1' gemfile: 'rails_5_2' + - ruby: '3.2' + gemfile: 'rails_5_2' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile BUNDLE_PATH_RELATIVE_TO_CWD: true From 0705a0dc3b86d23e8bd4bc4065d164567408ea9c Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Wed, 11 Oct 2023 20:15:49 -0500 Subject: [PATCH 3/7] Merge --- .github/workflows/ci.yml | 21 +- Appraisals | 2 +- CHANGELOG.md | 14 ++ Gemfile | 7 + Gemfile.lock | 214 +++++++++--------- README.md | 2 +- gemfiles/rails_5_2.gemfile | 5 + gemfiles/rails_5_2.gemfile.lock | 116 +++++++++- gemfiles/rails_6.gemfile | 5 + gemfiles/rails_6.gemfile.lock | 119 +++++++++- gemfiles/rails_6_1.gemfile | 5 + gemfiles/rails_6_1.gemfile.lock | 191 +++++++++++++++- gemfiles/rails_7.gemfile | 5 + gemfiles/rails_7.gemfile.lock | 185 ++++++++++++++- ...ails_master.gemfile => rails_main.gemfile} | 5 + ...r.gemfile.lock => rails_main.gemfile.lock} | 161 ++++++++++++- lib/noticed/delivery_methods/base.rb | 10 +- lib/noticed/delivery_methods/email.rb | 6 +- lib/noticed/model.rb | 6 +- lib/noticed/version.rb | 2 +- .../actioncable/test_helper.rb | 2 +- noticed.gemspec | 6 - test/delivery_methods/slack_test.rb | 23 +- test/noticed_test.rb | 2 +- 24 files changed, 971 insertions(+), 143 deletions(-) rename gemfiles/{rails_master.gemfile => rails_main.gemfile} (78%) rename gemfiles/{rails_master.gemfile.lock => rails_main.gemfile.lock} (60%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75c352cc..e83e10da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - rails_6_1 - rails_7 - rails_7_1 - - rails_master + - rails_main exclude: - ruby: '3.0' gemfile: 'rails_5_2' @@ -27,12 +27,14 @@ jobs: gemfile: 'rails_5_2' - ruby: '3.2' gemfile: 'rails_5_2' + - ruby: '3.2' + gemfile: 'rails_6' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile BUNDLE_PATH_RELATIVE_TO_CWD: true steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -40,6 +42,7 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler: default bundler-cache: true + rubygems: latest - name: StandardRb check run: bundle exec standardrb @@ -63,7 +66,7 @@ jobs: - rails_6_1 - rails_7 - rails_7_1 - - rails_master + - rails_main exclude: - ruby: '3.0' gemfile: 'rails_5_2' @@ -71,6 +74,8 @@ jobs: gemfile: 'rails_5_2' - ruby: '3.2' gemfile: 'rails_5_2' + - ruby: '3.2' + gemfile: 'rails_6' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile BUNDLE_PATH_RELATIVE_TO_CWD: true @@ -85,7 +90,7 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -93,6 +98,7 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler: default bundler-cache: true + rubygems: latest - name: StandardRb check run: bundle exec standardrb @@ -116,7 +122,7 @@ jobs: - rails_6_1 - rails_7 - rails_7_1 - - rails_master + - rails_main exclude: - ruby: '3.0' gemfile: 'rails_5_2' @@ -124,6 +130,8 @@ jobs: gemfile: 'rails_5_2' - ruby: '3.2' gemfile: 'rails_5_2' + - ruby: '3.2' + gemfile: 'rails_6' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile BUNDLE_PATH_RELATIVE_TO_CWD: true @@ -138,7 +146,7 @@ jobs: ports: ['5432:5432'] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -146,6 +154,7 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler: default bundler-cache: true + rubygems: latest - name: StandardRb check run: bundle exec standardrb diff --git a/Appraisals b/Appraisals index 3eb2eb8c..f9b6e6ed 100644 --- a/Appraisals +++ b/Appraisals @@ -18,6 +18,6 @@ appraise "rails-7-1" do gem "rails", "~> 7.1.0" end -appraise "rails-master" do +appraise "rails-main" do gem "rails", github: "rails/rails", branch: "main" end diff --git a/CHANGELOG.md b/CHANGELOG.md index 52f1d3f8..d407ccdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ ### Unreleased +### 1.6.3 + +* Fix `debug` and `ignore_failure` options in `post` requests. #284 - @mike-burns +* Add `logger` option to delivery methods to allow overriding the logger (defaults to `Rails.logger`) - @excid3 + +### 1.6.2 + +* Improve deprecation fix to include Rails 7.1.0.alpha and higher + +### 1.6.1 + +* Fix overridden `Object#method` in `Noticed::DeliveryMethods::Email` - @quadule +* Fix Rails 7.1 deprecation warning #281 - @excid3 + ### 1.6.0 * Catch deserialization errors. Instead of raising an ActiveRecord::RecordNotFound error, Noticed will replace params with information about the error. diff --git a/Gemfile b/Gemfile index a65c6d8d..39234a78 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,13 @@ gemspec # Git. Remember to move these dependencies to your gemspec before releasing # your gem to rubygems.org. +gem "standard" +gem "webmock" + +gem "pg" +gem "mysql2" +gem "sqlite3", "~> 1.6.0.rc2" + # To use a debugger gem "byebug", group: [:development, :test] gem "appraisal" diff --git a/Gemfile.lock b/Gemfile.lock index 46a2f3b8..d6bf8a33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,74 +1,74 @@ PATH remote: . specs: - noticed (1.6.0) + noticed (1.6.3) http (>= 4.0.0) rails (>= 5.2.0) GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actionmailbox (7.0.4.2) + actionpack (= 7.0.4.2) + activejob (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.0.4.2) + actionpack (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) + actionpack (7.0.4.2) + actionview (= 7.0.4.2) + activesupport (= 7.0.4.2) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actiontext (7.0.4.2) + actionpack (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.4.2) + activesupport (= 7.0.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) + activemodel (7.0.4.2) + activesupport (= 7.0.4.2) + activerecord (7.0.4.2) + activemodel (= 7.0.4.2) + activesupport (= 7.0.4.2) + activestorage (7.0.4.2) + actionpack (= 7.0.4.2) + activejob (= 7.0.4.2) + activerecord (= 7.0.4.2) + activesupport (= 7.0.4.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -85,26 +85,26 @@ GEM ast (2.4.2) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) connection_pool (2.3.0) crack (0.4.5) rexml crass (1.0.6) - digest (3.1.0) + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) - faraday (2.5.2) + erubi (1.12.0) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.2) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) - googleauth (1.2.0) + googleauth (1.3.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -113,7 +113,7 @@ GEM signet (>= 0.16, < 2.a) hashdiff (1.0.1) http-2 (0.11.0) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -123,97 +123,96 @@ GEM http-form_data (2.3.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - json (2.6.2) - jwt (2.5.0) + json (2.6.3) + jwt (2.7.0) + language_server-protocol (3.17.0.3) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + minitest (5.17.0) multi_json (1.15.0) - mysql2 (0.5.4) + mysql2 (0.5.5) net-http2 (0.18.4) http-2 (~> 0.11) - net-imap (0.2.3) - digest + net-imap (0.3.4) + date net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-smtp (0.3.3) net-protocol - timeout nio4r (2.5.8) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + nokogiri (1.14.1-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.1-x86_64-linux) racc (~> 1.4) os (1.1.4) parallel (1.22.1) - parser (3.1.2.1) + parser (3.2.1.0) ast (~> 2.4.1) - pg (1.4.3) - public_suffix (5.0.0) - racc (1.6.0) - rack (2.2.4) + pg (1.4.5) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.6.2) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + rails (7.0.4.2) + actioncable (= 7.0.4.2) + actionmailbox (= 7.0.4.2) + actionmailer (= 7.0.4.2) + actionpack (= 7.0.4.2) + actiontext (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activemodel (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) bundler (>= 1.15.0) - railties (= 7.0.4) + railties (= 7.0.4.2) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) + regexp_parser (2.7.0) rexml (3.2.5) - rubocop (1.35.1) + rubocop (1.44.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + rubocop-performance (1.15.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.11.0) @@ -223,20 +222,20 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sqlite3 (1.5.0) - mini_portile2 (~> 2.8.0) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) - strscan (3.0.4) + sqlite3 (1.6.0-x86_64-darwin) + sqlite3 (1.6.0-x86_64-linux) + standard (1.24.2) + language_server-protocol (~> 3.17.0.2) + rubocop (= 1.44.1) + rubocop-performance (= 1.15.2) thor (1.2.1) - timeout (0.3.0) - tzinfo (2.0.5) + timeout (0.3.1) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -244,10 +243,11 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.0) + zeitwerk (2.6.7) PLATFORMS - ruby + x86_64-darwin-22 + x86_64-linux DEPENDENCIES apnotic (~> 1.7) @@ -258,7 +258,7 @@ DEPENDENCIES net-smtp noticed! pg - sqlite3 + sqlite3 (~> 1.6.0.rc2) standard webmock diff --git a/README.md b/README.md index b92c97fd..b87f062f 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ end * `if: :method_name` - Calls `method_name` and cancels delivery method if `false` is returned * `unless: :method_name` - Calls `method_name` and cancels delivery method if `true` is returned * `delay: ActiveSupport::Duration` - Delays the delivery for the given duration of time -* `delay: :method_name` - Calls `method_name which should return an `ActiveSupport::Duration` and delays the delivery for the given duration of time +* `delay: :method_name` - Calls `method_name` which should return an `ActiveSupport::Duration` and delays the delivery for the given duration of time ##### Helper Methods diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 7790520d..459eb9a1 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "standard" +gem "webmock" +gem "pg" +gem "mysql2" +gem "sqlite3", "~> 1.6.0.rc2" gem "byebug", group: [:development, :test] gem "appraisal" gem "net-smtp" diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index eeaee867..927598e3 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - noticed (1.6.0) + noticed (1.6.3) http (>= 4.0.0) rails (>= 5.2.0) @@ -72,6 +72,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) erubi (1.12.0) +<<<<<<< HEAD faraday (2.7.11) base64 faraday-net_http (>= 2.0, < 3.1) @@ -84,6 +85,19 @@ GEM globalid (1.1.0) activesupport (>= 5.0) googleauth (1.8.1) +======= + faraday (2.7.3) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + globalid (1.0.1) + activesupport (>= 5.0) + googleauth (1.3.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -102,6 +116,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) +<<<<<<< HEAD jwt (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -112,33 +127,67 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) +======= + jwt (2.6.0) + language_server-protocol (3.17.0.2) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + loofah (2.19.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.8.0.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) method_source (1.0.0) +<<<<<<< HEAD mini_mime (1.1.5) mini_portile2 (2.8.4) minitest (5.20.0) +======= + mini_mime (1.1.2) + mini_portile2 (2.8.1) + minitest (5.17.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 multi_json (1.15.0) mysql2 (0.5.5) net-http2 (0.18.5) http-2 (~> 0.11) +<<<<<<< HEAD net-imap (0.4.1) +======= + net-imap (0.3.4) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout +<<<<<<< HEAD net-smtp (0.4.0) net-protocol nio4r (2.5.9) nokogiri (1.15.4) mini_portile2 (~> 2.8.2) +======= + net-smtp (0.3.3) + net-protocol + nio4r (2.5.8) + nokogiri (1.14.0) + mini_portile2 (~> 2.8.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 + racc (~> 1.4) + nokogiri (1.14.0-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) os (1.1.4) +<<<<<<< HEAD parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -148,6 +197,16 @@ GEM racc (1.7.1) rack (2.2.8) rack-test (2.1.0) +======= + parallel (1.22.1) + parser (3.2.0.0) + ast (~> 2.4.1) + pg (1.4.5) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.6.2) + rack-test (2.0.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rack (>= 1.3) rails (5.2.8.1) actioncable (= 5.2.8.1) @@ -166,9 +225,14 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) +<<<<<<< HEAD rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) +======= + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 railties (5.2.8.1) actionpack (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -177,10 +241,16 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.1.1) rake (13.0.6) +<<<<<<< HEAD regexp_parser (2.8.2) rexml (3.2.6) rubocop (1.56.4) base64 (~> 0.1.1) +======= + regexp_parser (2.6.1) + rexml (3.2.5) + rubocop (1.42.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -188,12 +258,21 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) +<<<<<<< HEAD rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) rubocop-performance (1.19.1) +======= + rubocop-ast (>= 1.24.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + rubocop-performance (1.15.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.13.0) @@ -203,13 +282,18 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) +<<<<<<< HEAD sprockets (4.2.1) +======= + sprockets (4.2.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) +<<<<<<< HEAD sqlite3 (1.6.7) mini_portile2 (~> 2.8.0) standard (1.31.2) @@ -228,12 +312,31 @@ GEM thread_safe (0.3.6) timeout (0.4.0) tzinfo (1.2.11) +======= + sqlite3 (1.6.0) + mini_portile2 (~> 2.8.0) + sqlite3 (1.6.0-x86_64-darwin) + sqlite3 (1.6.0-x86_64-linux) + standard (1.22.0) + language_server-protocol (~> 3.17.0.2) + rubocop (= 1.42.0) + rubocop-performance (= 1.15.2) + thor (1.2.1) + thread_safe (0.3.6) + timeout (0.3.1) + tzinfo (1.2.10) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.8.2) +<<<<<<< HEAD unicode-display_width (2.5.0) webmock (3.19.1) +======= + unicode-display_width (2.4.2) + webmock (3.18.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -242,11 +345,16 @@ GEM websocket-extensions (0.1.5) PLATFORMS +<<<<<<< HEAD arm64-darwin-21 arm64-darwin-22 x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 +======= + ruby + x86_64-darwin-22 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 x86_64-linux DEPENDENCIES @@ -259,9 +367,13 @@ DEPENDENCIES noticed! pg rails (~> 5.2.0) - sqlite3 + sqlite3 (~> 1.6.0.rc2) standard webmock BUNDLED WITH +<<<<<<< HEAD 2.4.20 +======= + 2.4.1 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 36c47cda..af45cbfc 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "standard" +gem "webmock" +gem "pg" +gem "mysql2" +gem "sqlite3", "~> 1.6.0.rc2" gem "byebug", group: [:development, :test] gem "appraisal" gem "net-smtp" diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index 9c5496e2..d1196178 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - noticed (1.6.0) + noticed (1.6.3) http (>= 4.0.0) rails (>= 5.2.0) @@ -85,6 +85,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) erubi (1.12.0) +<<<<<<< HEAD faraday (2.7.11) base64 faraday-net_http (>= 2.0, < 3.1) @@ -97,6 +98,19 @@ GEM globalid (1.1.0) activesupport (>= 5.0) googleauth (1.8.1) +======= + faraday (2.7.3) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + globalid (1.0.1) + activesupport (>= 5.0) + googleauth (1.3.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -115,6 +129,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) +<<<<<<< HEAD jwt (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -125,33 +140,67 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) +======= + jwt (2.6.0) + language_server-protocol (3.17.0.2) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + loofah (2.19.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.8.0.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) method_source (1.0.0) +<<<<<<< HEAD mini_mime (1.1.5) mini_portile2 (2.8.4) minitest (5.20.0) +======= + mini_mime (1.1.2) + mini_portile2 (2.8.1) + minitest (5.17.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 multi_json (1.15.0) mysql2 (0.5.5) net-http2 (0.18.5) http-2 (~> 0.11) +<<<<<<< HEAD net-imap (0.4.1) +======= + net-imap (0.3.4) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout +<<<<<<< HEAD net-smtp (0.4.0) net-protocol nio4r (2.5.9) nokogiri (1.15.4) mini_portile2 (~> 2.8.2) +======= + net-smtp (0.3.3) + net-protocol + nio4r (2.5.8) + nokogiri (1.14.0) + mini_portile2 (~> 2.8.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 + racc (~> 1.4) + nokogiri (1.14.0-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) os (1.1.4) +<<<<<<< HEAD parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -161,6 +210,16 @@ GEM racc (1.7.1) rack (2.2.8) rack-test (2.1.0) +======= + parallel (1.22.1) + parser (3.2.0.0) + ast (~> 2.4.1) + pg (1.4.5) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.6.2) + rack-test (2.0.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rack (>= 1.3) rails (6.0.6.1) actioncable (= 6.0.6.1) @@ -181,9 +240,14 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) +<<<<<<< HEAD rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) +======= + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 railties (6.0.6.1) actionpack (= 6.0.6.1) activesupport (= 6.0.6.1) @@ -192,10 +256,16 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.1.1) rake (13.0.6) +<<<<<<< HEAD regexp_parser (2.8.2) rexml (3.2.6) rubocop (1.56.4) base64 (~> 0.1.1) +======= + regexp_parser (2.6.1) + rexml (3.2.5) + rubocop (1.42.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -203,12 +273,21 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) +<<<<<<< HEAD rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) rubocop-performance (1.19.1) +======= + rubocop-ast (>= 1.24.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + rubocop-performance (1.15.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.13.0) @@ -218,13 +297,18 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) +<<<<<<< HEAD sprockets (4.2.1) +======= + sprockets (4.2.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) +<<<<<<< HEAD sqlite3 (1.6.7) mini_portile2 (~> 2.8.0) standard (1.31.2) @@ -243,18 +327,38 @@ GEM thread_safe (0.3.6) timeout (0.4.0) tzinfo (1.2.11) +======= + sqlite3 (1.6.0) + mini_portile2 (~> 2.8.0) + sqlite3 (1.6.0-x86_64-darwin) + sqlite3 (1.6.0-x86_64-linux) + standard (1.22.0) + language_server-protocol (~> 3.17.0.2) + rubocop (= 1.42.0) + rubocop-performance (= 1.15.2) + thor (1.2.1) + thread_safe (0.3.6) + timeout (0.3.1) + tzinfo (1.2.10) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.8.2) +<<<<<<< HEAD unicode-display_width (2.5.0) webmock (3.19.1) +======= + unicode-display_width (2.4.2) + webmock (3.18.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) +<<<<<<< HEAD zeitwerk (2.6.12) PLATFORMS @@ -263,6 +367,13 @@ PLATFORMS x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 +======= + zeitwerk (2.6.6) + +PLATFORMS + ruby + x86_64-darwin-22 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 x86_64-linux DEPENDENCIES @@ -275,9 +386,13 @@ DEPENDENCIES noticed! pg rails (~> 6.0.0) - sqlite3 + sqlite3 (~> 1.6.0.rc2) standard webmock BUNDLED WITH +<<<<<<< HEAD 2.4.20 +======= + 2.4.1 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 7641bfa3..662c6f0e 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "standard" +gem "webmock" +gem "pg" +gem "mysql2" +gem "sqlite3", "~> 1.6.0.rc2" gem "byebug", group: [:development, :test] gem "appraisal" gem "net-smtp" diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock index 49e55200..23648f73 100644 --- a/gemfiles/rails_6_1.gemfile.lock +++ b/gemfiles/rails_6_1.gemfile.lock @@ -1,13 +1,14 @@ PATH remote: .. specs: - noticed (1.6.0) + noticed (1.6.3) http (>= 4.0.0) rails (>= 5.2.0) GEM remote: https://rubygems.org/ specs: +<<<<<<< HEAD actioncable (6.1.7.6) actionpack (= 6.1.7.6) activesupport (= 6.1.7.6) @@ -30,10 +31,35 @@ GEM actionpack (6.1.7.6) actionview (= 6.1.7.6) activesupport (= 6.1.7.6) +======= + actioncable (6.1.7.1) + actionpack (= 6.1.7.1) + activesupport (= 6.1.7.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.7.1) + actionpack (= 6.1.7.1) + activejob (= 6.1.7.1) + activerecord (= 6.1.7.1) + activestorage (= 6.1.7.1) + activesupport (= 6.1.7.1) + mail (>= 2.7.1) + actionmailer (6.1.7.1) + actionpack (= 6.1.7.1) + actionview (= 6.1.7.1) + activejob (= 6.1.7.1) + activesupport (= 6.1.7.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.1.7.1) + actionview (= 6.1.7.1) + activesupport (= 6.1.7.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) +<<<<<<< HEAD actiontext (6.1.7.6) actionpack (= 6.1.7.6) activerecord (= 6.1.7.6) @@ -42,10 +68,21 @@ GEM nokogiri (>= 1.8.5) actionview (6.1.7.6) activesupport (= 6.1.7.6) +======= + actiontext (6.1.7.1) + actionpack (= 6.1.7.1) + activerecord (= 6.1.7.1) + activestorage (= 6.1.7.1) + activesupport (= 6.1.7.1) + nokogiri (>= 1.8.5) + actionview (6.1.7.1) + activesupport (= 6.1.7.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) +<<<<<<< HEAD activejob (6.1.7.6) activesupport (= 6.1.7.6) globalid (>= 0.3.6) @@ -62,6 +99,24 @@ GEM marcel (~> 1.0) mini_mime (>= 1.1.0) activesupport (6.1.7.6) +======= + activejob (6.1.7.1) + activesupport (= 6.1.7.1) + globalid (>= 0.3.6) + activemodel (6.1.7.1) + activesupport (= 6.1.7.1) + activerecord (6.1.7.1) + activemodel (= 6.1.7.1) + activesupport (= 6.1.7.1) + activestorage (6.1.7.1) + actionpack (= 6.1.7.1) + activejob (= 6.1.7.1) + activerecord (= 6.1.7.1) + activesupport (= 6.1.7.1) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -89,6 +144,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) erubi (1.12.0) +<<<<<<< HEAD faraday (2.7.11) base64 faraday-net_http (>= 2.0, < 3.1) @@ -101,6 +157,19 @@ GEM globalid (1.2.1) activesupport (>= 6.1) googleauth (1.8.1) +======= + faraday (2.7.3) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + globalid (1.0.1) + activesupport (>= 5.0) + googleauth (1.3.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -119,6 +188,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) +<<<<<<< HEAD jwt (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -129,33 +199,67 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) +======= + jwt (2.6.0) + language_server-protocol (3.17.0.2) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + loofah (2.19.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.8.0.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) method_source (1.0.0) +<<<<<<< HEAD mini_mime (1.1.5) mini_portile2 (2.8.4) minitest (5.20.0) +======= + mini_mime (1.1.2) + mini_portile2 (2.8.1) + minitest (5.17.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 multi_json (1.15.0) mysql2 (0.5.5) net-http2 (0.18.5) http-2 (~> 0.11) +<<<<<<< HEAD net-imap (0.4.1) +======= + net-imap (0.3.4) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout +<<<<<<< HEAD net-smtp (0.4.0) net-protocol nio4r (2.5.9) nokogiri (1.15.4) mini_portile2 (~> 2.8.2) +======= + net-smtp (0.3.3) + net-protocol + nio4r (2.5.8) + nokogiri (1.14.0) + mini_portile2 (~> 2.8.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 + racc (~> 1.4) + nokogiri (1.14.0-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) os (1.1.4) +<<<<<<< HEAD parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -180,26 +284,65 @@ GEM activesupport (= 6.1.7.6) bundler (>= 1.15.0) railties (= 6.1.7.6) +======= + parallel (1.22.1) + parser (3.2.0.0) + ast (~> 2.4.1) + pg (1.4.5) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.6.2) + rack-test (2.0.2) + rack (>= 1.3) + rails (6.1.7.1) + actioncable (= 6.1.7.1) + actionmailbox (= 6.1.7.1) + actionmailer (= 6.1.7.1) + actionpack (= 6.1.7.1) + actiontext (= 6.1.7.1) + actionview (= 6.1.7.1) + activejob (= 6.1.7.1) + activemodel (= 6.1.7.1) + activerecord (= 6.1.7.1) + activestorage (= 6.1.7.1) + activesupport (= 6.1.7.1) + bundler (>= 1.15.0) + railties (= 6.1.7.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) +<<<<<<< HEAD rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) railties (6.1.7.6) actionpack (= 6.1.7.6) activesupport (= 6.1.7.6) +======= + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) + railties (6.1.7.1) + actionpack (= 6.1.7.1) + activesupport (= 6.1.7.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) +<<<<<<< HEAD regexp_parser (2.8.2) rexml (3.2.6) rubocop (1.56.4) base64 (~> 0.1.1) +======= + regexp_parser (2.6.1) + rexml (3.2.5) + rubocop (1.42.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -207,12 +350,21 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) +<<<<<<< HEAD rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) rubocop-performance (1.19.1) +======= + rubocop-ast (>= 1.24.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + rubocop-performance (1.15.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.13.0) @@ -222,13 +374,18 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) +<<<<<<< HEAD sprockets (4.2.1) +======= + sprockets (4.2.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) +<<<<<<< HEAD sqlite3 (1.6.7) mini_portile2 (~> 2.8.0) standard (1.31.2) @@ -246,18 +403,37 @@ GEM thor (1.2.2) timeout (0.4.0) tzinfo (2.0.6) +======= + sqlite3 (1.6.0) + mini_portile2 (~> 2.8.0) + sqlite3 (1.6.0-x86_64-darwin) + sqlite3 (1.6.0-x86_64-linux) + standard (1.22.0) + language_server-protocol (~> 3.17.0.2) + rubocop (= 1.42.0) + rubocop-performance (= 1.15.2) + thor (1.2.1) + timeout (0.3.1) + tzinfo (2.0.5) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) +<<<<<<< HEAD unicode-display_width (2.5.0) webmock (3.19.1) +======= + unicode-display_width (2.4.2) + webmock (3.18.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) +<<<<<<< HEAD zeitwerk (2.6.12) PLATFORMS @@ -266,6 +442,13 @@ PLATFORMS x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 +======= + zeitwerk (2.6.6) + +PLATFORMS + ruby + x86_64-darwin-22 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 x86_64-linux DEPENDENCIES @@ -278,9 +461,13 @@ DEPENDENCIES noticed! pg rails (~> 6.1.0) - sqlite3 + sqlite3 (~> 1.6.0.rc2) standard webmock BUNDLED WITH +<<<<<<< HEAD 2.4.20 +======= + 2.4.1 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index efb6687c..7a2e996c 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "standard" +gem "webmock" +gem "pg" +gem "mysql2" +gem "sqlite3", "~> 1.6.0.rc2" gem "byebug", group: [:development, :test] gem "appraisal" gem "net-smtp" diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index b7399782..656183d4 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -1,13 +1,14 @@ PATH remote: .. specs: - noticed (1.6.0) + noticed (1.6.3) http (>= 4.0.0) rails (>= 5.2.0) GEM remote: https://rubygems.org/ specs: +<<<<<<< HEAD actioncable (7.0.8) actionpack (= 7.0.8) activesupport (= 7.0.8) @@ -19,20 +20,42 @@ GEM activerecord (= 7.0.8) activestorage (= 7.0.8) activesupport (= 7.0.8) +======= + actioncable (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.1) + actionpack (= 7.0.4.1) + activejob (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 mail (>= 2.7.1) net-imap net-pop net-smtp +<<<<<<< HEAD actionmailer (7.0.8) actionpack (= 7.0.8) actionview (= 7.0.8) activejob (= 7.0.8) activesupport (= 7.0.8) +======= + actionmailer (7.0.4.1) + actionpack (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activesupport (= 7.0.4.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) +<<<<<<< HEAD actionpack (7.0.8) actionview (= 7.0.8) activesupport (= 7.0.8) @@ -49,10 +72,29 @@ GEM nokogiri (>= 1.8.5) actionview (7.0.8) activesupport (= 7.0.8) +======= + actionpack (7.0.4.1) + actionview (= 7.0.4.1) + activesupport (= 7.0.4.1) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.1) + actionpack (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.1) + activesupport (= 7.0.4.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) +<<<<<<< HEAD activejob (7.0.8) activesupport (= 7.0.8) globalid (>= 0.3.6) @@ -69,6 +111,24 @@ GEM marcel (~> 1.0) mini_mime (>= 1.1.0) activesupport (7.0.8) +======= + activejob (7.0.4.1) + activesupport (= 7.0.4.1) + globalid (>= 0.3.6) + activemodel (7.0.4.1) + activesupport (= 7.0.4.1) + activerecord (7.0.4.1) + activemodel (= 7.0.4.1) + activesupport (= 7.0.4.1) + activestorage (7.0.4.1) + actionpack (= 7.0.4.1) + activejob (= 7.0.4.1) + activerecord (= 7.0.4.1) + activesupport (= 7.0.4.1) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.4.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -95,6 +155,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) erubi (1.12.0) +<<<<<<< HEAD faraday (2.7.11) base64 faraday-net_http (>= 2.0, < 3.1) @@ -107,6 +168,19 @@ GEM globalid (1.2.1) activesupport (>= 6.1) googleauth (1.8.1) +======= + faraday (2.7.3) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + globalid (1.0.1) + activesupport (>= 5.0) + googleauth (1.3.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -125,6 +199,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) +<<<<<<< HEAD jwt (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -135,25 +210,46 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) +======= + jwt (2.6.0) + language_server-protocol (3.17.0.2) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + loofah (2.19.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.8.0.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) method_source (1.0.0) +<<<<<<< HEAD mini_mime (1.1.5) minitest (5.20.0) +======= + mini_mime (1.1.2) + minitest (5.17.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 multi_json (1.15.0) mysql2 (0.5.5) net-http2 (0.18.5) http-2 (~> 0.11) +<<<<<<< HEAD net-imap (0.4.1) +======= + net-imap (0.3.4) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout +<<<<<<< HEAD net-smtp (0.4.0) net-protocol nio4r (2.5.9) @@ -198,16 +294,65 @@ GEM railties (7.0.8) actionpack (= 7.0.8) activesupport (= 7.0.8) +======= + net-smtp (0.3.3) + net-protocol + nio4r (2.5.8) + nokogiri (1.14.0-arm64-darwin) + racc (~> 1.4) + nokogiri (1.14.0-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.0-x86_64-linux) + racc (~> 1.4) + os (1.1.4) + parallel (1.22.1) + parser (3.2.0.0) + ast (~> 2.4.1) + pg (1.4.5) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.6.2) + rack-test (2.0.2) + rack (>= 1.3) + rails (7.0.4.1) + actioncable (= 7.0.4.1) + actionmailbox (= 7.0.4.1) + actionmailer (= 7.0.4.1) + actionpack (= 7.0.4.1) + actiontext (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activemodel (= 7.0.4.1) + activerecord (= 7.0.4.1) + activestorage (= 7.0.4.1) + activesupport (= 7.0.4.1) + bundler (>= 1.15.0) + railties (= 7.0.4.1) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) +<<<<<<< HEAD regexp_parser (2.8.2) rexml (3.2.6) rubocop (1.56.4) base64 (~> 0.1.1) +======= + regexp_parser (2.6.1) + rexml (3.2.5) + rubocop (1.42.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -215,12 +360,21 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) +<<<<<<< HEAD rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) rubocop-performance (1.19.1) +======= + rubocop-ast (>= 1.24.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + rubocop-performance (1.15.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.13.0) @@ -230,6 +384,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) +<<<<<<< HEAD sqlite3 (1.6.7-arm64-darwin) sqlite3 (1.6.7-x86_64-darwin) sqlite3 (1.6.7-x86_64-linux) @@ -248,19 +403,40 @@ GEM thor (1.2.2) timeout (0.4.0) tzinfo (2.0.6) +======= + sqlite3 (1.6.0-arm64-darwin) + sqlite3 (1.6.0-x86_64-darwin) + sqlite3 (1.6.0-x86_64-linux) + standard (1.22.0) + language_server-protocol (~> 3.17.0.2) + rubocop (= 1.42.0) + rubocop-performance (= 1.15.2) + thor (1.2.1) + timeout (0.3.1) + tzinfo (2.0.5) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) +<<<<<<< HEAD unicode-display_width (2.5.0) webmock (3.19.1) +======= + unicode-display_width (2.4.2) + webmock (3.18.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) +<<<<<<< HEAD zeitwerk (2.6.12) +======= + zeitwerk (2.6.6) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 PLATFORMS arm64-darwin-21 @@ -268,6 +444,7 @@ PLATFORMS x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 + x86_64-darwin-22 x86_64-linux DEPENDENCIES @@ -280,9 +457,13 @@ DEPENDENCIES noticed! pg rails (~> 7.0.0) - sqlite3 + sqlite3 (~> 1.6.0.rc2) standard webmock BUNDLED WITH +<<<<<<< HEAD 2.4.20 +======= + 2.4.1 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555 diff --git a/gemfiles/rails_master.gemfile b/gemfiles/rails_main.gemfile similarity index 78% rename from gemfiles/rails_master.gemfile rename to gemfiles/rails_main.gemfile index 17c543c0..c9583496 100644 --- a/gemfiles/rails_master.gemfile +++ b/gemfiles/rails_main.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "standard" +gem "webmock" +gem "pg" +gem "mysql2" +gem "sqlite3", "~> 1.6.0.rc2" gem "byebug", group: [:development, :test] gem "appraisal" gem "net-smtp" diff --git a/gemfiles/rails_master.gemfile.lock b/gemfiles/rails_main.gemfile.lock similarity index 60% rename from gemfiles/rails_master.gemfile.lock rename to gemfiles/rails_main.gemfile.lock index 6f27255a..c03641ba 100644 --- a/gemfiles/rails_master.gemfile.lock +++ b/gemfiles/rails_main.gemfile.lock @@ -1,6 +1,10 @@ GIT remote: https://github.com/rails/rails.git +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock revision: 90a6f3663b937cf90a7f642a10dfb36f8710ce6d +======= + revision: cc359c077fadc619dd4d098a3639b6eab22d6a06 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock branch: main specs: actioncable (7.2.0.alpha) @@ -28,10 +32,17 @@ GIT net-imap net-pop net-smtp +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock rails-dom-testing (~> 2.2) actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) +======= + rails-dom-testing (~> 2.0) + actionpack (7.1.0.alpha) + actionview (= 7.1.0.alpha) + activesupport (= 7.1.0.alpha) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -66,9 +77,13 @@ GIT activerecord (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) marcel (~> 1.0) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock activesupport (7.2.0.alpha) base64 bigdecimal +======= + activesupport (7.1.0.alpha) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) drb @@ -89,10 +104,17 @@ GIT activestorage (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) bundler (>= 1.15.0) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock railties (= 7.2.0.alpha) railties (7.2.0.alpha) actionpack (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) +======= + railties (= 7.1.0.alpha) + railties (7.1.0.alpha) + actionpack (= 7.1.0.alpha) + activesupport (= 7.1.0.alpha) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock irb rackup (>= 1.0.0) rake (>= 12.2) @@ -102,14 +124,18 @@ GIT PATH remote: .. specs: - noticed (1.6.0) + noticed (1.6.3) http (>= 4.0.0) rails (>= 5.2.0) GEM remote: https://rubygems.org/ specs: +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock addressable (2.8.5) +======= + addressable (2.8.4) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock public_suffix (>= 2.0.2, < 6.0) apnotic (1.7.1) connection_pool (~> 2) @@ -124,13 +150,18 @@ GEM builder (3.2.4) byebug (11.1.3) concurrent-ruby (1.2.2) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock connection_pool (2.4.1) +======= + connection_pool (2.4.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock crack (0.4.5) rexml crass (1.0.6) date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock drb (2.1.1) ruby2_keywords erubi (1.12.0) @@ -146,6 +177,20 @@ GEM globalid (1.2.1) activesupport (>= 6.1) googleauth (1.8.1) +======= + erubi (1.12.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + globalid (1.1.0) + activesupport (>= 5.0) + googleauth (1.5.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -161,6 +206,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) @@ -177,12 +223,30 @@ GEM loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) +======= + i18n (1.13.0) + concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.6.4) + reline (>= 0.3.0) + json (2.6.3) + jwt (2.7.0) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock mini_mime (1.1.5) minitest (5.20.0) multi_json (1.15.0) @@ -191,12 +255,23 @@ GEM net-http2 (0.18.5) http-2 (~> 0.11) net-imap (0.4.1) +======= + memoist (0.16.2) + mini_mime (1.1.2) + minitest (5.18.0) + multi_json (1.15.0) + mysql2 (0.5.5) + net-http2 (0.18.5) + http-2 (~> 0.11) + net-imap (0.3.4) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock net-smtp (0.4.0) net-protocol nio4r (2.5.9) @@ -217,6 +292,23 @@ GEM public_suffix (5.0.3) racc (1.7.1) rack (3.0.8) +======= + net-smtp (0.3.3) + net-protocol + nio4r (2.5.9) + nokogiri (1.14.3-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.14.3-x86_64-linux) + racc (~> 1.4) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.1) + ast (~> 2.4.1) + pg (1.5.3) + public_suffix (5.0.1) + racc (1.6.2) + rack (3.0.7) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -224,6 +316,7 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -241,9 +334,24 @@ GEM rexml (3.2.6) rubocop (1.56.4) base64 (~> 0.1.1) +======= + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + rainbow (3.1.1) + rake (13.0.6) + regexp_parser (2.8.0) + reline (0.3.3) + io-console (~> 0.5) + rexml (3.2.5) + rubocop (1.50.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) @@ -254,6 +362,18 @@ GEM rubocop-ast (1.29.0) parser (>= 3.2.1.0) rubocop-performance (1.19.1) +======= + parser (>= 3.2.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.0) + parser (>= 3.2.1.0) + rubocop-performance (1.16.0) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.13.0) @@ -263,6 +383,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock sqlite3 (1.6.7-arm64-darwin) sqlite3 (1.6.7-x86_64-darwin) sqlite3 (1.6.7-x86_64-linux) @@ -281,17 +402,40 @@ GEM stringio (3.0.8) thor (1.2.2) timeout (0.4.0) +======= + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) + standard (1.28.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50.2) + standard-custom (~> 1.0.0) + standard-performance (~> 1.0.1) + standard-custom (1.0.0) + lint_roller (~> 1.0) + standard-performance (1.0.1) + lint_roller (~> 1.0) + rubocop-performance (~> 1.16.0) + thor (1.2.1) + timeout (0.3.2) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock unicode-display_width (2.5.0) webmock (3.19.1) +======= + unicode-display_width (2.4.2) + webmock (3.18.1) +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -303,6 +447,15 @@ PLATFORMS x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 +======= + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.8) + +PLATFORMS + x86_64-darwin-22 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock x86_64-linux DEPENDENCIES @@ -315,9 +468,13 @@ DEPENDENCIES noticed! pg rails! - sqlite3 + sqlite3 (~> 1.6.0.rc2) standard webmock BUNDLED WITH +<<<<<<< HEAD:gemfiles/rails_master.gemfile.lock 2.4.20 +======= + 2.4.12 +>>>>>>> c4b364ea0521aa26b1ff79bbd7bf139e915e8555:gemfiles/rails_main.gemfile.lock diff --git a/lib/noticed/delivery_methods/base.rb b/lib/noticed/delivery_methods/base.rb index a9c57dc1..3b6793c0 100644 --- a/lib/noticed/delivery_methods/base.rb +++ b/lib/noticed/delivery_methods/base.rb @@ -6,7 +6,7 @@ class Base < Noticed.parent_class.constantize class_attribute :option_names, instance_writer: false, default: [] - attr_reader :notification, :options, :params, :recipient, :record + attr_reader :notification, :options, :params, :recipient, :record, :logger class << self # Copy option names from parent @@ -36,6 +36,9 @@ def assign_args(args) @recipient = args[:recipient] @record = args[:record] + # Set the default logger + @logger = @options.fetch(:logger, Rails.logger) + # Make notification aware of database record and recipient during delivery @notification.record = args[:record] @notification.recipient = args[:recipient] @@ -65,7 +68,6 @@ def deliver # post("http://example.com", basic_auth: {user:, pass:}, headers: {}, json: {}, form: {}) # def post(url, args = {}) - options ||= {} basic_auth = args.delete(:basic_auth) headers = args.delete(:headers) @@ -76,8 +78,8 @@ def post(url, args = {}) response = request.post(url, args) if options[:debug] - Rails.logger.debug("POST #{url}") - Rails.logger.debug("Response: #{response.code}: #{response}") + logger.debug("POST #{url}") + logger.debug("Response: #{response.code}: #{response}") end if !options[:ignore_failure] && !response.status.success? diff --git a/lib/noticed/delivery_methods/email.rb b/lib/noticed/delivery_methods/email.rb index 36b7c291..a62d3e3e 100644 --- a/lib/noticed/delivery_methods/email.rb +++ b/lib/noticed/delivery_methods/email.rb @@ -5,9 +5,9 @@ class Email < Base def deliver if options[:enqueue] - mailer.with(format).send(method.to_sym).deliver_later + mailer.with(format).send(mailer_method.to_sym).deliver_later else - mailer.with(format).send(method.to_sym).deliver_now + mailer.with(format).send(mailer_method.to_sym).deliver_now end end @@ -33,7 +33,7 @@ def mailer # If notification responds to symbol, call that method and use return value # If notification does not respond to symbol, use the symbol for the mailer method # Otherwise, use the underscored notification class name as the mailer method - def method + def mailer_method method_name = options[:method]&.to_sym if method_name.present? notification.respond_to?(method_name) ? notification.send(method_name) : method_name diff --git a/lib/noticed/model.rb b/lib/noticed/model.rb index 64acc26b..ba70dd35 100644 --- a/lib/noticed/model.rb +++ b/lib/noticed/model.rb @@ -13,7 +13,11 @@ module Model included do self.inheritance_column = nil - serialize :params, noticed_coder + if Rails.gem_version >= Gem::Version.new("7.1.0.alpha") + serialize :params, coder: noticed_coder + else + serialize :params, noticed_coder + end belongs_to :recipient, polymorphic: true diff --git a/lib/noticed/version.rb b/lib/noticed/version.rb index 97da5273..f7e52b85 100644 --- a/lib/noticed/version.rb +++ b/lib/noticed/version.rb @@ -1,3 +1,3 @@ module Noticed - VERSION = "1.6.0" + VERSION = "1.6.3" end diff --git a/lib/rails_6_polyfills/actioncable/test_helper.rb b/lib/rails_6_polyfills/actioncable/test_helper.rb index be7dda3f..55fd62b9 100644 --- a/lib/rails_6_polyfills/actioncable/test_helper.rb +++ b/lib/rails_6_polyfills/actioncable/test_helper.rb @@ -5,7 +5,7 @@ module ActionCable module Server class Configuration def pubsub_adapter - cable["adapter"] == "test" ? ActionCable::SubscriptionAdapter::Test : super + (cable["adapter"] == "test") ? ActionCable::SubscriptionAdapter::Test : super end end end diff --git a/noticed.gemspec b/noticed.gemspec index 1313580b..83d97d20 100644 --- a/noticed.gemspec +++ b/noticed.gemspec @@ -18,10 +18,4 @@ Gem::Specification.new do |spec| spec.add_dependency "rails", ">= 5.2.0" spec.add_dependency "http", ">= 4.0.0" - - spec.add_development_dependency "pg" - spec.add_development_dependency "standard" - spec.add_development_dependency "webmock" - spec.add_development_dependency "mysql2" - spec.add_development_dependency "sqlite3" end diff --git a/test/delivery_methods/slack_test.rb b/test/delivery_methods/slack_test.rb index ba34db44..3ceb0ab1 100644 --- a/test/delivery_methods/slack_test.rb +++ b/test/delivery_methods/slack_test.rb @@ -1,8 +1,17 @@ require "test_helper" class SlackTest < ActiveSupport::TestCase + class TestLogger + attr_reader :logs + + def debug(msg) + @logs ||= [] + @logs << msg + end + end + class SlackExample < Noticed::Base - deliver_by :slack, debug: true, url: :slack_url + deliver_by :slack, debug: true, url: :slack_url, logger: TestLogger.new def slack_url "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX" @@ -34,4 +43,16 @@ def slack_url assert_kind_of HTTP::Response, response end + + test "logs verbosely in debug mode" do + stub_delivery_method_request(delivery_method: :slack, matcher: /hooks.slack.com/) + + SlackExample.new.deliver(user) + + logger = SlackExample.delivery_methods.find { |m| m[:name] == :slack }.dig(:options, :logger) + assert_equal logger.logs[-2..], [ + "POST https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX", + "Response: 200: ok\r\n" + ] + end end diff --git a/test/noticed_test.rb b/test/noticed_test.rb index 0cee12bd..0c5c27c5 100644 --- a/test/noticed_test.rb +++ b/test/noticed_test.rb @@ -99,7 +99,7 @@ class WithDynamicDelay < Noticed::Base deliver_by :test, delay: :dynamic_delay def dynamic_delay - recipient.email == "first@example.com" ? 1.minute : 2.minutes + (recipient.email == "first@example.com") ? 1.minute : 2.minutes end end From fdc32936607f943a6db3d5e4f10ad7a53760676c Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Wed, 11 Oct 2023 20:29:09 -0500 Subject: [PATCH 4/7] Set target ruby version to 2.7 --- .standard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.standard.yml b/.standard.yml index f1b942c7..f925a432 100644 --- a/.standard.yml +++ b/.standard.yml @@ -1,3 +1,4 @@ +ruby_version: 2.7 ignore: - '**/*': - Style/HashSyntax From 8864bbc15961e4b5764e3c6267d9b1b94324f1a3 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Wed, 11 Oct 2023 20:54:09 -0500 Subject: [PATCH 5/7] Add support for HTML translations. Fixes #310 (#311) Allows users to use _html translations that will be automatically marked as html safe. --- CHANGELOG.md | 2 ++ lib/noticed/translation.rb | 8 +++++++- test/dummy/config/environments/development.rb | 8 -------- test/dummy/config/locales/en.yml | 1 + test/translation_test.rb | 12 ++++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d407ccdb..4d04e8bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ### Unreleased +* Support html safe translations for Rails 7+ + ### 1.6.3 * Fix `debug` and `ignore_failure` options in `post` requests. #284 - @mike-burns diff --git a/lib/noticed/translation.rb b/lib/noticed/translation.rb index ff8bd8f0..44571def 100644 --- a/lib/noticed/translation.rb +++ b/lib/noticed/translation.rb @@ -2,6 +2,8 @@ module Noticed module Translation extend ActiveSupport::Concern + include ActiveSupport::HtmlSafeTranslation if defined?(ActiveSupport::HtmlSafeTranslation) + # Returns the +i18n_scope+ for the class. Overwrite if you want custom lookup. def i18n_scope :notifications @@ -12,7 +14,11 @@ def class_scope end def translate(key, **options) - I18n.translate(scope_translation_key(key), **options) + if defined?(super) + super scope_translation_key(key), **options + else + I18n.translate scope_translation_key(key), **options + end end alias_method :t, :translate diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb index 09692df0..150fcfe2 100644 --- a/test/dummy/config/environments/development.rb +++ b/test/dummy/config/environments/development.rb @@ -45,14 +45,6 @@ # Highlight code that triggered database queries in logs. config.active_record.verbose_query_logs = true - # Debug mode disables concatenation and preprocessing of assets. - # This option may cause significant delays in view rendering with a large - # number of complex assets. - config.assets.debug = true - - # Suppress logger output for asset requests. - config.assets.quiet = true - # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true diff --git a/test/dummy/config/locales/en.yml b/test/dummy/config/locales/en.yml index aed50484..676340a8 100644 --- a/test/dummy/config/locales/en.yml +++ b/test/dummy/config/locales/en.yml @@ -31,6 +31,7 @@ en: hello: "Hello world" + message_html: "

Hello world

" notifications: noticed: i18n_example: diff --git a/test/translation_test.rb b/test/translation_test.rb index 250d1f43..8be0dfdb 100644 --- a/test/translation_test.rb +++ b/test/translation_test.rb @@ -5,6 +5,10 @@ class I18nExample < Noticed::Base def message t("hello") end + + def html_message + t("message_html") + end end class Noticed::I18nExample < Noticed::Base @@ -37,4 +41,12 @@ def message assert_equal "noticed.scoped_i18n_example.message", ScopedI18nExample.new.send(:scope_translation_key, ".message") assert_equal "This is a custom scoped translation", ScopedI18nExample.new.message end + + if defined?(ActiveSupport::HtmlSafeTranslation) + test "I18n supports html safe translations" do + message = I18nExample.new.html_message + assert_equal "

Hello world

", message + assert message.html_safe? + end + end end From 7319306d08ff86d99df17cec015f74e2c62783ca Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Thu, 12 Oct 2023 07:07:33 -0500 Subject: [PATCH 6/7] Simplify html translations by just calling module directly --- lib/noticed/translation.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/noticed/translation.rb b/lib/noticed/translation.rb index 44571def..0810157b 100644 --- a/lib/noticed/translation.rb +++ b/lib/noticed/translation.rb @@ -2,8 +2,6 @@ module Noticed module Translation extend ActiveSupport::Concern - include ActiveSupport::HtmlSafeTranslation if defined?(ActiveSupport::HtmlSafeTranslation) - # Returns the +i18n_scope+ for the class. Overwrite if you want custom lookup. def i18n_scope :notifications @@ -14,8 +12,8 @@ def class_scope end def translate(key, **options) - if defined?(super) - super scope_translation_key(key), **options + if defined?(::ActiveSupport::HtmlSafeTranslation) + ActiveSupport::HtmlSafeTranslation.translate scope_translation_key(key), **options else I18n.translate scope_translation_key(key), **options end From a970f6831a5b5419e8253813d899142f61175fc6 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Wed, 18 Oct 2023 07:41:55 -0500 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e83e10da..3785fcf0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,8 @@ on: - '*' push: branches: - - master + - main + jobs: sqlite: runs-on: ubuntu-latest