Merge branch 'main' into codex/add-hreflang-links-generation-and-rendering

rsmithlal · web-flow · commit 6510cd429a3b · 2025-08-13T08:51:45.000-02:30
Signed-off-by: Robert Smith &lt;rob@bettertogethersolutions.com&gt;
diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml
@@ -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 --subject coverage --status ${COVERAGE}% --color $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
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -678,7 +678,7 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.33.0)
+    rubocop-rails (2.33.1)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -699,7 +699,7 @@ GEM
     ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
-    rubyzip (2.4.1)
+    rubyzip (3.0.1)
     sass-embedded (1.86.3-aarch64-linux-gnu)
       google-protobuf (~> 4.30)
     sass-embedded (1.86.3-arm64-darwin)
@@ -711,11 +711,11 @@ GEM
     sassc-embedded (1.80.4)
       sass-embedded (~> 1.80)
     securerandom (0.4.1)
-    selenium-webdriver (4.34.0)
+    selenium-webdriver (4.35.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
     sentry-rails (5.26.0)
       railties (>= 5.0)
diff --git a/app/controllers/better_together/application_controller.rb b/app/controllers/better_together/application_controller.rb
@@ -129,6 +129,10 @@ def valid_platform_invitation_token_present?
 
     private
 
+    def disallow_robots
+      view_context.content_for(:meta_robots, 'noindex,nofollow')
+    end
+
     def render_not_found
       render 'errors/404', status: :not_found
     end
diff --git a/app/controllers/better_together/content/blocks_controller.rb b/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
diff --git a/app/controllers/better_together/content/page_blocks_controller.rb b/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
diff --git a/app/controllers/better_together/conversations_controller.rb b/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]
 
diff --git a/app/controllers/better_together/messages_controller.rb b/app/controllers/better_together/messages_controller.rb
@@ -4,6 +4,7 @@ module BetterTogether
   # handles managing messages
   class MessagesController < ApplicationController
     before_action :authenticate_user!
+    before_action :disallow_robots
     before_action :set_conversation
 
     def create
diff --git a/app/controllers/better_together/notifications_controller.rb b/app/controllers/better_together/notifications_controller.rb
@@ -4,6 +4,7 @@ module BetterTogether
   # handles rendering and marking notifications as read
   class NotificationsController < ApplicationController
     before_action :authenticate_user!
+    before_action :disallow_robots
 
     def index
       @notifications = helpers.current_person.notifications.includes(:event).order(created_at: :desc)
diff --git a/app/helpers/better_together/application_helper.rb b/app/helpers/better_together/application_helper.rb
@@ -102,6 +102,11 @@ def seo_meta_tags # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
     end
     # rubocop:enable Metrics/MethodLength
 
+    def robots_meta_tag(content = 'index,follow')
+      meta_content = content_for?(:meta_robots) ? content_for(:meta_robots) : content
+      tag.meta(name: 'robots', content: meta_content)
+    end
+
     # Builds Open Graph meta tags for the current view using content blocks when
     # provided. Falls back to localized defaults and the host community logo.
     # rubocop:todo Metrics/PerceivedComplexity
diff --git a/app/models/better_together/event.rb b/app/models/better_together/event.rb
@@ -27,21 +27,23 @@ class Event < ApplicationRecord
     translates :description, backend: :action_text
 
     validates :name, presence: true
+    validates :starts_at, presence: true
     validates :registration_url, format: { with: URI::DEFAULT_PARSER.make_regexp(%w[http https]) }, allow_blank: true,
                                  allow_nil: true
+    validate :ends_at_after_starts_at
 
     scope :draft, lambda {
       start_query = arel_table[:starts_at].eq(nil)
       where(start_query)
     }
 
     scope :upcoming, lambda {
-      start_query = arel_table[:starts_at].gteq(DateTime.now)
+      start_query = arel_table[:starts_at].gteq(Time.current)
       where(start_query)
     }
 
     scope :past, lambda {
-      start_query = arel_table[:starts_at].lt(DateTime.now)
+      start_query = arel_table[:starts_at].lt(Time.current)
       where(start_query)
     }
 
@@ -74,5 +76,14 @@ def to_s
     end
 
     configure_attachment_cleanup
+
+    private
+
+    def ends_at_after_starts_at
+      return if ends_at.blank? || starts_at.blank?
+      return if ends_at > starts_at
+
+      errors.add(:ends_at, I18n.t('errors.models.ends_at_before_starts_at'))
+    end
   end
 end
diff --git a/app/views/better_together/events/_form.html.erb b/app/views/better_together/events/_form.html.erb
@@ -100,7 +100,7 @@
           <div class="row">
             <!-- Start Datetime Field -->
             <div class="col-6 mb-3 pb-3 border-bottom">
-              <%= form.label :starts_at, t('better_together.events.labels.starts_at') %>
+              <%= required_label form, :starts_at, class: 'form-label' %>
               <%= form.datetime_field :starts_at, include_seconds: false, class: 'form-control' %>
               <% if event.errors[:starts_at].any? %>
                 <div class="invalid-feedback">
diff --git a/app/views/layouts/better_together/application.html.erb b/app/views/layouts/better_together/application.html.erb
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>">
   <head>
+    <meta charset="utf-8">
     <% if ENV["SENTRY_CLIENT_KEY"] %>
       <script src="https://js-de.sentry-cdn.com/<%= ENV["SENTRY_CLIENT_KEY"] %>.min.js" crossorigin="anonymous"></script>
     <% end %>
@@ -11,6 +12,7 @@
     <title><%= (yield(:page_title) + ' | ') if content_for?(:page_title) %><%= host_platform.name %></title>
     <%= open_graph_meta_tags %>
     <%= seo_meta_tags %>
+    <%= robots_meta_tag %>
     <meta name="color-scheme" content="light dark">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= csrf_meta_tags %>
diff --git a/app/views/layouts/better_together/turbo_native.html.erb b/app/views/layouts/better_together/turbo_native.html.erb
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>">
   <head>
+    <meta charset="utf-8">
     <% if ENV["SENTRY_CLIENT_KEY"] %>
       <script src="https://js-de.sentry-cdn.com/<%= ENV["SENTRY_CLIENT_KEY"] %>.min.js" crossorigin="anonymous"></script>
     <% end %>
@@ -11,6 +12,7 @@
     <title><%= (yield(:page_title) + ' | ') if content_for?(:page_title) %><%= host_platform.name %></title>
     <%= open_graph_meta_tags %>
     <%= seo_meta_tags %>
+    <%= robots_meta_tag %>
     <meta name="color-scheme" content="light dark">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <%= csrf_meta_tags %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1516,6 +1516,7 @@ en:
       protected_destroy: "This record is protected and cannot be destroyed."
       address_missing_type: "Address must be either physical, postal, or both."
       host_single: "can only be set for one record"
+      ends_at_before_starts_at: "must be after the start time"
     person_block:
       cannot_block_self: "cannot block yourself"
       cannot_block_manager: "cannot be a platform manager"
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -1515,6 +1515,7 @@ es:
       protected_destroy: "Este registro está protegido y no se puede eliminar."
       address_missing_type: "La dirección debe ser física, postal o ambas."
       host_single: "solo se puede establecer para un registro"
+      ends_at_before_starts_at: "debe ser después de la hora de inicio"
     person_block:
       cannot_block_self: "no puedes bloquearte a ti mismo"
       cannot_block_manager: "no puede ser un administrador de la plataforma"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -1537,6 +1537,7 @@ fr:
       protected_destroy: "Cet enregistrement est protégé et ne peut pas être supprimé."
       address_missing_type: "L'adresse doit être physique, postale ou les deux."
       host_single: "ne peut être défini que pour un seul enregistrement"
+      ends_at_before_starts_at: "doit être après l'heure de début"
     person_block:
       cannot_block_self: "ne peut pas vous bloquer vous-même"
       cannot_block_manager: "ne peut pas être un gestionnaire de plateforme"
diff --git a/spec/helpers/better_together/application_helper_spec.rb b/spec/helpers/better_together/application_helper_spec.rb
@@ -4,6 +4,7 @@
 
 module BetterTogether
   RSpec.describe ApplicationHelper, type: :helper do
+
     describe '#hreflang_links' do
       it 'returns alternate link tags for all locales' do
         allow(I18n).to receive(:available_locales).and_return(%i[en fr])
@@ -17,6 +18,19 @@ module BetterTogether
         expect(html).to include('rel="alternate" hreflang="fr" href="http://example.com/fr"')
       end
     end
+
+    describe '#robots_meta_tag' do
+      it 'renders default robots meta tag' do
+        tag = helper.robots_meta_tag
+        expect(tag).to include('name="robots"')
+        expect(tag).to include('content="index,follow"')
+      end
+
+      it 'allows override via content_for' do
+        view.content_for(:meta_robots, 'noindex,nofollow')
+        tag = helper.robots_meta_tag
+        expect(tag).to include('content="noindex,nofollow"')
+      end
+    end
   end
 end
-
diff --git a/spec/models/better_together/event_spec.rb b/spec/models/better_together/event_spec.rb
@@ -4,8 +4,27 @@
 
 module BetterTogether
   RSpec.describe Event, type: :model do
+    subject(:event) { described_class.new(name: 'Event', starts_at: Time.current) }
+
     it 'exists' do
       expect(described_class).to be
     end
+
+    it 'requires starts_at' do
+      event.starts_at = nil
+      expect(event).not_to be_valid
+      expect(event.errors[:starts_at]).to include("can't be blank")
+    end
+
+    it 'requires ends_at to be after starts_at' do
+      event.ends_at = event.starts_at - 1.hour
+      expect(event).not_to be_valid
+      expect(event.errors[:ends_at]).to include(I18n.t('errors.models.ends_at_before_starts_at'))
+    end
+
+    it 'is valid when ends_at is after starts_at' do
+      event.ends_at = event.starts_at + 1.hour
+      expect(event).to be_valid
+    end
   end
 end
