Merge branch 'ruby-3.2'

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { ruby: 2.7 }
-        - { ruby: 2.7, gemfile: 'gemfiles/rails_7.gemfile' }
-        - { ruby: 2.7, gemfile: 'gemfiles/rails_main.gemfile' }
+        - { ruby: 3.2 }
+        - { ruby: 3.2, gemfile: 'gemfiles/rails_7.gemfile' }
+        - { ruby: 3.2, gemfile: 'gemfiles/rails_main.gemfile' }
 
     services:
       postgres:

Gemfile

@@ -57,6 +57,10 @@ gem 'omniauth-rails_csrf_protection'
 
 gem 'scenic'
 
+gem 'net-imap', require: false
+gem 'net-pop', require: false
+gem 'net-smtp', require: false
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger
   # console

Gemfile.lock

@@ -7,7 +7,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.1.0)
+    Ascii85 (1.1.1)
     actioncable (6.1.6)
       actionpack (= 6.1.6)
       activesupport (= 6.1.6)
@@ -72,6 +72,7 @@ GEM
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.11.1)
       msgpack (~> 1.2)
@@ -80,6 +81,7 @@ GEM
     concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crass (1.0.6)
+    date (3.4.1)
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -101,6 +103,10 @@ GEM
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (2.0.2)
     ffi (1.17.0)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     fugit (1.5.3)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -124,20 +130,22 @@ GEM
       domain_name (~> 0.5)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    icasework (0.1.2)
-      activesupport (>= 4.0.0)
+    icasework (0.1.4)
+      activesupport (>= 4.0.0, < 6.2)
       jwt (~> 2.2.0)
       nokogiri (~> 1.0)
       pdf-reader (~> 2.4.0)
       rest-client (~> 2.1.0)
-    infreemation (0.2.3)
+      rexml (~> 3.4.0)
+    infreemation (0.2.4)
       json (~> 2.5.1)
       rest-client (~> 2.1.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     json (2.5.1)
     jwt (2.2.3)
+    libv8-node (16.10.0.0)
     libv8-node (16.10.0.0-aarch64-linux)
     libv8-node (16.10.0.0-arm64-darwin)
     libv8-node (16.10.0.0-x86_64-darwin)
@@ -163,15 +171,20 @@ GEM
     msgpack (1.5.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
+    net-imap (0.5.2)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-aarch64-linux)
-      racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
-      racc (~> 1.4)
     oauth2 (1.4.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -252,7 +265,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.5)
+    rexml (3.4.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
@@ -333,7 +346,9 @@ GEM
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
-    ttfunk (1.7.0)
+    timeout (0.4.3)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -375,6 +390,9 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   listen (>= 3.0.5, < 3.8)
   mini_racer
+  net-imap
+  net-pop
+  net-smtp
   omniauth (~> 2.0.4)
   omniauth-google-oauth2
   omniauth-rails_csrf_protection

app/workers/import_disclosure_log_worker.rb

@@ -8,7 +8,7 @@ class ImportDisclosureLogWorker
 
   def perform(duration = nil)
     @duration = duration
-    DisclosureLog.new(arguments).import!
+    DisclosureLog.new(**arguments).import!
   end
 
   private

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7-bullseye
+FROM ruby:3.2-bullseye
 
 ENV DOCKER 1
 ENV DEBIAN_FRONTEND noninteractive

gemfiles/rails_7.gemfile.lock

@@ -394,6 +394,9 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   listen (>= 3.0.5, < 3.8)
   mini_racer
+  net-imap
+  net-pop
+  net-smtp
   omniauth (~> 2.0.4)
   omniauth-google-oauth2
   omniauth-rails_csrf_protection

gemfiles/rails_main.gemfile.lock

@@ -401,6 +401,9 @@ DEPENDENCIES
   jbuilder (~> 2.11)
   listen (>= 3.0.5, < 3.8)
   mini_racer
+  net-imap
+  net-pop
+  net-smtp
   omniauth (~> 2.0.4)
   omniauth-google-oauth2
   omniauth-rails_csrf_protection

spec/services/generate_foi_suggestion_spec.rb

@@ -9,8 +9,8 @@ def suggest_all(body = nil, request: nil)
       described_class.from_request(request)
     end
 
-    def suggest(*args)
-      suggest_all(*args).first
+    def suggest(*args, **kwargs)
+      suggest_all(*args, **kwargs).first
     end
 
     context 'resources with keywords' do

spec/workers/import_disclosure_log_worker_spec.rb

@@ -13,7 +13,7 @@
 
   context 'no duration' do
     it 'calls #import! on DisclosureLog instance without duration' do
-      expect(DisclosureLog).to receive(:new).with({}).and_return(log)
+      expect(DisclosureLog).to receive(:new).with(no_args).and_return(log)
       expect(log).to receive(:import!)
       perform
     end