Merge branch 'master' into dietary-restrictions

Author: mikej

.github/workflows/ruby.yml

@@ -7,6 +7,10 @@ jobs:
     name: 'Tests'
     runs-on: ubuntu-latest
 
+    env:
+      # prevent unnecessary log output -- https://bundler.io/man/bundle-config.1.html
+      BUNDLE_IGNORE_FUNDING_REQUESTS: true
+      BUNDLE_IGNORE_MESSAGES: true
     services:
       postgres:
         image: postgres:17

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 ruby '3.4.4'
 
-gem 'rails', '7.0.8.1'
+gem 'rails', '~> 7.1.5.1' # LOCKED: It is Rails.
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem 'sprockets-rails'
 
@@ -10,7 +10,7 @@ gem 'benchmark' # LOCKED: Added because of activesupport 7.0
 gem 'bigdecimal' # LOCKED: Added because of activesupport 7.0
 gem 'carrierwave'
 gem 'cocoon'
-gem "csv" # LOCKED: csv was loaded from the standard library, but is not part of the default gems starting from Ruby 3.4.0. Due to config/application.rb
+gem 'csv' # LOCKED: csv was loaded from the standard library, but is not part of the default gems starting from Ruby 3.4.0. Due to config/application.rb
 gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'drb' # LOCKED: Added because of pry-remote
@@ -117,5 +117,6 @@ group :production do
 end
 
 gem 'rollbar'
+gem 'scout_apm'
 
-gem "carrierwave-aws", "~> 1.6"
+gem 'carrierwave-aws', '~> 1.6'

Gemfile.lock

@@ -1,73 +1,85 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      actionview (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.1)
-      actionview (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
-      rack (~> 2.0, >= 2.2.4)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nokogiri (>= 1.8.5)
+      racc
+      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.0.8.1)
-      actionpack (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.1)
-      activesupport (= 7.0.8.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.1)
-      activesupport (= 7.0.8.1)
-    activerecord (7.0.8.1)
-      activemodel (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
-    activestorage (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.1)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    acts-as-taggable-on (11.0.0)
-      activerecord (>= 7.0, < 8.0)
+    acts-as-taggable-on (12.0.0)
+      activerecord (>= 7.1, < 8.1)
       zeitwerk (>= 2.4, < 3.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -144,6 +156,7 @@ GEM
     commonmarker (2.3.2)
       rb_sys (~> 0.9)
     concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
     css_parser (1.14.0)
       addressable
@@ -261,14 +274,14 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.4.20)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
     nokogiri (1.18.9)
@@ -341,28 +354,34 @@ GEM
     pundit (2.5.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (2.2.17)
+    rack (3.2.0)
     rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
-    rack-protection (3.2.0)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rails (7.0.8.1)
-      actioncable (= 7.0.8.1)
-      actionmailbox (= 7.0.8.1)
-      actionmailer (= 7.0.8.1)
-      actionpack (= 7.0.8.1)
-      actiontext (= 7.0.8.1)
-      actionview (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activemodel (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.8.1)
+      railties (= 7.1.5.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -377,13 +396,14 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
-      method_source
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.0)
     rake-compiler-dock (1.9.1)
@@ -461,6 +481,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    securerandom (0.4.1)
+    scout_apm (5.7.1)
+      parser
     selenium-webdriver (4.34.0)
       base64 (~> 0.2)
       logger (~> 1.4)
@@ -522,7 +545,8 @@ GEM
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -586,7 +610,7 @@ DEPENDENCIES
   puma (~> 6.6)
   pundit
   rack-mini-profiler (~> 4.0)
-  rails (= 7.0.8.1)
+  rails (~> 7.1.5.1)
   rails-html-sanitizer (~> 1.6.2)
   rails4-autocomplete
   rails_12factor
@@ -600,6 +624,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   sassc-rails
+  scout_apm
   selenium-webdriver
   shoulda-matchers (~> 6.5)
   simple_form

app/controllers/concerns/mailing_list_concerns.rb

@@ -10,14 +10,14 @@ module MailingListConcerns
   module InstanceMethods
     def subscribe_to_newsletter(member)
       member.update(opt_in_newsletter_at: Time.zone.now)
-      MailingList.new(ENV['NEWSLETTER_ID']).subscribe(member.email,
-                                                      member.name,
-                                                      member.surname)
+      Services::MailingList.new(ENV['NEWSLETTER_ID']).subscribe(member.email,
+                                                                member.name,
+                                                                member.surname)
     end
 
     def unsubscribe_from_newsletter(member)
       member.update(opt_in_newsletter_at: nil)
-      MailingList.new(ENV['NEWSLETTER_ID']).unsubscribe(member.email)
+      Services::MailingList.new(ENV['NEWSLETTER_ID']).unsubscribe(member.email)
     end
   end
 end

app/controllers/events_controller.rb

@@ -13,16 +13,17 @@ def index
     events << Event.past.includes(:venue, :sponsors).limit(RECENT_EVENTS_DISPLAY_LIMIT)
     events = events.compact.flatten.sort_by(&:date_and_time).reverse.first(RECENT_EVENTS_DISPLAY_LIMIT)
     events_hash_grouped_by_date = events.group_by(&:date)
-    @past_events = events_hash_grouped_by_date.map.inject({}) do |hash, (key, value)|
+    @past_events = events_hash_grouped_by_date.map.each_with_object({}) do |(key, value), hash|
       hash[key] = EventPresenter.decorate_collection(value)
-      hash
     end
 
     events = [Workshop.includes(:chapter).upcoming.joins(:chapter).merge(Chapter.active)]
     events << Meeting.upcoming.all
     events << Event.upcoming.includes(:venue, :sponsors).all
     events = events.compact.flatten.sort_by(&:date_and_time).group_by(&:date)
-    @events = events.map.inject({}) { |hash, (key, value)| hash[key] = EventPresenter.decorate_collection(value); hash }
+    @events = events.map.each_with_object({}) do |(key, value), hash|
+ hash[key] = EventPresenter.decorate_collection(value)
+    end
   end
 
   def show
@@ -34,7 +35,7 @@ def show
     return unless logged_in?
 
     invitation = Invitation.find_by(member: current_user, event: event, attending: true)
-    return redirect_to event_invitation_path(@event, invitation) if invitation
+    redirect_to event_invitation_path(@event, invitation) if invitation
   end
 
   def student
@@ -47,7 +48,7 @@ def coach
 
   def rsvp
     set_event
-    ticket = Ticket.new(request, params)
+    ticket = Services::Ticket.new(request, params)
     member = Member.find_by(email: ticket.email)
     invitation = member.invitations.where(event: @event, role: 'Student').try(:first)
     invitation ||= Invitation.create(event: @event, member: member, role: 'Student')

app/mailers/event_invitation_mailer.rb

@@ -34,7 +34,7 @@ def attending(event, member, invitation)
 
     require 'services/event_calendar'
     attachments['codebar.ics'] = { mime_type: 'text/calendar',
-                                   content: EventCalendar.new(@event).calendar.to_ical }
+                                   content: Services::EventCalendar.new(@event).calendar.to_ical }
 
     subject = "Your spot to #{@event.name} has been confirmed."
 

app/models/contact.rb

@@ -5,8 +5,8 @@ class Contact < ApplicationRecord
   validates :name, :surname, :email, presence: true
 
   before_create :set_token
-  after_commit :subscribe_to_mailing_list, if: proc { |c| c.mailing_list_consent }
   after_commit :unsubscribe_from_mailing_list, if: proc { |c| !c.mailing_list_consent }
+  after_commit :subscribe_to_mailing_list, if: proc { |c| c.mailing_list_consent }
 
   def subscribe_to_mailing_list
     mailing_list.subscribe(email, name, surname)
@@ -18,7 +18,7 @@ def unsubscribe_from_mailing_list
   end
 
   def mailing_list
-    @mailing_list ||= MailingList.new(ENV['SPONSOR_NEWSLETTER_ID'])
+    @mailing_list ||= Services::MailingList.new(ENV['SPONSOR_NEWSLETTER_ID'])
   end
 
   private

app/models/group.rb

@@ -13,7 +13,7 @@ class Group < ApplicationRecord
 
   validates :name, presence: true, inclusion: { in: NAMES, message: 'Invalid name for Group' }
 
-  alias_attribute :city, :chapter
+  alias city chapter
 
   default_scope -> { joins(:chapter).includes(:chapter) }