Merge branch 'master' into dependabot/npm_and_yarn/qs-and-qs-and-qs-a…

…nd-body-parser-6.5.3

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: "CI"
+env:
+  BUNDLE_GEM__FURY__IO: ${{ secrets.BUNDLE_GEM__FURY__IO }}
+  BUNDLE_GITHUB__COM: ${{ secrets.BUNDLE_GITHUB__COM }}
+on:
+  push:
+    branches: [ "main", "master" ]
+  pull_request:
+    branches: [ "main", "master" ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      RAILS_ENV: test
+      FINCAP_ALGOLIA_APP_ID: test
+      FINCAP_ALGOLIA_API_KEY: test
+      FRONTEND_HTTP_REQUEST_TIMEOUT: 12
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Setup Node.js environment
+        uses: actions/[email protected]
+      - name: Install bower
+        run: npm install -g bower
+      - name: Install bowndler packages
+        run: bin/bowndler update
+      - name: Run tests
+        run: bin/rake

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.7.7

Gemfile

@@ -1,28 +1,30 @@
+ruby File.read('.ruby-version', &:readline)
+
 source 'https://rubygems.org'
-source 'http://gems.dev.mas.local'
 
-ruby File.read('.ruby-version', &:readline)
+source 'https://gem.fury.io/h_app288206558' do
+  gem 'dough-ruby', '~> 5.28'
+  gem 'mas-cms-client', '1.18.0'
+  gem 'site_search', '0.2.0'
+end
 
 gem 'rails', '~> 5.0.7'
 
 gem 'algoliasearch'
 gem 'autoprefixer-rails'
-gem 'dough-ruby', '~> 5.28'
+gem 'bowndler', '~> 1.0'
 gem 'jbuilder', '~> 2.5'
-gem 'jquery-rails'
-gem 'mas-cms-client', '1.18.0'
 gem 'meta-tags'
 gem 'newrelic_rpm'
 gem 'nokogiri'
 gem 'okcomputer'
-gem 'pg', '~> 0.18'
 gem 'sass-rails', '~> 5.0'
-gem 'site_search', '0.2.0', source: 'http://gems.dev.mas.local'
 gem 'uglifier', '>= 1.3.0'
-gem 'unicorn-rails'
+gem 'puma'
+gem 'rack-canonical-host'
 
 group :production do
-  gem 'syslog-logger'
+  gem 'rails_12factor'
 end
 
 group :development, :test do
@@ -31,28 +33,19 @@ group :development, :test do
   gem 'cucumber-rails', require: false
   gem 'danger', require: false
   gem 'danger-rubocop', require: false
-  gem 'database_cleaner'
   gem 'dotenv-rails'
-  gem 'factory_bot_rails'
   gem 'launchy'
   gem 'pry-byebug'
   gem 'rails-controller-testing'
   gem 'rspec-rails'
   gem 'rubocop', '~> 0.58.2', require: false
   gem 'site_prism'
-  gem 'sqlite3'
   gem 'tzinfo-data'
   gem 'vcr'
   gem 'webmock'
 end
 
 group :development do
   gem 'listen', '~> 3.0.5'
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'web-console', '>= 3.3.0'
 end
-
-group :build, :test, :development do
-  gem 'bowndler', '~> 1.0'
-end

Gemfile.lock

@@ -1,6 +1,6 @@
 GEM
   remote: https://rubygems.org/
-  remote: http://gems.dev.mas.local/
+  remote: https://gem.fury.io/h_app288206558/
   specs:
     actioncable (5.0.7.2)
       actionpack (= 5.0.7.2)
@@ -112,7 +112,6 @@ GEM
     danger-rubocop (0.6.0)
       danger
       rubocop
-    database_cleaner (1.6.2)
     diff-lcs (1.3)
     dotenv (2.2.1)
     dotenv-rails (2.2.1)
@@ -125,11 +124,6 @@ GEM
       sass-rails
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_bot (4.8.2)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
-      railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday-conductivity (0.3.1)
@@ -138,7 +132,7 @@ GEM
       faraday (~> 0.8)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.10.0)
+    ffi (1.15.5)
     gherkin (5.0.0)
     git (1.5.0)
     globalid (0.4.2)
@@ -151,12 +145,7 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
     json (1.8.6)
-    kgio (2.11.2)
     kramdown (1.17.0)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -182,25 +171,25 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.8.1)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     nap (1.1.0)
     newrelic_rpm (4.8.0.341)
-    nio4r (2.3.1)
+    nio4r (2.7.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.2)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     octokit (4.11.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     okcomputer (1.17.2)
     open4 (1.3.4)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
-    pg (0.21.0)
     powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -209,7 +198,13 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     public_suffix (3.0.3)
+    puma (6.4.2)
+      nio4r (~> 2.0)
+    racc (1.6.2)
     rack (2.0.6)
+    rack-canonical-host (1.1.0)
+      addressable (> 0, < 3)
+      rack (>= 1.0.0, < 3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.7.2)
@@ -233,14 +228,18 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (5.0.7.2)
       actionpack (= 5.0.7.2)
       activesupport (= 5.0.7.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.19.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -294,21 +293,14 @@ GEM
       capybara (~> 2.7)
     site_search (0.2.0)
       algoliasearch
-    spring (2.0.2)
-      activesupport (>= 4.2)
-    spring-watcher-listen (2.0.1)
-      listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
     structured_warnings (0.3.0)
-    syslog-logger (1.6.8)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
@@ -321,12 +313,6 @@ GEM
     uglifier (4.1.8)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
-    unicorn (5.4.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
-    unicorn-rails (2.2.1)
-      rack
-      unicorn
     vcr (4.0.0)
     web-console (3.5.1)
       actionview (>= 5.0)
@@ -355,41 +341,35 @@ DEPENDENCIES
   cucumber-rails
   danger
   danger-rubocop
-  database_cleaner
   dotenv-rails
-  dough-ruby (~> 5.28)
-  factory_bot_rails
+  dough-ruby (~> 5.28)!
   jbuilder (~> 2.5)
-  jquery-rails
   launchy
   listen (~> 3.0.5)
-  mas-cms-client (= 1.18.0)
+  mas-cms-client (= 1.18.0)!
   meta-tags
   newrelic_rpm
   nokogiri
   okcomputer
-  pg (~> 0.18)
   pry-byebug
+  puma
+  rack-canonical-host
   rails (~> 5.0.7)
   rails-controller-testing
+  rails_12factor
   rspec-rails
   rubocop (~> 0.58.2)
   sass-rails (~> 5.0)
   site_prism
   site_search (= 0.2.0)!
-  spring
-  spring-watcher-listen (~> 2.0.0)
-  sqlite3
-  syslog-logger
   tzinfo-data
   uglifier (>= 1.3.0)
-  unicorn-rails
   vcr
   web-console (>= 3.3.0)
   webmock
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.7.7p221
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

Procfile

@@ -0,0 +1 @@
+web: bundle exec puma -C config/puma.rb

app/assets/javascripts/application.js

@@ -12,7 +12,6 @@
 //
 //= require require_config
 //= require lib/modernizr-custom
-//= require jquery
 
 // Component Loader
 require(['jquery', 'componentLoader'], function ($, componentLoader) {

app/assets/javascripts/require_config.js.erb

@@ -19,6 +19,7 @@
       Rails.application.config.assets.prefix,
     paths: {
       # External dependancies
+      jquery: requirejs_path('jquery/dist/jquery'),
       eventsWithPromises: requirejs_path('eventsWithPromises/src/eventsWithPromises'),
       jqueryThrottleDebounce: requirejs_path('jqueryThrottleDebounce/jquery.ba-throttle-debounce'),
       rsvp: requirejs_path('rsvp/rsvp'),

app/views/layouts/application.html.erb

@@ -22,6 +22,10 @@
     <!--[if ( !IE ) | ( gte IE 9 ) ]><!-->
       <%= render 'shared/svg/icon_sprite' %>
     <!--<![endif]-->
+
+    <% if ENV['NO_ROBOTS'] == 'true' %>
+    <meta name="robots" content="noindex">
+    <% end %>
   </head>
 
   <body>

bin/bowndler

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('bowndler', 'bowndler')

bower.json.erb

@@ -5,6 +5,7 @@
   "dependencies": {
     "dough": "<%= gem_path('dough-ruby') %>",
     "requirejs": "2.1.*",
-    "yeast": "1.12.0"
+    "yeast": "1.12.0",
+    "jquery": "3.3.*"
   }
 }

config.ru

@@ -1,5 +1,7 @@
 # This file is used by Rack-based servers to start the application.
+require 'rack/canonical_host'
 
 require_relative 'config/environment'
 
+use Rack::CanonicalHost, ENV['CANONICAL_HOST'] if ENV['CANONICAL_HOST']
 run Rails.application

config/application.rb

@@ -4,7 +4,6 @@
 # Pick the frameworks you want:
 require "active_model/railtie"
 require "active_job/railtie"
-require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"