From 54acc369abc910e90d47cae8c75cdb498fec86c2 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sat, 20 Sep 2025 09:43:22 +0000
Subject: [PATCH 1/2] Rubocop

---
 app/controllers/activities_controller.rb | 18 ++++++++----------
 app/controllers/plantings_controller.rb  |  8 +++-----
 app/helpers/auto_suggest_helper.rb       |  2 +-
 app/helpers/event_helper.rb              |  4 ++--
 app/models/forum.rb                      |  1 +
 app/models/garden_type.rb                |  1 +
 app/models/member.rb                     |  9 ++++++---
 app/models/plant_part.rb                 |  1 +
 app/models/role.rb                       |  1 +
 app/models/seed.rb                       |  3 ++-
 app/resources/base_resource.rb           |  2 +-
 11 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 3d72ed439..84f676873 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -67,16 +67,14 @@ class ActivitiesController < DataController
   end
 
   def update
-    if @activity.update(activity_params)
-      if activity_params[:finished].present?
-        link = new_activity_path(
-          name:        @activity.name,
-          garden_id:   @activity.garden_id,
-          planting_id: @activity.planting_id,
-          due_date:    2.weeks.from_now.to_date
-        )
-        flash[:notice] = t('activities.finished_prompt_html', link: link).html_safe
-      end
+    if @activity.update(activity_params) && activity_params[:finished].present?
+      link = new_activity_path(
+        name:        @activity.name,
+        garden_id:   @activity.garden_id,
+        planting_id: @activity.planting_id,
+        due_date:    2.weeks.from_now.to_date
+      )
+      flash[:notice] = t('activities.finished_prompt_html', link: link).html_safe
     end
     respond_with @activity
   end
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 8e6228163..78cfc88d3 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -83,11 +83,9 @@ class PlantingsController < DataController
   end
 
   def update
-    if @planting.update(planting_params)
-      if planting_params[:finished].present? && @planting.garden.plantings.current.empty?
-        link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id)
-        flash[:notice] = t('plantings.finished_prompt_html', link: link).html_safe
-      end
+    if @planting.update(planting_params) && planting_params[:finished].present? && @planting.garden.plantings.current.empty?
+      link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id)
+      flash[:notice] = t('plantings.finished_prompt_html', link: link).html_safe
     end
     respond_with @planting
   end
diff --git a/app/helpers/auto_suggest_helper.rb b/app/helpers/auto_suggest_helper.rb
index ff0558ef2..9cc75107d 100644
--- a/app/helpers/auto_suggest_helper.rb
+++ b/app/helpers/auto_suggest_helper.rb
@@ -13,7 +13,7 @@ module AutoSuggestHelper
     resource = resource.class.name.downcase
     source_path = Rails.application.routes.url_helpers.send("search_#{source}s_path", format: :json)
     %(
-      <input id="#{source}" class="auto-suggest #{options[:class]}" #{options[:required] ? 'required="required"' : ''}
+      <input id="#{source}" class="auto-suggest #{options[:class]}" #{'required="required"' if options[:required]}
         type="text" value="#{default}" data-source-url="#{source_path}",
         placeholder="e.g. lettuce">
       <noscript class="text-warning">
diff --git a/app/helpers/event_helper.rb b/app/helpers/event_helper.rb
index 2e127c319..e349b06ff 100644
--- a/app/helpers/event_helper.rb
+++ b/app/helpers/event_helper.rb
@@ -7,8 +7,8 @@ module EventHelper
 
   def event_description(event)
     render "#{event.event_type.pluralize}/description", event_model: resolve_model(event)
-rescue ActionView::MissingTemplate
-  "#{event.event_type.humanize.downcase}d"
+  rescue ActionView::MissingTemplate
+    "#{event.event_type.humanize.downcase}d"
   end
 
   def resolve_model(event)
diff --git a/app/models/forum.rb b/app/models/forum.rb
index 717518981..9ca5f8826 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -3,6 +3,7 @@
 class Forum < ApplicationRecord
   extend FriendlyId
   include Ownable
+
   validates :name, presence: true
   validates :description, presence: true
   friendly_id :name, use: %i(slugged finders)
diff --git a/app/models/garden_type.rb b/app/models/garden_type.rb
index bed371e24..83336d46f 100644
--- a/app/models/garden_type.rb
+++ b/app/models/garden_type.rb
@@ -2,6 +2,7 @@
 
 class GardenType < ApplicationRecord
   extend FriendlyId
+
   friendly_id :name, use: %i(slugged finders)
 
   has_many :gardens, dependent: :nullify
diff --git a/app/models/member.rb b/app/models/member.rb
index f9b1c6942..3bfcf9d7c 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -2,12 +2,14 @@
 
 class Member < ApplicationRecord
   include Discard::Model
+
   acts_as_messageable # messages can be sent to this model
   include Geocodable
   include MemberFlickr
   include MemberNewsletter
 
   extend FriendlyId
+
   friendly_id :login_name, use: %i(slugged finders)
 
   #
@@ -105,9 +107,10 @@ class Member < ApplicationRecord
             uniqueness: {
               case_sensitive: false
             }
-  validates :website_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
-  validates :other_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
-  validates :instagram_handle, :facebook_handle, :bluesky_handle, format: { without: %r{\Ahttps?:\/\/|\/}, message: "should be a handle, not a URL" }, allow_blank: true
+  validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :instagram_handle, :facebook_handle, :bluesky_handle,
+            format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true
 
   #
   # Triggers
diff --git a/app/models/plant_part.rb b/app/models/plant_part.rb
index e7e808309..e7b122fe0 100644
--- a/app/models/plant_part.rb
+++ b/app/models/plant_part.rb
@@ -2,6 +2,7 @@
 
 class PlantPart < ApplicationRecord
   extend FriendlyId
+
   friendly_id :name, use: %i(slugged finders)
 
   has_many :harvests, dependent: :destroy
diff --git a/app/models/role.rb b/app/models/role.rb
index 027d25546..0e367dbb8 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -2,6 +2,7 @@
 
 class Role < ApplicationRecord
   extend FriendlyId
+
   friendly_id :name, use: %i(slugged finders)
   validates :name, uniqueness: true, presence: true
 
diff --git a/app/models/seed.rb b/app/models/seed.rb
index e99429a44..090c8f022 100644
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -6,6 +6,7 @@ class Seed < ApplicationRecord
   include Finishable
   include Ownable
   include SearchSeeds
+
   friendly_id :seed_slug, use: %i(slugged finders)
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
@@ -48,7 +49,7 @@ class Seed < ApplicationRecord
                                                                     "are heirloom, hybrid, or unknown" }
   validates :source, allow_blank: true,
                      inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
-                                                                 "or that you don't know" }
+                                                                "or that you don't know" }
 
   #
   # Delegations
diff --git a/app/resources/base_resource.rb b/app/resources/base_resource.rb
index b85ba45e1..e5cd9efe6 100644
--- a/app/resources/base_resource.rb
+++ b/app/resources/base_resource.rb
@@ -3,7 +3,7 @@
 class BaseResource < JSONAPI::Resource
   abstract
 
-  [:create, :update, :remove].each do |action|
+  %i(create update remove).each do |action|
     set_callback action, :before, :authorize
   end
 

From ce946c3a83853b28076195fb27a7a0bd8480564f Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sat, 20 Sep 2025 09:45:56 +0000
Subject: [PATCH 2/2] Rubocop fixes

---
 .../garden_types_controller_spec.rb           |  1 +
 spec/controllers/gardens_controller_spec.rb   |  1 +
 .../harvests/harvesting_a_crop_spec.rb        |  2 +-
 spec/features/members/deletion_spec.rb        |  4 ++--
 spec/models/planting_spec.rb                  | 19 ++++++++++---------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/spec/controllers/garden_types_controller_spec.rb b/spec/controllers/garden_types_controller_spec.rb
index 80a79662d..cac02e13a 100644
--- a/spec/controllers/garden_types_controller_spec.rb
+++ b/spec/controllers/garden_types_controller_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 RSpec.describe GardenTypesController, type: :controller do
   include Devise::Test::ControllerHelpers
+
   let(:valid_params) { { name: 'My second GardenType' } }
   let(:garden_type)  { FactoryBot.create(:garden_type) }
 
diff --git a/spec/controllers/gardens_controller_spec.rb b/spec/controllers/gardens_controller_spec.rb
index e0da0e4bf..f06b1bd54 100644
--- a/spec/controllers/gardens_controller_spec.rb
+++ b/spec/controllers/gardens_controller_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 RSpec.describe GardensController, type: :controller do
   include Devise::Test::ControllerHelpers
+
   let(:valid_params) { { name: 'My second Garden' } }
 
   let(:garden) { FactoryBot.create(:garden) }
diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb
index 77042a9e6..9cfbe787a 100644
--- a/spec/features/harvests/harvesting_a_crop_spec.rb
+++ b/spec/features/harvests/harvesting_a_crop_spec.rb
@@ -26,7 +26,7 @@ describe "Harvesting a crop", :js, :search do
 
       within "form#new_harvest" do
         choose plant_part.name
-        fill_in "When?", with: Time.new(2014, 06, 15)
+        fill_in "When?", with: Time.new(2014, 6, 15)
         fill_in "How many?", with: 42
         fill_in "Weighing (in total)", with: 42
         fill_in "Notes", with: "It's killer."
diff --git a/spec/features/members/deletion_spec.rb b/spec/features/members/deletion_spec.rb
index fd5206ca8..6c3e75d8e 100644
--- a/spec/features/members/deletion_spec.rb
+++ b/spec/features/members/deletion_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "member deletion", flaky: true do
+describe "member deletion", :flaky do
   context "with activity and followers" do
     let(:member)          { FactoryBot.create(:member)                     }
     let(:other_member)    { FactoryBot.create(:member)                     }
@@ -63,7 +63,7 @@ describe "member deletion", flaky: true do
       member.reload
       expect(member.discarded?).to be true
 
-      # Frustratingly, this cannot be discarded? and also meet 
+      # Frustratingly, this cannot be discarded? and also meet
       # `@member = Member.confirmed.kept.find_by!(slug: params[:slug])`
       #
       # Yet, we see the below assert fail in CI.
diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb
index 1788a3e8c..278417ba8 100644
--- a/spec/models/planting_spec.rb
+++ b/spec/models/planting_spec.rb
@@ -523,6 +523,7 @@ describe Planting do
 
   context "failed" do
     let(:failed_planting) { FactoryBot.create(:planting, failed: true) }
+
     it 'has a failed field' do
       expect(failed_planting.failed).to be true
     end
@@ -535,20 +536,20 @@ describe Planting do
     end
 
     it 'is not included in the active scope' do
-        @p = FactoryBot.create(:planting)
-        @f = FactoryBot.create(:planting, failed: true)
-        described_class.active.should include @p
-        described_class.active.should_not include @f
+      @p = FactoryBot.create(:planting)
+      @f = FactoryBot.create(:planting, failed: true)
+      described_class.active.should include @p
+      described_class.active.should_not include @f
     end
 
     it 'cannot be finished and failed' do
-        @f = FactoryBot.build(:planting, finished: true, failed: true)
-        @f.should_not be_valid
+      @f = FactoryBot.build(:planting, finished: true, failed: true)
+      @f.should_not be_valid
     end
 
     it 'is not finished' do
-        @f = FactoryBot.build(:planting, finished: true, failed: true)
-        expect(@f.finished?).to be false
+      @f = FactoryBot.build(:planting, finished: true, failed: true)
+      expect(@f.finished?).to be false
     end
   end
 
@@ -587,7 +588,7 @@ describe Planting do
       FactoryBot.create(:finished_planting, owner: member, garden: member.gardens.first)
     end
     let!(:failed_planting) do
-        FactoryBot.create(:planting, failed: true, owner: member, garden: member.gardens.first)
+      FactoryBot.create(:planting, failed: true, owner: member, garden: member.gardens.first)
     end
 
     it { expect(member.plantings.active).to include(planting) }