Merge branch 'dev' into fix/preserve-scientific-name-attributes

When editing a crop, the `recreate_names` method in the `CropsController`
would always destroy and recreate the associated scientific names, even if
they had not changed. This caused any additional attributes on the
scientific names to be lost.

This commit modifies `recreate_names` to first check if the submitted
names are different from the existing ones. If they are the same, the
method returns early, preserving the existing records and their
attributes.

Additionally, this commit corrects a typo in `crop_params` where
`:scientific_name` was used instead of `:name` for the nested attributes,
ensuring that the parameters are permitted correctly.

.dockerignore

@@ -1,30 +0,0 @@
-.git
-.github
-.devcontainer
-log/*
-tmp/*
-!tmp/keep
-node_modules
-public/assets
-.env
-.ruby-gemset
-.editorconfig
-.esignore
-.eslintrc.json
-.haml-lint.yml
-.overcommit.yml
-.rspec
-.rubocop.yml
-.rubocop_todo.yml
-.scss-lint.yml
-.travis.yml
-.yamllint
-CODE_OF_CONDUCT.md
-CONTRIBUTING.md
-CONTRIBUTORS.md
-LICENSE.txt
-README.md
-TECH.md
-docker-compose.yml
-Dockerfile
-.dockerignore

.github/workflows/docker-build-push.yml

@@ -1,43 +0,0 @@
-name: Docker Build and Push
-
-on:
-  push:
-    branches:
-      - mainline
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          images: ghcr.io/${{ github.repository }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
+# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -81,7 +81,7 @@ Layout/HashAlignment:
     - 'spec/requests/api/v1/activities_request_spec.rb'
     - 'spec/requests/api/v1/members_request_spec.rb'
 
-# Offense count: 5
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -92,6 +92,7 @@ Layout/LineLength:
     - 'app/models/concerns/predict_planting.rb'
     - 'app/models/crop.rb'
     - 'db/seeds.rb'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -153,6 +154,21 @@ Lint/SuppressedException:
   Exclude:
     - 'lib/tasks/testing.rake'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, consistent
+Lint/SymbolConversion:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+Lint/UselessAssignment:
+  Exclude:
+    - 'config.rb'
+    - 'config/compass.rb'
+
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
@@ -226,12 +242,18 @@ RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/tasks/import_spec.rb'
 
-# Offense count: 298
+# Offense count: 299
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
+# Offense count: 1
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/tasks/import_spec.rb'
+
 # Offense count: 36
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -242,12 +264,47 @@ RSpec/DescribedClass:
     - 'spec/models/member_spec.rb'
     - 'spec/services/timeline_service_spec.rb'
 
+# Offense count: 13
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/EmptyExampleGroup:
+  Exclude:
+    - 'spec/controllers/authentications_controller_spec.rb'
+    - 'spec/controllers/forums_controller_spec.rb'
+    - 'spec/controllers/home_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/controllers/plant_parts_controller_spec.rb'
+    - 'spec/controllers/seeds_controller_spec.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/requests/authentications_spec.rb'
+    - 'spec/views/home/index_spec.rb'
+    - 'spec/views/photos/edit.html.haml_spec.rb'
+    - 'spec/views/posts/_single.html.haml_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
 # Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 27
 
 # Offense count: 32
+RSpec/ExpectInHook:
+  Exclude:
+    - 'spec/controllers/garden_types_controller_spec.rb'
+    - 'spec/controllers/gardens_controller_spec.rb'
+    - 'spec/features/admin/forums_spec.rb'
+    - 'spec/features/admin/plant_parts_spec.rb'
+    - 'spec/features/admin/roles_spec.rb'
+    - 'spec/features/crops/crop_photos_spec.rb'
+    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/shared_examples/append_date.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -295,6 +352,7 @@ RSpec/IndexedLet:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/planting_reminder_spec.rb'
     - 'spec/features/timeline/index_spec.rb'
+    - 'spec/models/crop_spec.rb'
     - 'spec/models/member_spec.rb'
     - 'spec/views/forums/index.html.haml_spec.rb'
 
@@ -329,7 +387,7 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 191
+# Offense count: 189
 RSpec/MultipleExpectations:
   Max: 19
 
@@ -344,7 +402,7 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 109
+# Offense count: 111
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
@@ -475,6 +533,10 @@ Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/features/locale_spec.rb'
 
+# Offense count: 40
+Rails/I18nLocaleTexts:
+  Enabled: false
+
 # Offense count: 1
 # Configuration parameters: IgnoreScopes.
 Rails/InverseOf:
@@ -516,7 +578,7 @@ Rails/RakeEnvironment:
     - 'lib/tasks/i18n.rake'
     - 'lib/tasks/testing.rake'
 
-# Offense count: 8
+# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
 # AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -570,6 +632,15 @@ Rails/RootPathnameMethods:
     - 'lib/tasks/import.rake'
     - 'spec/rails_helper.rb'
 
+# Offense count: 4
+# Configuration parameters: ForbiddenMethods, AllowedMethods.
+# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
+    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
+    - 'db/migrate/20251128200506_add_description_to_crops.rb'
+
 # Offense count: 21
 Rails/ThreeStateBooleanColumn:
   Enabled: false
@@ -657,14 +728,6 @@ Style/FloatDivision:
   Exclude:
     - 'app/models/concerns/predict_planting.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
@@ -729,6 +792,13 @@ Style/OptionalBooleanParameter:
     - 'app/helpers/application_helper.rb'
     - 'app/models/concerns/member_newsletter.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'db/migrate/20251130035700_create_versions.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.

.scss-lint.yml

@@ -248,3 +248,6 @@ linters:
 
   ZeroUnit:
     enabled: true
+
+  Compass::*:
+    enabled: false

Dockerfile

@@ -1,52 +0,0 @@
-FROM ruby:3.4.8-trixie
-
-# Install system dependencies
-RUN apt-get update -qq && \
-    apt-get install -y --no-install-recommends \
-    build-essential \
-    libpq-dev \
-    git \
-    curl \
-    gnupg2 \
-    shared-mime-info \
-    libvips \
-    && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g yarn \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set production environment
-ENV RAILS_ENV=production \
-    BUNDLE_WITHOUT="development test" \
-    RAILS_SERVE_STATIC_FILES=true \
-    RAILS_LOG_TO_STDOUT=true
-
-WORKDIR /app
-
-# Install gems
-COPY Gemfile Gemfile.lock ./
-RUN bundle config set --local deployment 'true' && \
-    bundle config set --local without 'development test' && \
-    bundle install --jobs 4 --retry 3
-
-# Install JavaScript dependencies
-COPY package.json yarn.lock ./
-RUN yarn install --check-files
-
-# Copy the application code
-COPY . .
-
-# Precompile assets
-# Secret key base is needed for asset compilation but doesn't need to be the real one
-RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile
-
-# Add a script to be executed every time the container starts.
-COPY entrypoint.sh /usr/bin/
-RUN chmod +x /usr/bin/entrypoint.sh
-ENTRYPOINT ["entrypoint.sh"]
-
-EXPOSE 3000
-
-# Start the main process.
-CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]

Gemfile

@@ -116,8 +116,6 @@ gem 'xmlrpc' # fixes rake error - can be removed if not needed later
 
 gem 'puma'
 
-gem 'rack-attack'
-
 gem 'loofah', '>= 2.19.1'
 gem 'rack-protection', '>= 2.0.1'
 

Gemfile.lock

@@ -498,13 +498,11 @@ GEM
       date
       stringio
     public_suffix (7.0.5)
-    puma (8.0.1)
+    puma (8.0.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
     rack (2.2.23)
-    rack-attack (6.8.0)
-      rack (>= 1.0, < 4)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -843,7 +841,6 @@ DEPENDENCIES
   pry
   puma
   query_diet
-  rack-attack
   rack-cors
   rack-protection (>= 2.0.1)
   rails (~> 7.2.0)

app/controllers/activities_controller.rb

@@ -7,9 +7,9 @@ class ActivitiesController < DataController
     where = {}
     where['active'] = true unless @show_all
 
-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+    if params[:member_slug]
+      @owner = Member.find_by(slug: params[:member_slug])
+      where['owner_id'] = @owner.id unless @owner.nil?
     end
 
     @activities = Activity.search(

app/controllers/admin/crop_companions_controller.rb

@@ -15,7 +15,7 @@ module Admin
     def create
       @crop_companion = @crop.crop_companions.new(crop_companion_params)
       if @crop_companion.save
-        redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.created')
+        redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
       else
         render :new
       end
@@ -24,7 +24,7 @@ module Admin
     def destroy
       @crop_companion = @crop.crop_companions.find(params[:id])
       @crop_companion.destroy
-      redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.deleted')
+      redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
     end
 
     private

app/controllers/admin/members_controller.rb

@@ -8,9 +8,9 @@ module Admin
     responders :flash
 
     def index
-      @members = Member.order(:login_name)
-      @members = @members.where("login_name ILIKE ?", "%#{search_term}%") if search_term.present?
-      @members = @members.paginate(page: params[:page])
+      @members = Member.all
+      @members = @members.where("login_name ILIKE ?", "%#{search_term}%") unless search_term.nil?
+      @members = @members.order(:login_name).paginate(page: params[:page])
     end
 
     def edit

app/controllers/admin/versions_controller.rb

@@ -9,9 +9,9 @@ module Admin
       @version = PaperTrail::Version.find(params[:id])
       @object = @version.reify
       if @object.save
-        redirect_to admin_crops_path, notice: t('messages.revert_success', date: @version.created_at.strftime('%B %d, %Y'))
+        redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
       else
-        redirect_to admin_crops_path, alert: t('messages.revert_error', date: @version.created_at.strftime('%B %d, %Y'), errors: @object.errors.full_messages.to_sentence)
+        redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
       end
     end
 

app/controllers/alternate_names_controller.rb

@@ -30,7 +30,7 @@ class AlternateNamesController < ApplicationController
     @alternate_name = AlternateName.new(alternate_name_params)
 
     if @alternate_name.save
-      redirect_to @alternate_name.crop, notice: t('alternate_names.created')
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully created.'
     else
       render action: "new"
     end
@@ -40,7 +40,7 @@ class AlternateNamesController < ApplicationController
   # PUT /alternate_names/1.json
   def update
     if @alternate_name.update(alternate_name_params)
-      redirect_to @alternate_name.crop, notice: t('alternate_names.updated')
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.'
     else
       render action: "edit"
     end
@@ -51,7 +51,7 @@ class AlternateNamesController < ApplicationController
   def destroy
     @crop = @alternate_name.crop
     @alternate_name.destroy
-    redirect_to @crop, notice: t('alternate_names.deleted')
+    redirect_to @crop, notice: 'Alternate name was successfully deleted.'
   end
 
   private

app/controllers/authentications_controller.rb

@@ -24,9 +24,9 @@ class AuthenticationsController < ApplicationController
           name:
         )
 
-      flash[:notice] = t('messages.auth_success')
+      flash[:notice] = "Authentication successful."
     else
-      flash[:notice] = t('messages.auth_failed')
+      flash[:notice] = "Authentication failed."
     end
     redirect_to request.env['omniauth.origin'] || edit_member_registration_path
   end

app/controllers/blocks_controller.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class BlocksController < ApplicationController
-  load_and_authorize_resource
-  skip_load_resource only: :create
-
-  def create
-    @block = current_member.blocks.build(blocked: Member.find(params[:blocked]))
-
-    if @block.save
-      flash[:notice] = "Blocked #{@block.blocked.login_name}"
-    else
-      flash[:error] = "Already blocking or error while blocking."
-    end
-    redirect_back_or_to(root_path)
-  end
-
-  def destroy
-    @block = current_member.blocks.find(params[:id])
-    @unblocked = @block.blocked
-    @block.destroy
-
-    flash[:notice] = "Unblocked #{@unblocked.login_name}"
-    redirect_to @unblocked
-  end
-
-  private
-
-  def block_params
-    params.permit(:id, :blocked)
-  end
-end

app/controllers/charts/crops_controller.rb

@@ -3,7 +3,6 @@
 module Charts
   class CropsController < ApplicationController
     respond_to :json
-    before_action :set_crop
 
     def sunniness
       pie_chart_query 'sunniness'
@@ -14,28 +13,20 @@ module Charts
     end
 
     def harvested_for
-      data = Rails.cache.fetch("#{@crop.cache_key_with_version}/harvested_for", expires_in: 1.day) do
-        Harvest.joins(:plant_part)
-          .where(crop: @crop)
-          .group("plant_parts.name").count(:id)
-      end
-      render json: data
+      @crop = Crop.find_by!(slug: params[:crop_slug])
+      render json: Harvest.joins(:plant_part)
+        .where(crop: @crop)
+        .group("plant_parts.name").count(:id)
     end
 
     private
 
-    def set_crop
-      @crop = Crop.find_by!(slug: params[:crop_slug])
-    end
-
     def pie_chart_query(field)
-      data = Rails.cache.fetch("#{@crop.cache_key_with_version}/#{field}", expires_in: 1.day) do
-        Planting.where(crop: @crop)
-          .where.not(field.to_sym => nil)
-          .where.not(field.to_sym => '')
-          .group(field.to_sym).count(:id)
-      end
-      render json: data
+      @crop = Crop.find_by!(slug: params[:crop_slug])
+      render json: Planting.where(crop: @crop)
+        .where.not(field.to_sym => nil)
+        .where.not(field.to_sym => '')
+        .group(field.to_sym).count(:id)
     end
   end
 end

app/controllers/crops_controller.rb

@@ -204,6 +204,15 @@ class CropsController < ApplicationController
   def recreate_names(param_name, name_type)
     return if params[param_name].blank?
 
+    # Get the submitted names, reject blanks, and sort for comparison
+    submitted_names = params[param_name].values.reject(&:blank?).sort
+    # Get the existing names from the database, and sort for comparison
+    existing_names = @crop.send("#{name_type}_names").pluck(:name).sort
+
+    # Return early to prevent destroying and recreating names (and their associated attributes)
+    # if the list of names has not changed.
+    return if submitted_names == existing_names
+
     @crop.send("#{name_type}_names").each(&:destroy)
     params[param_name].each_value do |value|
       next if value.empty?
@@ -226,7 +235,7 @@ class CropsController < ApplicationController
       :public_food_key,
       :row_spacing, :spread, :height,
       :sowing_method, :sun_requirements, :growing_degree_days,
-      scientific_names_attributes: %i(scientific_name _destroy id)
+      scientific_names_attributes: %i(name _destroy id)
     )
   end
 

app/controllers/follows_controller.rb

@@ -13,9 +13,9 @@ class FollowsController < ApplicationController
     @follow = current_member.follows.build(followed: Member.find(params[:followed]))
 
     if @follow.save
-      flash[:notice] = t('messages.followed', name: @follow.followed.login_name)
+      flash[:notice] = "Followed #{@follow.followed.login_name}"
     else
-      flash[:error] = t('messages.follow_error')
+      flash[:error] = "Already following or error while following."
     end
     redirect_back_or_to(root_path)
   end
@@ -25,7 +25,7 @@ class FollowsController < ApplicationController
     @unfollowed = @follow.followed
     @follow.destroy
 
-    flash[:notice] = t('messages.unfollowed', name: @unfollowed.login_name)
+    flash[:notice] = "Unfollowed #{@unfollowed.login_name}"
     redirect_to @unfollowed
   end
 

app/controllers/forums_controller.rb

@@ -32,14 +32,14 @@ class ForumsController < ApplicationController
   # POST /forums.json
   def create
     @forum = Forum.new(forum_params)
-    flash[:notice] = t('forums.created') if @forum.save
+    flash[:notice] = 'Forum was successfully created.' if @forum.save
     respond_with(@forum)
   end
 
   # PUT /forums/1
   # PUT /forums/1.json
   def update
-    flash[:notice] = t('forums.updated') if @forum.update(forum_params)
+    flash[:notice] = 'Forum was successfully updated.' if @forum.update(forum_params)
     respond_with(@forum)
   end
 
@@ -47,7 +47,7 @@ class ForumsController < ApplicationController
   # DELETE /forums/1.json
   def destroy
     @forum.destroy
-    flash[:notice] = t('forums.deleted')
+    flash[:notice] = 'Forum was successfully deleted'
     redirect_to forums_url
   end
 

app/controllers/gardens_controller.rb

@@ -2,7 +2,7 @@
 
 class GardensController < DataController
   def index
-    @owner = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
+    @owner = Member.find_by(slug: params[:member_slug])
     @show_all = params[:all] == '1'
     @show_jump_to = params[:member_slug].present? || false
 

app/controllers/harvests_controller.rb

@@ -5,8 +5,8 @@ class HarvestsController < DataController
 
   def index
     where = {}
-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
+    if params[:member_slug]
+      @owner = Member.find_by(slug: params[:member_slug])
       where['owner_id'] = @owner.id
     end
 

app/controllers/likes_controller.rb

@@ -14,7 +14,7 @@ class LikesController < ApplicationController
       @like.likeable.reindex(refresh: true)
       success(@like, liked_by_member: true, status_code: :created)
     else
-      failed(@like, message: t('messages.unable_to_like'))
+      failed(@like, message: 'Unable to like')
     end
   end
 
@@ -29,7 +29,7 @@ class LikesController < ApplicationController
       @like.likeable.reindex(refresh: true)
       success(@like, liked_by_member: false, status_code: :ok)
     else
-      failed(@like, message: t('messages.unable_to_unlike'))
+      failed(@like, message: 'Unable to unlike')
     end
   end
 

app/controllers/messages_controller.rb

@@ -27,21 +27,10 @@ class MessagesController < ApplicationController
   def create
     if params[:conversation_id].present?
       @conversation = Mailboxer::Conversation.find(params[:conversation_id])
-      # Check if any of the recipients have blocked the sender
-      if @conversation.recipients.any? { |recipient| recipient.already_blocking?(current_member) }
-        flash[:error] = "You cannot reply to this conversation because one of the recipients has blocked you."
-        redirect_to conversation_path(@conversation)
-        return
-      end
       current_member.reply_to_conversation(@conversation, params[:body])
       redirect_to conversation_path(@conversation)
     else
       recipient = Member.find(params[:recipient_id])
-      if recipient.already_blocking?(current_member)
-        flash[:error] = "You cannot send a message to a member who has blocked you."
-        redirect_back_or_to(root_path)
-        return
-      end
       body = params[:body]
       subject = params[:subject]
       @conversation = current_member.send_message(recipient, body, subject)

app/controllers/omniauth_callbacks_controller.rb

@@ -10,7 +10,7 @@ require './lib/actions/oauth_signup_action'
 #
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def failure
-    flash[:alert] = t('messages.auth_failed')
+    flash[:alert] = "Authentication failed."
     redirect_to request.env['omniauth.origin'] || "/"
   end
 

app/controllers/photos_controller.rb

@@ -102,12 +102,11 @@ class PhotosController < ApplicationController
     end
 
     @current_set = params[:set]
-    @current_tag = params[:tag]
 
     page = params[:page] || 1
 
     @sets = current_member.flickr_sets
-    photos, total = current_member.flickr_photos(page, @current_set, @current_tag)
+    photos, total = current_member.flickr_photos(page, @current_set)
 
     @photos = WillPaginate::Collection.create(page, 30, total) do |pager|
       pager.replace photos
@@ -119,8 +118,6 @@ class PhotosController < ApplicationController
       { crops: @crop.id }
     elsif params[:planting_id]
       { planting_id: @planting.id }
-    elsif params[:planting_slug]
-      { plantings: @planting.id }
     else
       {}
     end
@@ -129,6 +126,5 @@ class PhotosController < ApplicationController
   def set_crop_and_planting
     @crop = Crop.find params[:crop_slug] if params[:crop_slug]
     @planting = Planting.find params[:planting_id] if params[:planting_id]
-    @planting ||= Planting.find params[:planting_slug] if params[:planting_slug]
   end
 end

app/controllers/places_controller.rb

@@ -33,7 +33,7 @@ class PlacesController < ApplicationController
 
   def search
     if params[:new_place].empty?
-      redirect_to places_path, alert: t('messages.invalid_location')
+      redirect_to places_path, alert: 'Please enter a valid location'
     else
       redirect_to place_path(params[:new_place])
     end

app/controllers/plantings_controller.rb

@@ -11,9 +11,9 @@ class PlantingsController < DataController
     where = {}
     where['active'] = true unless @show_all
 
-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+    if params[:member_slug]
+      @owner = Member.find_by(slug: params[:member_slug])
+      where['owner_id'] = @owner.id unless @owner.nil?
     end
 
     if params[:crop_slug]
@@ -116,11 +116,11 @@ class PlantingsController < DataController
     new_planting.finished_at = nil
 
     if new_planting.save
-      redirect_to edit_planting_path(new_planting), notice: t('messages.transplant_success')
+      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
     else
       # if the save fails, we should probably roll back the finishing of the original planting
       @planting.update(finished: false, finished_at: nil)
-      redirect_to @planting, alert: t('messages.transplant_error', errors: new_planting.errors.full_messages.to_sentence)
+      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
     end
   end
 
@@ -160,7 +160,7 @@ class PlantingsController < DataController
   end
 
   def matching_seeds
-    @matching_seeds ||= Seed.where(crop: @planting.crop, owner: @planting.owner)
+    Seed.where(crop: @planting.crop, owner: @planting.owner)
       .where('(finished_at IS NULL OR finished_at >= ?)', @planting.planted_at)
       .where('(saved_at IS NULL OR saved_at <= ?)', @planting.planted_at)
   end

app/controllers/posts_controller.rb

@@ -8,7 +8,7 @@ class PostsController < ApplicationController
   respond_to :rss, only: %i(index show)
 
   def index
-    @author = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
+    @author = Member.find_by(slug: params[:member_slug])
     @posts = posts
     respond_with(@posts)
   end
@@ -29,17 +29,17 @@ class PostsController < ApplicationController
   def create
     params[:post][:author_id] = current_member.id
     @post = Post.new(post_params)
-    flash[:notice] = t('posts.created') if @post.save
+    flash[:notice] = 'Post was successfully created.' if @post.save
     respond_with(@post)
   end
 
   def update
-    flash[:notice] = t('posts.updated') if @post.update(post_params)
+    flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
     respond_with(@post)
   end
 
   def destroy
-    flash[:notice] = t('posts.deleted') if @post.destroy
+    flash[:notice] = 'Post was deleted.' if @post.destroy
     respond_with(@post)
   end
 

app/controllers/scientific_names_controller.rb

@@ -54,7 +54,7 @@ class ScientificNamesController < ApplicationController
   def destroy
     @crop = @scientific_name.crop
     @scientific_name.destroy
-    flash[:notice] = t('scientific_names.deleted')
+    flash[:notice] = 'Scientific name was successfully deleted.'
     respond_with(@crop)
   end
 

app/controllers/seeds_controller.rb

@@ -5,7 +5,7 @@ class SeedsController < DataController
     where = {}
 
     if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
+      @owner = Member.find_by(slug: params[:member_slug])
       where['owner_id'] = @owner.id
     end
 
@@ -61,7 +61,7 @@ class SeedsController < DataController
     @seed.finished ||= false
     @seed.owner = current_member
     @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
-    flash[:notice] = t('seeds.added_to_stash', crop: @seed.crop) if @seed.save
+    flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
     if params[:return] == 'planting'
       respond_with(@seed, location: @seed.parent_planting)
     else
@@ -70,7 +70,7 @@ class SeedsController < DataController
   end
 
   def update
-    flash[:notice] = t('seeds.updated') if @seed.update(seed_params)
+    flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
     respond_with(@seed)
   end
 

app/controllers/sessions_controller.rb

@@ -5,7 +5,7 @@ class SessionsController < Devise::SessionsController
 
   def create
     super do |_resource|
-      flash[:alert] = t('messages.crops_waiting') if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
+      flash[:alert] = "There are crops waiting to be wrangled." if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
     end
   end
 end

app/helpers/crops_helper.rb

@@ -2,47 +2,28 @@
 
 module CropsHelper
   def crop_or_parent(crop, attribute)
-    @crop_or_parent_cache ||= {}
-    cache_key = [crop.persisted? ? crop.id : crop.object_id, attribute]
-    return @crop_or_parent_cache[cache_key] if @crop_or_parent_cache.key?(cache_key)
+    default = crop.send(attribute)
+    return default if default.present?
 
-    @crop_or_parent_cache[cache_key] = begin
-      value = crop.send(attribute)
-      if value.blank?
-        parent = crop
-        while (parent = parent.parent)
-          parent_value = parent.send(attribute)
-          if parent_value.present?
-            value = parent_value
-            break
-          end
-        end
-      end
-      value
+    parent = crop
+    while parent = parent.parent
+      return parent.send(attribute) if parent&.send(attribute).present?
     end
+
+    # For scopes, arrays, etc return the empty value
+    default
   end
 
   def display_seed_availability(member, crop)
-    @seed_availability_cache ||= {}
-    cache_key = [
-      member.persisted? ? member.id : member.object_id,
-      crop.persisted? ? crop.id : crop.object_id
-    ]
-    return @seed_availability_cache[cache_key] if @seed_availability_cache.key?(cache_key)
+    seeds = member.seeds.where(crop:)
+    total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
 
-    @seed_availability_cache[cache_key] = begin
-      seeds = member.seeds.where(crop:)
+    return "You don't have any seeds of this crop." if seeds.none?
 
-      if seeds.none?
-        "You don't have any seeds of this crop."
-      else
-        total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
-        if total_quantity == 0
-          "You have an unknown quantity of seeds of this crop."
-        else
-          "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
-        end
-      end
+    if total_quantity == 0
+      "You have an unknown quantity of seeds of this crop."
+    else
+      "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
     end
   end
 
@@ -59,57 +40,53 @@ module CropsHelper
   end
 
   def crop_jsonld_data(crop, full_attributes: true)
-    Rails.cache.fetch([crop.cache_key_with_version, "jsonld", full_attributes]) do
-      same_as_urls = [crop.en_wikipedia_url]
-      crop.scientific_names.each do |scientific_name|
-        if scientific_name.wikidata_id.present?
-          same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}"
-        end
-      end
-
-      subject_of_entities = []
-      images = []
-      if full_attributes
-        if crop.en_youtube_url.present?
-          subject_of_entities << {
-            '@type': "VideoObject",
-            url:     crop.en_youtube_url
-          }
-        end
-
-        crop.posts.each do |post|
-          subject_of_entities << {
-            '@type': "SocialMediaPosting",
-            url:     post_url(post),
-            author:  {
-              '@type': 'Person',
-              name:    post.author.login_name
-            },
-            datePublished: post.created_at
-          }
-        end
-
-        crop.photos.each do |photo|
-          images << photo.fullsize_url
-        end
-      end
-
-      # TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
-      # has_many :plantings, dependent: :destroy
-      # has_many :seeds, dependent: :destroy
-      # has_many :harvests, dependent: :destroy
-
-      {
-        '@context':     "https://schema.org",
-        '@type':        "BioChemEntity",
-        name:           crop.name,
-        taxonomicRange: crop.scientific_names.map(&:name),
-        description:    crop.description,
-        sameAs:         same_as_urls,
-        alternateName:  crop.alternate_names.map(&:name),
-        subjectOf:      subject_of_entities,
-        image:          images
-      }.compact
+    same_as_urls = [crop.en_wikipedia_url]
+    crop.scientific_names.each do |scientific_name|
+      same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}" if scientific_name.wikidata_id.present?
     end
+
+    subject_of_entities = []
+    if full_attributes
+      if crop.en_youtube_url.present?
+        subject_of_entities << {
+          '@type': "VideoObject",
+          url:     crop.en_youtube_url
+        }
+      end
+
+      crop.posts.each do |post|
+        subject_of_entities << {
+          '@type': "SocialMediaPosting",
+          url:     post_url(post),
+          author:  {
+            '@type': 'Person',
+            name: post.author.login_name
+          },
+          'datePublished': post.created_at
+        }
+      end
+
+      images = []
+      crop.photos.each do |photo|
+        images << photo.fullsize_url
+      end
+    end
+
+    # TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
+    # has_many :plantings, dependent: :destroy
+    # has_many :seeds, dependent: :destroy
+    # has_many :harvests, dependent: :destroy
+
+    {
+      '@context':     "https://schema.org",
+      '@type':        "BioChemEntity",
+      name:           crop.name,
+      taxonomicRange: crop.scientific_names.map(&:name),
+      description:    crop.description,
+      sameAs:         same_as_urls,
+      alternateName:  crop.alternate_names.map(&:name),
+      subjectOf:      subject_of_entities,
+      image:          images
+    }.compact
   end
 end

app/helpers/plantings_helper.rb

@@ -46,13 +46,9 @@ module PlantingsHelper
   # Returns a list of gardens the planting can be transplanted to
   # based on the planting's owner.
   def transplantable_gardens_by_owner(planting)
-    @transplantable_gardens ||= {}
-    cache_key = planting.id || planting.object_id
-    @transplantable_gardens[cache_key] ||= begin
-      garden_ids = planting.owner.gardens.select(:id).to_a + GardenCollaborator.where(member_id: planting.owner.id).select(:garden_id).to_a
+    garden_ids = planting.owner.gardens.select(:id).to_a + GardenCollaborator.where(member_id: planting.owner.id).select(:garden_id).to_a
 
-      Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
-    end
+    Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
   end
 
   def days_from_now_to_last_harvest(planting)

app/models/ability.rb

@@ -164,12 +164,6 @@ class Ability
     can :destroy, Follow
     cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
-    # blocking/unblocking permissions
-    can :create, Block
-    cannot :create, Block, blocked_id: member.id # can't block yourself
-
-    can :destroy, Block, blocker_id: member.id # can only unblock your own blocks
-
     cannot :create, GardenType
     cannot :update, GardenType
     cannot :destroy, GardenType

app/models/block.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class Block < ApplicationRecord
-  belongs_to :blocker, class_name: "Member"
-  belongs_to :blocked, class_name: "Member"
-
-  validates :blocker_id, uniqueness: { scope: :blocked_id }
-
-  after_create :destroy_follow_relationship
-
-  private
-
-  def destroy_follow_relationship
-    # Destroy the follow relationship in both directions
-    Follow.where(follower: blocker, followed: blocked).destroy_all
-    Follow.where(follower: blocked, followed: blocker).destroy_all
-  end
-end

app/models/comment.rb

@@ -4,7 +4,6 @@ class Comment < ApplicationRecord
   belongs_to :author, class_name: 'Member', inverse_of: :comments
   belongs_to :commentable, polymorphic: true, counter_cache: true
   # validates :body, presence: true
-  validate :author_is_not_blocked
 
   scope :post_order, -> { order(created_at: :asc) } # for display on post page
 
@@ -26,14 +25,4 @@ class Comment < ApplicationRecord
   def to_s
     "#{author.login_name} commented on #{commentable.subject}"
   end
-
-  private
-
-  def author_is_not_blocked
-    return unless author
-
-    return unless commentable.author.already_blocking?(author)
-
-    errors.add(:base, "You cannot comment on a post of a member who has blocked you.")
-  end
 end

app/models/concerns/member_flickr.rb

@@ -40,15 +40,8 @@ module MemberFlickr
     # Fetches a collection of photos from Flickr
     # Returns a [[page of photos], total] pair.
     # Total is needed for pagination.
-    def flickr_photos(page_num = 1, set = nil, tags = nil)
-      result = if tags.present?
-                 flickr.photos.search(
-                   user_id:  'me',
-                   tags:     tags,
-                   page:     page_num,
-                   per_page: 30
-                 )
-               elsif set.present?
+    def flickr_photos(page_num = 1, set = nil)
+      result = if set
                  flickr.photosets.getPhotos(
                    photoset_id: set,
                    page:        page_num,

app/models/concerns/predict_harvest.rb

@@ -6,31 +6,23 @@ module PredictHarvest
   included do
     # dates
     def first_harvest_date
-      return @first_harvest_date if defined?(@first_harvest_date)
-
-      @first_harvest_date = harvests_with_dates.minimum(:harvested_at)
+      harvests_with_dates.minimum(:harvested_at)
     end
 
     def last_harvest_date
-      return @last_harvest_date if defined?(@last_harvest_date)
-
-      @last_harvest_date = harvests_with_dates.maximum(:harvested_at)
+      harvests_with_dates.maximum(:harvested_at)
     end
 
     def first_harvest_predicted_at
-      return @first_harvest_predicted_at if defined?(@first_harvest_predicted_at)
+      return unless crop.median_days_to_first_harvest.present? && planted_at.present?
 
-      @first_harvest_predicted_at = if crop.median_days_to_first_harvest.present? && planted_at.present?
-                                      planted_at + crop.median_days_to_first_harvest.days
-                                    end
+      planted_at + crop.median_days_to_first_harvest.days
     end
 
     def last_harvest_predicted_at
-      return @last_harvest_predicted_at if defined?(@last_harvest_predicted_at)
+      return unless crop.median_days_to_last_harvest.present? && planted_at.present?
 
-      @last_harvest_predicted_at = if crop.median_days_to_last_harvest.present? && planted_at.present?
-                                     planted_at + crop.median_days_to_last_harvest.days
-                                   end
+      planted_at + crop.median_days_to_last_harvest.days
     end
 
     # actions
@@ -73,18 +65,16 @@ module PredictHarvest
     end
 
     def neighbours_for_harvest_predictions
-      @neighbours_for_harvest_predictions ||= begin
-        # use this planting's harvest if any
-        if harvests.size.positive?
-          harvests
-        # otherwise use nearby plantings
-        elsif location
-          Harvest.where(planting: nearby_same_crop.has_harvests)
-              .where.not(planting_id: nil)
-        else
-          Harvest.none
-        end
+      # use this planting's harvest if any
+      return harvests if harvests.size.positive?
+
+      # otherwise use nearby plantings
+      if location
+        return Harvest.where(planting: nearby_same_crop.has_harvests)
+            .where.not(planting_id: nil)
       end
+
+      Harvest.none
     end
 
     private

app/models/concerns/predict_planting.rb

@@ -13,49 +13,40 @@ module PredictPlanting
 
     # dates
     def finish_predicted_at
-      return @finish_predicted_at if defined?(@finish_predicted_at)
-
-      @finish_predicted_at = if planted_at.blank? || failed?
-                               nil
-                             elsif crop.median_lifespan.present?
-                               planted_at + crop.median_lifespan.days
-                             elsif crop.parent.present? && crop.parent.median_lifespan.present?
-                               planted_at + crop.parent.median_lifespan.days
-                             end
+      if planted_at.blank? || failed?
+        nil
+      elsif crop.median_lifespan.present?
+        planted_at + crop.median_lifespan.days
+      elsif crop.parent.present? && crop.parent.median_lifespan.present?
+        planted_at + crop.parent.median_lifespan.days
+      end
     end
 
     # days
     def expected_lifespan
-      return @expected_lifespan if defined?(@expected_lifespan)
-
-      @expected_lifespan = if actual_lifespan.present?
-                             actual_lifespan
-                           elsif crop.median_lifespan.present?
-                             crop.median_lifespan
-                           elsif crop.parent.present? && crop.parent.median_lifespan.present?
-                             crop.parent.median_lifespan
-                           end
+      if actual_lifespan.present?
+        actual_lifespan
+      elsif crop.median_lifespan.present?
+        crop.median_lifespan
+      elsif crop.parent.present? && crop.parent.median_lifespan.present?
+        crop.parent.median_lifespan
+      end
     end
 
     def actual_lifespan
-      return @actual_lifespan if defined?(@actual_lifespan)
+      return unless planted_at.present? && finished_at.present? && !failed?
 
-      @actual_lifespan = if planted_at.present? && finished_at.present? && !failed?
-                           (finished_at - planted_at).to_i
-                         end
+      (finished_at - planted_at).to_i
     end
 
     def age_in_days
-      return @age_in_days if defined?(@age_in_days)
+      return if planted_at.blank?
+      return if failed?
 
-      @age_in_days = if planted_at.blank? || failed?
-                       nil
-                     else
-                       known_last_day = finished_at || Time.zone.today
-                       known_last_day = Time.zone.today if known_last_day > Time.zone.today
+      known_last_day ||= finished_at || Time.zone.today
+      known_last_day = Time.zone.today if known_last_day > Time.zone.today
 
-                       (known_last_day - planted_at).to_i
-                     end
+      (known_last_day - planted_at).to_i
     end
 
     def percentage_grown

app/models/crop.rb

@@ -57,13 +57,13 @@ class Crop < ApplicationRecord
   validates :en_wikipedia_url,
             format: {
               with:    %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
-              message: :not_a_valid_wikipedia_url
+              message: 'is not a valid English Wikipedia URL'
             },
             if:     :approved?
   validates :en_youtube_url,
             format: {
               with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
-              message: :not_a_valid_youtube_url
+              message: 'is not a valid YouTube URL'
             },
             allow_blank: true
   validates :name, uniqueness: { scope: :approval_status }, if: :pending?
@@ -190,12 +190,12 @@ class Crop < ApplicationRecord
     return if rejected?
     return unless reason_for_rejection.present? || rejection_notes.present?
 
-    errors.add(:approval_status, :rejection_reason_required)
+    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
   end
 
   def must_have_meaningful_reason_for_rejection
     return unless reason_for_rejection == "other" && rejection_notes.blank?
 
-    errors.add(:rejection_notes, :rejection_notes_required)
+    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
   end
 end

app/models/follow.rb

@@ -4,7 +4,6 @@ class Follow < ApplicationRecord
   belongs_to :follower, class_name: "Member", inverse_of: :follows
   belongs_to :followed, class_name: "Member", inverse_of: :inverse_follows
   validates :follower_id, uniqueness: { scope: :followed_id }
-  validate :follower_is_not_blocked
 
   after_create do
     Notification.create(
@@ -15,14 +14,4 @@ class Follow < ApplicationRecord
       notifiable:   self
     )
   end
-
-  private
-
-  def follower_is_not_blocked
-    return unless follower
-
-    return unless followed.already_blocking?(follower)
-
-    errors.add(:base, "You cannot follow a member who has blocked you.")
-  end
 end

app/models/garden.rb

@@ -32,7 +32,7 @@ class Garden < ApplicationRecord
 
   validates :name, uniqueness: { scope: :owner_id }
   validates :name,
-            format: { without: /\n/, message: :no_newlines },
+            format: { without: /\n/, message: "must contain no newlines" },
             allow_blank: false, presence: true,
             length: { maximum: 255 }
 
@@ -53,7 +53,7 @@ class Garden < ApplicationRecord
     "acres"         => "acre"
   }.freeze
   validates :area_unit, inclusion:   { in:      AREA_UNITS_VALUES.values,
-                                       message: :not_a_valid_area_unit },
+                                       message: "%<value>s is not a valid area unit" },
                         allow_blank: true
 
   def cleanup_area

app/models/garden_collaborator.rb

@@ -11,7 +11,7 @@ class GardenCollaborator < ApplicationRecord
     return unless member
     return unless garden
 
-    errors.add(:member_id, :cannot_be_garden_owner) if garden.owner == member
+    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
   end
 
   def member_slug

app/models/harvest.rb

@@ -58,18 +58,18 @@ class Harvest < ApplicationRecord
   ##
   ## Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: :crop_not_found }
-  validates :plant_part, presence: { message: :crop_not_found }
+  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :plant_part, presence: { message: "must be present and exist in our database" }
   validates :harvested_at, presence: true
   validates :quantity, allow_nil: true, numericality: {
     only_integer: false, greater_than_or_equal_to: 0
   }
   validates :unit, allow_blank: true, inclusion: {
-    in: UNITS_VALUES.values, message: :not_a_valid_unit
+    in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
   }
   validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
   validates :weight_unit, allow_blank: true, inclusion: {
-    in: WEIGHT_UNITS_VALUES.values, message: :not_a_valid_unit
+    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
   }
   validate :crop_must_match_planting
   validate :owner_must_match_planting
@@ -109,49 +109,37 @@ class Harvest < ApplicationRecord
   def to_s
     # 50 individual apples, weighing 3lb
     # 2 buckets of apricots, weighing 10kg
-    @to_s ||= "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
   end
 
   def quantity_to_human
-    @quantity_to_human ||= if quantity
-                             number_to_human(quantity.to_s, strip_insignificant_zeros: true)
-                           else
-                             ""
-                           end
+    return number_to_human(quantity.to_s, strip_insignificant_zeros: true) if quantity
+
+    ""
   end
 
   def unit_to_human
-    @unit_to_human ||= begin
-      if !quantity || !unit
-        ""
-      elsif unit == 'individual'
-        'individual'
-      elsif quantity == 1
-        "#{unit} of"
-      else
-        "#{unit.pluralize} of"
-      end
-    end
+    return "" unless quantity && unit
+    return 'individual' if unit == 'individual'
+    return "#{unit} of" if quantity == 1
+
+    "#{unit.pluralize} of"
   end
 
   def weight_to_human
-    @weight_to_human ||= if weight_quantity
-                           "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
-                         else
-                           ""
-                         end
+    return "" unless weight_quantity
+
+    "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
   end
 
   def crop_name_to_human
-    @crop_name_to_human ||= begin
-      if unit != 'individual' # buckets of apricot*s*
-        crop.name.pluralize
-      elsif quantity == 1
-        crop.name
-      else
-        crop.name.pluralize
-      end.to_s
-    end
+    if unit != 'individual' # buckets of apricot*s*
+      crop.name.pluralize
+    elsif quantity == 1
+      crop.name
+    else
+      crop.name.pluralize
+    end.to_s
   end
 
   private
@@ -159,7 +147,7 @@ class Harvest < ApplicationRecord
   def crop_must_match_planting
     return if planting.blank? # only check if we are linked to a planting
 
-    errors.add(:planting, :same_crop_required) unless crop == planting.crop
+    errors.add(:planting, "must be the same crop") unless crop == planting.crop
   end
 
   def owner_must_match_planting
@@ -167,13 +155,14 @@ class Harvest < ApplicationRecord
 
     return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner, :same_owner_required)
+    errors.add(:owner,
+               "of harvest must be the same as planting, or a collaborator on that garden")
   end
 
   def harvest_must_be_after_planting
     # only check if we are linked to a planting
     return unless harvested_at.present? && planting.present? && planting.planted_at.present?
 
-    errors.add(:planting, :harvest_after_planted) unless harvested_at > planting.planted_at
+    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
   end
 end

app/models/like.rb

@@ -5,24 +5,4 @@ class Like < ApplicationRecord
   belongs_to :likeable, polymorphic: true, counter_cache: true, touch: true
   validates :member, :likeable, presence: true
   validates :member, uniqueness: { scope: :likeable }
-  validate :member_is_not_blocked
-
-  def likeable_author
-    if likeable.respond_to?(:author)
-      likeable.author
-    elsif likeable.respond_to?(:owner)
-      likeable.owner
-    end
-  end
-
-  private
-
-  def member_is_not_blocked
-    return unless member
-
-    author = likeable_author
-    return unless author&.already_blocking?(member)
-
-    errors.add(:base, "You cannot like content of a member who has blocked you.")
-  end
 end

app/models/member.rb

@@ -52,15 +52,6 @@ class Member < ApplicationRecord
   has_many :followed, through: :follows
   has_many :followers, through: :inverse_follows, source: :follower
 
-  #
-  # Blocking other members
-  has_many :blocks, class_name: "Block", foreign_key: "blocker_id", dependent: :destroy,
-                    inverse_of: :blocker
-  has_many :inverse_blocks, class_name: "Block", foreign_key: "blocked_id",
-                            dependent: :destroy, inverse_of: :blocked
-  has_many :blocked_members, through: :blocks, source: :blocked
-  has_many :blockers, through: :inverse_blocks, source: :blocker
-
   #
   # Global data records this member created
   has_many :requested_crops, class_name: 'Crop', foreign_key: 'requester_id', dependent: :nullify,
@@ -105,21 +96,21 @@ class Member < ApplicationRecord
   validates :tos_agreement, acceptance: { allow_nil: true, accept: true }
   validates :login_name,
             length:     {
-              minimum: 2, maximum: 25, message: :login_name_length
+              minimum: 2, maximum: 25, message: "should be between 2 and 25 characters long"
             },
             exclusion:  {
-              in: %w(growstuff admin moderator staff nearby), message: :login_name_reserved
+              in: %w(growstuff admin moderator staff nearby), message: "name is reserved"
             },
             format:     {
-              with: /\A\w+\z/, message: :login_name_format
+              with: /\A\w+\z/, message: "may only include letters, numbers, or underscores"
             },
             uniqueness: {
               case_sensitive: false
             }
-  validates :website_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
-  validates :other_url, format: { with: %r{\Ahttps?://}, message: :url_format }, 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: :handle_format }, allow_blank: true
+            format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true
 
   #
   # Triggers
@@ -173,12 +164,12 @@ class Member < ApplicationRecord
   end
 
   def self.nearest_to(place)
-    return [] if place.blank?
-
-    latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
-    return [] unless latitude && longitude
-
-    Member.located.near([latitude, longitude], 1000)
+    nearby_members = []
+    if place
+      latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
+      nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) } if latitude && longitude
+    end
+    nearby_members
   end
 
   def already_following?(member)
@@ -188,33 +179,4 @@ class Member < ApplicationRecord
   def get_follow(member)
     follows.find_by(followed_id: member.id) if already_following?(member)
   end
-
-  def already_blocking?(member)
-    blocks.exists?(blocked_id: member.id)
-  end
-
-  def get_block(member)
-    blocks.find_by(blocked_id: member.id) if already_blocking?(member)
-  end
-
-  def has_activity?
-    (gardens.exists? && gardens.count > 1) ||
-      plantings.exists? ||
-      harvests.exists? ||
-      seeds.exists? ||
-      photos.exists? ||
-      forums.exists? ||
-      activities.exists? ||
-      posts.exists? ||
-      comments.exists? ||
-      requested_crops.exists? ||
-      created_crops.exists? ||
-      likes.exists? ||
-      created_alternate_names.exists? ||
-      created_scientific_names.exists? ||
-      follows.exists? ||
-      inverse_follows.exists? ||
-      blocks.exists? ||
-      inverse_blocks.exists?
-  end
 end

app/models/photo_association.rb

@@ -29,12 +29,12 @@ class PhotoAssociation < ApplicationRecord
   def photo_and_item_have_same_owner
     return if photographable_type == 'Crop'
 
-    errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
+    errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
   end
 
   def crop_present
     return unless %w(Planting Seed Harvest).include?(photographable_type)
 
-    errors.add(:crop_id, :calculate_crop_failed) if crop_id.blank?
+    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
   end
 end

app/models/planting.rb

@@ -72,7 +72,7 @@ class Planting < ApplicationRecord
   ##
   ## Validations
   validates :garden, presence: true
-  validates :crop, presence: true, approved: { message: :crop_must_be_approved }
+  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
   validate :cannot_be_finished_and_failed
@@ -80,10 +80,10 @@ class Planting < ApplicationRecord
     only_integer: true, greater_than_or_equal_to: 0
   }
   validates :sunniness, allow_blank: true, inclusion: {
-    in: SUNNINESS_VALUES, message: :not_a_valid_sunniness
+    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
   }
   validates :planted_from, allow_blank: true, inclusion: {
-    in: PLANTED_FROM_VALUES, message: :not_a_valid_planting_method
+    in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
   }
   validates :overall_rating, allow_blank: true, numericality: {
     only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
@@ -119,36 +119,33 @@ class Planting < ApplicationRecord
   end
 
   def nearby_same_crop
-    return @nearby_same_crop if defined?(@nearby_same_crop)
+    return Planting.none if location.blank? || latitude.blank? || longitude.blank?
 
-    @nearby_same_crop = if location.blank? || latitude.blank? || longitude.blank?
-                          Planting.none
-                        else
-                          # latitude, longitude = Geocoder.coordinates(location, params: { limit: 1 })
-                          Planting.joins(:garden)
-                            .where(crop:)
-                            .located
-                            .where('gardens.latitude < ? AND gardens.latitude > ?',
-                                   latitude + 10, latitude - 10)
-                        end
+    # latitude, longitude = Geocoder.coordinates(location, params: { limit: 1 })
+    Planting.joins(:garden)
+      .where(crop:)
+      .located
+      .where('gardens.latitude < ? AND gardens.latitude > ?',
+             latitude + 10, latitude - 10)
   end
 
   private
 
   def cannot_be_finished_and_failed
-    errors.add(:failed, :failed_and_finished) if finished && failed
+    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
   end
 
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both
 
-    errors.add(:finished_at, :finished_after_planted) unless planted_at < finished_at
+    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
   end
 
   def owner_must_match_garden_owner
     return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner, :same_owner_required)
+    errors.add(:owner,
+               "must be the same as garden, or a collaborator on that garden")
   end
 end

app/models/post.rb

@@ -49,10 +49,9 @@ class Post < ApplicationRecord
 
   # return posts sorted by recent activity
   def self.recently_active
-    left_joins(:comments)
-      .select('posts.*, COALESCE(MAX(comments.created_at), posts.created_at) AS last_activity_at')
-      .group('posts.id')
-      .order(Arel.sql('last_activity_at DESC'))
+    Post.order(created_at: :desc).sort do |a, b|
+      b.recent_activity <=> a.recent_activity
+    end
   end
 
   def owner_id

app/models/seed.rb

@@ -28,7 +28,7 @@ class Seed < ApplicationRecord
   #
   # Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: :crop_not_found }
+  validates :crop, presence: { message: "must be present and exist in our database" }
   validates :quantity, allow_nil:    true,
                        numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :days_until_maturity_min, allow_nil:    true,
@@ -36,15 +36,20 @@ class Seed < ApplicationRecord
   validates :days_until_maturity_max, allow_nil:    true,
                                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :tradable_to, allow_blank: false,
-                          inclusion:   { in: TRADABLE_TO_VALUES, message: :tradable_to_inclusion }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
+                                                                          "locally, nationally, or internationally" }
   validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: :organic_inclusion }
+                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
+                                                                  "are organic or not, or that you don't know" }
   validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: :gmo_inclusion }
+                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
+                                                          "genetically modified or not, or that you don't know" }
   validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: :heirloom_inclusion }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
+                                                                    "are heirloom, hybrid, or unknown" }
   validates :source, allow_blank: true,
-                     inclusion:   { in: SOURCE_VALUES, message: :source_inclusion }
+                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
+                                                                "or that you don't know" }
 
   #
   # Delegations

app/services/gbif_service.rb

@@ -85,7 +85,7 @@ class GbifService
   end
 
   def import!
-    Crop.order(updated_at: :desc).find_each do |crop|
+    Crop.order(updated_at: :desc).each do |crop|
       Rails.logger.debug { "#{crop.id}, #{crop.name}" }
       update_crop(crop) if crop.valid?
     rescue ActiveRecord::RecordInvalid

app/views/activities/index.html.haml

@@ -3,7 +3,7 @@
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Activities', activities_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s activities", member_activities_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s activities", activities_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to 'Activities', activities_path
 

app/views/alternate_names/_form.html.haml

@@ -16,14 +16,14 @@
       %p
         %span.help-block
           For detailed crop wrangling guidelines, please consult the
-          = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
+          = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
           on the Growstuff wiki.
 
       .form-group
         = f.label :crop_id, class: 'control-label col-md-2'
         .col-md-8
-          = select(:alternate_name, :crop_id,
-                              Crop.order(:name).pluck(:name, :id),
+          = collection_select(:alternate_name, :crop_id,
+                              Crop.all, :id, :name,
                               { selected: @alternate_name.crop_id || @crop.id },
                               class: 'form-control')
 

app/views/crops/_actions.html.haml

@@ -1,9 +1,6 @@
 - if crop.approved? && signed_in?
-  - active_plantings = current_member.plantings.where(crop: crop).active
 
   .btn-group.crop-actions{"aria-label" => "Crop Actions", role: "group"}
     = render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
     = render 'harvests/modal', harvest: Harvest.new(crop: @crop,  owner: current_member)
     = render 'seeds/modal', seed: Seed.new(crop: @crop,  owner: current_member)
-    - if active_plantings.any?
-      = render 'plantings/failed_modal', crop: crop, active_plantings: active_plantings

app/views/crops/_form.html.haml

@@ -85,7 +85,7 @@
 
       -# Only crop wranglers see the crop hierarchy (for now)
       - if can? :wrangle, @crop
-        = f.select(:parent_id, Crop.order(:name).pluck(:name, :id),
+        = f.collection_select(:parent_id, Crop.all.order(:name), :id, :name,
           { include_blank: true, label: 'Parent crop'})
         %span.help-block Optional. For setting up crop hierarchies for varieties etc.
 

app/views/crops/_harvests.html.haml

@@ -5,15 +5,14 @@
       %p Nobody has harvested this crop yet.
   - unless crop.harvests.empty?
     %ul.list-group.list-group-flush
-      - Rails.cache.fetch([crop, "recent_harvests", Time.zone.today]) do
-        - Harvest.where(crop: crop).includes(:owner).order(harvested_at: :desc).limit(3).each do |harvest|
-          %li.list-group-item
-            = link_to harvest_path(harvest), class: 'card-link' do
-              = harvest_icon
-              #{harvest.owner} harvested #{display_quantity(harvest)}.
-            .float-right= render 'members/location', member: harvest.owner
-            .harvest-timeago
-              %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
+      - Harvest.where(crop: crop).includes(:owner).order(harvested_at: :desc).limit(3).each do |harvest|
+        %li.list-group-item
+          = link_to harvest_path(harvest), class: 'card-link' do
+            = harvest_icon
+            #{harvest.owner} harvested #{display_quantity(harvest)}.
+          .float-right= render 'members/location', member: harvest.owner
+          .harvest-timeago
+            %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
       %li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
       - if crop.approved?
         - if current_member

app/views/crops/_plantings.html.haml

@@ -8,8 +8,6 @@
           = link_to planting_path(planting), class: 'card-link' do
             = planting_icon
             = planting
-          - if can?(:edit, planting)
-            .float-right= render 'plantings/actions', planting: planting
           .float-right= render 'members/location', member: planting.owner
   .card-footer
     - if crop.approved?

app/views/crops/show.html.haml

@@ -73,11 +73,10 @@
               = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
     - if @crop.varieties.any?
-      - cache [@crop, 'varieties'] do
-        %section.varieties
-          %h2 Varieties
-          .index-cards
-            = render 'varieties', crop: @crop
+      %section.varieties
+        %h2 Varieties
+        .index-cards
+          = render 'varieties', crop: @crop
 
     %section.crop-map
       %h2
@@ -135,11 +134,9 @@
     = render 'harvests', crop: @crop
     = render 'find_seeds', crop: @crop
 
-    - cache [@crop, 'openfarm_data'] do
-      = render 'openfarm_data', crop: @crop
+    = render 'openfarm_data', crop: @crop
 
-    - cache [@crop, 'nutritional_data'] do
-      = render 'nutritional_data', crop: @crop
+    = render 'nutritional_data', crop: @crop
 
     = cute_icon
     .card

app/views/forums/index.html.haml

@@ -6,7 +6,6 @@
 
 - @forums.each do |forum|
   %h2= forum
-  %p= forum.description
   %p
     = localize_plural(forum.posts, Post)
     |

app/views/harvests/_popover.html.haml

@@ -1,4 +1,3 @@
-- cache harvest do
-  %p
-    %small
-      = harvest.harvested_at
+%p
+  %small
+    = harvest.harvested_at

app/views/harvests/index.html.haml

@@ -4,7 +4,7 @@
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Harvests', harvests_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s harvests", member_harvests_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s harvests", harvests_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to "Harvests", harvests_path
 .row

app/views/members/_follow_buttons.haml

@@ -1,11 +1,6 @@
 - if current_member && current_member != member # must be logged in, can't follow yourself
-  - block = current_member.get_block(member)
   - follow = current_member.get_follow(member)
-  - if !block && !follow && can?(:create, Follow) # not already following, and not blocking
+  - if !follow && can?(:create, Follow) # not already following
     = link_to 'Follow', follows_path(followed: member), method: :post, class: 'btn btn-block btn-success'
   - if follow && can?(:destroy, follow) # already following
-    = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'
-  - if !block && can?(:create, Block) # not already blocking
-    = link_to 'Block', blocks_path(blocked: member), method: :post, class: 'btn btn-block btn-danger'
-  - if block && can?(:destroy, block) # already blocking
-    = link_to 'Unblock', block_path(block), method: :delete, class: 'btn btn-block'
+    = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'

app/views/photos/new.html.haml

@@ -21,14 +21,13 @@
     Please select a photo from your recent uploads.
 
 
-  %p
-    = bootstrap_form_tag(url: new_photo_path, method: :get, layout: :inline) do |f|
-      - if @sets && !@sets.empty?
-        = f.select :set, options_for_select(@sets, @current_set), label: "Choose a photo album", include_blank: true
-      = f.text_field :tag, value: @current_tag, label: "or search by tag"
-      = hidden_field_tag :type, @type
-      = hidden_field_tag :id, @id
-      = f.submit "Search", class: "btn btn-success"
+  - if @sets && !@sets.empty?
+    %p
+      = bootstrap_form_tag(url: new_photo_path, method: :get, layout: :inline) do |f|
+        = f.select :set, options_for_select(@sets, @current_set), label: "Choose a photo album"
+        = hidden_field_tag :type, @type
+        = hidden_field_tag :id, @id
+        = f.submit "Search", class: "btn btn-success"
 
   - if @sets && @current_set
     %h2= @sets.key(@current_set)

app/views/plantings/_failed_modal.html.haml

@@ -1,26 +0,0 @@
-#modelFailedPlantingForm.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "failed-planting-button", role: "dialog", tabindex: "-1"}
-  .modal-dialog{role: "document"}
-    .modal-content
-      .modal-header.text-center
-        %h4.modal-title.w-100.font-weight-bold Mark #{crop.name} planting as failed
-        %button.close{"aria-label" => "Close", "data-bs-dismiss" => "modal", type: "button"}
-          %span{"aria-hidden" => "true"} ×
-      .modal-body
-        %p Which planting would you like to mark as failed?
-
-        %ul.list-group
-          - active_plantings.each do |planting|
-            %li.list-group-item
-              = link_to planting_path(planting, planting: {failed: 1}), method: :put do
-                .d-flex.justify-content-between
-                  %span
-                    %h4= planting.garden.name
-                    %p Planted #{planting.planted_at}
-                  %span
-                    = finished_icon
-        .mt-3.text-right
-          = link_to 'cancel', '', "data-bs-dismiss" => "modal", class: 'btn btn-secondary'
-
-%a.btn#failed-planting-button{"data-bs-target" => "#modelFailedPlantingForm", "data-bs-toggle" => "modal", href: ""}
-  = finished_icon
-  Mark as failed

app/views/plantings/index.html.haml

@@ -4,7 +4,7 @@
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Plantings', plantings_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s plantings", member_plantings_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s plantings", plantings_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to 'Plantings', plantings_path
 

app/views/scientific_names/_form.html.haml

@@ -11,14 +11,14 @@
   %p
     %span.help-block
       For detailed crop wrangling guidelines, please consult the
-      = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
+      = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
       on the Growstuff wiki.
 
   .form-group
     = f.label :crop_id, class: 'control-label col-md-2'
     .col-md-8
-      = select(:scientific_name, :crop_id, Crop.order(:name).pluck(:name, :id),
-        { selected: @scientific_name.crop_id || @crop.id },
+      = collection_select(:scientific_name, :crop_id, Crop.all.order(:name), :id,
+        :name, { selected: @scientific_name.crop_id || @crop.id },
         class: 'form-control')
   .form-group
     = f.label :name, class: 'control-label col-md-2'

app/views/seeds/index.html.haml

@@ -1,7 +1,7 @@
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Seeds', seeds_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s seeds", member_seeds_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s seeds", seeds_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to 'Seeds', seeds_path
 

config.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Require any additional compass plugins here.
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "app/assets/stylesheets"
+sass_dir = "app/assets/stylesheets"
+javascripts_dir = "app/assets/javascripts"
+images_dir      = "app/assets/images"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

config/application.rb

@@ -73,8 +73,6 @@ module Growstuff
     config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)
 
     # config.active_record.raise_in_transactional_callbacks = true
-    config.middleware.insert_before 0, Rack::Attack
-
     config.middleware.insert_before 0, Rack::Cors do
       allow do
         origins '*'

config/compass.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Require any additional compass plugins here.
+project_type = :rails

config/initializers/rack_attack.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class Rack::Attack
-  ### Throttle Config ###
-
-  if Rails.env.production?
-    # Throttle requests to /plantings, /harvests, and /members to 10 per minute per IP
-    # Includes API routes
-    throttle('req/ip/restricted_routes', limit: 20, period: 1.minute) do |req|
-      if req.path =~ %r{^/(plantings|harvests|members)(/|$)} || req.path =~ %r{^/api/v1/(plantings|harvests|members)(/|$)}
-        req.ip
-      end
-    end
-
-    ### Fail2Ban Config ###
-
-    # Block IPs that make too many requests to suspicious paths
-    # After 5 "bad" requests in 10 minutes, block the IP for 1 hour
-    blocklist('fail2ban/pentesters') do |req|
-      Fail2Ban.filter("pentesters-#{req.ip}", maxretry: 5, findtime: 10.minutes, bantime: 1.hour) do
-        # The count for the IP is incremented if the return value is truthy.
-        req.path.include?('wp-admin') ||
-          req.path.include?('wp-login') ||
-          req.path.include?('cgi-bin') ||
-          req.path.end_with?('.php', '.asp', '.aspx', '.jsp', '.exe', '.env', '.git')
-      end
-    end
-  end
-
-  ### Custom Response Headers ###
-
-  # Add Retry-After header to throttled responses
-  self.throttled_response_retry_after_header = true
-end

config/locales/en.yml

@@ -63,56 +63,6 @@ en:
       seed:
         one: seed
         other: seeds
-    errors:
-      messages:
-        crop_not_found: must be present and exist in our database
-        crop_must_be_approved: must be present and exist in our database
-        failed_and_finished: "can't be true if planting is also finished"
-        finished_after_planted: must be after the planting date
-        rejection_reason_required: must be rejected if a reason for rejection is present
-        rejection_notes_required: "must be added if the reason for rejection is \"other\""
-        same_crop_required: must be the same crop
-        harvest_after_planted: cannot be harvested before planting
-        cannot_be_garden_owner: cannot be the garden owner
-        same_owner_required: "of harvest must be the same as planting, or a collaborator on that garden"
-        photo_owner_mismatch: must have same owner as item it links to
-        calculate_crop_failed: failed to calculate crop
-        not_a_valid_wikipedia_url: is not a valid English Wikipedia URL
-        not_a_valid_youtube_url: is not a valid YouTube URL
-        not_a_valid_sunniness: "%{value} is not a valid sunniness value"
-        not_a_valid_planting_method: "%{value} is not a valid planting method"
-        not_a_valid_unit: "%{value} is not a valid unit"
-        not_a_valid_area_unit: "%{value} is not a valid area unit"
-        no_newlines: must contain no newlines
-      models:
-        member:
-          attributes:
-            login_name:
-              login_name_length: should be between 2 and 25 characters long
-              login_name_reserved: name is reserved
-              login_name_format: may only include letters, numbers, or underscores
-            website_url:
-              url_format: "must start with http:// or https://"
-            other_url:
-              url_format: "must start with http:// or https://"
-            instagram_handle:
-              handle_format: should be a handle, not a URL
-            facebook_handle:
-              handle_format: should be a handle, not a URL
-            bluesky_handle:
-              handle_format: should be a handle, not a URL
-        seed:
-          attributes:
-            tradable_to:
-              tradable_to_inclusion: "You may only trade seed nowhere, locally, nationally, or internationally"
-            organic:
-              organic_inclusion: "You must say whether the seeds are organic or not, or that you don't know"
-            gmo:
-              gmo_inclusion: "You must say whether the seeds are genetically modified or not, or that you don't know"
-            heirloom:
-              heirloom_inclusion: "You must say whether the seeds are heirloom, hybrid, or unknown"
-            source:
-              source_inclusion: "You must say where the seeds are from, or that you don't know"
   application_helper:
     title:
       title:
@@ -162,9 +112,6 @@ en:
   forums:
     index:
       title: Forums
-    created: Forum was successfully created.
-    updated: Forum was successfully updated.
-    deleted: Forum was successfully deleted.
   gardens:
     created: Garden was successfully created.
     deleted: Garden was successfully deleted.
@@ -261,8 +208,6 @@ en:
       trade_to: Will trade to
       unspecified: unspecified
       view_all: View all seeds
-    added_to_stash: Successfully added %{crop} seed to your stash.
-    updated: Seed was successfully updated.
     stats:
       member_linktext: "%{count} members"
       message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}; and %{contributors} people have contributed to our code on %{github}!
@@ -330,21 +275,6 @@ en:
   links:
     my_gardens: My gardens
 
-  messages:
-    auth_success: Authentication successful.
-    auth_failed: Authentication failed.
-    crops_waiting: There are crops waiting to be wrangled.
-    followed: "Followed %{name}"
-    unfollowed: "Unfollowed %{name}"
-    follow_error: Already following or error while following.
-    transplant_success: Planting was successfully transplanted.
-    transplant_error: "There was an error transplanting the planting: %{errors}"
-    revert_success: "Reverted to version from %{date}"
-    revert_error: "Could not revert to version from %{date}. Errors: %{errors}"
-    invalid_location: Please enter a valid location
-    unable_to_like: Unable to like
-    unable_to_unlike: Unable to unlike
-
   members:
     edit_profile: Edit profile
     index:
@@ -412,22 +342,10 @@ en:
       progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
   posts:
     write_blog_post: Write blog post
-    created: Post was successfully created.
-    updated: Post was successfully updated.
-    deleted: Post was deleted.
     index:
       title:
         author_posts: "%{author} posts"
         default: Everyone's posts
-  scientific_names:
-    deleted: Scientific name was successfully deleted.
-  alternate_names:
-    created: Alternate name was successfully created.
-    updated: Alternate name was successfully updated.
-    deleted: Alternate name was successfully deleted.
-  crop_companions:
-    created: Companion was successfully created.
-    deleted: Companion was successfully destroyed.
   seeds:
     form:
       trade_help: >
@@ -443,7 +361,6 @@ en:
         owner_seeds: "%{owner} seeds"
     save_seeds: Save seeds
     string: "%{crop} seeds belonging to %{owner}"
-    added_to_stash: Successfully added %{crop} seed to your stash.
   unauthorized:
     create:
       all: Please sign in or sign up to create a %{subject}.

config/routes.rb

@@ -105,7 +105,6 @@ Rails.application.routes.draw do
   resources :forums
 
   resources :follows, only: %i(create destroy)
-  resources :blocks, only: %i(create destroy)
 
   post 'likes' => 'likes#create'
   delete 'likes' => 'likes#destroy'
@@ -122,7 +121,6 @@ Rails.application.routes.draw do
 
     resources :follows
     get 'followers' => 'follows#followers'
-    resources :blocks, only: %i(create destroy)
   end
 
   resources :messages

db/migrate/20250901144900_create_blocks.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class CreateBlocks < ActiveRecord::Migration[6.1]
-  def change
-    create_table :blocks do |t|
-      t.references :blocker, foreign_key: { to_table: :members }
-      t.references :blocked, foreign_key: { to_table: :members }
-
-      t.timestamps
-    end
-    add_index :blocks, %i(blocker_id blocked_id), unique: true
-  end
-end

db/migrate/20251130035700_create_versions.rb

@@ -37,6 +37,6 @@ class CreateVersions < ActiveRecord::Migration[7.2]
       t.string   :event,     null: false
       t.text     :object, limit: TEXT_BYTES
     end
-    add_index :versions, %i(item_type item_id)
+    add_index :versions, %i[item_type item_id]
   end
 end

db/schema.rb

@@ -384,16 +384,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
     t.index ["member_id"], name: "index_authentications_on_member_id"
   end
 
-  create_table "blocks", force: :cascade do |t|
-    t.bigint "blocker_id"
-    t.bigint "blocked_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["blocked_id"], name: "index_blocks_on_blocked_id"
-    t.index ["blocker_id", "blocked_id"], name: "index_blocks_on_blocker_id_and_blocked_id", unique: true
-    t.index ["blocker_id"], name: "index_blocks_on_blocker_id"
-  end
-
   create_table "comfy_cms_categories", id: :serial, force: :cascade do |t|
     t.integer "site_id", null: false
     t.string "label", null: false
@@ -982,8 +972,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
-  add_foreign_key "blocks", "members", column: "blocked_id"
-  add_foreign_key "blocks", "members", column: "blocker_id"
   add_foreign_key "harvests", "plantings"
   add_foreign_key "mailboxer_conversation_opt_outs", "mailboxer_conversations", column: "conversation_id", name: "mb_opt_outs_on_conversations_id"
   add_foreign_key "mailboxer_notifications", "mailboxer_conversations", column: "conversation_id", name: "notifications_on_conversation_id"

docker-compose.yml

@@ -1,76 +0,0 @@
-version: '3.8'
-
-services:
-  web:
-    build: .
-    ports:
-      - "3000:3000"
-    depends_on:
-      db:
-        condition: service_healthy
-      elasticsearch:
-        condition: service_healthy
-    environment:
-      DATABASE_URL: postgresql://postgres:postgres@db:5432/growstuff_prod
-      ELASTICSEARCH_URL: http://elasticsearch:9200/
-      RAILS_ENV: production
-      RAILS_LOG_TO_STDOUT: "true"
-      RAILS_SERVE_STATIC_FILES: "true"
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      DEVISE_SECRET_KEY: secret
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (local)"
-      RAILS_SECRET_TOKEN: supersecret
-      SECRET_KEY_BASE: supersecretbase
-
-  db:
-    image: postgres:17
-    restart: unless-stopped
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-      - .devcontainer/create-db-user.sql:/docker-entrypoint-initdb.d/create-db-user.sql
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_DB: growstuff_prod
-      POSTGRES_PASSWORD: postgres
-    ports:
-      - "5432:5432"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
-    container_name: elasticsearch
-    restart: unless-stopped
-    environment:
-      - xpack.security.enabled=false
-      - discovery.type=single-node
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    cap_add:
-      - IPC_LOCK
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:9200 | grep tagline"]
-      interval: 10s
-      timeout: 10s
-      retries: 120
-    volumes:
-      - esdata01:/usr/share/elasticsearch/data
-    ports:
-      - 9200:9200
-      - 9300:9300
-
-volumes:
-  postgres-data:
-  esdata01:

entrypoint.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-# Remove a potentially pre-existing server.pid for Rails.
-rm -f /app/tmp/pids/server.pid
-
-# Then exec the container's main process (what's set as CMD in the Dockerfile).
-exec "$@"

lib/tasks/members.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :members do
-  desc "Remove inactive members with no activity and last login > 24 months ago"
-  # usage: rake members:cleanup_inactive
-  # usage: DRY_RUN=true rake members:cleanup_inactive
-  task cleanup_inactive: :environment do
-    limit_date = 3.years.ago
-    dry_run = ENV.fetch('DRY_RUN', 'false') == 'true'
-
-    inactive_members = Member.where("last_sign_in_at < ? OR (last_sign_in_at IS NULL AND created_at < ?)", limit_date, limit_date)
-
-    count = 0
-    inactive_members.find_each do |member|
-      # Check for activity using the model method
-      unless member.has_activity?
-        if dry_run
-          puts "[DRY RUN] Would delete inactive member: #{member.login_name} (ID: #{member.id}, Last login: #{member.last_sign_in_at || 'Never'}, Created: #{member.created_at})"
-        else
-          puts "Deleting inactive member: #{member.login_name} (ID: #{member.id}, Last login: #{member.last_sign_in_at || 'Never'}, Created: #{member.created_at})"
-          member.destroy
-        end
-        count += 1
-      end
-    end
-
-    if dry_run
-      puts "Total inactive members that would be deleted: #{count}"
-    else
-      puts "Total inactive members deleted: #{count}"
-    end
-  end
-end

public/robots.txt

@@ -123,27 +123,13 @@ Disallow: /
 User-agent: WebReaper
 Disallow: /
 
-# Semrush seem to crawl everything.
+# Per their statement, semrushbot respects crawl-delay directives
+# We want them to overall stay within reasonable request rates to
+# the backend (20 rps); keeping in mind that the crawl-delay will 
+# be applied by site and not globally by the bot, 5 seconds seem
+# like a reasonable approximation
 User-agent: SemrushBot
-Disallow: /
- 
-User-agent: SiteAuditBot
-Disallow: /
- 
-User-agent: SemrushBot-BA
-Disallow: /
- 
-User-agent: SemrushBot-SI
-Disallow: /
- 
-User-agent: SemrushBot-SWA
-Disallow: /
- 
-User-agent: SplitSignalBot
-Disallow: /
- 
-User-agent: SemrushBot-OCOB
-Disallow: /
+Crawl-delay: 5
 
 #
 # Friendly, low-speed bots are welcome viewing pages, but not

spec/controllers/authentications_controller_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe AuthenticationsController do
+  before do
+    @member = create(:member)
+    sign_in @member
+    controller.stub(:current_member) { @member }
+    @auth = create(:authentication, member: @member)
+    request.env['omniauth.auth'] = {
+      'provider'    => 'foo',
+      'uid'         => 'bar',
+      'info'        => { 'nickname' => 'blah' },
+      'credentials' => { 'token' => 'blah', 'secret' => 'blah' }
+    }
+  end
+end

spec/controllers/charts/crops_controller_spec.rb

@@ -7,42 +7,21 @@ describe Charts::CropsController do
     let(:crop) { create(:crop) }
 
     describe 'sunniness' do
-      it "returns a successful response" do
-        get :sunniness, params: { crop_slug: crop.to_param }
-        expect(response).to be_successful
-      end
+      before { get :sunniness, params: { crop_slug: crop.to_param } }
 
-      it "caches the result" do
-        cache_key = "#{crop.cache_key_with_version}/sunniness"
-        expect(Rails.cache).to receive(:fetch).with(cache_key, expires_in: 1.day).and_call_original
-        get :sunniness, params: { crop_slug: crop.to_param }
-      end
+      it { expect(response).to be_successful }
     end
 
     describe 'planted_from' do
-      it "returns a successful response" do
-        get :planted_from, params: { crop_slug: crop.to_param }
-        expect(response).to be_successful
-      end
+      before { get :planted_from, params: { crop_slug: crop.to_param } }
 
-      it "caches the result" do
-        cache_key = "#{crop.cache_key_with_version}/planted_from"
-        expect(Rails.cache).to receive(:fetch).with(cache_key, expires_in: 1.day).and_call_original
-        get :planted_from, params: { crop_slug: crop.to_param }
-      end
+      it { expect(response).to be_successful }
     end
 
     describe 'harvested_for' do
-      it "returns a successful response" do
-        get :harvested_for, params: { crop_slug: crop.to_param }
-        expect(response).to be_successful
-      end
+      before { get :harvested_for, params: { crop_slug: crop.to_param } }
 
-      it "caches the result" do
-        cache_key = "#{crop.cache_key_with_version}/harvested_for"
-        expect(Rails.cache).to receive(:fetch).with(cache_key, expires_in: 1.day).and_call_original
-        get :harvested_for, params: { crop_slug: crop.to_param }
-      end
+      it { expect(response).to be_successful }
     end
   end
 end

spec/controllers/forums_controller_spec.rb

@@ -3,111 +3,17 @@
 require 'rails_helper'
 
 describe ForumsController do
-  let(:admin) { create(:admin_member) }
-  let(:member) { create(:member) }
-  let(:forum) { create(:forum) }
+  login_member(:admin_member)
 
-  describe "GET #index" do
-    it "returns a success response" do
-      get :index
-      expect(response).to be_successful
-    end
-
-    it "assigns @forums" do
-      forum # create forum
-      get :index
-      expect(assigns(:forums)).to include(forum)
-    end
+  def valid_attributes
+    {
+      "name"        => "MyString",
+      "description" => "Something",
+      "owner_id"    => 1
+    }
   end
 
-  describe "GET #show" do
-    it "returns a success response" do
-      get :show, params: { id: forum.to_param }
-      expect(response).to be_successful
-    end
-  end
-
-  context "as an admin" do
-    before { sign_in admin }
-
-    describe "GET #new" do
-      it "returns a success response" do
-        get :new
-        expect(response).to be_successful
-      end
-    end
-
-    describe "GET #edit" do
-      it "returns a success response" do
-        get :edit, params: { id: forum.to_param }
-        expect(response).to be_successful
-      end
-    end
-
-    describe "POST #create" do
-      context "with valid params" do
-        let(:valid_attributes) { { name: "New Forum", description: "A new forum", owner_id: admin.id } }
-
-        it "creates a new Forum" do
-          expect do
-            post :create, params: { forum: valid_attributes }
-          end.to change(Forum, :count).by(1)
-        end
-
-        it "redirects to the created forum" do
-          post :create, params: { forum: valid_attributes }
-          expect(response).to redirect_to(Forum.last)
-        end
-      end
-    end
-
-    describe "PUT #update" do
-      context "with valid params" do
-        let(:new_attributes) { { name: "Updated Name" } }
-
-        it "updates the requested forum" do
-          put :update, params: { id: forum.to_param, forum: new_attributes }
-          forum.reload
-          expect(forum.name).to eq("Updated Name")
-        end
-
-        it "redirects to the forum" do
-          put :update, params: { id: forum.to_param, forum: new_attributes }
-          expect(response).to redirect_to(forum)
-        end
-      end
-    end
-
-    describe "DELETE #destroy" do
-      it "destroys the requested forum" do
-        forum # ensure forum exists
-        expect do
-          delete :destroy, params: { id: forum.to_param }
-        end.to change(Forum, :count).by(-1)
-      end
-
-      it "redirects to the forums list" do
-        delete :destroy, params: { id: forum.to_param }
-        expect(response).to redirect_to(forums_url)
-      end
-    end
-  end
-
-  context "as a regular member" do
-    before { sign_in member }
-
-    describe "GET #new" do
-      it "denies access" do
-        get :new
-        expect(response).to redirect_to(root_path)
-      end
-    end
-
-    describe "POST #create" do
-      it "denies access" do
-        post :create, params: { forum: { name: "Forbidden" } }
-        expect(response).to redirect_to(root_path)
-      end
-    end
+  def valid_session
+    {}
   end
 end

spec/controllers/garden_types_controller_spec.rb

@@ -24,42 +24,29 @@ RSpec.describe GardenTypesController do
     describe 'changing existing records' do
       before do
         allow(GardenType).to receive(:find).and_return(:garden_type)
+        expect(garden_type).not_to receive(:save)
+        expect(garden_type).not_to receive(:save!)
+        expect(garden_type).not_to receive(:update)
+        expect(garden_type).not_to receive(:update!)
+        expect(garden_type).not_to receive(:destroy)
       end
 
       describe 'GET edit' do
-        it "redirects to root" do
-          expect(garden_type).not_to receive(:save)
-          expect(garden_type).not_to receive(:save!)
-          expect(garden_type).not_to receive(:update)
-          expect(garden_type).not_to receive(:update!)
-          expect(garden_type).not_to receive(:destroy)
-          get :edit, params: { id: garden_type.to_param }
-          expect(response).to redirect_to(root_path)
-        end
+        before { get :edit, params: { id: garden_type.to_param } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
 
       describe 'POST update' do
-        it "redirects to root" do
-          expect(garden_type).not_to receive(:save)
-          expect(garden_type).not_to receive(:save!)
-          expect(garden_type).not_to receive(:update)
-          expect(garden_type).not_to receive(:update!)
-          expect(garden_type).not_to receive(:destroy)
-          post :update, params: { id: garden_type.to_param, garden_type: valid_params }
-          expect(response).to redirect_to(root_path)
-        end
+        before { post :update, params: { id: garden_type.to_param, garden_type: valid_params } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
 
       describe 'DELETE' do
-        it "redirects to root" do
-          expect(garden_type).not_to receive(:save)
-          expect(garden_type).not_to receive(:save!)
-          expect(garden_type).not_to receive(:update)
-          expect(garden_type).not_to receive(:update!)
-          expect(garden_type).not_to receive(:destroy)
-          delete :destroy, params: { id: garden_type.to_param, params: { garden_type: valid_params } }
-          expect(response).to redirect_to(root_path)
-        end
+        before { delete :destroy, params: { id: garden_type.to_param, params: { garden_type: valid_params } } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
     end
   end
@@ -73,43 +60,30 @@ RSpec.describe GardenTypesController do
       let(:any_garden_type) { double('garden_type') }
 
       before do
-        allow(GardenType).to receive(:find).and_return(:any_garden_type)
+        expect(GardenType).to receive(:find).and_return(:any_garden_type)
+        expect(any_garden_type).not_to receive(:save)
+        expect(any_garden_type).not_to receive(:save!)
+        expect(any_garden_type).not_to receive(:update)
+        expect(any_garden_type).not_to receive(:update!)
+        expect(any_garden_type).not_to receive(:destroy)
       end
 
       describe 'GET edit' do
-        it "redirects to root" do
-          expect(any_garden_type).not_to receive(:save)
-          expect(any_garden_type).not_to receive(:save!)
-          expect(any_garden_type).not_to receive(:update)
-          expect(any_garden_type).not_to receive(:update!)
-          expect(any_garden_type).not_to receive(:destroy)
-          get :edit, params: { id: any_garden_type.to_param }
-          expect(response).to redirect_to(root_path)
-        end
+        before { get :edit, params: { id: any_garden_type.to_param } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
 
       describe 'POST update' do
-        it "redirects to root" do
-          expect(any_garden_type).not_to receive(:save)
-          expect(any_garden_type).not_to receive(:save!)
-          expect(any_garden_type).not_to receive(:update)
-          expect(any_garden_type).not_to receive(:update!)
-          expect(any_garden_type).not_to receive(:destroy)
-          post :update, params: { id: any_garden_type.to_param, garden_type: valid_params }
-          expect(response).to redirect_to(root_path)
-        end
+        before { post :update, params: { id: any_garden_type.to_param, garden_type: valid_params } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
 
       describe 'DELETE' do
-        it "redirects to root" do
-          expect(any_garden_type).not_to receive(:save)
-          expect(any_garden_type).not_to receive(:save!)
-          expect(any_garden_type).not_to receive(:update)
-          expect(any_garden_type).not_to receive(:update!)
-          expect(any_garden_type).not_to receive(:destroy)
-          delete :destroy, params: { id: any_garden_type.to_param, params: { garden_type: valid_params } }
-          expect(response).to redirect_to(root_path)
-        end
+        before { delete :destroy, params: { id: any_garden_type.to_param, params: { garden_type: valid_params } } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
     end
   end

spec/controllers/gardens_controller_spec.rb

@@ -25,42 +25,29 @@ RSpec.describe GardensController do
     describe 'changing existing records' do
       before do
         allow(Garden).to receive(:find).and_return(:garden)
+        expect(garden).not_to receive(:save)
+        expect(garden).not_to receive(:save!)
+        expect(garden).not_to receive(:update)
+        expect(garden).not_to receive(:update!)
+        expect(garden).not_to receive(:destroy)
       end
 
       describe 'GET edit' do
-        it "redirects to login" do
-          expect(garden).not_to receive(:save)
-          expect(garden).not_to receive(:save!)
-          expect(garden).not_to receive(:update)
-          expect(garden).not_to receive(:update!)
-          expect(garden).not_to receive(:destroy)
-          get :edit, params: { slug: garden.to_param }
-          expect(response).to redirect_to(new_member_session_path)
-        end
+        before { get :edit, params: { slug: garden.to_param } }
+
+        it { expect(response).to redirect_to(new_member_session_path) }
       end
 
       describe 'POST update' do
-        it "redirects to login" do
-          expect(garden).not_to receive(:save)
-          expect(garden).not_to receive(:save!)
-          expect(garden).not_to receive(:update)
-          expect(garden).not_to receive(:update!)
-          expect(garden).not_to receive(:destroy)
-          post :update, params: { slug: garden.to_param, garden: valid_params }
-          expect(response).to redirect_to(new_member_session_path)
-        end
+        before { post :update, params: { slug: garden.to_param, garden: valid_params } }
+
+        it { expect(response).to redirect_to(new_member_session_path) }
       end
 
       describe 'DELETE' do
-        it "redirects to login" do
-          expect(garden).not_to receive(:save)
-          expect(garden).not_to receive(:save!)
-          expect(garden).not_to receive(:update)
-          expect(garden).not_to receive(:update!)
-          expect(garden).not_to receive(:destroy)
-          delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } }
-          expect(response).to redirect_to(new_member_session_path)
-        end
+        before { delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } } }
+
+        it { expect(response).to redirect_to(new_member_session_path) }
       end
     end
   end
@@ -74,43 +61,30 @@ RSpec.describe GardensController do
       let(:not_my_garden) { double('garden') }
 
       before do
-        allow(Garden).to receive(:find).and_return(:not_my_garden)
+        expect(Garden).to receive(:find).and_return(:not_my_garden)
+        expect(not_my_garden).not_to receive(:save)
+        expect(not_my_garden).not_to receive(:save!)
+        expect(not_my_garden).not_to receive(:update)
+        expect(not_my_garden).not_to receive(:update!)
+        expect(not_my_garden).not_to receive(:destroy)
       end
 
       describe 'GET edit' do
-        it "redirects to root" do
-          expect(not_my_garden).not_to receive(:save)
-          expect(not_my_garden).not_to receive(:save!)
-          expect(not_my_garden).not_to receive(:update)
-          expect(not_my_garden).not_to receive(:update!)
-          expect(not_my_garden).not_to receive(:destroy)
-          get :edit, params: { slug: not_my_garden.to_param }
-          expect(response).to redirect_to(root_path)
-        end
+        before { get :edit, params: { slug: not_my_garden.to_param } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
 
       describe 'POST update' do
-        it "redirects to root" do
-          expect(not_my_garden).not_to receive(:save)
-          expect(not_my_garden).not_to receive(:save!)
-          expect(not_my_garden).not_to receive(:update)
-          expect(not_my_garden).not_to receive(:update!)
-          expect(not_my_garden).not_to receive(:destroy)
-          post :update, params: { slug: not_my_garden.to_param, garden: valid_params }
-          expect(response).to redirect_to(root_path)
-        end
+        before { post :update, params: { slug: not_my_garden.to_param, garden: valid_params } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
 
       describe 'DELETE' do
-        it "redirects to root" do
-          expect(not_my_garden).not_to receive(:save)
-          expect(not_my_garden).not_to receive(:save!)
-          expect(not_my_garden).not_to receive(:update)
-          expect(not_my_garden).not_to receive(:update!)
-          expect(not_my_garden).not_to receive(:destroy)
-          delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } }
-          expect(response).to redirect_to(root_path)
-        end
+        before { delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } } }
+
+        it { expect(response).to redirect_to(root_path) }
       end
     end
   end

spec/controllers/harvests_controller_spec.rb

@@ -15,12 +15,12 @@ describe HarvestsController, :search do
   end
 
   describe "GET index" do
-    let!(:first_member)     { create(:member)                                                  }
-    let(:second_member)     { create(:member)                                                  }
-    let(:tomato)            { create(:tomato)                                                  }
-    let(:maize)             { create(:maize)                                                   }
-    let!(:tomato_harvest)   { create(:harvest, owner_id: first_member.id, crop_id: tomato.id)  }
-    let!(:maize_harvest)    { create(:harvest, owner_id: second_member.id, crop_id: maize.id)  }
+    let!(:member1)  { create(:member)                                            }
+    let(:member2)   { create(:member)                                            }
+    let(:tomato)    { create(:tomato)                                            }
+    let(:maize)     { create(:maize)                                             }
+    let!(:harvest1) { create(:harvest, owner_id: member1.id, crop_id: tomato.id) }
+    let!(:harvest2) { create(:harvest, owner_id: member2.id, crop_id: maize.id)  }
 
     before { Harvest.reindex }
 
@@ -28,16 +28,16 @@ describe HarvestsController, :search do
       before { get :index, params: {} }
 
       it { expect(assigns(:harvests).size).to eq 2 }
-      it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
-      it { expect(assigns(:harvests)[1].slug).to eq maize_harvest.slug }
+      it { expect(assigns(:harvests)[0].slug).to eq harvest1.slug }
+      it { expect(assigns(:harvests)[1].slug).to eq harvest2.slug }
     end
 
     describe "picks up owner from params and shows owner's harvests only" do
-      before { get :index, params: { member_slug: first_member.slug } }
+      before { get :index, params: { member_slug: member1.slug } }
 
-      it { expect(assigns(:owner)).to eq first_member }
+      it { expect(assigns(:owner)).to eq member1 }
       it { expect(assigns(:harvests).size).to eq 1 }
-      it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
+      it { expect(assigns(:harvests)[0].slug).to eq harvest1.slug }
     end
 
     describe "picks up crop from params and shows the harvests for the crop only" do
@@ -45,7 +45,7 @@ describe HarvestsController, :search do
 
       it { expect(assigns(:crop)).to eq maize }
       it { expect(assigns(:harvests).size).to eq 1 }
-      it { expect(assigns(:harvests)[0].slug).to eq maize_harvest.slug }
+      it { expect(assigns(:harvests)[0].slug).to eq harvest2.slug }
     end
 
     describe "generates a csv" do

spec/controllers/photos_controller_spec.rb

@@ -60,7 +60,6 @@ describe PhotosController, :search do
       sign_in member
       member.stub(:flickr_photos) { [[], 0] }
       member.stub(:flickr_sets) { { "foo" => "bar" } }
-      member.stub(:flickr_auth_valid?) { true }
       controller.stub(:current_member) { member }
     end
 
@@ -86,16 +85,6 @@ describe PhotosController, :search do
       it { expect(assigns(:item)).to eq garden }
       it { expect(flash[:alert]).not_to be_present }
     end
-
-    describe "filtering by tag" do
-      let(:tag) { "tomato" }
-
-      it "passes the tag to flickr_photos" do
-        expect(member).to receive(:flickr_photos).with(anything, nil, tag).and_return([[], 0])
-        get :new, params: { type: "planting", id: planting.id, tag: tag }
-        expect(assigns(:current_tag)).to eq tag
-      end
-    end
   end
 
   describe "POST create" do

spec/controllers/places_controller_spec.rb

@@ -9,18 +9,18 @@ describe PlacesController do
 
   describe "GET show" do
     before do
-      @london_member = create(:london_member)
-      @edinburgh_member = create(:edinburgh_member)
+      @member_london = create(:london_member)
+      @member_south_pole = create(:south_pole_member)
     end
 
     it "assigns place name" do
-      get :show, params: { place: @london_member.location }
-      assigns(:place).should eq @london_member.location
+      get :show, params: { place: @member_london.location }
+      assigns(:place).should eq @member_london.location
     end
 
     it "assigns nearby members" do
-      get :show, params: { place: @london_member.location }
-      assigns(:nearby_members).should eq [@london_member, @edinburgh_member]
+      get :show, params: { place: @member_london.location }
+      assigns(:nearby_members).should eq [@member_london, @member_south_pole]
     end
   end
 

spec/controllers/plantings_controller_spec.rb

@@ -13,12 +13,12 @@ describe PlantingsController, :search do
   end
 
   describe "GET index", :search do
-    let!(:first_member)      { create(:member)                                                       }
-    let!(:second_member)     { create(:member)                                                       }
-    let!(:tomato)            { create(:tomato)                                                       }
-    let!(:maize)             { create(:maize)                                                        }
-    let!(:tomato_planting)   { create(:planting, crop: tomato, owner: first_member, created_at: 1.day.ago) }
-    let!(:maize_planting)    { create(:planting, crop: maize, owner: second_member, created_at: 5.days.ago) }
+    let!(:member1)   { create(:member)                                                       }
+    let!(:member2)   { create(:member)                                                       }
+    let!(:tomato)    { create(:tomato)                                                       }
+    let!(:maize)     { create(:maize)                                                        }
+    let!(:planting1) { create(:planting, crop: tomato, owner: member1, created_at: 1.day.ago) }
+    let!(:planting2) { create(:planting, crop: maize, owner: member2, created_at: 5.days.ago) }
 
     before do
       Planting.reindex
@@ -28,23 +28,23 @@ describe PlantingsController, :search do
       before { get :index }
 
       it { expect(assigns(:plantings).size).to eq 2 }
-      it { expect(assigns(:plantings)[0]['slug']).to eq tomato_planting.slug }
-      it { expect(assigns(:plantings)[1]['slug']).to eq maize_planting.slug }
+      it { expect(assigns(:plantings)[0]['slug']).to eq planting1.slug }
+      it { expect(assigns(:plantings)[1]['slug']).to eq planting2.slug }
     end
 
     describe "picks up owner from params and shows owner's plantings only" do
-      before { get :index, params: { member_slug: first_member.slug } }
+      before { get :index, params: { member_slug: member1.slug } }
 
-      it { expect(assigns(:owner)).to eq first_member }
+      it { expect(assigns(:owner)).to eq member1 }
       it { expect(assigns(:plantings).size).to eq 1 }
-      it { expect(assigns(:plantings).first['slug']).to eq tomato_planting.slug }
+      it { expect(assigns(:plantings).first['slug']).to eq planting1.slug }
     end
 
     describe "picks up crop from params and shows the plantings for the crop only" do
       before { get :index, params: { crop_slug: maize.slug } }
 
       it { expect(assigns(:crop)).to eq maize }
-      it { expect(assigns(:plantings).first['slug']).to eq maize_planting.slug }
+      it { expect(assigns(:plantings).first['slug']).to eq planting2.slug }
     end
   end
 

spec/controllers/seeds_controller_spec.rb

@@ -21,6 +21,10 @@ describe SeedsController, :search do
 
     it { expect(response).to be_successful }
 
+    context 'no parent planting' do
+      before { get :new }
+    end
+
     context 'with parent planting' do
       let!(:planting) { create(:planting, owner:) }
 

spec/features/admin/forums_spec.rb

@@ -22,6 +22,7 @@ describe "forums", :js do
     before do
       visit forums_path
       click_link "New forum"
+      expect(page).to have_current_path new_forum_path, ignore_query: true
       fill_in 'Name', with: 'Discussion'
       fill_in 'Description', with: "this is a new forum"
       select member.login_name, from: "Owner"

spec/features/admin/plant_parts_spec.rb

@@ -23,6 +23,7 @@ describe "plant parts", :js do
     before do
       visit plant_parts_path
       click_link "New plant part"
+      expect(page).to have_current_path new_plant_part_path, ignore_query: true
       fill_in 'Name', with: "this is a new plant part"
       click_button 'Save'
     end

spec/features/admin/roles_spec.rb

@@ -23,6 +23,7 @@ describe "roles", :js do
     before do
       visit admin_roles_path
       click_link "New role"
+      expect(page).to have_current_path new_admin_role_path, ignore_query: true
       fill_in 'Name', with: 'Discussion'
       fill_in 'Description', with: "this is a new role"
       click_button 'Save'

spec/features/crops/crop_photos_spec.rb

@@ -15,44 +15,41 @@ describe "crop detail page", :js, :search do
   let!(:planting) { create(:planting, crop:, owner: owner_member) }
   let!(:seed)     { create(:seed, crop:, owner: owner_member)     }
 
-  let!(:first_planting_photo)  { create(:photo, owner: owner_member) }
-  let!(:second_planting_photo) { create(:photo, owner: owner_member) }
-  let!(:first_harvest_photo)   { create(:photo, owner: owner_member) }
-  let!(:second_harvest_photo)  { create(:photo, owner: owner_member) }
-  let!(:first_seed_photo)      { create(:photo, owner: owner_member) }
-  let!(:second_seed_photo)     { create(:photo, owner: owner_member) }
+  let!(:photo1) { create(:photo, owner: owner_member) }
+  let!(:photo2) { create(:photo, owner: owner_member) }
+  let!(:photo3) { create(:photo, owner: owner_member) }
+  let!(:photo4) { create(:photo, owner: owner_member) }
+  let!(:photo5) { create(:photo, owner: owner_member) }
+  let!(:photo6) { create(:photo, owner: owner_member) }
 
   before do
-    planting.photos << first_planting_photo
-    planting.photos << second_planting_photo
-    harvest.photos << first_harvest_photo
-    harvest.photos << second_harvest_photo
-    seed.photos << first_seed_photo
-    seed.photos << second_seed_photo
+    planting.photos << photo1
+    planting.photos << photo2
+    harvest.photos << photo3
+    harvest.photos << photo4
+    seed.photos << photo5
+    seed.photos << photo6
     Crop.reindex
     visit crop_path(crop)
+    expect(crop.photos.count).to eq 6
+    expect(crop.photos.by_model(Planting).count).to eq 2
+    expect(page).to have_content 'Photos'
   end
 
   shared_examples "shows photos" do
-    it "shows the photo section" do
-      expect(crop.photos.count).to eq 6
-      expect(crop.photos.by_model(Planting).count).to eq 2
-      expect(page).to have_content 'Photos'
-    end
-
     describe "show planting photos" do
-      it { is_expected.to have_xpath("//img[contains(@src,'#{first_planting_photo.fullsize_url}')]") }
-      it { is_expected.to have_xpath("//img[contains(@src,'#{second_planting_photo.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.fullsize_url}')]") }
     end
 
     describe "show harvest photos" do
-      it { is_expected.to have_xpath("//img[contains(@src,'#{first_harvest_photo.fullsize_url}')]") }
-      it { is_expected.to have_xpath("//img[contains(@src,'#{second_harvest_photo.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.fullsize_url}')]") }
     end
 
     describe "show seed photos" do
-      it { is_expected.to have_xpath("//img[contains(@src,'#{first_seed_photo.fullsize_url}')]") }
-      it { is_expected.to have_xpath("//img[contains(@src,'#{second_seed_photo.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo5.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo6.fullsize_url}')]") }
     end
 
     describe "link to more photos" do

spec/features/forums_spec.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe "Forums usage", :js do
-  let!(:forum) { create(:forum, name: "General Discussion", description: "Talk about anything") }
-  let(:member) { create(:member) }
-
-  describe "browsing forums" do
-    it "shows the list of forums" do
-      visit forums_path
-      expect(page).to have_content("General Discussion")
-      expect(page).to have_content("Talk about anything")
-    end
-  end
-
-  describe "viewing a forum" do
-    let!(:post) { create(:post, forum: forum, subject: "Hello World", author: member) }
-
-    it "shows forum details and posts" do
-      visit forum_path(forum)
-      expect(page).to have_css("h1", text: "General Discussion")
-      expect(page).to have_content("Talk about anything")
-      expect(page).to have_content("Hello World")
-      expect(page).to have_link("Post something")
-    end
-  end
-
-  describe "starting a new post from a forum" do
-    include_context 'signed in member'
-
-    it "pre-fills the forum when creating a new post" do
-      visit forum_path(forum)
-      click_link "Post something"
-
-      expect(page).to have_current_path(new_post_path(forum_id: forum.id))
-      expect(page).to have_content("This post will be posted in the forum #{forum.name}")
-
-      fill_in "post_subject", with: "My New Post"
-      fill_in "post_body", with: "Content of my post"
-      click_button "Post"
-
-      expect(page).to have_content("Post was successfully created")
-      expect(Post.last.forum).to eq(forum)
-    end
-  end
-end

spec/features/members/blocking_spec.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe "blocks", :js do
-  context "when signed in" do
-    include_context 'signed in member'
-    let(:other_member) { create(:member) }
-
-    it "your profile doesn't have a block button" do
-      visit member_path(member)
-      expect(page).to have_no_link "Block"
-      expect(page).to have_no_link "Unblock"
-    end
-
-    context "blocking another member" do
-      before { visit member_path(other_member) }
-
-      it "has a block button" do
-        expect(page).to have_link "Block", href: blocks_path(blocked: other_member.slug)
-      end
-
-      it "has correct message and unblock button" do
-        click_link 'Block'
-        expect(page).to have_content "Blocked #{other_member.login_name}"
-        expect(page).to have_link "Unblock", href: block_path(member.get_block(other_member))
-      end
-
-      it "has correct message and block button after unblock" do
-        click_link 'Block'
-        click_link 'Unblock'
-        expect(page).to have_content "Unblocked #{other_member.login_name}"
-        visit member_path(other_member) # unblocking redirects to root
-        expect(page).to have_link "Block", href: blocks_path(blocked: other_member.slug)
-      end
-
-      context "when a member is blocked" do
-        before do
-          click_link 'Block'
-        end
-
-        it "prevents following" do
-          visit member_path(other_member)
-          expect(page).to have_no_link "Follow"
-        end
-
-        xit "prevents messaging" do
-          visit new_message_path(recipient_id: other_member.id)
-          fill_in "Subject", with: "Test message"
-          fill_in "Body", with: "Test message body"
-          click_button "Send message"
-          expect(page).to have_content "You cannot send a message to a member who has blocked you."
-        end
-
-        xit "prevents commenting" do
-          post = create(:post, author: other_member)
-          visit post_path(post)
-          fill_in "comment_body", with: "Test comment"
-          click_button "Post Comment"
-          expect(page).to have_content "You cannot comment on a post of a member who has blocked you."
-        end
-
-        xit "prevents liking" do
-          post = create(:post, author: other_member)
-          visit post_path(post)
-          click_link "Like"
-          expect(page).to have_content "You cannot like content of a member who has blocked you."
-        end
-      end
-    end
-  end
-end

spec/features/members/following_spec.rb

@@ -23,17 +23,6 @@ describe "follows", :js do
       expect(page).to have_no_link "Unfollow"
     end
 
-    context "when the other member is blocked" do
-      before do
-        member.blocks.create(blocked: other_member)
-        visit member_path(other_member)
-      end
-
-      it "does not have a follow button" do
-        expect(page).to have_no_link "Follow"
-      end
-    end
-
     context "following another member" do
       before { visit member_path(other_member) }
 

spec/features/members/list_spec.rb

@@ -6,29 +6,27 @@ describe "members list" do
   context "list all members" do
     subject { page.all("#maincontainer h4.login-name") }
 
-    let!(:archaeopteryx) { create(:member, login_name: "Archaeopteryx", confirmed_at: Time.zone.parse('2013-02-10')) }
-    let!(:zephyrosaurus) { create(:member, login_name: "Zephyrosaurus", confirmed_at: Time.zone.parse('2014-01-11')) }
-    let!(:testingname)   { create(:member, login_name: "Testingname", confirmed_at: Time.zone.parse('2014-05-09'))   }
+    let!(:member1) { create(:member, login_name: "Archaeopteryx", confirmed_at: Time.zone.parse('2013-02-10')) }
+    let!(:member2) { create(:member, login_name: "Zephyrosaurus", confirmed_at: Time.zone.parse('2014-01-11')) }
+    let!(:member3) { create(:member, login_name: "Testingname", confirmed_at: Time.zone.parse('2014-05-09'))   }
 
     before do
       visit members_path
+      expect(page).to have_css "#sort"
+      expect(page).to have_css "form"
     end
 
     it "default alphabetical sort" do
-      expect(page).to have_css "#sort"
-      expect(page).to have_css "form"
       click_button('Show')
-      expect(subject.first).to have_text archaeopteryx.login_name
-      expect(subject.last).to have_text zephyrosaurus.login_name
+      expect(subject.first).to have_text member1.login_name
+      expect(subject.last).to have_text member2.login_name
     end
 
     it "recently joined sort" do
-      expect(page).to have_css "#sort"
-      expect(page).to have_css "form"
       select("recently", from: 'sort')
       click_button('Show')
-      expect(subject.first).to have_text testingname.login_name
-      expect(subject.last).to have_text archaeopteryx.login_name
+      expect(subject.first).to have_text member3.login_name
+      expect(subject.last).to have_text member1.login_name
     end
   end
 end

spec/features/members/profile_spec.rb

@@ -118,15 +118,15 @@ describe "member profile", :js do
     end
 
     context 'member has activities' do
-      let!(:past_activity) { create(:activity, owner: member, due_date: 3.days.ago) }
-      let!(:planting_activity) { create(:activity, :planting, owner: member) }
-      let!(:garden_activity) { create(:activity, :garden, owner: member) }
+      let!(:activity) { create(:activity, owner: member, due_date: 3.days.ago) }
+      let!(:activity2) { create(:activity, :planting, owner: member) }
+      let!(:activity3) { create(:activity, :garden, owner: member) }
 
       before { visit member_path(member) }
 
-      it { expect(page).to have_link href: activity_path(past_activity) }
-      it { expect(page).to have_link href: activity_path(planting_activity) }
-      it { expect(page).to have_link href: activity_path(garden_activity) }
+      it { expect(page).to have_link href: activity_path(activity) }
+      it { expect(page).to have_link href: activity_path(activity2) }
+      it { expect(page).to have_link href: activity_path(activity3) }
     end
 
     context 'member has seeds' do

spec/features/percy/percy_spec.rb

@@ -7,17 +7,17 @@ describe 'Test with visual testing', :js do
   # on every run, so doesn't trigger percy to see changes
   before { Faker::Config.random = Random.new(42) }
 
-  let!(:member)        { create(:member, login_name: 'percy', preferred_avatar_uri: member_gravatar) }
-  let!(:crop_wrangler) { create(:crop_wrangling_member, login_name: 'croppy', preferred_avatar_uri: crop_wrangler_gravatar) }
-  let!(:admin_user) { create(:admin_member, login_name: 'janitor', preferred_avatar_uri: admin_gravatar) }
-  let!(:someone_else) { create(:edinburgh_member, login_name: 'ruby', preferred_avatar_uri: someone_else_gravatar) }
+  let!(:member)        { create(:member, login_name: 'percy', preferred_avatar_uri: gravatar) }
+  let!(:crop_wrangler) { create(:crop_wrangling_member, login_name: 'croppy', preferred_avatar_uri: gravatar2) }
+  let!(:admin_user) { create(:admin_member, login_name: 'janitor', preferred_avatar_uri: gravatar3) }
+  let!(:someone_else) { create(:edinburgh_member, login_name: 'ruby', preferred_avatar_uri: gravatar4) }
 
-  let(:member_gravatar) { 'https://secure.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
-  let(:crop_wrangler_gravatar) { 'https://secure.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
-  let(:admin_gravatar) { 'https://secure.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
-  let(:someone_else_gravatar) { 'https://secure.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
+  let(:gravatar) { 'https://secure.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
+  let(:gravatar2) { 'https://secure.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
+  let(:gravatar3) { 'https://secure.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
+  let(:gravatar4) { 'https://secure.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
 
-  let!(:tomato) { create(:tomato, creator: someone_else) }
+  let!(:tomato)   { create(:tomato, creator: someone_else) }
   let(:plant_part) { create(:plant_part, name: 'fruit') }
 
   let(:tomato_photo) do

spec/features/planting_reminder_spec.rb

@@ -30,13 +30,13 @@ describe "Planting reminder email", :js do
   context "when member has some plantings" do
     # Bangs are used on the following 2 let blocks in order to ensure that the plantings are present
     # in the database before the email is generated: otherwise, they won't be present in the email.
-    let!(:recent_planting) { create(:predictable_planting, planted_at: 10.days.ago, garden: member.gardens.first, owner: member) }
-    let!(:older_planting)  { create(:predictable_planting, planted_at: 30.days.ago, garden: member.gardens.first, owner: member) }
+    let!(:p1) { create(:predictable_planting, planted_at: 10.days.ago, garden: member.gardens.first, owner: member) }
+    let!(:p2) { create(:predictable_planting, planted_at: 30.days.ago, garden: member.gardens.first, owner: member) }
 
     describe "lists plantings" do
       it { expect(mail).to have_content "Progress report" }
-      it { expect(mail).to have_link recent_planting.crop.to_s, href: planting_url(recent_planting) }
-      it { expect(mail).to have_link older_planting.crop.to_s, href: planting_url(older_planting) }
+      it { expect(mail).to have_link p1.crop.to_s, href: planting_url(p1) }
+      it { expect(mail).to have_link p2.crop.to_s, href: planting_url(p2) }
       it { expect(mail).to have_content "keep your garden records up to date" }
     end
   end
@@ -50,15 +50,15 @@ describe "Planting reminder email", :js do
   context "when member has some harvests" do
     # Bangs are used on the following 2 let blocks in order to ensure that the plantings are present
     # in the database before the spec is run.
-    let!(:recent_planting) { create(:predictable_planting, garden: member.gardens.first, owner: member, planted_at: 20.days.ago) }
-    let!(:older_planting)  { create(:predictable_planting, garden: member.gardens.first, owner: member) }
-    let!(:recent_harvest)  { create(:harvest, owner: member, planting: recent_planting, harvested_at: 1.day.ago) }
-    let!(:older_harvest)   { create(:harvest, owner: member, planting: older_planting, harvested_at: 3.days.ago) }
+    let!(:p1) { create(:predictable_planting, garden: member.gardens.first, owner: member, planted_at: 20.days.ago) }
+    let!(:p2) { create(:predictable_planting, garden: member.gardens.first, owner: member) }
+    let!(:h1) { create(:harvest, owner: member, planting: p1, harvested_at: 1.day.ago) }
+    let!(:h2) { create(:harvest, owner: member, planting: p2, harvested_at: 3.days.ago) }
 
     describe "lists planting that are ready for harvest" do
       it { expect(mail).to have_content "Ready to harvest" }
-      it { expect(mail).to have_link recent_planting.crop.name, href: planting_url(recent_planting) }
-      it { expect(mail).to have_link older_planting.crop.name, href: planting_url(older_planting) }
+      it { expect(mail).to have_link p1.crop.name, href: planting_url(p1) }
+      it { expect(mail).to have_link p2.crop.name, href: planting_url(p2) }
       it { expect(mail).to have_content "Harvested anything lately?" }
     end
   end