WIP: Dependency, Rails, and Ruby upgrade main branch

.env.example

@@ -63,6 +63,8 @@ amazon_authorize_key=
 
 # Third party integration (required)
 congress_forms_url=http://phantomdc.example.com
+google_civic_api_url=https://www.googleapis.com/civicinfo/v2/representatives/
+google_civic_api_key=
 smarty_streets_id=
 smarty_streets_token=
 

.env.test

@@ -8,8 +8,8 @@ call_tool_api_key=xyz
 
 storage=s3
 amazon_region=us-west-1
-amazon_bucket=actioncenter-staging
-amazon_bucket_url=actioncentertest.s3-us-west-1.amazonaws.com
+amazon_bucket=actioncenter-test
+amazon_bucket_url=actioncenter-testurl.s3-us-west-1.amazonaws.com
 
 supporters_api_key=xyz
 supporters_host=https://civicrm.test

.gitignore

@@ -33,3 +33,4 @@ public/webshims
 
 # Ignore dotenv file
 /.env
+/public/uploads

.rubocop.yml

@@ -1,18 +1,78 @@
+require:
+  - rubocop-rails
+  - rubocop-performance
+
 inherit_gem:
   rubocop-github:
     - config/default.yml
     - config/rails.yml
 
 AllCops:
-  TargetRailsVersion: 4.2
-  TargetRubyVersion: 2.3
+  TargetRailsVersion: 7.0
+  TargetRubyVersion: 3.0
+  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - 'db/**/*'
     - 'config/**/*'
     - 'bin/**/*'
     - 'vendor/**/*'
+    - 'features/**/*'
+
+# Handle cops not enabled by default
+# Should probably be checked on rubocop version upgrades
+# Last checked 02/09/21
+# Disables cops marked as unsafe in docs
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: false
 
-### Override rubcop-github ###
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
+Performance/AncestorsInclude:
+  Enabled: false
+
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+
+Performance/RedundantSortBlock:
+  Enabled: true
+
+Performance/RedundantStringChars:
+  Enabled: true
+
+Performance/ReverseFirst:
+  Enabled: true
+
+Performance/SortReverse:
+  Enabled: true
+
+Performance/Squeeze:
+  Enabled: true
+
+Performance/StringInclude:
+  Enabled: true
+
+Bundler/OrderedGems:
+  Enabled: false
+
+### Override rubocop-github ###
 
 Style/FrozenStringLiteralComment:
   # We aren't upgrading to Ruby 3.0, so this is just noise
@@ -30,9 +90,6 @@ GitHub/RailsControllerRenderPathsExist:
   # Doesn't seem to work; can't find templates that exist
   Enabled: false
 
-GitHub/RailsApplicationRecord:
-  # Doesn't apply to < Rails 5.0, and ignores TargetRailsVersion
-  Enabled: false
 
 Lint/Void:
   Exclude:
@@ -43,7 +100,7 @@ Lint/Debugger:
   Exclude:
     - 'features/step_definitions/debug_steps.rb'
 
-Style/BlockComments:
+Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*'
 
@@ -65,7 +122,30 @@ Layout/MultilineHashBraceLayout:
 Layout/SpaceAroundOperators:
   Enabled: true
 
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+
 Security/JSONLoad:
   Enabled: true
   Exclude:
     - 'spec/**/*'
+
+Rails/HttpStatus:
+  EnforcedStyle: 'numeric'
+
+Style/Alias:
+  Enabled: false
+
+Style/BlockComments:
+  Exclude:
+    - 'spec/**/*'
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: 'compact'
+
+Style/Documentation:
+  Enabled: false
+
+Style/NumericLiterals:
+  MinDigits: 6

.ruby-version

@@ -1 +1 @@
-2.5.5
+3.3.5

.travis.yml

@@ -14,7 +14,7 @@ before_script:
   - npm install
   - cp config/database.yml.travis config/database.yml
   - psql -c 'create database travis_ci_test;' -U postgres
-  - RAILS_ENV=test bundle exec rails webdrivers:chromedriver:update
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 script:
   - bundle exec rubocop
   - $(npm bin)/sass-lint -vq

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5-stretch
+FROM ruby:3.3-slim
 
 RUN mkdir /opt/actioncenter
 WORKDIR /opt/actioncenter
@@ -13,24 +13,10 @@ RUN apt-get update && \
     postgresql-client \
     cron \
     gnupg \
-    libssl-dev
-
-RUN set -x; \
-  curl -sL https://deb.nodesource.com/setup_6.x -o nodesource_setup.sh \
-  && chmod +x nodesource_setup.sh \
-  && ./nodesource_setup.sh \
-  && apt-get update \
-  && apt-get install -y --no-install-recommends \
+    libssl-dev \
+    shared-mime-info \
     nodejs \
-    npm \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-  && apt-get update \
-  && apt-get install \
-    yarn
+    npm
 
 COPY package.json package-lock.json ./
 RUN npm install
@@ -65,11 +51,10 @@ RUN bundle exec rake assets:precompile \
   SECRET_KEY_BASE=noop \
   devise_secret_key=noop \
   amazon_region=noop \
+  amazon_bucket=noop \
   DATABASE_URL=postgres://noop
-RUN bundle exec rake webshims:update_public
 
-RUN mkdir /opt/actioncenter/log \
-          /var/www
+RUN mkdir /var/www
 RUN chown -R www-data /opt/actioncenter/public \
                       /opt/actioncenter/db \
                       /opt/actioncenter/tmp \

Gemfile

@@ -1,31 +1,29 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0"
+gem "rails", "~> 7.0.0"
 
-#Database
+# Database
 gem "pg", "~> 1.1"
-gem "pg_search"
+gem "pg_search", "~> 2"
 
 # Hosting-related
-gem "aws-sdk", "~> 2.3"
-gem "aws-sdk-rails", "~> 1"
+gem "aws-sdk-rails", "~> 2"
+gem "aws-sdk-s3", "~> 1"
 gem "dotenv-rails", "~> 2"
 gem "rack-attack", "~> 5"
-gem "rails_12factor", group: :production # Loads "rails_serve_static_assets" and "rails_stdout_logging"
-gem "rails_response_headers", "~> 0"
+gem "rails_response_headers", git: "https://github.com/EFForg/rails_response_headers.git"
 
 # Frontend/assets
 gem "bootstrap-daterangepicker-rails", "~> 3"
 gem "bootstrap-sass", "~> 3.4"
 gem "bourbon", "~> 3"
 gem "bundler", ">= 1.8.4" # needed for rails-assets
-gem "fontello_rails_converter", "~> 0"
 gem "react-rails", "~> 1"
 gem "redcarpet", "~> 3" # Markdown
-gem "sass-rails", "~> 5.0"
+gem "sass-rails", "< 5.1"
 gem "select2-rails"               # Autocomplete select menus
 gem "uglifier", ">= 1.3.0"        # compressor for JavaScript assets
-gem "webshims-rails", "~> 1"
+
 source "https://rails-assets.org" do
   gem "rails-assets-chartjs", "~> 2"
   gem "rails-assets-congress-images-102x125"
@@ -44,17 +42,17 @@ source "https://rails-assets.org" do
 end
 
 # File upload
-gem "paperclip", "~> 5.2"
+gem "carrierwave", "~> 3.0"
+gem "fog-aws"
 
 # Email preformatting
 gem "nokogiri", "~> 1"                    # Required for premailer-rails
 gem "premailer-rails", "~> 1"             # Inline styles for emails
 
-# Optimization
-gem "sprockets-image_compressor", "~> 0" # Optimizes png/jpg
-
 # Analytics
-gem "ahoy_matey", "~> 1.6" # Analytics
+gem "ahoy_matey", "~> 4.0"
+# required for ahoy_matey 2.0 with activerecordstore
+gem "uuidtools", "~> 2"
 gem "chartkick", "~> 3"
 gem "eff_matomo", "~> 0.2.4", require: "matomo"
 gem "groupdate", "~> 2"
@@ -64,16 +62,15 @@ gem "daemons", "~> 1"
 gem "delayed_job_active_record", "~> 4"
 
 # Exception monitoring
-gem "sentry-raven", "~> 0.15"
+gem "sentry-raven", "~> 3.1.2"
 
 # Fancy counter caches
 gem "counter_culture", "~> 2.0"
 
 # Other
-gem "activerecord-session_store", "~> 1"
-gem "acts_as_paranoid", git: "https://github.com/ActsAsParanoid/acts_as_paranoid.git"
+gem "activerecord-session_store", "~> 2.1.0"
+gem "acts_as_paranoid", "~> 0.7"
 gem "cocoon", "~> 1"                      # Dynamically add and remove nested associations from forms
-gem "descriptive_statistics", "~> 2"      # Used for calculating percentiles
 gem "devise", "~> 4.7"
 gem "ejs", "~> 1"                         # Embedded javascript
 gem "email_validator", "~> 1"
@@ -84,17 +81,19 @@ gem "gravatar-ultimate", "~> 2"
 gem "http_accept_language", "~> 2"        # Detect HTTP language header
 gem "invisible_captcha", "~> 0"           # Prevent form submissions by bots
 gem "iso_country_codes", "~> 0"
-gem "jbuilder", "~> 1.2" # JSON APIs
+gem "jbuilder", "~> 2"
 gem "oauth", "~> 0"
 gem "rest-client", "~> 2"
-gem "sanitize", "~> 4" # Sanitize user input
-gem "warden", "1.2.4" # This dep of devise has a bug in 1.2.5 so am avaoiding
+gem "sanitize", "~> 6" # Sanitize user input
 gem "whenever", "~> 0", require: false # Cron jobs
 gem "will_paginate", "~> 3.0"
-gem "xmlrpc"
+gem "xmlrpc", "~> 0.3"
 
 # For creating many records, quickly
-gem "fast_inserter", "~> 0.1"
+gem "fast_inserter", "~> 2.0"
+
+# Pin psych to below version 4 until we're on rails 7 and ruby 3.1
+gem "psych", "< 4"
 
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api
@@ -103,31 +102,23 @@ end
 
 group :development do
   gem "better_errors", "~> 2"
-  gem "binding_of_caller", "~> 0"
-  gem "rails-dev-tweaks", "~> 1.1"
-  gem "rb-fchange", "~> 0", require: false
-  gem "rb-fsevent", "~> 0", require: false
-  gem "rb-inotify", "~> 0", require: false
 end
 
 group :test do
-  gem "webmock", "~> 2"
+  gem "webmock", "~> 3"
+  gem "selenium-devtools"
 end
 
 group :development, :test do
   gem "byebug"
-  gem "capybara", "~> 3.26"
-  gem "cucumber-rails", "1.6.0", require: false
-  gem "database_cleaner", "~> 1"
-  gem "factory_girl_rails", "~> 4"
-  gem "poltergeist", "~> 1"
+  gem "capybara", "~> 3"
+  gem "factory_bot_rails", "~> 6.2"
   gem "rails-controller-testing"
-  gem "rspec-core", "~> 3"
-  gem "rspec-rails", "~> 3"
-  gem "rubocop", "0.52.0"
-  gem "rubocop-github", "0.9.0"
-  gem "selenium-webdriver", "~> 3"
-  gem "webdrivers", "~> 4"
+  gem "rspec-rails", "~> 6.1"
+  gem "rubocop"
+  gem "rubocop-github", "~> 0.16"
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
 end
 
 group :production do