Merge branch 'dev' into feat/add-australian-food-classification-data-table

This commit introduces a new database table, `australian_food_classification_data`, to store nutritional information.

The table schema has been created with a comprehensive set of columns to accommodate the detailed food classification data. The `decimal` data type is used for all numeric fields to ensure precision. A unique index has been added to the `public_food_key` column to serve as a primary identifier for the food items.

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
 
 # Install Rails
 RUN gem install rails:7.0.8

.github/workflows/ci-features-admin.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-comments.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-conversations.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-crops.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-gardens.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-harvests.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-home.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-members.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-places.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-plantings.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-posts.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-seeds.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-timeline.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -61,7 +61,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -112,7 +112,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -91,7 +91,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: '12'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -108,5 +108,23 @@ jobs:
         run: bundle exec rails db:prepare
 
 
-      - name: Run tests with test-queue
-        run: bundle exec test-queue rspec spec -fd
+      - name: Run rspec (lib)
+        run: bundle exec rspec spec/lib/ -fd --fail-fast
+
+      - name: Run rspec (services)
+        run: bundle exec rspec spec/services/ -fd --fail-fast
+
+      - name: Run rspec (models)
+        run: bundle exec rspec spec/models/ -fd --fail-fast
+
+      - name: Run rspec (controllers)
+        run: bundle exec rspec spec/controllers/ -fd --fail-fast
+
+      - name: Run rspec (views)
+        run: bundle exec rspec spec/views/ -fd --fail-fast
+
+      - name: Run rspec (routing)
+        run: bundle exec rspec spec/routing/ -fd --fail-fast
+
+      - name: Run rspec (request)
+        run: bundle exec rspec spec/requests/ -fd --fail-fast

.rubocop.yml

@@ -24,7 +24,6 @@ Naming/FileName:
 
 RSpec/DescribeClass:
   Exclude:
-   - 'spec/tasks/import_spec.rb'
    - 'spec/views/**/*.rb'
    - 'spec/features/**/*.rb'
 
@@ -72,7 +71,4 @@ Layout/LineLength:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/20190317023129_finished_boolean.rb'
-    - 'db/migrate/20251128200506_add_description_to_crops.rb'
-    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
-    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
     - 'db/seeds.rb'

.rubocop_todo.yml

@@ -1,22 +1,33 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
+# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 19
-Capybara/NegationMatcherAfterVisit:
+# Offense count: 231
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: link_or_button, strict
+Capybara/ClickLinkOrButtonStyle:
+  Enabled: false
+
+# Offense count: 39
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: DefaultSelector.
+Capybara/RSpec/HaveSelector:
   Exclude:
-    - 'spec/features/admin/reverting_crops_spec.rb'
-    - 'spec/features/crops/crop_detail_page_spec.rb'
-    - 'spec/features/crops/crop_wranglers_spec.rb'
-    - 'spec/features/gardens/gardens_spec.rb'
-    - 'spec/features/members/deletion_spec.rb'
-    - 'spec/features/members/following_spec.rb'
-    - 'spec/features/members/profile_spec.rb'
+    - 'spec/features/conversations/index_spec.rb'
+    - 'spec/features/footer_spec.rb'
+    - 'spec/features/gardens/adding_gardens_spec.rb'
+    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
+    - 'spec/features/members/list_spec.rb'
     - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/seeds/adding_seeds_spec.rb'
+    - 'spec/features/shared_examples/crop_suggest.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/support/feature_helpers.rb'
+    - 'spec/views/posts/show.html.haml_spec.rb'
 
 # Offense count: 14
 Capybara/SpecificMatcher:
@@ -32,22 +43,21 @@ Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/shared_examples/crop_suggest.rb'
 
-# Offense count: 8
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
 # SupportedStyles: explicit, implicit
 FactoryBot/AssociationStyle:
   Exclude:
     - 'spec/factories/alternate_names.rb'
-    - 'spec/factories/comments.rb'
     - 'spec/factories/crop.rb'
     - 'spec/factories/like.rb'
-    - 'spec/factories/notifications.rb'
     - 'spec/factories/scientific_name.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, ExplicitOnly.
+# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
 # SupportedStyles: create_list, n_times
 FactoryBot/CreateList:
   Exclude:
@@ -56,51 +66,31 @@ FactoryBot/CreateList:
     - 'spec/views/posts/index.html.haml_spec.rb'
 
 # Offense count: 4
-# Configuration parameters: MaxAmount.
+# Configuration parameters: Include, MaxAmount.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
 FactoryBot/ExcessiveCreateList:
   Exclude:
     - 'spec/controllers/posts_controller_spec.rb'
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 312
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/crops_helper.rb'
-    - 'app/models/concerns/search_harvests.rb'
-    - 'app/models/concerns/search_plantings.rb'
-    - 'app/models/crop.rb'
-    - 'config/sitemap.rb'
-    - 'lib/tasks/import.rake'
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-    - 'spec/requests/api/v1/members_request_spec.rb'
+# Offense count: 1127
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Include.
+# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+FactoryBot/SyntaxMethods:
+  Enabled: false
 
-# Offense count: 6
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
-    - 'Gemfile'
-    - 'app/controllers/admin/versions_controller.rb'
-    - 'app/models/concerns/predict_planting.rb'
-    - 'app/models/crop.rb'
+    - 'app/helpers/crops_helper.rb'
     - 'db/seeds.rb'
-    - 'spec/requests/api/v1/activities_request_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/AmbiguousOperatorPrecedence:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-
-# Offense count: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
@@ -108,33 +98,25 @@ Lint/AmbiguousRange:
     - 'app/models/concerns/search_activities.rb'
     - 'app/models/concerns/search_harvests.rb'
     - 'app/models/concerns/search_plantings.rb'
-    - 'db/seeds.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'app/helpers/crops_helper.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: enums
-Lint/ConstantDefinitionInBlock:
-  Exclude:
-    - 'lib/tasks/import.rake'
 
 # Offense count: 2
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/models/harvest.rb'
     - 'lib/actions/oauth_signup_action.rb'
 
-# Offense count: 1
-Lint/DuplicateMethods:
+# Offense count: 8
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
   Exclude:
-    - 'app/models/planting.rb'
+    - 'db/migrate/20171022032108_all_the_predictions.rb'
+    - 'spec/controllers/home_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/controllers/plant_parts_controller_spec.rb'
+    - 'spec/factories/crop_companions.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/requests/authentications_spec.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -154,106 +136,62 @@ 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).
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
     - 'config.rb'
     - 'config/compass.rb'
 
-# Offense count: 1
-Lint/UselessConstantScoping:
-  Exclude:
-    - 'app/controllers/members_controller.rb'
-
-# Offense count: 61
+# Offense count: 52
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 295
+  Max: 151
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 294
+  Max: 115
 
-# Offense count: 10
+# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 298
+  Max: 188
 
-# Offense count: 1
-# Configuration parameters: LengthThreshold.
-Metrics/CollectionLiteralLength:
-  Exclude:
-    - 'lib/tasks/import.rake'
-
-# Offense count: 10
+# Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 82
+# Offense count: 71
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 296
+  Max: 127
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 144
+  Max: 125
 
-# Offense count: 8
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 32
 
-# Offense count: 2
-# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
-# AllowedMethods: call
-# WaywardPredicates: infinite?, nonzero?
-Naming/PredicateMethod:
-  Exclude:
-    - 'app/models/concerns/finishable.rb'
-    - 'app/models/seed.rb'
-
 # Offense count: 3
 RSpec/AnyInstance:
   Exclude:
     - 'spec/controllers/harvests_controller_spec.rb'
     - 'spec/controllers/photos_controller_spec.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/BeEq:
-  Exclude:
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
-# Offense count: 1
-RSpec/BeforeAfterAll:
-  Exclude:
-    - 'spec/tasks/import_spec.rb'
-
-# Offense count: 299
+# Offense count: 292
 # 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.
@@ -266,6 +204,7 @@ RSpec/DescribedClass:
 
 # Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/controllers/authentications_controller_spec.rb'
@@ -288,10 +227,10 @@ RSpec/EmptyLineAfterExample:
   Exclude:
     - 'spec/models/ability_spec.rb'
 
-# Offense count: 146
+# Offense count: 140
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 27
+  Max: 25
 
 # Offense count: 32
 RSpec/ExpectInHook:
@@ -316,30 +255,11 @@ RSpec/HookArgument:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
 RSpec/HooksBeforeExamples:
   Exclude:
     - 'spec/features/crops/creating_a_crop_spec.rb'
 
-# Offense count: 53
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/IncludeExamples:
-  Exclude:
-    - 'spec/features/conversations/index_spec.rb'
-    - 'spec/features/crops/alternate_name_spec.rb'
-    - 'spec/features/crops/browse_crops_spec.rb'
-    - 'spec/features/crops/creating_a_crop_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-    - 'spec/features/crops/delete_crop_spec.rb'
-    - 'spec/features/gardens/actions_spec.rb'
-    - 'spec/features/gardens/adding_gardens_spec.rb'
-    - 'spec/features/gardens/index_spec.rb'
-    - 'spec/features/likeable_spec.rb'
-    - 'spec/features/signout_spec.rb'
-    - 'spec/models/crop_spec.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/photos/show.html.haml_spec.rb'
-    - 'spec/views/seeds/index.rss.haml_spec.rb'
-
 # Offense count: 37
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
@@ -356,12 +276,12 @@ RSpec/IndexedLet:
     - 'spec/models/member_spec.rb'
     - 'spec/views/forums/index.html.haml_spec.rb'
 
-# Offense count: 719
+# Offense count: 720
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# Offense count: 41
+# Offense count: 40
 RSpec/LetSetup:
   Enabled: false
 
@@ -387,16 +307,16 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 189
+# Offense count: 152
 RSpec/MultipleExpectations:
   Max: 19
 
-# Offense count: 166
+# Offense count: 138
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 16
+  Max: 20
 
-# Offense count: 183
+# Offense count: 133
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -407,18 +327,17 @@ RSpec/NamedSubject:
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 407
+# Offense count: 403
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 3
 RSpec/PendingWithoutReason:
   Exclude:
     - 'spec/features/seeds/misc_seeds_spec.rb'
     - 'spec/features/unsubscribing_spec.rb'
-    - 'spec/requests/api/v1/gardens_request_spec.rb'
 
 # Offense count: 2
 RSpec/RepeatedDescription:
@@ -439,14 +358,15 @@ RSpec/RepeatedExampleGroupBody:
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
 RSpec/ScatteredSetup:
   Exclude:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/plantings/prediction_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
-# SupportedInflectors: default, active_support
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/controllers/member_controller_spec.rb'
@@ -460,6 +380,8 @@ RSpec/StubbedMock:
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: constant, string
 RSpec/VerifiedDoubleReference:
   Exclude:
     - 'spec/models/member_spec.rb'
@@ -472,38 +394,47 @@ RSpec/VerifiedDoubles:
     - 'spec/controllers/gardens_controller_spec.rb'
     - 'spec/views/devise/shared/_links_spec.rb'
 
-# Offense count: 30
-# Configuration parameters: Database.
+# Offense count: 7
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ResponseMethods.
+# ResponseMethods: response, last_response
+RSpecRails/HaveHttpStatus:
+  Exclude:
+    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
+    - 'spec/controllers/harvests_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/requests/harvests_spec.rb'
+
+# Offense count: 16
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpecRails/InferredSpecType:
+  Enabled: false
+
+# Offense count: 28
+# Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
+# Include: db/**/*.rb
 Rails/BulkChangeTable:
   Enabled: false
 
 # Offense count: 4
+# Configuration parameters: Include.
+# Include: db/**/*.rb
 Rails/CreateTableWithTimestamps:
   Exclude:
     - 'db/migrate/20150201052245_create_cms.rb'
     - 'db/migrate/20171022032108_all_the_predictions.rb'
 
-# Offense count: 8
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
-    - 'app/controllers/activities_controller.rb'
     - 'app/mailers/notifier_mailer.rb'
-    - 'app/models/concerns/search_seeds.rb'
-    - 'spec/features/activities/creating_a_recurring_activity_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: slashes, arguments
-Rails/FilePath:
-  Exclude:
-    - 'lib/tasks/import.rake'
-
-# Offense count: 12
+# Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: order, limit, select, lock
@@ -514,39 +445,38 @@ Rails/FindEach:
     - 'db/migrate/20171129041341_create_photographings.rb'
     - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
     - 'db/migrate/20191119030244_cms_tags.rb'
-    - 'lib/tasks/wikidata.rake'
 
 # Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
   Exclude:
     - 'app/models/member.rb'
     - 'app/models/role.rb'
 
-# Offense count: 6
+# Offense count: 5
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
-    - 'app/models/crop.rb'
     - 'app/models/member.rb'
 
 # Offense count: 1
+# Configuration parameters: Include.
+# Include: spec/**/*.rb, test/**/*.rb
 Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/features/locale_spec.rb'
 
-# Offense count: 40
+# Offense count: 33
 Rails/I18nLocaleTexts:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: IgnoreScopes.
-Rails/InverseOf:
-  Exclude:
-    - 'app/models/member.rb'
-
-# Offense count: 4
+# Offense count: 3
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
 Rails/LexicallyScopedActionFilter:
   Exclude:
-    - 'app/controllers/api/v1/base_controller.rb'
     - 'app/controllers/data_controller.rb'
     - 'app/controllers/registrations_controller.rb'
 
@@ -562,16 +492,10 @@ Rails/PluralizationGrammar:
   Exclude:
     - 'spec/requests/plantings_spec.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Rails/Presence:
-  Exclude:
-    - 'app/controllers/photos_controller.rb'
-    - 'app/controllers/plantings_controller.rb'
-    - 'app/models/concerns/open_farm_data.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Include.
+# Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
   Exclude:
     - 'lib/tasks/hooks.rake'
@@ -589,8 +513,9 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/forums_controller.rb'
     - 'app/controllers/plant_parts_controller.rb'
     - 'app/controllers/scientific_names_controller.rb'
-    - 'spec/features/members/deletion_spec.rb'
+    - 'app/services/openfarm_service.rb'
     - 'spec/features/percy/percy_spec.rb'
+    - 'spec/models/harvest_spec.rb'
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -601,13 +526,14 @@ Rails/RedundantPresenceValidationOnBelongsTo:
     - 'app/models/planting.rb'
     - 'app/models/scientific_name.rb'
 
-# Offense count: 16
+# Offense count: 15
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Include.
+# Include: spec/controllers/**/*.rb, spec/requests/**/*.rb, test/controllers/**/*.rb, test/integration/**/*.rb
 Rails/ResponseParsedBody:
   Exclude:
     - 'spec/controllers/api/v1/plantings_controller_spec.rb'
     - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/api/v1/activities_request_spec.rb'
     - 'spec/requests/api/v1/crop_request_spec.rb'
     - 'spec/requests/api/v1/gardens_request_spec.rb'
     - 'spec/requests/api/v1/harvests_request_spec.rb'
@@ -617,44 +543,29 @@ Rails/ResponseParsedBody:
     - 'spec/requests/api/v1/seeds_request_spec.rb'
 
 # Offense count: 9
+# Configuration parameters: Include.
+# Include: db/**/*.rb
 Rails/ReversibleMigration:
   Exclude:
     - 'db/migrate/20130326092227_change_planted_at_to_date.rb'
     - 'db/migrate/20191119020643_upgrade_cms.rb'
 
-# Offense count: 6
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RootPathnameMethods:
   Exclude:
     - 'app/controllers/crops_controller.rb'
     - 'app/helpers/icons_helper.rb'
-    - 'config/application.rb'
-    - '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
+# Configuration parameters: Include.
+# Include: db/**/*.rb
 Rails/ThreeStateBooleanColumn:
   Enabled: false
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
-
 # Offense count: 6
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/follow.rb'
@@ -672,28 +583,24 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/WhereRange:
   Exclude:
     - 'app/models/concerns/predict_planting.rb'
     - 'app/models/garden.rb'
-    - 'app/models/seed.rb'
 
 # Offense count: 1
 Rake/MethodDefinitionInTask:
   Exclude:
     - 'lib/tasks/growstuff.rake'
 
-# Offense count: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
-# SupportedStylesForClasses: ~, nested, compact
-# SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
-    - 'app/controllers/admin/crops_controller.rb'
     - 'lib/actions/oauth_signup_action.rb'
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
@@ -708,44 +615,30 @@ Style/CommentedKeyword:
     - 'spec/models/planting_spec.rb'
 
 # Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars, DefaultToNil.
-Style/FetchEnvVar:
-  Exclude:
-    - 'config/sitemap.rb'
-
-# Offense count: 2
-Style/FileOpen:
-  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'db/seeds.rb'
-
-# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: left_coerce, right_coerce, single_coerce, fdiv
-Style/FloatDivision:
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
   Exclude:
-    - 'app/models/concerns/predict_planting.rb'
+    - 'config/initializers/new_framework_defaults_6_0.rb'
+    - 'db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'config/environments/production.rb'
     - 'lib/tasks/gbif.rake'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/actions/oauth_signup_action.rb'
+    - 'lib/tasks/openfarm.rake'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MapIntoArray:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: nonzero?
+Style/IfWithBooleanLiteralBranches:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'app/controllers/gardens_controller.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -767,13 +660,12 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 6
+# Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
-    - 'app/controllers/activities_controller.rb'
     - 'app/helpers/crops_helper.rb'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
@@ -784,21 +676,13 @@ Style/OpenStructUse:
   Exclude:
     - 'spec/helpers/event_helper_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
-    - '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.
@@ -813,34 +697,20 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/RedundantInterpolation:
-  Exclude:
-    - 'app/helpers/buttons_helper.rb'
-
-# Offense count: 4
-# Configuration parameters: Max.
-Style/SafeNavigationChainLength:
-  Exclude:
-    - 'app/models/ability.rb'
-
-# Offense count: 3
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
   Exclude:
-    - 'app/controllers/activities_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/messages_controller.rb'
 
-# Offense count: 27
+# Offense count: 24
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'app/controllers/messages_controller.rb'
-    - 'app/controllers/registrations_controller.rb'
     - 'app/helpers/buttons_helper.rb'
     - 'config/initializers/rswag_api.rb'
     - 'spec/helpers/gardens_helper_spec.rb'

.ruby-version

@@ -1 +1 @@
-3.4.8
+3.3.8

.travis.yml

@@ -0,0 +1,31 @@
+sudo: required
+language: ruby
+dist: bionic
+branches:
+  only:
+    - mainline
+    - dev
+cache:
+  bundler: true
+  yarn: true
+  directories:
+    - tmp/cache/assets/test/sprockets
+env:
+  global:
+    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
+before_deploy:
+  - bundle exec script/heroku_maintenance.rb on
+deploy:
+  provider: heroku
+  api_key:
+    secure: "WrQxf0fEKkCdXrjcejurobOnNNz3he4dDwjBbToXbQTQNDObPp7NetJrLsfM8FiUFEeOuvhIHHiDQtMvY720zGGAGxDptvgFS+0QHCUqoTRZA/yFfUmHlG2jROXTzk5uVK0AE4k6Ion5kX8+mM0EnMT/7u+MTFiukrJctSiEXfg="
+  on:
+    repo: Growstuff/growstuff
+  app:
+    dev: growstuff-staging
+    mainline: growstuff-prod
+  run:
+    - "script/deploy-tasks.sh"
+    - restart
+after_deploy:
+  - bundle exec script/heroku_maintenance.rb off

Gemfile

@@ -136,11 +136,6 @@ gem "gbifrb"
 
 gem "msgpack"
 
-# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
-# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
-# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
-gem "connection_pool", "< 3"
-
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
@@ -196,14 +191,14 @@ group :test do
   gem 'rails-controller-testing'
   gem "rspec-rebound"
   gem 'selenium-webdriver'
-  gem 'test-queue'
   gem 'timecop'
   gem 'vcr'
 end
 
+group :travis do
+  gem 'platform-api'
+end
+
 gem "i18n_data", "~> 1.1"
 
 gem "paper_trail", "~> 17.0"
-
-gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
-gem 'sitemap_generator'

Gemfile.lock

@@ -33,29 +33,29 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actioncable (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionmailbox (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       mail (>= 2.8.0)
-    actionmailer (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionmailer (7.2.3)
+      actionpack (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activesupport (= 7.2.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3.1)
-      actionview (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionpack (7.2.3)
+      actionview (= 7.2.3)
+      activesupport (= 7.2.3)
       cgi
       nokogiri (>= 1.8.5)
       racc
@@ -65,15 +65,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actiontext (7.2.3)
+      actionpack (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionview (7.2.3)
+      activesupport (= 7.2.3)
       builder (~> 3.1)
       cgi
       erubi (~> 1.11)
@@ -82,29 +82,29 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    active_median (1.0.0)
-      activesupport (>= 7.2)
+    active_median (0.6.0)
+      activesupport (>= 7.1)
     active_record_union (1.4.0)
       activerecord (>= 6.0)
     active_utils (3.6.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activejob (7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.3.6)
-    activemodel (7.2.3.1)
-      activesupport (= 7.2.3.1)
-    activerecord (7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activemodel (7.2.3)
+      activesupport (= 7.2.3)
+    activerecord (7.2.3)
+      activemodel (= 7.2.3)
+      activesupport (= 7.2.3)
       timeout (>= 0.4.0)
-    activestorage (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activestorage (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activesupport (= 7.2.3)
       marcel (~> 1.0)
-    activesupport (7.2.3.1)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -113,42 +113,23 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1, < 6)
+      minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1240.0)
-    aws-sdk-core (3.245.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      bigdecimal
-      jmespath (~> 1, >= 1.6.1)
-      logger
-    aws-sdk-kms (1.123.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.11.2)
+    axe-core-api (4.11.0)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.2)
-      axe-core-api (= 4.11.2)
+    axe-core-capybara (4.11.0)
+      axe-core-api (= 4.11.0)
       dumb_delegator
-    axe-core-rspec (4.11.2)
-      axe-core-api (= 4.11.2)
+    axe-core-rspec (4.11.0)
+      axe-core-api (= 4.11.0)
       dumb_delegator
       ostruct
       virtus
@@ -157,13 +138,13 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
-    bcrypt (3.1.22)
+    bcrypt (3.1.20)
     benchmark (0.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (4.1.2)
+    bigdecimal (3.3.1)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -177,11 +158,10 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.1.1)
+    bullet (8.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (13.0.0)
-      reline (>= 0.6.0)
+    byebug (12.0.0)
     cancancan (3.6.1)
     capybara (3.40.0)
       addressable
@@ -195,7 +175,7 @@ GEM
     capybara-email (3.0.2)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.27)
+    capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
     carrierwave (3.0.7)
@@ -205,10 +185,9 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    cgi (0.5.1)
+    cgi (0.5.0)
     chartkick (5.2.1)
-    childprocess (5.1.0)
-      logger (~> 1.5)
+    childprocess (5.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -221,7 +200,7 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.5)
     crass (1.0.6)
     crowdin-api (1.12.0)
@@ -236,30 +215,29 @@ GEM
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (5.0.2)
-      logger
+    dalli (3.2.8)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.5.1)
+    date (3.5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (5.0.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 7.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.6.2)
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
     domain_name (0.6.20240107)
-    dotenv (3.2.0)
-    dotenv-rails (3.2.0)
-      dotenv (= 3.2.0)
+    dotenv (3.1.8)
+    dotenv-rails (3.1.8)
+      dotenv (= 3.1.8)
       railties (>= 6.1)
     drb (2.2.3)
     dumb_delegator (1.1.0)
@@ -276,28 +254,30 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.2)
+    erb (6.0.0)
     erubi (1.13.1)
+    erubis (2.7.0)
+    excon (1.2.5)
+      logger
     execjs (2.10.0)
     factory_bot (6.5.5)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.8.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.1)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
-    ffi (1.17.3)
-    ffi (1.17.3-x86_64-linux-gnu)
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    ffi (1.16.3)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
-    friendly_id (5.6.0)
+    friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
     geocoder (1.8.6)
@@ -313,7 +293,7 @@ GEM
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (7.2.0)
+    haml (7.0.2)
       temple (>= 0.8.2)
       thor
       tilt
@@ -322,24 +302,30 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.73.0)
+    haml_lint (0.67.0)
       haml (>= 5.0)
-      parallel (>= 1.10)
+      parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashie (5.1.0)
-      logger
+    hashie (5.0.0)
+    heroics (0.1.3)
+      base64
+      erubis (~> 2.0)
+      excon
+      moneta
+      multi_json (>= 1.9.2)
+      webrick
     highline (3.1.2)
       reline
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httparty (0.24.0)
+    httparty (0.22.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.8)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
@@ -355,7 +341,7 @@ GEM
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.2)
+    icalendar (2.12.1)
       base64
       ice_cube (~> 0.16)
       logger
@@ -365,21 +351,19 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.2)
-    irb (1.17.0)
+    io-console (0.8.1)
+    irb (1.15.3)
       pp (>= 0.6.0)
-      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jmespath (1.6.2)
     jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.3)
-    json-schema (6.2.0)
+    json (2.16.0)
+    json-schema (6.0.0)
       addressable (~> 2.8)
-      bigdecimal (>= 3.1, < 5)
+      bigdecimal (~> 3.1)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -389,22 +373,20 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.5)
-    launchy (3.1.1)
+    launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-      logger (~> 1.6)
     leaflet-rails (1.9.5)
       actionpack (>= 4.2.0)
       railties (>= 4.2.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     lint_roller (1.1.0)
-    listen (3.10.0)
-      logger
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -422,7 +404,7 @@ GEM
       sass (>= 3.5.2)
     material_icons (4.0.0)
       railties (>= 3.2)
-    matrix (0.4.3)
+    matrix (0.4.2)
     memcachier (0.0.2)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -435,13 +417,14 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.27.0)
+    minitest (5.26.2)
+    moneta (1.0.0)
     msgpack (1.8.0)
-    multi_json (1.19.1)
-    multi_xml (0.8.1)
-      bigdecimal (>= 3.1, < 5)
-    net-http (0.9.1)
-      uri (>= 0.11.1)
+    multi_json (1.15.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    net-http (0.6.0)
+      uri
     net-imap (0.5.12)
       date
       net-protocol
@@ -453,13 +436,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.19.2)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.17.0)
+    oj (3.16.12)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -477,32 +460,35 @@ GEM
     paper_trail (17.0.0)
       activerecord (>= 7.1)
       request_store (~> 1.4)
-    parallel (2.0.1)
-    parser (3.3.11.1)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.3)
-    pg (1.6.3-x86_64-linux)
+    pg (1.6.2)
+    pg (1.6.2-x86_64-linux)
+    platform-api (3.8.0)
+      heroics (~> 0.1.1)
+      moneta (~> 1.0.0)
+      rate_throttle_client (~> 0.1.0)
     popper_js (2.11.8)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.9.0)
-    pry (0.16.0)
+    prism (1.6.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-      reline (>= 0.6.0)
-    psych (5.3.1)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (7.0.5)
-    puma (8.0.0)
+    public_suffix (6.0.2)
+    puma (7.1.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.23)
+    rack (2.2.21)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -515,20 +501,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.3.1)
-      actioncable (= 7.2.3.1)
-      actionmailbox (= 7.2.3.1)
-      actionmailer (= 7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actiontext (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    rails (7.2.3)
+      actioncable (= 7.2.3)
+      actionmailbox (= 7.2.3)
+      actionmailer (= 7.2.3)
+      actionpack (= 7.2.3)
+      actiontext (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activemodel (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       bundler (>= 1.15.0)
-      railties (= 7.2.3.1)
+      railties (= 7.2.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -537,8 +523,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
@@ -548,9 +534,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    railties (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
@@ -560,18 +546,19 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.4.2)
+    rake (13.3.1)
+    rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (7.2.0)
+    rdoc (6.16.1)
       erb
       psych (>= 4.0.0)
       tsort
-    recaptcha (5.21.2)
-    redis-client (0.26.2)
+    recaptcha (5.21.1)
+    redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.12.0)
+    regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -599,20 +586,20 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.8)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.4)
+    rspec-rails (8.0.2)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
-      rspec-core (>= 3.13.0, < 5.0.0)
-      rspec-expectations (>= 3.13.0, < 5.0.0)
-      rspec-mocks (>= 3.13.0, < 5.0.0)
-      rspec-support (>= 3.13.0, < 5.0.0)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-rebound (0.2.1)
       rspec-core (~> 3.3)
-    rspec-support (3.13.7)
+    rspec-support (3.13.6)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
@@ -628,27 +615,27 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.86.1)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (>= 1.10)
+      parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.49.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.7)
+      prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.34.3)
+    rubocop-rails (2.34.2)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -657,7 +644,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.9.0)
+    rubocop-rspec (3.8.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-rspec_rails (2.32.0)
@@ -668,7 +655,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.2.2)
+    rubyzip (3.2.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -682,27 +669,25 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.2.0)
+    scout_apm (5.8.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.43.0)
+    selenium-webdriver (4.38.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
-    sidekiq (7.3.10)
+    sidekiq (7.3.9)
       base64
-      connection_pool (>= 2.3.0, < 3)
+      connection_pool (>= 2.3.0)
       logger
-      rack (>= 2.2.4, < 3.3)
-      redis-client (>= 0.23.0, < 1)
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
     simple_po_parser (1.1.6)
-    sitemap_generator (6.3.0)
-      builder (~> 3.0)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -712,35 +697,35 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.2.0)
+    stringio (3.1.8)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.7)
+    terser (1.2.6)
       execjs (>= 0.3.0, < 3)
-    test-queue (0.11.1)
-    thor (1.5.0)
+    thor (1.4.0)
     thread_safe (0.3.6)
-    tilt (2.7.0)
-    timecop (0.9.11)
-    timeout (0.5.0)
+    tilt (2.6.1)
+    timecop (0.9.10)
+    timeout (0.4.4)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
+    unicode-emoji (4.1.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.18.0)
-    uri (1.1.1)
+    uri (1.0.3)
     useragent (0.16.11)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.4.0)
+    vcr (6.3.1)
+      base64
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -760,12 +745,11 @@ GEM
     will_paginate (4.0.1)
     will_paginate-bootstrap-style (0.3.0)
       will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.4)
-      rexml
+    xmlrpc (0.3.3)
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.5)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -775,7 +759,6 @@ DEPENDENCIES
   active_median
   active_record_union
   active_utils
-  aws-sdk-s3 (~> 1, >= 1.114.0)
   axe-core-capybara
   axe-core-rspec
   better_errors
@@ -794,7 +777,6 @@ DEPENDENCIES
   chartkick
   coffee-rails
   comfortable_mexican_sofa!
-  connection_pool (< 3)
   crowdin-cli
   csv_shaper
   dalli
@@ -839,6 +821,7 @@ DEPENDENCIES
   paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
+  platform-api
   pry
   puma
   query_diet
@@ -871,10 +854,8 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
-  sitemap_generator
   sprockets (< 4)
   terser
-  test-queue
   timecop
   unicorn
   validate_url
@@ -885,7 +866,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.4.8p72
+   ruby 3.3.8p144
 
 BUNDLED WITH
    2.4.22

app/assets/stylesheets/application.scss

@@ -33,4 +33,4 @@
 
 @view-transition {
   navigation: auto;
-}
+}

app/controllers/crops_controller.rb

@@ -160,7 +160,7 @@ class CropsController < ApplicationController
              when 'youtube'
                Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
              when 'alternate_names'
-               Crop.approved.where.missing(:alternate_names).order(plantings_count: :desc)
+               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
              when 'wikidata'
                crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
                Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
@@ -170,8 +170,6 @@ class CropsController < ApplicationController
                Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
              when 'height'
                Crop.approved.where(height: nil).order(plantings_count: :desc)
-             when 'public_food_key'
-               Crop.approved.where(public_food_key: [nil, '']).order(plantings_count: :desc)
              else
                Crop.none
              end

app/controllers/follows_controller.rb

@@ -17,7 +17,7 @@ class FollowsController < ApplicationController
     else
       flash[:error] = "Already following or error while following."
     end
-    redirect_back_or_to(root_path)
+    redirect_back fallback_location: root_path
   end
 
   def destroy

app/controllers/home_controller.rb

@@ -10,6 +10,4 @@ class HomeController < ApplicationController
     # the relevant class methods directly in the view, so that fragment
     # caching will be effective.
   end
-
-  def community_gardens; end
 end

app/helpers/crops_helper.rb

@@ -58,11 +58,7 @@ module CropsHelper
         subject_of_entities << {
           '@type': "SocialMediaPosting",
           url:     post_url(post),
-          author:  {
-            '@type': 'Person',
-            name: post.author.login_name
-          },
-          'datePublished': post.created_at
+          author:  post.author
         }
       end
 

app/models/australian_food_classification_data.rb

@@ -1,8 +1,2 @@
-# frozen_string_literal: true
-
 class AustralianFoodClassificationData < ApplicationRecord
-  belongs_to :crop,
-             foreign_key: :public_food_key,
-             primary_key: :public_food_key,
-             inverse_of:  :australian_food_classification_data
 end

app/models/concerns/search_harvests.rb

@@ -53,9 +53,7 @@ module SearchHarvests
       owners = []
       1..limit.times do
         where = {
-          # Disabled for now so that more relevant harvests are
-          # surfaced; even if we're falling back to crop photos.
-          # photos_count: { gt: 0 },
+          photos_count: { gt: 0 },
           owner_id:     { not: owners }
         }
         one_record = search('*',

app/models/concerns/search_plantings.rb

@@ -66,9 +66,7 @@ module SearchPlantings
       owners = []
       1..limit.times do
         where = {
-          # Disabled for now so that more relevant plantings are
-          # surfaced; even if we're falling back to crop photos.
-          # photos_count: { gt: 0 },
+          photos_count: { gt: 0 },
           owner_id:     { not: owners }
         }
         one_record = search('*',

app/models/crop.rb

@@ -28,10 +28,6 @@ class Crop < ApplicationRecord
   has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
-  has_one :australian_food_classification_data,
-          foreign_key: :public_food_key,
-          primary_key: :public_food_key,
-          inverse_of:  :crop
 
   accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
 

app/views/comments/index.html.haml

@@ -1,13 +0,0 @@
-- content_for :title, "Comments"
-- content_for :meta_description, "Browse and search for comments."
-- content_for :breadcrumbs do
-  %li.breadcrumb-item.active= link_to "Comments", comments_path
-
-%h1 Comments
-
-= will_paginate @comments
-
-- @comments.each do |comment|
-  = render 'single', comment: comment
-
-= will_paginate @comments

app/views/crops/_nutritional_data.html.haml

@@ -1,38 +0,0 @@
-- data = crop.australian_food_classification_data
-- if data
-  .card
-    .card-body
-      %h4.card-title Nutritional Data
-      %p.card-text A summary of nutritional data per 100g for #{data.food_name}.
-      %table.table.table-sm.table-borderless
-        %tbody
-          - if data.energy_with_dietary_fibre_equated_kj.to_f > 0
-            %tr
-              %th Energy
-              %td= "#{data.energy_with_dietary_fibre_equated_kj.to_f.round(1)} kJ"
-          - if data.protein_g.to_f > 0
-            %tr
-              %th Protein
-              %td= "#{data.protein_g.to_f.round(1)} g"
-          - if data.fat_total_g.to_f > 0
-            %tr
-              %th Fat, total
-              %td= "#{data.fat_total_g.to_f.round(1)} g"
-          - if data.available_carbohydrate_with_sugar_alcohols_g.to_f > 0
-            %tr
-              %th Carbohydrate
-              %td= "#{data.available_carbohydrate_with_sugar_alcohols_g.to_f.round(1)} g"
-          - if data.total_sugars_g.to_f > 0
-            %tr
-              %th - Sugars
-              %td= "#{data.total_sugars_g.to_f.round(1)} g"
-          - if data.total_dietary_fibre_g.to_f > 0
-            %tr
-              %th Fibre
-              %td= "#{data.total_dietary_fibre_g.to_f.round(1)} g"
-          - if data.sodium_na_mg.to_f > 0
-            %tr
-              %th Sodium
-              %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
-    .card-footer
-      = link_to "See more", "https://www.foodstandards.gov.au/science-data/food-nutrient-databases/afcd/search/food/#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"

app/views/crops/data_improvement.html.haml

@@ -1,10 +1,10 @@
 %h1 Data Improvement
 
-- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", public_food_key: "Public Food Key", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
+- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
 
 %ul.nav.nav-tabs
   - tabs.each do |key, value|
-    %li{class: "nav-item #{('active' if @active_tab == key.to_s)}"}
+    %li{class: ('active' if @active_tab == key.to_s)}
       = link_to value, data_improvement_crops_path(tab: key)
 
 .tab-content

app/views/crops/index.html.haml

@@ -1,5 +1,4 @@
 - content_for :title, t('.title')
-- content_for :meta_description, "Browse and search for crops."
 
 - content_for :buttonbar do
   - if can? :wrangle, Crop

app/views/crops/show.html.haml

@@ -1,13 +1,5 @@
 = render 'schema_org', crop: @crop
-- content_for :title do
-  = @crop.name.titleize
-  - if @crop.default_scientific_name.present?
-    = " (#{@crop.default_scientific_name})"
-- content_for :meta_description do
-  - if @crop.description.present?
-    = @crop.description
-  - else
-    = "Learn how to grow #{@crop.name}."
+- content_for :title, @crop.name
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: crop_image_path(@crop))
   = tag("meta", property: "og:title", content: @crop.name)
@@ -136,8 +128,6 @@
 
     = render 'openfarm_data', crop: @crop
 
-    = render 'nutritional_data', crop: @crop
-
     = cute_icon
     .card
       .card-body

app/views/harvests/index.html.haml

@@ -1,6 +1,5 @@
 - content_for(:title) do
   = title('harvests', @owner, @crop, @planting)
-- content_for :meta_description, "Browse and search for harvests."
 - content_for :breadcrumbs do
   - if @owner
     %li.breadcrumb-item= link_to 'Harvests', harvests_path

app/views/harvests/show.html.haml

@@ -1,9 +1,4 @@
 = content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
-- content_for :meta_description do
-  - if @harvest.description.present?
-    = @harvest.description
-  - else
-    = "#{@harvest.crop} harvested by #{@harvest.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: harvest_image_path(@harvest))
   = tag("meta", property: "og:image:user_generated", content: "true")
@@ -76,4 +71,3 @@
 
     .col-md-4.col-xs-12
       = render @harvest.crop
-      = render 'crops/nutritional_data', crop: @harvest.crop

app/views/home/_harvests.html.haml

@@ -9,5 +9,4 @@
           %small.text-muted
             harvested by #{harvest.owner_login_name}
         %p.mb-2
-          - if harvest.thumbnail_url
-            = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
+          = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"

app/views/home/community_gardens.html.haml

@@ -1,37 +0,0 @@
-- content_for :title do
-  = t('community_gardens.title')
-- content_for :meta_description do
-  = t('community_gardens.meta_description')
-
-
-
-.container.mt-5
-
-  .row
-    .col-lg-6.col-sm-12
-      .row
-        %h1.display-4= t('community_gardens.header')
-        %p.lead= t('community_gardens.lead')
-      .row
-        %h2= t('community_gardens.features_title')
-        %ul
-          %li Track all your plantings and harvests
-          %li Keep notes your community's progress
-          %li Add collaborators to your garden plots
-          %li See what other community gardens are growing
-          %li Get advice and support from our community of gardeners
-
-      .row
-        %h2= t('community_gardens.get_started')
-        %p= t('community_gardens.get_started_text')
-        %p
-          = link_to t('.sign_up'), new_member_registration_path, class: 'btn btn-success btn-lg'
-      .row
-        %h2= t('community_gardens.collaborate')
-        %p= t('community_gardens.collaborate_text')
-        %p
-          = link_to t('community_gardens.learn_more'), gardens_path, class: 'btn btn-info btn-lg'
-
-    .col-lg-6.d-lg-block.d-xs-none
-      .container
-        =image_tag("girlwithvegetables-0038331hotifw.svg", width: "100%")

app/views/home/index.html.haml

@@ -1,7 +1,5 @@
 - content_for :title do
   = ENV['GROWSTUFF_SITE_NAME']
-- content_for :meta_description do
-  Growstuff is a community of food gardeners. Let's learn to grow food together.
 
 - if member_signed_in?
   .row

app/views/layouts/_head.html.haml

@@ -27,14 +27,9 @@
 
   %title
     = content_for?(:title) ? yield(:title) + " - #{ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']
-  - if content_for?(:meta_description)
-    %meta{name: "description", content: yield(:meta_description)}
-  - else
-    %meta{name: "description", content: "Growstuff is a community of food gardeners. Let's learn to grow food together. All our data is open data."}
   = csrf_meta_tags
   = stylesheet_link_tag "application", media: "all"
 
   %link{ href: path_to_image("growstuff-apple-touch-icon-precomposed.png"), rel: "apple-touch-icon-precomposed" }
   %link{ href: "https://fonts.googleapis.com/css?family=Modak|Raleway&display=swap", rel: "stylesheet" }
   = favicon_link_tag 'favicon.ico'
-  = tag("meta", name: "google-site-verification", content: "j249rPGdBqZ7gcShcdsSXCnGN5lqCuTISJnlQXxOfu4")

app/views/layouts/_menu.haml

@@ -52,7 +52,6 @@
         .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
           = link_to t('.community_map'), places_path, class: 'dropdown-item'
           = link_to t('.browse_members'), members_path, class: 'dropdown-item'
-          = link_to t('.community_gardens'), community_gardens_path, class: 'dropdown-item'
           = link_to t('.posts'), posts_path, class: 'dropdown-item'
           = link_to t('.forums'), forums_path, class: 'dropdown-item'
 

app/views/members/show.html.haml

@@ -1,9 +1,4 @@
 - content_for :title, @member.login_name
-- content_for :meta_description do
-  - if @member.bio.present?
-    = @member.bio
-  - else
-    = "Gardening profile for #{@member.login_name}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: avatar_uri(@member, 200))
   = tag("meta", property: "og:image:user_generated", content: "true")

app/views/plantings/index.html.haml

@@ -1,5 +1,4 @@
 - content_for :title, title('plantings', @owner, @crop, @planting)
-- content_for :meta_description, "Browse and search for plantings."
 
 - content_for :breadcrumbs do
   - if @owner

app/views/plantings/show.html.haml

@@ -1,9 +1,4 @@
 = content_for :title, "#{@planting.crop} in #{@planting.location}"
-- content_for :meta_description do
-  - if @planting.description.present?
-    = @planting.description
-  - else
-    = "#{@planting.crop} planted in #{@planting.location} by #{@planting.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: planting_image_path(@planting))
   = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")

app/views/scientific_names/_form.html.haml

@@ -27,7 +27,7 @@
   .form-group
     = f.label :wikidata_id, "Wikidata ID", class: 'control-label col-md-2'
     .col-md-8
-      = f.text_field :wikidata_id, class: 'form-control', pattern: 'Q[1-9][0-9]*'
+      = f.text_field :wikidata_id, class: 'form-control'
   .form-group
     .form-actions.col-md-offset-2.col-md-8
       = f.submit 'Save', class: 'btn btn-primary'

app/views/seeds/index.html.haml

@@ -6,7 +6,6 @@
     %li.breadcrumb-item.active= link_to 'Seeds', seeds_path
 
 - content_for :title, title('seeds', @owner, @crop, @planting)
-- content_for :meta_description, "Browse and search for seeds."
 
 .row
   .col-md-2

app/views/seeds/show.html.haml

@@ -1,9 +1,4 @@
 - content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
-- content_for :meta_description do
-  - if @seed.description.present?
-    = @seed.description
-  - else
-    = "Seeds for #{@seed.crop.name}, shared by #{@seed.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: seed_image_path(@seed))
   - if @seed.description

config.ru

@@ -3,6 +3,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require File.expand_path('config/environment', __dir__)
-
-use Rack::Deflater
 run Rails.application

config/initializers/new_framework_defaults_6_0.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 6.0 upgrade.

config/locales/en.yml

@@ -219,18 +219,6 @@ en:
     pwa_ios_steps_html: 1. Tap the <strong>Share</strong> button in Safari.<br>2. Scroll down and tap <strong>Add to Home Screen</strong>'.
     pwa_ios_title: For iOS (iPhone/iPad)
     pwa_title: Want to install Growstuff on your phone?
-  community_gardens:
-    title: Community Gardens on Growstuff
-    meta_description: Manage your community garden, track your plantings, and collaborate with other gardeners.
-    header: Community Gardens
-    lead: Growstuff is open source and the perfect place to manage your community garden. Track your plantings, celebrate your harvests, and collaborate with your fellow gardeners, all in one place.
-    get_started: Get Started Today
-    get_started_text: Signing up for Growstuff is free and easy. Create an account to start tracking your garden today.
-    sign_up: Sign up for free
-    collaborate: Collaborate with Your Team
-    collaborate_text: Invite other gardeners to collaborate on your garden plots. Share the work, share the harvest, and grow together as a community.
-    learn_more: Learn more about gardens
-    features_title: Features for Community Gardens
   label:
     days_until_harvest: "%{number} days"
     weeks_until_harvest: "%{number} weeks until harvest"
@@ -247,7 +235,6 @@ en:
       browse_members: Browse Members
       community: Community
       community_map: Community Map
-      community_gardens: Community Gardens
       garden_type: Garden Type
       garden_types: Garden Types
       crop_wrangling: Crop Wrangling

config/routes.rb

@@ -23,7 +23,6 @@ Rails.application.routes.draw do
   resources :authentications, only: %i(create destroy)
 
   get "home/index"
-  get '/community-gardens', to: 'home#community_gardens'
   root to: 'home#index'
 
   concern :has_photos do

config/sitemap.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'aws-sdk-s3'
-
-# Set the host name for URL creation
-SitemapGenerator::Sitemap.default_host = 'https://growstuff.org'
-
-SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
-  ENV['S3_SITEMAP_BUCKET'],
-  access_key_id: ENV['S3_ACCESS_KEY'],
-  secret_access_key: ENV['S3_SECRET_KEY'],
-  region: ENV.fetch('S3_AWS_REGION', 'us-east-1')
-)
-
-SitemapGenerator::Sitemap.create do
-  # Add static pages
-  add '/about', changefreq: 'monthly'
-  add '/community', changefreq: 'monthly'
-  add '/contact', changefreq: 'monthly'
-
-  # Add crops
-  Crop.approved.find_each do |crop|
-    add crop_path(crop), lastmod: crop.updated_at
-  end
-
-  # Add members
-  Member.kept.find_each do |member|
-    add member_path(member), lastmod: member.updated_at
-  end
-
-  # Add plantings
-  Planting.active.find_each do |planting|
-    add planting_path(planting), lastmod: planting.updated_at
-  end
-
-  # Add seeds
-  Seed.active.find_each do |seed|
-    add seed_path(seed), lastmod: seed.updated_at
-  end
-
-  # Add harvests
-  Harvest.find_each do |harvest|
-    add harvest_path(harvest), lastmod: harvest.updated_at
-  end
-
-  # Add posts
-  Post.find_each do |post|
-    add post_path(post), lastmod: post.updated_at
-  end
-
-  # Add photos
-  Photo.find_each do |photo|
-    add photo_path(photo), lastmod: photo.updated_at
-  end
-end

db/migrate/20171022032108_all_the_predictions.rb

@@ -18,6 +18,7 @@ class AllThePredictions < ActiveRecord::Migration[4.2]
 
     remove_column :plantings, :days_before_maturity, :integer
 
-    create_table :median_functions
+    create_table :median_functions do |t|
+    end
   end
 end

db/migrate/20190712003735_add_like_counter_caches.rb

@@ -14,23 +14,23 @@ class AddLikeCounterCaches < ActiveRecord::Migration[5.2]
   end
 
   def data
-    execute <<~SQL.squish
-      UPDATE photos
-         SET likes_count = (
-           SELECT count(1)
-             FROM likes
-            WHERE likes.likeable_id = photos.id
-            AND likeable_type = 'Photo'
-            )
+    execute <<-SQL.squish
+        UPDATE photos
+           SET likes_count = (
+             SELECT count(1)
+               FROM likes
+              WHERE likes.likeable_id = photos.id
+              AND likeable_type = 'Photo'
+              )
     SQL
-    execute <<~SQL.squish
-      UPDATE posts
-         SET likes_count = (
-           SELECT count(1)
-             FROM likes
-            WHERE likes.likeable_id = posts.id
-            AND likeable_type = 'Post'
-            )
+    execute <<-SQL.squish
+        UPDATE posts
+           SET likes_count = (
+             SELECT count(1)
+               FROM likes
+              WHERE likes.likeable_id = posts.id
+              AND likeable_type = 'Post'
+              )
     SQL
   end
 end

db/migrate/20191226024813_crop_harvest_counter_cache.rb

@@ -11,13 +11,13 @@ class CropHarvestCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<~SQL.squish
-      UPDATE crops
-         SET harvests_count = (
-           SELECT count(1)
-             FROM harvests
-            WHERE harvests.crop_id = crops.id
-            )
+    execute <<-SQL.squish
+        UPDATE crops
+           SET harvests_count = (
+             SELECT count(1)
+               FROM harvests
+              WHERE harvests.crop_id = crops.id
+              )
     SQL
   end
 end

db/migrate/20191226024957_crop_photo_counter_cache.rb

@@ -11,13 +11,13 @@ class CropPhotoCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<~SQL.squish
-      UPDATE crops
-         SET photo_associations_count = (
-           SELECT count(1)
-             FROM photo_associations
-            WHERE photo_associations.crop_id = crops.id
-            )
+    execute <<-SQL.squish
+        UPDATE crops
+           SET photo_associations_count = (
+             SELECT count(1)
+               FROM photo_associations
+              WHERE photo_associations.crop_id = crops.id
+              )
     SQL
   end
 end

db/migrate/20191226025124_plant_part_harvest_counter_cache.rb

@@ -11,13 +11,13 @@ class PlantPartHarvestCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<~SQL.squish
-      UPDATE plant_parts
-         SET harvests_count = (
-           SELECT count(1)
-             FROM harvests
-            WHERE harvests.plant_part_id = plant_parts.id
-            )
+    execute <<-SQL.squish
+        UPDATE plant_parts
+           SET harvests_count = (
+             SELECT count(1)
+               FROM harvests
+              WHERE harvests.plant_part_id = plant_parts.id
+              )
     SQL
   end
 end

db/migrate/20191226025225_post_comment_counter_cache.rb

@@ -11,7 +11,7 @@ class PostCommentCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<~SQL.squish
+    execute <<-SQL.squish
       UPDATE posts
          SET comments_count = (
            SELECT count(1)

db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This migration comes from active_storage (originally 20180723000244)
 class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
   def up

db/migrate/20240101010101_add_fields_to_crops.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddFieldsToCrops < ActiveRecord::Migration[5.2]
   def change
     add_column :crops, :row_spacing, :integer

db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
   def up
     Crop.find_each do |crop|

db/migrate/20240716120000_add_social_media_to_members.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddSocialMediaToMembers < ActiveRecord::Migration[6.0]
   def change
     add_column :members, :website_url, :string

db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class RenameOtherHandleToOtherUrlInMembers < ActiveRecord::Migration[6.0]
   def change
     rename_column :members, :other_handle, :other_url

db/migrate/20240929041435_create_garden_collaborators.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
   def change
     create_table :garden_collaborators do |t|

db/migrate/20241129215300_create_australian_food_classification_data.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
   def change
     create_table :australian_food_classification_data do |t|

db/migrate/20250810120000_make_notifications_polymorphic.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class MakeNotificationsPolymorphic < ActiveRecord::Migration[6.1]
   def change
     add_column :notifications, :notifiable_type, :string

db/migrate/20250824081313_change_comments_polymorphic.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ChangeCommentsPolymorphic < ActiveRecord::Migration[7.2]
   def change
     add_column :comments, :commentable_type, :string

db/migrate/20250824085224_add_photos_comment_count.rb

@@ -11,7 +11,7 @@ class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
   end
 
   def set_counter_value
-    execute <<~SQL.squish
+    execute <<-SQL.squish
       UPDATE photos
          SET comments_count = (
            SELECT count(1)

db/migrate/20250901105232_add_source_to_seeds.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddSourceToSeeds < ActiveRecord::Migration[7.2]
   def change
     add_column :seeds, :source, :string

db/migrate/20250901110545_add_indexes_crops.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddIndexesCrops < ActiveRecord::Migration[7.2]
   def change
     add_index :alternate_names, :crop_id

db/migrate/20250901130830_add_overall_rating_plantings.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
   def change
     add_column :plantings, :overall_rating, :integer

db/migrate/20251128193317_add_en_youtube_url_to_crops.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
   def change
     add_column :crops, :en_youtube_url, :string

db/migrate/20251129212800_create_australian_food_classification_data.rb

@@ -0,0 +1,301 @@
+class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
+  def change
+    create_table :australian_food_classification_data do |t|
+      t.string :public_food_key, index: true, unique: true
+      t.string :classification
+      t.string :food_name
+      t.decimal :energy_with_dietary_fibre_equated_kj
+      t.decimal :energy_without_dietary_fibre_equated_kj
+      t.decimal :moisture_water_g
+      t.decimal :protein_g
+      t.decimal :nitrogen_g
+      t.decimal :fat_total_g
+      t.decimal :ash_g
+      t.decimal :total_dietary_fibre_g
+      t.decimal :alcohol_g
+      t.decimal :fructose_g
+      t.decimal :glucose_g
+      t.decimal :sucrose_g
+      t.decimal :maltose_g
+      t.decimal :lactose_g
+      t.decimal :galactose_g
+      t.decimal :maltotrios_g
+      t.decimal :total_sugars_g
+      t.decimal :added_sugars_g
+      t.decimal :free_sugars_g
+      t.decimal :starch_g
+      t.decimal :dextrin_g
+      t.decimal :glycerol_g
+      t.decimal :glycogen_g
+      t.decimal :inulin_g
+      t.decimal :erythritol_g
+      t.decimal :maltitol_g
+      t.decimal :mannitol_g
+      t.decimal :xylitol_g
+      t.decimal :maltodextrin_g
+      t.decimal :oligosaccharides_g
+      t.decimal :polydextrose_g
+      t.decimal :raffinose_g
+      t.decimal :stachyose_g
+      t.decimal :sorbitol_g
+      t.decimal :resistant_starch_g
+      t.decimal :available_carbohydrate_without_sugar_alcohols_g
+      t.decimal :available_carbohydrate_with_sugar_alcohols_g
+      t.decimal :acetic_acid_g
+      t.decimal :citric_acid_g
+      t.decimal :fumaric_acid_g
+      t.decimal :lactic_acid_g
+      t.decimal :malic_acid_g
+      t.decimal :oxalic_acid_g
+      t.decimal :propionic_acid_g
+      t.decimal :quinic_acid_g
+      t.decimal :shikimic_acid_g
+      t.decimal :succinic_acid_g
+      t.decimal :tartaric_acid_g
+      t.decimal :aluminium_al_ug
+      t.decimal :antimony_sb_ug
+      t.decimal :arsenic_as_ug
+      t.decimal :cadmium_cd_ug
+      t.decimal :calcium_ca_mg
+      t.decimal :chromium_cr_ug
+      t.decimal :chloride_cl_mg
+      t.decimal :cobalt_co_ug
+      t.decimal :copper_cu_mg
+      t.decimal :fluoride_f_ug
+      t.decimal :iodine_i_ug
+      t.decimal :iron_fe_mg
+      t.decimal :lead_pb_ug
+      t.decimal :magnesium_mg_mg
+      t.decimal :manganese_mn_mg
+      t.decimal :mercury_hg_ug
+      t.decimal :molybdenum_mo_ug
+      t.decimal :nickel_ni_ug
+      t.decimal :phosphorus_p_mg
+      t.decimal :potassium_k_mg
+      t.decimal :selenium_se_ug
+      t.decimal :sodium_na_mg
+      t.decimal :sulphur_s_mg
+      t.decimal :tin_sn_ug
+      t.decimal :zinc_zn_mg
+      t.decimal :retinol_preformed_vitamin_a_ug
+      t.decimal :alpha_carotene_ug
+      t.decimal :beta_carotene_ug
+      t.decimal :cryptoxanthin_ug
+      t.decimal :beta_carotene_equivalents_provitamin_a_ug
+      t.decimal :vitamin_a_retinol_equivalents_ug
+      t.decimal :lutein_ug
+      t.decimal :lycopene_ug
+      t.decimal :xanthophyl_ug
+      t.decimal :thiamin_b1_mg
+      t.decimal :riboflavin_b2_mg
+      t.decimal :niacin_b3_mg
+      t.decimal :niacin_derived_from_tryptophan_mg
+      t.decimal :niacin_derived_equivalents_mg
+      t.decimal :pantothenic_acid_b5_mg
+      t.decimal :pyridoxine_b6_mg
+      t.decimal :biotin_b7_ug
+      t.decimal :cobalamin_b12_ug
+      t.decimal :folate_natural_ug
+      t.decimal :folic_acid_ug
+      t.decimal :total_folates_ug
+      t.decimal :dietary_folate_equivalents_ug
+      t.decimal :vitamin_c_mg
+      t.decimal :cholecalciferol_d3_ug
+      t.decimal :ergocalciferol_d2_ug
+      t.decimal :c25_hydroxy_cholecalciferol_25_oh_d3_ug
+      t.decimal :c25_hydroxy_ergocalciferol_25_oh_d2_ug
+      t.decimal :vitamin_d3_equivalents_ug
+      t.decimal :alpha_tocopherol_mg
+      t.decimal :alpha_tocotrienol_mg
+      t.decimal :beta_tocopherol_mg
+      t.decimal :beta_tocotrienol_mg
+      t.decimal :delta_tocopherol_mg
+      t.decimal :delta_tocotrienol_mg
+      t.decimal :gamma_tocopherol_mg
+      t.decimal :gamma_tocotrienol_mg
+      t.decimal :vitamin_e_mg
+      t.decimal :c4_t
+      t.decimal :c6_t
+      t.decimal :c8_t
+      t.decimal :c10_t
+      t.decimal :c11_t
+      t.decimal :c12_t
+      t.decimal :c13_t
+      t.decimal :c14_t
+      t.decimal :c15_t
+      t.decimal :c16_t
+      t.decimal :c17_t
+      t.decimal :c18_t
+      t.decimal :c19_t
+      t.decimal :c20_t
+      t.decimal :c21_t
+      t.decimal :c22_t
+      t.decimal :c23_t
+      t.decimal :c24_t
+      t.decimal :total_saturated_fatty_acids_equated_t
+      t.decimal :c10_1_t
+      t.decimal :c12_1_t
+      t.decimal :c14_1_t
+      t.decimal :c15_1_t
+      t.decimal :c16_1_t
+      t.decimal :c17_1_t
+      t.decimal :c18_1_t
+      t.decimal :c18_1w5_t
+      t.decimal :c18_1w6_t
+      t.decimal :c18_1w7_t
+      t.decimal :c18_1w9_t
+      t.decimal :c20_1_t
+      t.decimal :c20_1w9_t
+      t.decimal :c20_1w13_t
+      t.decimal :c20_1w11_t
+      t.decimal :c22_1_t
+      t.decimal :c22_1w9_t
+      t.decimal :c22_1w11_t
+      t.decimal :c24_1_t
+      t.decimal :c24_1w9_t
+      t.decimal :c24_1w11_t
+      t.decimal :c24_1w13_t
+      t.decimal :total_monounsaturated_fatty_acids_equated_t
+      t.decimal :c12_2_t
+      t.decimal :c16_2w4_t
+      t.decimal :c16_3_t
+      t.decimal :c18_2w6_t
+      t.decimal :c18_3w3_t
+      t.decimal :c18_3w4_t
+      t.decimal :c18_3w6_t
+      t.decimal :c18_4w1_t
+      t.decimal :c18_4w3_t
+      t.decimal :c20_2_t
+      t.decimal :c20_2w6_t
+      t.decimal :c20_3_t
+      t.decimal :c20_4_t
+      t.decimal :c20_3w3_t
+      t.decimal :c20_3w6_t
+      t.decimal :c20_4w3_t
+      t.decimal :c20_4w6_t
+      t.decimal :c20_5w3_t
+      t.decimal :c21_5w3_t
+      t.decimal :c22_2_t
+      t.decimal :c22_2w6_t
+      t.decimal :c22_4w6_t
+      t.decimal :c22_5w3_t
+      t.decimal :c22_5w6_t
+      t.decimal :c22_6w3_t
+      t.decimal :total_polyunsaturated_fatty_acids_equated_t
+      t.decimal :total_long_chain_omega_3_fatty_acids_equated_t
+      t.decimal :total_undifferentiated_fatty_acids_t
+      t.decimal :total_trans_fatty_acids_imputed_t
+      t.decimal :c4_g
+      t.decimal :c6_g
+      t.decimal :c8_g
+      t.decimal :c10_g
+      t.decimal :c11_g
+      t.decimal :c12_g
+      t.decimal :c13_g
+      t.decimal :c14_g
+      t.decimal :c15_g
+      t.decimal :c16_g
+      t.decimal :c17_g
+      t.decimal :c18_g
+      t.decimal :c19_g
+      t.decimal :c20_g
+      t.decimal :c21_g
+      t.decimal :c22_g
+      t.decimal :c23_g
+      t.decimal :c24_g
+      t.decimal :total_saturated_fatty_acids_equated_g
+      t.decimal :c10_1_g
+      t.decimal :c12_1_g
+      t.decimal :c14_1_g
+      t.decimal :c15_1_g
+      t.decimal :c16_1_g
+      t.decimal :c17_1_g
+      t.decimal :c18_1_g
+      t.decimal :c18_1w5_mg
+      t.decimal :c18_1w6_mg
+      t.decimal :c18_1w7_g
+      t.decimal :c18_1w9_mg
+      t.decimal :c20_1_g
+      t.decimal :c20_1w9_mg
+      t.decimal :c20_1w13_mg
+      t.decimal :c20_1w11_mg
+      t.decimal :c22_1_g
+      t.decimal :c22_1w9_mg
+      t.decimal :c22_1w11_mg
+      t.decimal :c24_1_g
+      t.decimal :c24_1w9_mg
+      t.decimal :c24_1w11_mg
+      t.decimal :c24_1w13_mg
+      t.decimal :total_monounsaturated_fatty_acids_equated_g
+      t.decimal :c12_2_g
+      t.decimal :c16_2w4_mg
+      t.decimal :c16_3_g
+      t.decimal :c18_2w6_g
+      t.decimal :c18_3w3_g
+      t.decimal :c18_3w4_g
+      t.decimal :c18_3w6_mg
+      t.decimal :c18_4w1_g
+      t.decimal :c18_4w3_mg
+      t.decimal :c20_2_mg
+      t.decimal :c20_2w6_mg
+      t.decimal :c20_3_mg
+      t.decimal :c20_3w3_mg
+      t.decimal :c20_3w6_mg
+      t.decimal :c20_4_g
+      t.decimal :c20_4w3_mg
+      t.decimal :c20_4w6_mg
+      t.decimal :c20_5w3_mg
+      t.decimal :c21_5w3_g
+      t.decimal :c22_5w3_mg
+      t.decimal :c22_4w6_mg
+      t.decimal :c22_2_g
+      t.decimal :c22_2w6_mg
+      t.decimal :c22_5w6_g
+      t.decimal :c22_6w3_mg
+      t.decimal :total_polyunsaturated_fatty_acids_equated_g
+      t.decimal :total_long_chain_omega_3_fatty_acids_equated_mg
+      t.decimal :total_undifferentiated_fatty_acids_mass_basis_basis_mg
+      t.decimal :total_trans_fatty_acids_imputed_mg
+      t.decimal :caffeine_mg
+      t.decimal :cholesterol_mg
+      t.decimal :alanine_mg_gn
+      t.decimal :arginine_mg_gn
+      t.decimal :aspartic_acid_mg_gn
+      t.decimal :cystine_plus_cysteine_mg_gn
+      t.decimal :glutamic_acid_mg_gn
+      t.decimal :glycine_mg_gn
+      t.decimal :histidine_mg_gn
+      t.decimal :isoleucine_mg_gn
+      t.decimal :leucine_mg_gn
+      t.decimal :lysine_mg_gn
+      t.decimal :methionine_mg_gn
+      t.decimal :phenylalanine_mg_gn
+      t.decimal :proline_mg_gn
+      t.decimal :serine_mg_gn
+      t.decimal :threonine_mg_gn
+      t.decimal :tyrosine_mg_gn
+      t.decimal :tryptophan_mg_gn
+      t.decimal :valine_mg_gn
+      t.decimal :alanine_mg
+      t.decimal :arginine_mg
+      t.decimal :aspartic_acid_mg
+      t.decimal :cystine_plus_cysteine_mg
+      t.decimal :glutamic_acid_mg
+      t.decimal :glycine_mg
+      t.decimal :histidine_mg
+      t.decimal :isoleucine_mg
+      t.decimal :leucine_mg
+      t.decimal :lysine_mg
+      t.decimal :methionine_mg
+      t.decimal :phenylalanine_mg
+      t.decimal :proline_mg
+      t.decimal :serine_mg
+      t.decimal :threonine_mg
+      t.decimal :tyrosine_mg
+      t.decimal :tryptophan_mg
+      t.decimal :valine_mg
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20251130035700_create_versions.rb

@@ -1,8 +1,7 @@
-# frozen_string_literal: true
-
 # This migration creates the `versions` table for the Version class.
 # All other migrations PT provides are optional.
 class CreateVersions < ActiveRecord::Migration[7.2]
+
   # The largest text column available in all supported RDBMS is
   # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
   # so that MySQL will use `longtext` instead of `text`.  Otherwise,

db/migrate/20251130035701_add_object_changes_to_versions.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This migration adds the optional `object_changes` column, in which PaperTrail
 # will store the `changes` diff for each update event. See the readme for
 # details.

db/migrate/20251130053104_add_public_food_key_to_crops.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
   def change
     add_column :crops, :public_food_key, :string

db/migrate/20251201045000_add_index_to_crops_public_food_key.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddIndexToCropsPublicFoodKey < ActiveRecord::Migration[7.2]
-  def change
-    add_index :crops, :public_food_key
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
+ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -564,7 +564,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
     t.index ["creator_id"], name: "index_crops_on_creator_id"
     t.index ["name"], name: "index_crops_on_name"
     t.index ["parent_id"], name: "index_crops_on_parent_id"
-    t.index ["public_food_key"], name: "index_crops_on_public_food_key"
     t.index ["requester_id"], name: "index_crops_on_requester_id"
     t.index ["slug"], name: "index_crops_on_slug", unique: true
   end

lib/tasks/import.rake

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'csv'
 
 namespace :import do

lib/tasks/wikidata.rake

@@ -13,65 +13,45 @@ namespace :wikidata do
     end
 
     Crop.all.each do |crop|
-      puts "Processing crop: #{crop.name}"
-      wikidata_id = nil
+      next unless crop.en_wikipedia_url.present?
 
-      # Try to find Wikidata ID from the scientific_names table first
-      if (sci_name_with_id = crop.scientific_names.find { |sn| sn.wikidata_id.present? })
-        wikidata_id = sci_name_with_id.wikidata_id
-        puts "  Found Wikidata ID in scientific_names table: #{wikidata_id}"
-      # If not found, try the existing en_wikipedia_url method
-      elsif crop.en_wikipedia_url.present?
-        begin
-          title = crop.en_wikipedia_url.split('/').last
-          puts "  Searching for Wikidata ID using Wikipedia URL: #{crop.en_wikipedia_url}"
+      begin
+        title = crop.en_wikipedia_url.split('/').last
+        puts "Processing crop: #{crop.name} (Wikipedia title: #{title})"
 
-          # Get Wikidata ID from Wikipedia API
-          wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
-          wiki_response = Net::HTTP.get(wiki_uri)
-          wiki_data = JSON.parse(wiki_response)
-          pages = wiki_data['query']['pages']
-          page_id = pages.keys.first
+        # Get Wikidata ID from Wikipedia API
+        wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
+        wiki_response = Net::HTTP.get(wiki_uri)
+        wiki_data = JSON.parse(wiki_response)
+        page_id = wiki_data['query']['pages'].keys.first
+        wikidata_id = wiki_data['query']['pages'][page_id]['pageprops']['wikibase_item']
 
-          if page_id != "-1" && pages[page_id]['pageprops'] && pages[page_id]['pageprops']['wikibase_item']
-            wikidata_id = pages[page_id]['pageprops']['wikibase_item']
-            puts "    Found Wikidata ID via Wikipedia URL: #{wikidata_id}"
-          end
-        rescue StandardError => e
-          puts "    Error querying Wikipedia for URL #{crop.en_wikipedia_url}: #{e.message}"
-        end
-      end
-
-      if wikidata_id
-        begin
+        if wikidata_id
+          puts "  Found Wikidata ID: #{wikidata_id}"
           # Get aliases from Wikidata API
           wikidata_uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=aliases&format=json")
           wikidata_response = Net::HTTP.get(wikidata_uri)
           wikidata_data = JSON.parse(wikidata_response)
 
-          aliases = wikidata_data.dig('entities', wikidata_id, 'aliases')
-          if aliases
-            aliases.each do |lang, values|
-              values.each do |value|
-                next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
+          aliases = wikidata_data['entities'][wikidata_id]['aliases']
+          aliases.each do |lang, values|
+            values.each do |value|
+              next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
 
-                AlternateName.create!(
-                  name:     value['value'],
-                  language: lang,
-                  crop:     crop,
-                  creator:  creator
-                )
-                puts "      Added alternate name: #{value['value']} (#{lang})"
-              end
+              AlternateName.create!(
+                name:     value['value'],
+                language: lang,
+                crop:     crop,
+                creator:  creator
+              )
+              puts "    Added alternate name: #{value['value']} (#{lang})"
             end
-          else
-            puts "    No aliases found for Wikidata ID: #{wikidata_id}"
           end
-        rescue StandardError => e
-          puts "    Error processing Wikidata aliases for #{crop.name}: #{e.message}"
+        else
+          puts "  Could not find Wikidata ID for #{crop.name}"
         end
-      else
-        puts "  Could not find Wikidata ID for #{crop.name}"
+      rescue StandardError => e
+        puts "  Error processing crop #{crop.name}: #{e.message}"
       end
     end
   end

package.json

@@ -14,8 +14,9 @@
     "@coffeelint/cli": "^3.0.0",
     "@percy/cli": "^1.0.0-beta.76",
     "csslint": "^1.0.5",
-    "eslint": "^10.0.0",
-    "eslint-config-google": "^0.9.1"
+    "eslint": "^5.0.0",
+    "eslint-config-google": "^0.9.1",
+    "jshint": "^2.9.4"
   },
   "repository": {
     "type": "git",

public/robots.txt

@@ -140,5 +140,3 @@ Crawl-delay: 5
 #
 User-agent: *
 Disallow: /api/
-
-Sitemap: https://growstuff-prod.s3.us-west-2.amazonaws.com/sitemap.xml.gz

spec/controllers/admin_controller_spec.rb

@@ -14,7 +14,7 @@ describe AdminController do
     end
 
     describe 'assigns @members' do
-      let!(:m) { create(:newsletter_recipient_member) }
+      let!(:m) { FactoryBot.create(:newsletter_recipient_member) }
 
       it { expect(assigns(:members)).to eq [m] }
     end

spec/controllers/api/v1/plantings_controller_spec.rb

@@ -2,17 +2,17 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::PlantingsController do
+RSpec.describe Api::V1::PlantingsController, type: :controller do
   subject { JSON.parse response.body }
 
-  let!(:member) { create(:member) }
+  let!(:member) { FactoryBot.create(:member) }
 
   describe '#index' do
     let(:matching_planting) { subject['data'].select { |planting| planting['id'] == my_planting.id.to_s }.first }
 
     describe 'GET #index' do
       context 'basic planting' do
-        let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
+        let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
         let(:expected_attributes) do
           {
             'crop-name'           => my_planting.crop.name,
@@ -42,11 +42,11 @@ RSpec.describe Api::V1::PlantingsController do
 
         it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
         it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response).to have_http_status :ok }
+        it { expect(response.status).to eq 200 }
       end
 
       context 'with photo' do
-        let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
+        let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
 
         let(:expected_attributes) do
           {
@@ -72,7 +72,7 @@ RSpec.describe Api::V1::PlantingsController do
             'thumbnail'           => photo.thumbnail_url
           }
         end
-        let(:photo) { create(:photo, owner: my_planting.owner) }
+        let(:photo) { FactoryBot.create(:photo, owner: my_planting.owner) }
 
         before do
           my_planting.photos << photo
@@ -81,7 +81,7 @@ RSpec.describe Api::V1::PlantingsController do
 
         it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
         it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response).to have_http_status :ok }
+        it { expect(response.status).to eq 200 }
       end
     end
   end

spec/controllers/authentications_controller_spec.rb

@@ -4,10 +4,10 @@ require 'rails_helper'
 
 describe AuthenticationsController do
   before do
-    @member = create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
     controller.stub(:current_member) { @member }
-    @auth = create(:authentication, member: @member)
+    @auth = FactoryBot.create(:authentication, member: @member)
     request.env['omniauth.auth'] = {
       'provider'    => 'foo',
       'uid'         => 'bar',

spec/controllers/charts/crops_controller_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Charts::CropsController do
   describe 'GET charts' do
-    let(:crop) { create(:crop) }
+    let(:crop) { FactoryBot.create(:crop) }
 
     describe 'sunniness' do
       before { get :sunniness, params: { crop_slug: crop.to_param } }

spec/controllers/charts/gardens_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Charts::GardensController do
   include Devise::Test::ControllerHelpers
 
-  let(:garden) { create(:garden) }
+  let(:garden) { FactoryBot.create(:garden) }
 
   context "when not signed in" do
     describe 'GET timeline' do
@@ -18,7 +18,7 @@ describe Charts::GardensController do
   context "when signed in" do
     before { sign_in member }
 
-    let!(:member) { create(:member) }
+    let!(:member) { FactoryBot.create(:member) }
 
     describe 'GET timeline' do
       before { get :timeline, params: { garden_slug: garden.to_param } }

spec/controllers/comments_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe CommentsController do
   subject { response }
 
-  let(:member) { create(:member) }
+  let(:member) { FactoryBot.create(:member) }
 
   before do
     sign_in member
@@ -13,13 +13,13 @@ describe CommentsController do
   end
 
   def valid_attributes
-    @post = create(:post)
+    @post = FactoryBot.create(:post)
     { post_id: @post.id, body: "some text" }
   end
 
   describe "GET RSS feed" do
-    let!(:first_comment) { create(:comment, created_at: 10.days.ago) }
-    let!(:last_comment) { create(:comment, created_at: 4.minutes.ago) }
+    let!(:first_comment) { FactoryBot.create(:comment, created_at: 10.days.ago) }
+    let!(:last_comment) { FactoryBot.create(:comment, created_at: 4.minutes.ago) }
 
     describe "returns an RSS feed" do
       before { get :index, format: "rss" }
@@ -32,7 +32,7 @@ describe CommentsController do
   end
 
   describe "GET new" do
-    let(:post) { create(:post) }
+    let(:post) { FactoryBot.create(:post) }
 
     describe "with valid params" do
       before do
@@ -41,7 +41,7 @@ describe CommentsController do
         }
       end
 
-      let(:old_comment) { create(:comment, commentable: post) }
+      let(:old_comment) { FactoryBot.create(:comment, commentable: post) }
 
       it "picks up post from params" do
         expect(assigns(:commentable)).to eq(post)
@@ -59,13 +59,13 @@ describe CommentsController do
   end
 
   describe "GET edit" do
-    let(:post) { create(:post) }
+    let(:post) { FactoryBot.create(:post) }
 
     before { get :edit, params: { id: comment.to_param } }
 
     describe "my comment" do
-      let!(:comment)     { create(:comment, author: member, commentable: post) }
-      let!(:old_comment) { create(:comment, commentable: post, created_at: Time.zone.yesterday) }
+      let!(:comment)     { FactoryBot.create(:comment, author: member, commentable: post) }
+      let!(:old_comment) { FactoryBot.create(:comment, commentable: post, created_at: Time.zone.yesterday) }
 
       it "assigns previous comments as @comments" do
         expect(assigns(:comments)).to eq([comment, old_comment])
@@ -73,7 +73,7 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { create(:comment, commentable: post) }
+      let(:comment) { FactoryBot.create(:comment, commentable: post) }
 
       it { expect(response).not_to be_successful }
     end
@@ -83,7 +83,7 @@ describe CommentsController do
     before { put :update, params: { id: comment.to_param, comment: valid_attributes } }
 
     describe "my comment" do
-      let(:comment) { create(:comment, author: member) }
+      let(:comment) { FactoryBot.create(:comment, author: member) }
 
       it "redirects to the comment's post" do
         expect(response).to redirect_to(comment.commentable)
@@ -91,16 +91,16 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { create(:comment) }
+      let(:comment) { FactoryBot.create(:comment) }
 
       it { expect(response).not_to be_successful }
     end
 
     describe "attempting to change post_id" do
-      let(:post)             { create(:post, subject: 'our post')           }
-      let(:other_post)       { create(:post, subject: 'the other post')     }
+      let(:post)             { FactoryBot.create(:post, subject: 'our post')           }
+      let(:other_post)       { FactoryBot.create(:post, subject: 'the other post')     }
       let(:valid_attributes) { { commentable_type: "Post", commentable_id: other_post.id, body: "kōrero" } }
-      let(:comment)          { create(:comment, author: member, commentable: post) }
+      let(:comment)          { FactoryBot.create(:comment, author: member, commentable: post) }
 
       it "does not change post_id" do
         comment.reload
@@ -113,7 +113,7 @@ describe CommentsController do
     before { delete :destroy, params: { id: comment.to_param } }
 
     describe "my comment" do
-      let(:comment) { create(:comment, author: member) }
+      let(:comment) { FactoryBot.create(:comment, author: member) }
 
       it "redirects to the post the comment was on" do
         expect(response).to redirect_to(comment.commentable)
@@ -121,7 +121,7 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { create(:comment) }
+      let(:comment) { FactoryBot.create(:comment) }
 
       it { expect(response).not_to be_successful }
     end

spec/controllers/crops_controller_spec.rb

@@ -42,8 +42,8 @@ describe CropsController do
 
   describe "GET crop search" do
     describe 'fetches the crop search page' do
-      let!(:tomato) { create(:tomato) }
-      let!(:maize)  { create(:maize) }
+      let!(:tomato) { FactoryBot.create(:tomato) }
+      let!(:maize)  { FactoryBot.create(:maize) }
 
       before { Crop.reindex }
 
@@ -140,7 +140,7 @@ describe CropsController do
   describe 'DELETE destroy' do
     subject { delete :destroy, params: { slug: crop.to_param } }
 
-    let!(:crop) { create(:crop) }
+    let!(:crop) { FactoryBot.create(:crop) }
 
     context 'not logged in' do
       it { expect { subject }.not_to change(Crop, :count) }

spec/controllers/garden_types_controller_spec.rb

@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-RSpec.describe GardenTypesController do
+RSpec.describe GardenTypesController, type: :controller do
   include Devise::Test::ControllerHelpers
 
   let(:valid_params) { { name: 'My second GardenType' } }
-  let(:garden_type)  { create(:garden_type) }
+  let(:garden_type)  { FactoryBot.create(:garden_type) }
 
   context "when not signed in" do
     describe 'GET new' do
@@ -54,7 +54,7 @@ RSpec.describe GardenTypesController do
   context "when signed in as a member" do
     before { sign_in member }
 
-    let!(:member) { create(:member) }
+    let!(:member) { FactoryBot.create(:member) }
 
     describe "for any garden_type" do
       let(:any_garden_type) { double('garden_type') }

spec/controllers/gardens_controller_spec.rb

@@ -2,12 +2,12 @@
 
 require 'rails_helper'
 
-RSpec.describe GardensController do
+RSpec.describe GardensController, type: :controller do
   include Devise::Test::ControllerHelpers
 
   let(:valid_params) { { name: 'My second Garden' } }
 
-  let(:garden) { create(:garden) }
+  let(:garden) { FactoryBot.create(:garden) }
 
   context "when not signed in" do
     describe 'GET new' do
@@ -55,7 +55,7 @@ RSpec.describe GardensController do
   context "when signed in" do
     before { sign_in member }
 
-    let!(:member) { create(:member) }
+    let!(:member) { FactoryBot.create(:member) }
 
     describe "for another member's garden" do
       let(:not_my_garden) { double('garden') }

spec/controllers/harvests_controller_spec.rb

@@ -8,19 +8,19 @@ describe HarvestsController, :search do
   def valid_attributes
     {
       owner_id:      subject.current_member.id,
-      crop_id:       create(:crop).id,
-      plant_part_id: create(:plant_part).id,
+      crop_id:       FactoryBot.create(:crop).id,
+      plant_part_id: FactoryBot.create(:plant_part).id,
       harvested_at:  '2017-01-01'
     }
   end
 
   describe "GET index" do
-    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)  }
+    let!(:member1)  { FactoryBot.create(:member)                                            }
+    let(:member2)   { FactoryBot.create(:member)                                            }
+    let(:tomato)    { FactoryBot.create(:tomato)                                            }
+    let(:maize)     { FactoryBot.create(:maize)                                             }
+    let!(:harvest1) { FactoryBot.create(:harvest, owner_id: member1.id, crop_id: tomato.id) }
+    let!(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id)  }
 
     before { Harvest.reindex }
 
@@ -51,7 +51,7 @@ describe HarvestsController, :search do
     describe "generates a csv" do
       before { get :index, format: "csv" }
 
-      it { expect(response).to have_http_status :ok }
+      it { expect(response.status).to eq 200 }
     end
   end
 
@@ -109,7 +109,7 @@ describe HarvestsController, :search do
       end
 
       describe "links to planting" do
-        let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
+        let(:planting) { FactoryBot.create(:planting, owner_id: member.id, garden: member.gardens.first) }
 
         before { post :create, params: { harvest: valid_attributes.merge(planting_id: planting.id) } }
 
@@ -134,8 +134,8 @@ describe HarvestsController, :search do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { create(:planting) }
-      let(:harvest)         { create(:harvest)  }
+      let(:not_my_planting) { FactoryBot.create(:planting) }
+      let(:harvest)         { FactoryBot.create(:harvest)  }
 
       describe "does not save planting_id" do
         before do
@@ -153,7 +153,7 @@ describe HarvestsController, :search do
       let(:harvest) { Harvest.create! valid_attributes }
 
       it "updates the requested harvest" do
-        new_crop = create(:crop)
+        new_crop = FactoryBot.create(:crop)
         expect do
           put :update, params: { slug: harvest.to_param, harvest: { crop_id: new_crop.id } }
           harvest.reload
@@ -190,8 +190,8 @@ describe HarvestsController, :search do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { create(:planting) }
-      let(:harvest)         { create(:harvest)  }
+      let(:not_my_planting) { FactoryBot.create(:planting) }
+      let(:harvest)         { FactoryBot.create(:harvest)  }
 
       describe "does not save planting_id" do
         before do

spec/controllers/home_controller_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe HomeController do
+  describe "GET index" do
+  end
+end

spec/controllers/likes_controller_spec.rb

@@ -3,9 +3,9 @@
 require 'rails_helper'
 
 describe LikesController do
-  let(:like)     { create(:like, member:) }
-  let(:member)   { create(:member)               }
-  let(:blogpost) { create(:post)                 }
+  let(:like)     { FactoryBot.create(:like, member:) }
+  let(:member)   { FactoryBot.create(:member)               }
+  let(:blogpost) { FactoryBot.create(:post)                 }
 
   before { sign_in member }
 
@@ -19,7 +19,10 @@ describe LikesController do
     it { JSON.parse(response.body)["description"] == "1 like" }
 
     describe "Liking someone else's post" do
-      it { expect(response).to have_http_status(:created) }
+      it { expect(response.code).to eq('201') }
+    end
+
+    describe "Liking your own post" do
     end
   end
 
@@ -29,14 +32,14 @@ describe LikesController do
     it { expect(response.content_type).to eq "application/json; charset=utf-8" }
 
     describe "un-liking something i liked before" do
-      it { expect(response).to have_http_status(:ok) }
+      it { expect(response.code).to eq('200') }
       it { JSON.parse(response.body)["description"] == "0 likes" }
     end
 
     describe "Deleting someone else's like" do
-      let(:like) { create(:like) }
+      let(:like) { FactoryBot.create(:like) }
 
-      it { expect(response).to have_http_status(:forbidden) }
+      it { expect(response.code).to eq('403') }
       it { JSON.parse(response.body)["error"] == "Unable to like" }
     end
   end

spec/controllers/member_controller_spec.rb

@@ -4,8 +4,8 @@ require 'rails_helper'
 
 describe MembersController do
   before do
-    @member = create(:member)
-    @flickr_auth = create(:flickr_authentication, member: @member)
+    @member = FactoryBot.create(:member)
+    @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
   end
 
   describe "GET index" do
@@ -39,7 +39,7 @@ describe MembersController do
     end
 
     it "doesn't show unconfirmed members" do
-      @member2 = create(:unconfirmed_member)
+      @member2 = FactoryBot.create(:unconfirmed_member)
       get :show, params: { slug: @member2.id }
       expect(response).to have_http_status(:not_found)
     end

spec/controllers/photo_associations_controller_spec.rb

@@ -17,8 +17,8 @@ describe PhotoAssociationsController do
     before { photo.harvests << harvest }
 
     describe "my harvest my photo" do
-      let(:harvest) { create(:harvest, owner: member) }
-      let(:photo)   { create(:photo, owner: member)   }
+      let(:harvest) { FactoryBot.create(:harvest, owner: member) }
+      let(:photo)   { FactoryBot.create(:photo, owner: member)   }
 
       it "removes link" do
         expect { delete :destroy, params: valid_params }.to change { photo.harvests.count }.by(-1)
@@ -26,8 +26,8 @@ describe PhotoAssociationsController do
     end
 
     describe "another member's harvest from another member's photo" do
-      let(:harvest) { create(:harvest, owner: photo.owner) }
-      let(:photo) { create(:photo) }
+      let(:harvest) { FactoryBot.create(:harvest, owner: photo.owner) }
+      let(:photo) { FactoryBot.create(:photo) }
 
       it do
         expect do

spec/controllers/photos_controller_spec.rb

@@ -7,7 +7,7 @@ describe PhotosController, :search do
 
   describe 'GET index' do
     describe 'all photos' do
-      let!(:photo) { create(:photo, :reindex) }
+      let!(:photo) { FactoryBot.create(:photo, :reindex) }
 
       before do
         Photo.reindex
@@ -21,10 +21,10 @@ describe PhotosController, :search do
     end
 
     describe '#index crop photos' do
-      let!(:photo)      { create(:photo, :reindex, owner: member, title: 'no assocations photo') }
-      let!(:crop_photo) { create(:photo, :reindex, owner: member, title: 'photos of planting')   }
-      let!(:planting)   { create(:planting, :reindex, crop:, owner: member) }
-      let!(:crop)       { create(:crop, :reindex) }
+      let!(:photo)      { FactoryBot.create(:photo, :reindex, owner: member, title: 'no assocations photo') }
+      let!(:crop_photo) { FactoryBot.create(:photo, :reindex, owner: member, title: 'photos of planting')   }
+      let!(:planting)   { FactoryBot.create(:planting, :reindex, crop:, owner: member) }
+      let!(:crop)       { FactoryBot.create(:crop, :reindex) }
 
       before do
         planting.photos << crop_photo
@@ -49,12 +49,12 @@ describe PhotosController, :search do
   end
 
   describe "GET new" do
-    let(:tomato)   { create(:tomato)                                }
-    let(:planting) { create(:planting, crop: tomato, owner: member) }
-    let(:garden)   { create(:garden, owner: member)                 }
-    let(:harvest)  { create(:harvest, owner: member)                }
-    let(:member)   { create(:member)                                }
-    let!(:auth)    { create(:flickr_authentication, member:) }
+    let(:tomato)   { FactoryBot.create(:tomato)                                }
+    let(:planting) { FactoryBot.create(:planting, crop: tomato, owner: member) }
+    let(:garden)   { FactoryBot.create(:garden, owner: member)                 }
+    let(:harvest)  { FactoryBot.create(:harvest, owner: member)                }
+    let(:member)   { FactoryBot.create(:member)                                }
+    let!(:auth)    { FactoryBot.create(:flickr_authentication, member:) }
 
     before do
       sign_in member
@@ -97,11 +97,11 @@ describe PhotosController, :search do
                                                            link_url:      "http://example.com")
     end
 
-    let(:member)   { create(:member)                                  }
-    let(:garden)   { create(:garden, owner: member)                   }
-    let(:planting) { create(:planting, garden:, owner: member) }
-    let(:harvest)  { create(:harvest, owner: member)                  }
-    let(:photo)    { create(:photo, owner: member)                    }
+    let(:member)   { FactoryBot.create(:member)                                  }
+    let(:garden)   { FactoryBot.create(:garden, owner: member)                   }
+    let(:planting) { FactoryBot.create(:planting, garden:, owner: member) }
+    let(:harvest)  { FactoryBot.create(:harvest, owner: member)                  }
+    let(:photo)    { FactoryBot.create(:photo, owner: member)                    }
 
     describe "with valid params" do
       before { controller.stub(:current_member) { member } }
@@ -153,7 +153,7 @@ describe PhotosController, :search do
       end
 
       it "doesn't attach photo to a comment" do
-        comment = create(:comment)
+        comment = FactoryBot.create(:comment)
         expect do
           post :create, params: {
             photo: { source_id: photo.source_id, source: 'flickr' }, type: "comment", id: comment.id
@@ -163,7 +163,7 @@ describe PhotosController, :search do
     end
 
     describe "for the second time" do
-      let(:planting) { create(:planting, owner: member) }
+      let(:planting) { FactoryBot.create(:planting, owner: member) }
       let(:valid_params) { { photo: { source_id: 1 }, id: planting.id, type: 'planting' } }
 
       it "does not add a photo twice" do
@@ -176,8 +176,8 @@ describe PhotosController, :search do
       before { controller.stub(:current_member) { member } }
 
       describe "creates the planting/photo link" do
-        let(:planting) { create(:planting, garden:, owner: member) }
-        let(:photo) { create(:photo, owner: member) }
+        let(:planting) { FactoryBot.create(:planting, garden:, owner: member) }
+        let(:photo) { FactoryBot.create(:photo, owner: member) }
 
         before { post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id } }
 
@@ -196,11 +196,11 @@ describe PhotosController, :search do
     end
 
     describe "with mismatched owners" do
-      let(:photo) { create(:photo) }
+      let(:photo) { FactoryBot.create(:photo) }
 
       it "does not create the planting/photo link" do
         # members will be auto-created, and different
-        another_planting = create(:planting)
+        another_planting = FactoryBot.create(:planting)
         expect do
           post :create, params: {
             photo: { source_id: photo.source_id, source: 'flickr' },
@@ -212,7 +212,7 @@ describe PhotosController, :search do
 
       it "does not create the harvest/photo link" do
         # members will be auto-created, and different
-        another_harvest = create(:harvest)
+        another_harvest = FactoryBot.create(:harvest)
         expect do
           post :create, params: {
             photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: another_harvest.id