From 2f39129b726903c9df2cdaf42e894225f69fa8e0 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 3 Sep 2025 14:35:03 -0230 Subject: [PATCH 1/3] Remove (unnecessary) require statements --- app/future_controllers/better_together/api_controller.rb | 2 -- .../better_together/bt/api/v1/communities_controller.rb | 2 -- .../bt/api/v1/community_memberships_controller.rb | 2 -- .../better_together/bt/api/v1/people_controller.rb | 2 -- .../better_together/bt/api/v1/roles_controller.rb | 2 -- app/helpers/better_together/calendars_helper.rb | 2 -- app/resources/better_together/api_resource.rb | 2 -- .../better_together/bt/api/v1/community_membership_resource.rb | 2 -- app/resources/better_together/bt/api/v1/community_resource.rb | 2 -- app/resources/better_together/bt/api/v1/person_resource.rb | 2 -- .../better_together/bt/api/v1/registration_resource.rb | 2 -- app/resources/better_together/bt/api/v1/role_resource.rb | 2 -- app/resources/better_together/bt/api/v1/user_resource.rb | 2 -- 13 files changed, 26 deletions(-) diff --git a/app/future_controllers/better_together/api_controller.rb b/app/future_controllers/better_together/api_controller.rb index 9b529eb5c..5c0b191ab 100644 --- a/app/future_controllers/better_together/api_controller.rb +++ b/app/future_controllers/better_together/api_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'jsonapi/resource_controller' - module BetterTogether # Base API controller class ApiController < ::JSONAPI::ResourceController diff --git a/app/future_controllers/better_together/bt/api/v1/communities_controller.rb b/app/future_controllers/better_together/bt/api/v1/communities_controller.rb index 7b43a2a5b..8e11ba483 100644 --- a/app/future_controllers/better_together/bt/api/v1/communities_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/communities_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_controller' - module BetterTogether module Bt module Api diff --git a/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb b/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb index 87718e09a..78e0f3f18 100644 --- a/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_controller' - module BetterTogether module Bt module Api diff --git a/app/future_controllers/better_together/bt/api/v1/people_controller.rb b/app/future_controllers/better_together/bt/api/v1/people_controller.rb index f5908d72e..83d55067f 100644 --- a/app/future_controllers/better_together/bt/api/v1/people_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/people_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_controller' - module BetterTogether module Bt module Api diff --git a/app/future_controllers/better_together/bt/api/v1/roles_controller.rb b/app/future_controllers/better_together/bt/api/v1/roles_controller.rb index 0ff0d05e5..e41dcb7c7 100644 --- a/app/future_controllers/better_together/bt/api/v1/roles_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/roles_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_controller' - module BetterTogether module Bt module Api diff --git a/app/helpers/better_together/calendars_helper.rb b/app/helpers/better_together/calendars_helper.rb index 46bb6bfbf..888402eb6 100644 --- a/app/helpers/better_together/calendars_helper.rb +++ b/app/helpers/better_together/calendars_helper.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -# require 'simple_calendar/calendar_helper' - module BetterTogether module CalendarsHelper include SimpleCalendar::CalendarHelper diff --git a/app/resources/better_together/api_resource.rb b/app/resources/better_together/api_resource.rb index b1433e97e..e9d0afe00 100644 --- a/app/resources/better_together/api_resource.rb +++ b/app/resources/better_together/api_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -# require 'jsonapi/resource' - module BetterTogether # Base JSONAPI serializer that sets common attrbutes class ApiResource < ::JSONAPI::Resource diff --git a/app/resources/better_together/bt/api/v1/community_membership_resource.rb b/app/resources/better_together/bt/api/v1/community_membership_resource.rb index 8f5e6d0b1..db62eca83 100644 --- a/app/resources/better_together/bt/api/v1/community_membership_resource.rb +++ b/app/resources/better_together/bt/api/v1/community_membership_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_resource' - module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/community_resource.rb b/app/resources/better_together/bt/api/v1/community_resource.rb index d29917ac1..873ca2975 100644 --- a/app/resources/better_together/bt/api/v1/community_resource.rb +++ b/app/resources/better_together/bt/api/v1/community_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_resource' - module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/person_resource.rb b/app/resources/better_together/bt/api/v1/person_resource.rb index b75034c41..200f9b45e 100644 --- a/app/resources/better_together/bt/api/v1/person_resource.rb +++ b/app/resources/better_together/bt/api/v1/person_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_resource' - module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/registration_resource.rb b/app/resources/better_together/bt/api/v1/registration_resource.rb index 13e4abccf..695b87fa9 100644 --- a/app/resources/better_together/bt/api/v1/registration_resource.rb +++ b/app/resources/better_together/bt/api/v1/registration_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_resource' - module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/role_resource.rb b/app/resources/better_together/bt/api/v1/role_resource.rb index e65bac423..9a100da3a 100644 --- a/app/resources/better_together/bt/api/v1/role_resource.rb +++ b/app/resources/better_together/bt/api/v1/role_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_resource' - module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/user_resource.rb b/app/resources/better_together/bt/api/v1/user_resource.rb index ad5d7d450..50aad20cc 100644 --- a/app/resources/better_together/bt/api/v1/user_resource.rb +++ b/app/resources/better_together/bt/api/v1/user_resource.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'better_together/api_resource' - module BetterTogether module Bt module Api From 469844504edbd7a10a43c6daf41a2964a4180564 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 3 Sep 2025 17:21:39 -0230 Subject: [PATCH 2/3] Revert "replace require_dependency" This (partially) reverts commit 8cf9077b01a1d4eae758227a4c69cd086e616faa. --- .../better_together/api_controller.rb | 2 ++ .../bt/api/v1/communities_controller.rb | 2 ++ .../v1/community_memberships_controller.rb | 2 ++ .../bt/api/v1/people_controller.rb | 2 ++ .../bt/api/v1/roles_controller.rb | 2 ++ .../better_together/calendars_helper.rb | 1 + app/models/better_together/geography/map.rb | 4 ++-- app/resources/better_together/api_resource.rb | 2 ++ .../api/v1/community_membership_resource.rb | 2 ++ .../bt/api/v1/community_resource.rb | 2 ++ .../bt/api/v1/person_resource.rb | 2 ++ .../bt/api/v1/registration_resource.rb | 2 ++ .../bt/api/v1/role_resource.rb | 2 ++ .../bt/api/v1/user_resource.rb | 2 ++ lib/better_together/engine.rb | 22 +++++++++---------- spec/dummy/config/initializers/rswag_ui.rb | 2 +- 16 files changed, 39 insertions(+), 14 deletions(-) diff --git a/app/future_controllers/better_together/api_controller.rb b/app/future_controllers/better_together/api_controller.rb index 5c0b191ab..2c3a3408f 100644 --- a/app/future_controllers/better_together/api_controller.rb +++ b/app/future_controllers/better_together/api_controller.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'jsonapi/resource_controller' + module BetterTogether # Base API controller class ApiController < ::JSONAPI::ResourceController diff --git a/app/future_controllers/better_together/bt/api/v1/communities_controller.rb b/app/future_controllers/better_together/bt/api/v1/communities_controller.rb index 8e11ba483..8ae716112 100644 --- a/app/future_controllers/better_together/bt/api/v1/communities_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/communities_controller.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_controller' + module BetterTogether module Bt module Api diff --git a/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb b/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb index 78e0f3f18..683be86e6 100644 --- a/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_controller' + module BetterTogether module Bt module Api diff --git a/app/future_controllers/better_together/bt/api/v1/people_controller.rb b/app/future_controllers/better_together/bt/api/v1/people_controller.rb index 83d55067f..6b14c2e6c 100644 --- a/app/future_controllers/better_together/bt/api/v1/people_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/people_controller.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_controller' + module BetterTogether module Bt module Api diff --git a/app/future_controllers/better_together/bt/api/v1/roles_controller.rb b/app/future_controllers/better_together/bt/api/v1/roles_controller.rb index e41dcb7c7..589ddcff0 100644 --- a/app/future_controllers/better_together/bt/api/v1/roles_controller.rb +++ b/app/future_controllers/better_together/bt/api/v1/roles_controller.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_controller' + module BetterTogether module Bt module Api diff --git a/app/helpers/better_together/calendars_helper.rb b/app/helpers/better_together/calendars_helper.rb index 888402eb6..bf2475d57 100644 --- a/app/helpers/better_together/calendars_helper.rb +++ b/app/helpers/better_together/calendars_helper.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require_dependency 'simple_calendar/calendar_helper' module BetterTogether module CalendarsHelper include SimpleCalendar::CalendarHelper diff --git a/app/models/better_together/geography/map.rb b/app/models/better_together/geography/map.rb index 00aacb41e..d0b9a2383 100644 --- a/app/models/better_together/geography/map.rb +++ b/app/models/better_together/geography/map.rb @@ -85,5 +85,5 @@ def to_s end end -require 'better_together/geography/community_map' -require 'better_together/geography/community_collection_map' +require_dependency 'better_together/geography/community_map' +require_dependency 'better_together/geography/community_collection_map' diff --git a/app/resources/better_together/api_resource.rb b/app/resources/better_together/api_resource.rb index e9d0afe00..3d27aa4d5 100644 --- a/app/resources/better_together/api_resource.rb +++ b/app/resources/better_together/api_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'jsonapi/resource' + module BetterTogether # Base JSONAPI serializer that sets common attrbutes class ApiResource < ::JSONAPI::Resource diff --git a/app/resources/better_together/bt/api/v1/community_membership_resource.rb b/app/resources/better_together/bt/api/v1/community_membership_resource.rb index db62eca83..d3795a78e 100644 --- a/app/resources/better_together/bt/api/v1/community_membership_resource.rb +++ b/app/resources/better_together/bt/api/v1/community_membership_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_resource' + module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/community_resource.rb b/app/resources/better_together/bt/api/v1/community_resource.rb index 873ca2975..0a50b8499 100644 --- a/app/resources/better_together/bt/api/v1/community_resource.rb +++ b/app/resources/better_together/bt/api/v1/community_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_resource' + module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/person_resource.rb b/app/resources/better_together/bt/api/v1/person_resource.rb index 200f9b45e..d2e2190ed 100644 --- a/app/resources/better_together/bt/api/v1/person_resource.rb +++ b/app/resources/better_together/bt/api/v1/person_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_resource' + module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/registration_resource.rb b/app/resources/better_together/bt/api/v1/registration_resource.rb index 695b87fa9..2faa230c0 100644 --- a/app/resources/better_together/bt/api/v1/registration_resource.rb +++ b/app/resources/better_together/bt/api/v1/registration_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_resource' + module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/role_resource.rb b/app/resources/better_together/bt/api/v1/role_resource.rb index 9a100da3a..bf9f33bc5 100644 --- a/app/resources/better_together/bt/api/v1/role_resource.rb +++ b/app/resources/better_together/bt/api/v1/role_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_resource' + module BetterTogether module Bt module Api diff --git a/app/resources/better_together/bt/api/v1/user_resource.rb b/app/resources/better_together/bt/api/v1/user_resource.rb index 50aad20cc..3290a17ac 100644 --- a/app/resources/better_together/bt/api/v1/user_resource.rb +++ b/app/resources/better_together/bt/api/v1/user_resource.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require_dependency 'better_together/api_resource' + module BetterTogether module Bt module Api diff --git a/lib/better_together/engine.rb b/lib/better_together/engine.rb index 30fe104c4..0344ade23 100644 --- a/lib/better_together/engine.rb +++ b/lib/better_together/engine.rb @@ -53,14 +53,14 @@ class Engine < ::Rails::Engine end config.before_initialize do - require 'friendly_id' - require 'mobility' - require 'friendly_id/mobility' - require 'jsonapi-resources' - require 'importmap-rails' - require 'public_activity' - require 'pundit' - require 'rack/cors' + require_dependency 'friendly_id' + require_dependency 'mobility' + require_dependency 'friendly_id/mobility' + require_dependency 'jsonapi-resources' + require_dependency 'importmap-rails' + require_dependency 'public_activity' + require_dependency 'pundit' + require_dependency 'rack/cors' end default_url_options = { @@ -80,13 +80,13 @@ class Engine < ::Rails::Engine end initializer 'better_together.action_mailer' do |app| - if Rails.env.production? - app.config.action_mailer.show_previews = false - else + if Rails.env.development? app.config.action_mailer.show_previews = true app.config.action_mailer.preview_paths = app.config.action_mailer.preview_paths.to_a + [BetterTogether::Engine.root.join('spec/mailers/previews')] + else + app.config.action_mailer.show_previews = false end end diff --git a/spec/dummy/config/initializers/rswag_ui.rb b/spec/dummy/config/initializers/rswag_ui.rb index 9e105e7b6..1f871c794 100644 --- a/spec/dummy/config/initializers/rswag_ui.rb +++ b/spec/dummy/config/initializers/rswag_ui.rb @@ -1,7 +1,7 @@ # spec/dummy/config/initializers/rswag_ui.rb # frozen_string_literal: true -require 'rswag' +require_dependency 'rswag' Rswag::Ui.configure do |c| # List the Swagger endpoints that you want to be documented through the swagger-ui From d237aea2826349fa6dde1507bc9dce6ee0290d48 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Wed, 3 Sep 2025 17:32:31 -0230 Subject: [PATCH 3/3] Fix navigation item creation by reloading area before saving --- app/builders/better_together/navigation_builder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/builders/better_together/navigation_builder.rb b/app/builders/better_together/navigation_builder.rb index 5f0e759ed..13b224148 100644 --- a/app/builders/better_together/navigation_builder.rb +++ b/app/builders/better_together/navigation_builder.rb @@ -62,9 +62,9 @@ def build_better_together # rubocop:todo Metrics/MethodLength, Metrics/AbcSize ) # Add children to Better Together Navigation Item - better_together_nav_item.create_children(better_together_pages, area.reload) + better_together_nav_item.create_children(better_together_pages, area) - area.save! + area.reload.save! end end # rubocop:enable Metrics/AbcSize