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

Author: rsmithlal

.env.prod.sample

@@ -24,7 +24,7 @@ PORT=5000
 
 RACK_ENV=production
 RAILS_ENV=production
-RAILS_LOG_LEVEL=debug
+RAILS_LOG_LEVEL=info
 RAILS_LOG_TO_STDOUT=true
 RAILS_SERVE_STATIC_FILES=true
 

.github/workflows/rubyonrails.yml

@@ -13,11 +13,11 @@ jobs:
           - 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'
+            rails: '7.2.2.1'
+            allowed_failure: false   # ⚠️ allowed to fail
+          - ruby: '3.4.4'
+            rails: '8.0.2'
             allowed_failure: true    # ⚠️ allowed to fail
 
     env:
@@ -89,6 +89,22 @@ jobs:
           bundle exec rspec
         continue-on-error: ${{ matrix.allowed_failure }}
 
+      - name: Generate coverage badge
+        if: ${{ github.ref == 'refs/heads/main' && success() }}
+        continue-on-error: true
+        run: |
+          COVERAGE=$(jq -r '.result.covered_percent' coverage/.last_run.json)
+          COLOR=$(node -e "cov=parseFloat(process.argv[1]);console.log(cov>=90?'green':cov>=75?'orange':'red')" $COVERAGE)
+          npx badgen-cli coverage ${COVERAGE}% -c $COLOR > coverage.svg
+
+      - name: Commit badge
+        if: ${{ github.ref == 'refs/heads/main' && success() }}
+        continue-on-error: true
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "chore: update coverage badge"
+          file_pattern: coverage.svg
+
   # ── style & security jobs (unchanged) ───────────────────────────────────────
   rubocop:
     runs-on: ubuntu-latest

app/controllers/better_together/application_controller.rb

@@ -9,6 +9,8 @@ class ApplicationController < ActionController::Base # rubocop:todo Metrics/Clas
 
     protect_from_forgery with: :exception
 
+    layout :determine_layout
+
     before_action :check_platform_setup
     before_action :set_locale
     before_action :store_user_location!, if: :storable_location?
@@ -23,12 +25,13 @@ class ApplicationController < ActionController::Base # rubocop:todo Metrics/Clas
       Rack::MiniProfiler.authorize_request if current_user&.permitted_to?('manage_platform')
     end
 
-    rescue_from ActiveRecord::RecordNotFound, with: :handle404
-    rescue_from ActionController::RoutingError, with: :handle404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+    rescue_from ActionController::RoutingError, with: :render_not_found
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
     rescue_from StandardError, with: :handle_error
 
-    helper_method :current_invitation, :default_url_options, :valid_platform_invitation_token_present?
+    helper_method :current_invitation, :default_url_options, :valid_platform_invitation_token_present?,
+                  :turbo_native_app?
 
     def self.default_url_options
       super.merge(locale: I18n.locale)
@@ -126,11 +129,11 @@ def valid_platform_invitation_token_present?
 
     private
 
-    def handle404
-      render_404
+    def disallow_robots
+      view_context.content_for(:meta_robots, 'noindex,nofollow')
     end
 
-    def render_404 # rubocop:todo Naming/VariableNumber
+    def render_not_found
       render 'errors/404', status: :not_found
     end
 
@@ -254,5 +257,13 @@ def metric_viewable_type
     def metric_viewable_id
       metric_viewable&.id
     end
+
+    def determine_layout
+      turbo_native_app? ? 'better_together/turbo_native' : 'better_together/application'
+    end
+
+    def turbo_native_app?
+      request.user_agent.to_s.include?('Turbo Native')
+    end
   end
 end

app/controllers/better_together/content/blocks_controller.rb

@@ -5,6 +5,7 @@ module Content
     # CRUD for content blocks independently of pages
     class BlocksController < ResourceController
       before_action :authenticate_user!
+      before_action :disallow_robots
       before_action :set_block, only: %i[show edit update destroy]
       before_action only: %i[index], if: -> { Rails.env.development? } do
         # Make sure that all BLock subclasses are loaded in dev to generate new block buttons

app/controllers/better_together/content/page_blocks_controller.rb

@@ -5,6 +5,7 @@ module Content
     # CRUD for page blocks
     class PageBlocksController < ApplicationController
       before_action :authenticate_user!
+      before_action :disallow_robots
       before_action :set_page
 
       def new

app/controllers/better_together/conversations_controller.rb

@@ -4,6 +4,7 @@ module BetterTogether
   # Handles managing conversations
   class ConversationsController < ApplicationController
     before_action :authenticate_user!
+    before_action :disallow_robots
     before_action :set_conversations, only: %i[index new show]
     before_action :set_conversation, only: %i[show]
 
@@ -20,7 +21,7 @@ def new
       authorize @conversation
     end
 
-    def create # rubocop:todo Metrics/MethodLength
+    def create # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
       @conversation = Conversation.new(conversation_params.merge(creator: helpers.current_person))
 
       authorize @conversation
@@ -33,7 +34,16 @@ def create # rubocop:todo Metrics/MethodLength
           format.html { redirect_to @conversation }
         end
       else
-        render :new
+        respond_to do |format|
+          format.turbo_stream do
+            render turbo_stream: turbo_stream.update(
+              'form_errors',
+              partial: 'layouts/better_together/errors',
+              locals: { object: @conversation }
+            )
+          end
+          format.html { render :new }
+        end
       end
     end
 

app/controllers/better_together/friendly_resource_controller.rb

@@ -23,7 +23,7 @@ def set_resource_instance
       # 2. By friendly on all available locales
       @resource ||= find_by_translatable
 
-      handle404 && return if @resource.nil?
+      render_not_found && return if @resource.nil?
 
       @resource
     end

app/controllers/better_together/geography/continents_controller.rb

@@ -22,22 +22,40 @@ def new
       def edit; end
 
       # POST /geography/continents
-      def create
+      def create # rubocop:todo Metrics/MethodLength
         @geography_continent = Geography::Continent.new(geography_continent_params)
 
         if @geography_continent.save
           redirect_to @geography_continent, notice: 'Continent was successfully created.'
         else
-          render :new, status: :unprocessable_entity
+          respond_to do |format|
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.update(
+                'form_errors',
+                partial: 'layouts/better_together/errors',
+                locals: { object: @geography_continent }
+              )
+            end
+            format.html { render :new, status: :unprocessable_entity }
+          end
         end
       end
 
       # PATCH/PUT /geography/continents/1
-      def update
+      def update # rubocop:todo Metrics/MethodLength
         if @geography_continent.update(geography_continent_params)
           redirect_to @geography_continent, notice: 'Continent was successfully updated.', status: :see_other
         else
-          render :edit, status: :unprocessable_entity
+          respond_to do |format|
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.update(
+                'form_errors',
+                partial: 'layouts/better_together/errors',
+                locals: { object: @geography_continent }
+              )
+            end
+            format.html { render :edit, status: :unprocessable_entity }
+          end
         end
       end
 

app/controllers/better_together/geography/countries_controller.rb

@@ -28,23 +28,41 @@ def new
       def edit; end
 
       # POST /geography/countries
-      def create
+      def create # rubocop:todo Metrics/MethodLength
         @geography_country = resource_class.new(geography_country_params)
         authorize_geography_country
 
         if @geography_country.save
           redirect_to @geography_country, notice: 'Country was successfully created.', status: :see_other
         else
-          render :new, status: :unprocessable_entity
+          respond_to do |format|
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.update(
+                'form_errors',
+                partial: 'layouts/better_together/errors',
+                locals: { object: @geography_country }
+              )
+            end
+            format.html { render :new, status: :unprocessable_entity }
+          end
         end
       end
 
       # PATCH/PUT /geography/countries/1
-      def update
+      def update # rubocop:todo Metrics/MethodLength
         if @geography_country.update(geography_country_params)
           redirect_to @geography_country, notice: 'Country was successfully updated.', status: :see_other
         else
-          render :edit, status: :unprocessable_entity
+          respond_to do |format|
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.update(
+                'form_errors',
+                partial: 'layouts/better_together/errors',
+                locals: { object: @geography_country }
+              )
+            end
+            format.html { render :edit, status: :unprocessable_entity }
+          end
         end
       end
 

app/controllers/better_together/geography/region_settlements_controller.rb

@@ -22,23 +22,41 @@ def new
       def edit; end
 
       # POST /geography/region_settlements
-      def create
+      def create # rubocop:todo Metrics/MethodLength
         @geography_region_settlement = Geography::RegionSettlement.new(geography_region_settlement_params)
 
         if @geography_region_settlement.save
           redirect_to @geography_region_settlement, notice: 'Region settlement was successfully created.'
         else
-          render :new, status: :unprocessable_entity
+          respond_to do |format|
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.update(
+                'form_errors',
+                partial: 'layouts/better_together/errors',
+                locals: { object: @geography_region_settlement }
+              )
+            end
+            format.html { render :new, status: :unprocessable_entity }
+          end
         end
       end
 
       # PATCH/PUT /geography/region_settlements/1
-      def update
+      def update # rubocop:todo Metrics/MethodLength
         if @geography_region_settlement.update(geography_region_settlement_params)
           redirect_to @geography_region_settlement, notice: 'Region settlement was successfully updated.',
                                                     status: :see_other
         else
-          render :edit, status: :unprocessable_entity
+          respond_to do |format|
+            format.turbo_stream do
+              render turbo_stream: turbo_stream.update(
+                'form_errors',
+                partial: 'layouts/better_together/errors',
+                locals: { object: @geography_region_settlement }
+              )
+            end
+            format.html { render :edit, status: :unprocessable_entity }
+          end
         end
       end