Merge branch 'main' into dependabot/bundler/rubocop-rails-2.33.3

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         include:
           - ruby: '3.4.4'
-            rails: '7.1.5.1'
+            rails: '7.1.5.2'
             allowed_failure: false   # ✅ required
           - ruby: '3.4.4'
             rails: '7.2.2.1'
@@ -55,15 +55,15 @@ jobs:
           # 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' }}
+          bundler-cache: ${{ matrix.rails == '7.1.5.2' }}
 
           # 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'
+        if: matrix.rails != '7.1.5.2'
         id: update
         run: |
           # turn off deployment mode
@@ -75,20 +75,20 @@ jobs:
         continue-on-error: ${{ matrix.allowed_failure }}
 
       - name: Prepare DB schema
-        if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
+        if: (matrix.rails == '7.1.5.2') || 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: Wait for Elasticsearch
-        if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
+        if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
         run: |
           echo "Waiting for Elasticsearch to be healthy..."
           curl -s "http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" || (echo "Elasticsearch not healthy" && exit 1)
 
       - name: Run RSpec
-        if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
+        if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
         env:
           RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: |

.rubocop.yml

@@ -5,6 +5,20 @@ AllCops:
     - 'spec/dummy/db/schema.rb'
     - 'vendor/**/*'
   NewCops: enable
+  TargetRubyVersion: 3.4
+plugins:
+  - rubocop-rails
+  - rubocop-rspec
+  - rubocop-rspec_rails
+  - rubocop-capybara
+  - rubocop-factory_bot
 Style/StringLiterals:
   Exclude:
     - 'db/migrate/*'
+
+Rails:
+  Enabled: false
+Capybara:
+  Enabled: false
+FactoryBot:
+  Enabled: false

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', ENV.fetch('RAILS_VERSION', '7.1.5.1')
+gem 'rails', ENV.fetch('RAILS_VERSION', '7.1.5.2')
 
 # Redis for ActionCable and background jobs
 gem 'redis', '~> 5.4'

Gemfile.lock

@@ -68,51 +68,51 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actioncable (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.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)
+    actionmailbox (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activestorage (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    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)
+    actionmailer (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      actionview (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.1)
-      actionview (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionpack (7.1.5.2)
+      actionview (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       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)
+    actiontext (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activestorage (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionview (7.1.5.2)
+      activesupport (= 7.1.5.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -125,27 +125,27 @@ GEM
       activestorage (>= 6.1.4)
       activesupport (>= 6.1.4)
       marcel (>= 1.0.3)
-    activejob (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activejob (7.1.5.2)
+      activesupport (= 7.1.5.2)
       globalid (>= 0.3.6)
-    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)
+    activemodel (7.1.5.2)
+      activesupport (= 7.1.5.2)
+    activerecord (7.1.5.2)
+      activemodel (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       timeout (>= 0.4.0)
     activerecord-import (2.2.0)
       activerecord (>= 4.2)
     activerecord-postgis-adapter (9.0.2)
       activerecord (~> 7.1.0)
       rgeo-activerecord (~> 7.0.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)
+    activestorage (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       marcel (~> 1.0)
-    activesupport (7.1.5.1)
+    activesupport (7.1.5.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -548,20 +548,20 @@ GEM
       rack (>= 1.3)
     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)
+    rails (7.1.5.2)
+      actioncable (= 7.1.5.2)
+      actionmailbox (= 7.1.5.2)
+      actionmailer (= 7.1.5.2)
+      actionpack (= 7.1.5.2)
+      actiontext (= 7.1.5.2)
+      actionview (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activemodel (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activestorage (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.5.1)
+      railties (= 7.1.5.2)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -572,9 +572,9 @@ GEM
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    railties (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -845,7 +845,7 @@ DEPENDENCIES
   pundit-resources (~> 1.1.4)!
   rack-mini-profiler
   rack-protection
-  rails (= 7.1.5.1)
+  rails (= 7.1.5.2)
   rb-readline
   rbtrace
   redis (~> 5.4)

README.md

@@ -10,6 +10,26 @@ This project embodies our vision of a world where collaboration leads to greater
 
 This project is the core community building portion of the Better Together platform.
 
+## Joatu Requests and Offers
+
+The Joatu module enables community members to post service **requests** and **offers** and to create agreements between them.
+
+### Endpoints
+
+- `POST /:locale/joatu/requests` — create a request
+- `POST /:locale/joatu/offers` — create an offer
+- `POST /:locale/joatu/agreements` — create an agreement between an offer and a request
+- `POST /:locale/joatu/agreements/:id/reject` — reject an agreement
+
+Each endpoint expects parameters nested under the matching resource name. For example:
+
+```bash
+curl -X POST /en/joatu/requests \\
+  -d 'request[name]=Repair help' \\
+  -d 'request[description]=Need bike fixes' \\
+  -d 'request[creator_id]=<person_uuid>'
+```
+
 ## Dependencies
 
 In addition to other dependencies, the Better Together Community Engine relies on Action Text and Action Storage, which are part of the Rails framework. These dependencies are essential for handling rich text content and file storage within the platform.

app/assets/stylesheets/better_together/application.scss

@@ -72,7 +72,7 @@
 }
 
 #flash_messages {
-  position: absolute;
+  position: fixed;
   width: 100vw;
   top: 6vh;
   z-index: 1001;

app/assets/stylesheets/better_together/forms.scss

@@ -5,6 +5,14 @@
   font-weight: bold;
 }
 
+.form-label {
+  font-weight: 500;
+}
+
+.agreement-modal-link {
+  text-decoration: none;
+}
+
 .bt-mb-3 {
   margin-bottom: 1rem;
 }

app/builders/better_together/agreement_builder.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+# app/builders/better_together/agreement_builder.rb
+
+module BetterTogether
+  # Builder to seed initial agreements
+  class AgreementBuilder < Builder
+    class << self
+      def seed_data
+        build_privacy_policy
+        build_terms_of_service
+        build_code_of_conduct
+      end
+
+      def clear_existing
+        BetterTogether::AgreementParticipant.delete_all
+        BetterTogether::AgreementTerm.delete_all
+        BetterTogether::Agreement.delete_all
+      end
+
+      # rubocop:todo Metrics/AbcSize
+      def build_privacy_policy # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
+        agreement = BetterTogether::Agreement.find_or_create_by!(identifier: 'privacy_policy') do |a|
+          a.protected = true
+          a.title = 'Privacy Policy'
+          a.description = 'Summary of how we handle your data.'
+          a.privacy = 'public'
+        end
+
+        agreement.agreement_terms.find_or_create_by!(identifier: 'privacy_policy_summary') do |term|
+          term.protected = true
+          term.position = 1
+          term.content = 'We respect your privacy and protect your personal information.'
+        end
+
+        # If a Page exists for the privacy policy, link it so the page content
+        # is shown to users instead of the agreement terms.
+        page = BetterTogether::Page.find_by(identifier: 'privacy_policy') ||
+               BetterTogether::Page.find_by(slug: 'privacy-policy')
+        agreement.update!(page: page) if page.present?
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      # rubocop:todo Metrics/AbcSize
+      def build_terms_of_service # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
+        agreement = BetterTogether::Agreement.find_or_create_by!(identifier: 'terms_of_service') do |a|
+          a.protected = true
+          a.title = 'Terms of Service'
+          a.description = 'Rules you agree to when using the platform.'
+          a.privacy = 'public'
+        end
+
+        agreement.agreement_terms.find_or_create_by!(identifier: 'terms_of_service_summary') do |term|
+          term.protected = true
+          term.position = 1
+          term.content = 'Use the platform responsibly and respectfully.'
+        end
+
+        # Link a Terms of Service Page if one exists
+        page = BetterTogether::Page.find_by(identifier: 'terms_of_service') ||
+               BetterTogether::Page.find_by(slug: 'terms-of-service')
+        agreement.update!(page: page) if page.present?
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      # rubocop:todo Metrics/MethodLength
+      def build_code_of_conduct # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+        agreement = BetterTogether::Agreement.find_or_create_by!(identifier: 'code_of_conduct') do |a|
+          a.protected = true
+          a.title = 'Code of Conduct'
+          a.description = 'Community code of conduct and expectations.'
+          a.privacy = 'public'
+        end
+
+        agreement.agreement_terms.find_or_create_by!(identifier: 'code_of_conduct_summary') do |term|
+          term.protected = true
+          term.position = 1
+          term.content = 'Be respectful, inclusive, and considerate to other community members.'
+        end
+
+        # Link a Code of Conduct Page if one exists
+        page = BetterTogether::Page.find_by(identifier: 'code_of_conduct') ||
+               BetterTogether::Page.find_by(slug: 'code-of-conduct')
+        agreement.update!(page: page) if page.present?
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end