Merge branch 'main' into dependabot/bundler/rubocop-1.78.0

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -1,84 +1,109 @@
-# This workflow uses actions that are not certified by GitHub.  They are
-# provided by a third-party and are governed by separate terms of service,
-# privacy policy, and support documentation.
-#
-# This workflow will install a prebuilt Ruby version, install dependencies, and
-# run tests and linters.
 name: "Ruby on Rails CI"
-on:
-  push:
-    branches: [ "main", "dev" ]
-  pull_request:
-    branches: [ "main", "dev" ]
+
+on: { push: { branches: [main, dev] }, pull_request: { branches: [main, dev] } }
+
 jobs:
   rspec:
     runs-on: ubuntu-latest
     environment: test
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: '3.4.4'
+            rails: '7.1.5.1'
+            allowed_failure: false   # ✅ required
+          - ruby: '3.4.4'
+            rails: '7.2'
+            allowed_failure: true    # ⚠️ allowed to fail
+          - ruby: '3.4.4'
+            rails: '8.0'
+            allowed_failure: true    # ⚠️ allowed to fail
+
+    env:
+      RAILS_ENV: test
+      DATABASE_URL: "postgis://rails:password@localhost:5432/rails_test"
+      ES_HOST:  "http://localhost"
+      RAILS_VERSION: ${{ matrix.rails }}
+
     services:
       postgres:
         image: postgis/postgis:latest
-        ports:
-          - "5432:5432"
-        env:
-          POSTGRES_DB: rails_test
-          POSTGRES_USER: rails
-          POSTGRES_PASSWORD: password
+        ports: ["5432:5432"]
+        env: { POSTGRES_DB: rails_test, POSTGRES_USER: rails, POSTGRES_PASSWORD: password }
       elasticsearch:
         image: elasticsearch:7.17.23
-        ports:
-          - "9200:9200"
+        ports: ["9200:9200"]
         env:
-          "node.name": elasticsearch
-          "cluster.name": better-together-es
-          "discovery.seed_hosts": elasticsearch
-          "discovery.type": single-node
-          "bootstrap.memory_lock": true
-          "ES_JAVA_OPTS": "-Xms512m -Xmx512m"
-    env:
-      RAILS_ENV: test
-      DATABASE_URL: "postgis://rails:password@localhost:5432/rails_test"
-      ES_HOST: "http://localhost"
+          node.name: elasticsearch
+          cluster.name: better-together-es
+          discovery.seed_hosts: elasticsearch
+          discovery.type: single-node
+          bootstrap.memory_lock: "true"
+          ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      # Add or replace dependency steps here
-      - name: Install Ruby and gems
+
+      - name: Install Ruby & gems
         uses: ruby/setup-ruby@v1
         with:
-          bundler-cache: true
-      # Add or replace database setup steps here
-      - name: Set up database schema
-        run: rm -f spec/dummy/tmp/pids/server.pid && cd ./spec/dummy && bundle exec rails db:schema:load
-      # Add or replace test runners here
-      - name: Run tests
+          ruby-version: ${{ matrix.ruby }}
+
+          # Run the automatic bundle-install only on 7.1.
+          # For 7.2 / 8.0 it just sets up Ruby *and* restores a cache layer
+          # that we’ll reuse in the later manual install.
+          bundler-cache: ${{ matrix.rails == '7.1.5.1' }}
+
+          # One cache bucket per Rails version so they don’t clobber each other.
+          cache-version: rails-${{ matrix.rails }}
+
+      # Updating Rails can legitimately blow up on the experimental tracks,
+      # so we allow that *step* to error out without failing the job.
+      - name: Update Rails & install gems
+        if: matrix.rails != '7.1.5.1'
+        id: update
+        run: |
+          # turn off deployment mode
+          bundle config set deployment false
+          # conservative upgrade to the target rails version
+          bundle update rails --conservative
+          # install missing gems (writes bin/rspec, etc)
+          bundle install --jobs 4 --retry 3
+        continue-on-error: ${{ matrix.allowed_failure }}
+
+      - name: Prepare DB schema
+        if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
+        run: |
+          rm -f spec/dummy/tmp/pids/server.pid
+          bundle exec rake -f spec/dummy/Rakefile db:schema:load
+        continue-on-error: ${{ matrix.allowed_failure }}
+
+      - name: Run RSpec
+        if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
         env:
           RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
-        run: rm -f spec/dummy/tmp/pids/server.pid && bundle exec rspec
+        run: |
+          rm -f spec/dummy/tmp/pids/server.pid
+          bundle exec rspec
+        continue-on-error: ${{ matrix.allowed_failure }}
 
+  # ── style & security jobs (unchanged) ───────────────────────────────────────
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Install Ruby and gems
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - name: Lint Ruby files with Rubocop
-        run: bundle exec rubocop --parallel
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with: { bundler-cache: true }
+      - run: bundle exec rubocop --parallel
 
   security:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Install Ruby and gems
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - name: Generate binstubs
-        run: bundle binstubs bundler-audit --force
-      - name: Security audit dependencies
-        run: bundle exec bundler-audit --update
-      - name: Security audit application code
-        run: bundle exec brakeman -q -w2
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with: { bundler-cache: true }
+      - run: bundle binstubs bundler-audit --force
+      - run: bundle exec bundler-audit --update
+      - run: bundle exec brakeman -q -w2

Gemfile

@@ -27,7 +27,7 @@ gem 'pundit-resources', '~> 1.1.4', github: 'better-together-org/pundit-resource
 
 # Core Rails gem
 gem 'rack-protection'
-gem 'rails', '~> 7.1.3'
+gem 'rails', ENV.fetch('RAILS_VERSION', '7.1.5.1')
 
 # Redis for ActionCable and background jobs
 gem 'redis', '~> 5.4'

Gemfile.lock

@@ -1,19 +1,19 @@
 GIT
   remote: https://github.com/better-together-org/pundit-resources.git
-  revision: b6218c695c2b6c7413ab416a318cd540835c5394
+  revision: 4e50d1f97a1e7c864bc45e2613b763ecf8f079ce
   specs:
-    pundit-resources (1.1.5)
+    pundit-resources (1.1.6)
       activesupport
       jsonapi-resources
       pundit
-      rails (>= 4.2.1, < 7.2)
+      rails (>= 4.2.1, < 8.1)
 
 GIT
   remote: https://github.com/better-together-org/storext.git
-  revision: 1d7c3707b3e412fece0022c16cc6f51564969d2c
+  revision: ebc92461e95d07c34f5d8eac4eb7ad13cfd92afa
   specs:
-    storext (3.3.0)
-      activerecord (>= 4.0, < 8)
+    storext (3.3.1)
+      activerecord (>= 4.0, < 8.1)
       virtus
 
 PATH
@@ -53,7 +53,7 @@ PATH
       rack-attack
       rack-cors (>= 1.1.1, < 3.1.0)
       rack-mini-profiler
-      rails (>= 5.2.2, < 7.2.0)
+      rails (>= 7.1, < 8.1)
       reform-rails (~> 0.2.0)
       rswag (>= 2.3.1, < 2.17.0)
       ruby-openai
@@ -167,19 +167,20 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1133.0)
-    aws-sdk-core (3.227.0)
+    aws-partitions (1.1139.0)
+    aws-sdk-core (3.228.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.107.0)
-      aws-sdk-core (~> 3, >= 3.227.0)
+    aws-sdk-kms (1.109.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.194.0)
-      aws-sdk-core (~> 3, >= 3.227.0)
+    aws-sdk-s3 (1.195.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -396,7 +397,7 @@ GEM
     image_processing (1.14.0)
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.2.1)
+    importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
@@ -495,7 +496,9 @@ GEM
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pg (1.6.0-x86_64-linux)
+    pg (1.6.1-aarch64-linux)
+    pg (1.6.1-arm64-darwin)
+    pg (1.6.1-x86_64-linux)
     popper_js (2.11.8)
     pp (0.6.2)
       prettyprint
@@ -521,7 +524,7 @@ GEM
       i18n (>= 0.5.0)
       railties (>= 6.1.0)
     public_suffix (6.0.1)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     pundit (2.5.0)
       activesupport (>= 3.0.0)
@@ -842,7 +845,7 @@ DEPENDENCIES
   pundit-resources (~> 1.1.4)!
   rack-mini-profiler
   rack-protection
-  rails (~> 7.1.3)
+  rails (= 7.1.5.1)
   rb-readline
   rbtrace
   redis (~> 5.4)

app/assets/config/better_together_manifest.js

@@ -4,6 +4,7 @@
 //= link_tree ../stylesheets .css
 //= link_tree ../../../vendor/stylesheets .css
 //= link_tree ../stylesheets .scss
+//= link better_together/mailer.css
 //= link_tree ../images
 
 //= link actioncable.js

app/assets/stylesheets/better_together/application.scss

@@ -14,29 +14,29 @@
  *= require_self
  */
 
-@import 'theme';
+@use 'theme' as *;
 
 // Import Bootstrap and Font Awesome
 
-@import 'bootstrap';
-@import 'cards';
-@import 'devise';
-@import 'font-awesome';
-@import 'actiontext';
-@import 'contact_details';
-@import 'content_blocks';
-@import 'conversations';
-@import 'forms';
-@import 'image-galleries';
-@import 'maps';
-@import 'metrics';
-@import 'navigation';
-@import 'notifications';
-@import 'profiles';
-@import 'simple_calendar';
-@import 'share';
-@import 'sidebar_nav';
-@import 'trix-extensions/richtext';
+@use 'bootstrap' as *;
+@use 'cards';
+@use 'devise';
+@use 'font-awesome';
+@use 'actiontext';
+@use 'contact_details';
+@use 'content_blocks';
+@use 'conversations';
+@use 'forms';
+@use 'image-galleries';
+@use 'maps';
+@use 'metrics';
+@use 'navigation';
+@use 'notifications';
+@use 'profiles';
+@use 'simple_calendar';
+@use 'share';
+@use 'sidebar_nav';
+@use 'trix-extensions/richtext';
 
 // Styles that use the variables
 .text-opposite-theme {
@@ -74,7 +74,7 @@
 #flash_messages {
   position: absolute;
   width: 100vw;
-  top: 7.5vh;
+  top: 6vh;
   z-index: 1001;
 }
 

app/assets/stylesheets/better_together/contact_details.scss

@@ -1,4 +1,4 @@
-@import 'theme';
+@use 'theme' as *;
 
 .contact-detail-item {
   margin-bottom: 15px;

app/assets/stylesheets/better_together/forms.scss

@@ -1,4 +1,4 @@
-@import "theme";
+@use "theme" as *;
 
 .required-indicator {
   color: $danger;

app/assets/stylesheets/better_together/share.scss

@@ -1,5 +1,4 @@
-
-@import 'theme';
+@use 'theme' as *;
 
 .social-share-buttons {
   margin-top: 40px;

app/assets/stylesheets/better_together/sidebar_nav.scss

@@ -1,4 +1,4 @@
-@import 'theme';
+@use 'theme' as *;
 
 #sidebar_nav {
   // Sidebar heading styles

app/controllers/better_together/messages_controller.rb

@@ -34,11 +34,6 @@ def notify_participants(message)
       # Get all participants except the sender
       recipients = message.conversation.participants.where.not(id: message.sender_id)
 
-      # Log recipients for debugging
-      puts "Recipients for message notification: #{recipients.map(&:id)}"
-
-      # broadcast_to_recipients(message, recipients)
-
       # Pass the array of recipients to the notification
       BetterTogether::NewMessageNotifier.with(record: message).deliver_later(recipients)
     end