Rubocop: Layout/HashAlignment

Rubocop: Capybara/NegationMatcher

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
 
 # 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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - 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@v5
+        uses: actions/upload-artifact@v7
         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@v4
+        uses: actions/cache@v5
         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: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.rubocop.yml

@@ -24,6 +24,7 @@ Naming/FileName:
 
 RSpec/DescribeClass:
   Exclude:
+   - 'spec/tasks/import_spec.rb'
    - 'spec/views/**/*.rb'
    - 'spec/features/**/*.rb'
 
@@ -71,4 +72,7 @@ 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,18 +1,31 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
+# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 231
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: link_or_button, strict
-Capybara/ClickLinkOrButtonStyle:
-  Enabled: false
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
 
-# Offense count: 39
+# Offense count: 19
+Capybara/NegationMatcherAfterVisit:
+  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/plantings/planting_a_crop_spec.rb'
+
+# Offense count: 34
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: DefaultSelector.
 Capybara/RSpec/HaveSelector:
@@ -25,7 +38,6 @@ Capybara/RSpec/HaveSelector:
     - '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'
 
@@ -43,21 +55,22 @@ Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/shared_examples/crop_suggest.rb'
 
-# Offense count: 6
+# Offense count: 8
 # 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: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+# Configuration parameters: EnforcedStyle, ExplicitOnly.
 # SupportedStyles: create_list, n_times
 FactoryBot/CreateList:
   Exclude:
@@ -66,31 +79,49 @@ FactoryBot/CreateList:
     - 'spec/views/posts/index.html.haml_spec.rb'
 
 # Offense count: 4
-# Configuration parameters: Include, MaxAmount.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+# Configuration parameters: MaxAmount.
 FactoryBot/ExcessiveCreateList:
   Exclude:
     - 'spec/controllers/posts_controller_spec.rb'
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 1127
+# Offense count: 1158
 # 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: 2
+# Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# 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:
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+    - 'spec/requests/api/v1/members_request_spec.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'Gemfile'
+    - 'app/controllers/admin/versions_controller.rb'
+    - 'app/models/concerns/predict_planting.rb'
+    - 'app/models/crop.rb'
     - 'db/seeds.rb'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
 
-# Offense count: 3
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
@@ -98,14 +129,34 @@ 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.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/models/harvest.rb'
     - 'lib/actions/oauth_signup_action.rb'
 
+# Offense count: 1
+Lint/DuplicateMethods:
+  Exclude:
+    - 'app/models/planting.rb'
+
 # Offense count: 8
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@@ -136,62 +187,112 @@ 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 unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
+# This cop supports safe autocorrection (--autocorrect).
 Lint/UselessAssignment:
   Exclude:
     - 'config.rb'
     - 'config/compass.rb'
 
-# Offense count: 52
+# Offense count: 1
+Lint/UselessConstantScoping:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+
+# Offense count: 61
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 151
+  Max: 295
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 115
+  Max: 294
 
-# Offense count: 7
+# Offense count: 10
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 188
+  Max: 298
 
-# Offense count: 6
+# Offense count: 1
+# Configuration parameters: LengthThreshold.
+Metrics/CollectionLiteralLength:
+  Exclude:
+    - 'lib/tasks/import.rake'
+
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 71
+# Offense count: 82
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 127
+  Max: 296
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 125
+  Max: 144
 
-# Offense count: 5
+# Offense count: 8
 # 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: 292
+# 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: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ContextMethod:
+  Exclude:
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+
+# Offense count: 299
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
+# Offense count: 1
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/tasks/import_spec.rb'
+
 # Offense count: 36
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -204,7 +305,6 @@ RSpec/DescribedClass:
 
 # Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/controllers/authentications_controller_spec.rb'
@@ -227,10 +327,18 @@ RSpec/EmptyLineAfterExample:
   Exclude:
     - 'spec/models/ability_spec.rb'
 
-# Offense count: 140
+# Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 25
+  Max: 27
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: method_call, block
+RSpec/ExpectChange:
+  Exclude:
+    - 'spec/models/crop_spec.rb'
 
 # Offense count: 32
 RSpec/ExpectInHook:
@@ -255,11 +363,30 @@ 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:
@@ -276,12 +403,12 @@ RSpec/IndexedLet:
     - 'spec/models/member_spec.rb'
     - 'spec/views/forums/index.html.haml_spec.rb'
 
-# Offense count: 720
+# Offense count: 719
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# Offense count: 40
+# Offense count: 41
 RSpec/LetSetup:
   Enabled: false
 
@@ -307,16 +434,16 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 152
+# Offense count: 189
 RSpec/MultipleExpectations:
   Max: 19
 
-# Offense count: 138
+# Offense count: 166
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 20
+  Max: 16
 
-# Offense count: 133
+# Offense count: 183
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -327,17 +454,18 @@ RSpec/NamedSubject:
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 403
+# Offense count: 407
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 4
 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:
@@ -358,15 +486,14 @@ 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: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
+# SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/controllers/member_controller_spec.rb'
@@ -380,8 +507,6 @@ 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'
@@ -405,36 +530,44 @@ RSpecRails/HaveHttpStatus:
     - 'spec/controllers/likes_controller_spec.rb'
     - 'spec/requests/harvests_spec.rb'
 
-# Offense count: 16
+# Offense count: 17
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
 RSpecRails/InferredSpecType:
   Enabled: false
 
-# Offense count: 28
-# Configuration parameters: Database, Include.
+# Offense count: 30
+# Configuration parameters: Database.
 # 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: 1
+# Offense count: 8
 # 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: 11
+# 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
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: order, limit, select, lock
@@ -445,38 +578,39 @@ 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: 5
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Offense count: 6
 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: 33
+# Offense count: 40
 Rails/I18nLocaleTexts:
   Enabled: false
 
-# Offense count: 3
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
+# Offense count: 1
+# Configuration parameters: IgnoreScopes.
+Rails/InverseOf:
+  Exclude:
+    - 'app/models/member.rb'
+
+# Offense count: 4
 Rails/LexicallyScopedActionFilter:
   Exclude:
+    - 'app/controllers/api/v1/base_controller.rb'
     - 'app/controllers/data_controller.rb'
     - 'app/controllers/registrations_controller.rb'
 
@@ -492,10 +626,16 @@ 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'
@@ -513,7 +653,7 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/forums_controller.rb'
     - 'app/controllers/plant_parts_controller.rb'
     - 'app/controllers/scientific_names_controller.rb'
-    - 'app/services/openfarm_service.rb'
+    - 'spec/features/members/deletion_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/models/harvest_spec.rb'
 
@@ -526,14 +666,13 @@ Rails/RedundantPresenceValidationOnBelongsTo:
     - 'app/models/planting.rb'
     - 'app/models/scientific_name.rb'
 
-# Offense count: 15
+# Offense count: 16
 # 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'
@@ -543,29 +682,44 @@ 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: 2
+# Offense count: 6
 # 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'
@@ -583,24 +737,34 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# Offense count: 2
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Rails/WhereMissing:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+
+# Offense count: 3
 # 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: 3
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # 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'
@@ -615,30 +779,51 @@ 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:
+  Exclude:
+    - 'app/models/concerns/predict_planting.rb'
+
+# Offense count: 22
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Exclude:
-    - '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'
+  Enabled: false
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'config/environments/production.rb'
     - 'lib/tasks/gbif.rake'
-    - 'lib/tasks/openfarm.rake'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/actions/oauth_signup_action.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: nonzero?
-Style/IfWithBooleanLiteralBranches:
+Style/MapIntoArray:
   Exclude:
-    - 'app/controllers/gardens_controller.rb'
+    - 'app/helpers/crops_helper.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -660,12 +845,13 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 5
+# Offense count: 6
 # 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'
@@ -676,13 +862,21 @@ Style/OpenStructUse:
   Exclude:
     - 'spec/helpers/event_helper_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # 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.
@@ -697,20 +891,34 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# Offense count: 2
+# 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
 # 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: 24
+# Offense count: 27
 # 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.3.8
+3.4.8

.travis.yml

@@ -1,31 +0,0 @@
-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

@@ -139,7 +139,7 @@ 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" 
+gem "connection_pool", "< 3"
 
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
@@ -200,10 +200,6 @@ group :test do
   gem 'vcr'
 end
 
-group :travis do
-  gem 'platform-api'
-end
-
 gem "i18n_data", "~> 1.1"
 
 gem "paper_trail", "~> 17.0"

Gemfile.lock

@@ -33,29 +33,29 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    actioncable (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
       mail (>= 2.8.0)
-    actionmailer (7.2.3)
-      actionpack (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       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)
-      actionpack (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3)
-      activesupport (= 7.2.3)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
       cgi
       erubi (~> 1.11)
@@ -82,29 +82,29 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    active_median (0.6.0)
-      activesupport (>= 7.1)
+    active_median (1.0.0)
+      activesupport (>= 7.2)
     active_record_union (1.4.0)
       activerecord (>= 6.0)
     active_utils (3.6.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.3)
-      activesupport (= 7.2.3)
+    activejob (7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
       timeout (>= 0.4.0)
-    activestorage (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activesupport (= 7.2.3)
+    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)
       marcel (~> 1.0)
-    activesupport (7.2.3)
+    activesupport (7.2.3.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -113,17 +113,17 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1189.0)
-    aws-sdk-core (3.239.2)
+    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)
@@ -131,24 +131,24 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.205.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    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.0)
+    axe-core-api (4.11.2)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-capybara (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
-    axe-core-rspec (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-rspec (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
       ostruct
       virtus
@@ -157,13 +157,13 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
-    bcrypt (3.1.20)
+    bcrypt (3.1.22)
     benchmark (0.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.1.2)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -177,10 +177,11 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.1.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (12.0.0)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
     cancancan (3.6.1)
     capybara (3.40.0)
       addressable
@@ -194,7 +195,7 @@ GEM
     capybara-email (3.0.2)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.27)
       capybara (>= 1.0, < 4)
       launchy
     carrierwave (3.0.7)
@@ -204,9 +205,10 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    cgi (0.5.0)
+    cgi (0.5.1)
     chartkick (5.2.1)
-    childprocess (5.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -219,7 +221,7 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.5)
     crass (1.0.6)
     crowdin-api (1.12.0)
@@ -234,20 +236,21 @@ GEM
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (3.2.8)
+    dalli (5.0.2)
+      logger
     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.0)
+    date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.4)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 7.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.6.2)
@@ -273,26 +276,24 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.0)
+    erb (6.0.2)
     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.5.3)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
-    ffi (1.16.3)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    ffi (1.17.3)
+    ffi (1.17.3-x86_64-linux-gnu)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
@@ -312,7 +313,7 @@ GEM
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (7.1.0)
+    haml (7.2.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -321,30 +322,24 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.67.0)
+    haml_lint (0.73.0)
       haml (>= 5.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashie (5.0.0)
-    heroics (0.1.3)
-      base64
-      erubis (~> 2.0)
-      excon
-      moneta
-      multi_json (>= 1.9.2)
-      webrick
+    hashie (5.1.0)
+      logger
     highline (3.1.2)
       reline
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httparty (0.22.0)
+    httparty (0.24.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
@@ -360,7 +355,7 @@ GEM
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.1)
+    icalendar (2.12.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -370,9 +365,10 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.1)
-    irb (1.15.3)
+    io-console (0.8.2)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -380,10 +376,10 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.16.0)
-    json-schema (6.0.0)
+    json (2.19.3)
+    json-schema (6.2.0)
       addressable (~> 2.8)
-      bigdecimal (~> 3.1)
+      bigdecimal (>= 3.1, < 5)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -393,20 +389,22 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.5)
-    launchy (3.0.1)
+    launchy (3.1.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.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -424,7 +422,7 @@ GEM
       sass (>= 3.5.2)
     material_icons (4.0.0)
       railties (>= 3.2)
-    matrix (0.4.2)
+    matrix (0.4.3)
     memcachier (0.0.2)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -437,14 +435,13 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.2)
-    moneta (1.0.0)
+    minitest (5.27.0)
     msgpack (1.8.0)
-    multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
-    net-http (0.6.0)
-      uri
+    multi_json (1.19.1)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     net-imap (0.5.12)
       date
       net-protocol
@@ -456,13 +453,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.18.10)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.13)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -480,35 +477,32 @@ GEM
     paper_trail (17.0.0)
       activerecord (>= 7.1)
       request_store (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (2.0.1)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    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)
+    pg (1.6.3)
+    pg (1.6.3-x86_64-linux)
     popper_js (2.11.8)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.6.0)
-    pry (0.15.2)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.6)
+      reline (>= 0.6.0)
+    psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.5)
+    puma (7.2.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.21)
+    rack (2.2.23)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -521,20 +515,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    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)
+    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)
       bundler (>= 1.15.0)
-      railties (= 7.2.3)
+      railties (= 7.2.3.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -543,8 +537,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       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)
@@ -554,9 +548,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
@@ -566,19 +560,18 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.3.1)
-    rate_throttle_client (0.1.2)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.17.0)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    recaptcha (5.21.1)
-    redis-client (0.23.2)
+    recaptcha (5.21.2)
+    redis-client (0.26.2)
       connection_pool
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -606,20 +599,20 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
+    rspec-rails (8.0.4)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
+      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-rebound (0.2.1)
       rspec-core (~> 3.3)
-    rspec-support (3.13.6)
+    rspec-support (3.13.7)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
@@ -635,27 +628,27 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.81.7)
+    rubocop (1.86.1)
       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.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     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.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -664,7 +657,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-rspec_rails (2.32.0)
@@ -689,24 +682,24 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.0.0)
+    scout_apm (6.2.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.39.0)
+    selenium-webdriver (4.43.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.9)
+    sidekiq (7.3.10)
       base64
-      connection_pool (>= 2.3.0)
+      connection_pool (>= 2.3.0, < 3)
       logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
+      rack (>= 2.2.4, < 3.3)
+      redis-client (>= 0.23.0, < 1)
     simple_po_parser (1.1.6)
     sitemap_generator (6.3.0)
       builder (~> 3.0)
@@ -719,35 +712,34 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.9)
+    stringio (3.2.0)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.6)
+    terser (1.2.7)
       execjs (>= 0.3.0, < 3)
-    thor (1.4.0)
+    thor (1.5.0)
     thread_safe (0.3.6)
-    tilt (2.6.1)
-    timecop (0.9.10)
+    tilt (2.7.0)
+    timecop (0.9.11)
     timeout (0.5.0)
     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.1.0)
+    unicode-emoji (4.2.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.18.0)
-    uri (1.0.3)
+    uri (1.1.1)
     useragent (0.16.11)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.3.1)
-      base64
+    vcr (6.4.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -767,11 +759,12 @@ GEM
     will_paginate (4.0.1)
     will_paginate-bootstrap-style (0.3.0)
       will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.3)
+    xmlrpc (0.3.4)
+      rexml
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.3)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby
@@ -845,7 +838,6 @@ DEPENDENCIES
   paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
-  platform-api
   pry
   puma
   query_diet
@@ -891,7 +883,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22

app/controllers/follows_controller.rb

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

app/helpers/application_helper.rb

@@ -130,9 +130,9 @@ module ApplicationHelper
       doc = Nokogiri::XML(response.body)
       doc.xpath('//xmlns:entry').first(2).map do |entry|
         {
-          title: entry.xpath('xmlns:title').text,
+          title:   entry.xpath('xmlns:title').text,
           content: entry.xpath('xmlns:content').text,
-          link: entry.xpath('xmlns:link/@href').text,
+          link:    entry.xpath('xmlns:link/@href').text,
           updated: entry.xpath('xmlns:updated').text
         }
       end

app/helpers/crops_helper.rb

@@ -56,13 +56,13 @@ module CropsHelper
 
       crop.posts.each do |post|
         subject_of_entities << {
-          '@type': "SocialMediaPosting",
-          url:     post_url(post),
-          author:  {
+          '@type':         "SocialMediaPosting",
+          url:             post_url(post),
+          author:          {
             '@type': 'Person',
-            name: post.author.login_name
+            name:    post.author.login_name
           },
-          'datePublished': post.created_at 
+          'datePublished': post.created_at
         }
       end
 

app/models/concerns/search_harvests.rb

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

app/models/concerns/search_plantings.rb

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

app/models/crop.rb

@@ -61,7 +61,7 @@ class Crop < ApplicationRecord
             },
             if:     :approved?
   validates :en_youtube_url,
-            format: {
+            format:      {
               with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
               message: 'is not a valid YouTube URL'
             },

app/views/crops/_nutritional_data.html.haml

@@ -35,4 +35,4 @@
               %th Sodium
               %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
     .card-footer
-      = link_to "See more", "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
+      = 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/home/_harvests.html.haml

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

config/sitemap.rb

@@ -7,9 +7,9 @@ SitemapGenerator::Sitemap.default_host = 'https://growstuff.org'
 
 SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
   ENV['S3_SITEMAP_BUCKET'],
-  access_key_id: ENV['S3_ACCESS_KEY'],
+  access_key_id:     ENV['S3_ACCESS_KEY'],
   secret_access_key: ENV['S3_SECRET_KEY'],
-  region: ENV.fetch('S3_AWS_REGION', 'us-east-1')
+  region:            ENV.fetch('S3_AWS_REGION', 'us-east-1')
 )
 
 SitemapGenerator::Sitemap.create do

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/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/20251130035700_create_versions.rb

@@ -1,7 +1,6 @@
 # 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,

lib/tasks/import.rake

@@ -4,299 +4,299 @@ namespace :import do
   desc "Import Australian Food Classification Data from a CSV file"
   task australian_food_classification_data: :environment do
     HEADER_MAP = {
-      "Public Food Key" => :public_food_key,
-      "Classification" => :classification,
-      "Food Name" => :food_name,
-      "Energy with dietary fibre, equated \n(kJ)" => :energy_with_dietary_fibre_equated_kj,
-      "Energy, without dietary fibre, equated \n(kJ)" => :energy_without_dietary_fibre_equated_kj,
-      "Moisture (water) \n(g)" => :moisture_water_g,
-      "Protein \n(g)" => :protein_g,
-      "Nitrogen \n(g)" => :nitrogen_g,
-      "Fat, total \n(g)" => :fat_total_g,
-      "Ash \n(g)" => :ash_g,
-      "Total dietary fibre \n(g)" => :total_dietary_fibre_g,
-      "Alcohol \n(g)" => :alcohol_g,
-      "Fructose \n(g)" => :fructose_g,
-      "Glucose \n(g)" => :glucose_g,
-      "Sucrose\n(g)" => :sucrose_g,
-      "Maltose \n(g)" => :maltose_g,
-      "Lactose \n(g)" => :lactose_g,
-      "Galactose \n(g)" => :galactose_g,
-      "Maltotrios \n(g)" => :maltotrios_g,
-      "Total sugars (g)" => :total_sugars_g,
-      "Added sugars (g)" => :added_sugars_g,
-      "Free sugars \n(g)" => :free_sugars_g,
-      "Starch \n(g)" => :starch_g,
-      "Dextrin \n(g)" => :dextrin_g,
-      "Glycerol \n(g)" => :glycerol_g,
-      "Glycogen \n(g)" => :glycogen_g,
-      "Inulin \n(g)" => :inulin_g,
-      "Erythritol \n(g)" => :erythritol_g,
-      "Maltitol \n(g)" => :maltitol_g,
-      "Mannitol \n(g)" => :mannitol_g,
-      "Xylitol \n(g)" => :xylitol_g,
-      "Maltodextrin (g)" => :maltodextrin_g,
-      "Oligosaccharides  \n(g)" => :oligosaccharides_g,
-      "Polydextrose \n(g)" => :polydextrose_g,
-      "Raffinose \n(g)" => :raffinose_g,
-      "Stachyose \n(g)" => :stachyose_g,
-      "Sorbitol \n(g)" => :sorbitol_g,
-      "Resistant starch \n(g)" => :resistant_starch_g,
-      "Available carbohydrate, without sugar alcohols \n(g)" => :available_carbohydrate_without_sugar_alcohols_g,
-      "Available carbohydrate, with sugar alcohols \n(g)" => :available_carbohydrate_with_sugar_alcohols_g,
-      "Acetic acid \n(g)" => :acetic_acid_g,
-      "Citric acid \n(g)" => :citric_acid_g,
-      "Fumaric acid \n(g)" => :fumaric_acid_g,
-      "Lactic acid \n(g)" => :lactic_acid_g,
-      "Malic acid\n (g)" => :malic_acid_g,
-      "Oxalic acid \n(g)" => :oxalic_acid_g,
-      "Propionic acid \n(g)" => :propionic_acid_g,
-      "Quinic acid \n(g)" => :quinic_acid_g,
-      "Shikimic acid \n(g)" => :shikimic_acid_g,
-      "Succinic acid \n(g)" => :succinic_acid_g,
-      "Tartaric acid \n(g)" => :tartaric_acid_g,
-      "Aluminium (Al) \n(ug)" => :aluminium_al_ug,
-      "Antimony (Sb) \n(ug)" => :antimony_sb_ug,
-      "Arsenic (As) \n(ug)" => :arsenic_as_ug,
-      "Cadmium (Cd) \n(ug)" => :cadmium_cd_ug,
-      "Calcium (Ca) \n(mg)" => :calcium_ca_mg,
-      "Chromium (Cr) \n(ug)" => :chromium_cr_ug,
-      "Chloride (Cl) \n(mg)" => :chloride_cl_mg,
-      "Cobalt (Co) \n(ug)" => :cobalt_co_ug,
-      "Copper (Cu) \n(mg)" => :copper_cu_mg,
-      "Fluoride (F) \n(ug)" => :fluoride_f_ug,
-      "Iodine (I) \n(ug)" => :iodine_i_ug,
-      "Iron (Fe) \n(mg)" => :iron_fe_mg,
-      "Lead (Pb) \n(ug)" => :lead_pb_ug,
-      "Magnesium (Mg) \n(mg)" => :magnesium_mg_mg,
-      "Manganese (Mn) \n(mg)" => :manganese_mn_mg,
-      "Mercury (Hg) \n(ug)" => :mercury_hg_ug,
-      "Molybdenum (Mo) \n(ug)" => :molybdenum_mo_ug,
-      "Nickel (Ni) \n(ug)" => :nickel_ni_ug,
-      "Phosphorus (P) \n(mg)" => :phosphorus_p_mg,
-      "Potassium (K) \n(mg)" => :potassium_k_mg,
-      "Selenium (Se) \n(ug)" => :selenium_se_ug,
-      "Sodium (Na) \n(mg)" => :sodium_na_mg,
-      "Sulphur (S) \n(mg)" => :sulphur_s_mg,
-      "Tin (Sn) \n(ug)" => :tin_sn_ug,
-      "Zinc (Zn) \n(mg)" => :zinc_zn_mg,
-      "Retinol (preformed vitamin A) \n(ug)" => :retinol_preformed_vitamin_a_ug,
-      "Alpha-carotene \n(ug)" => :alpha_carotene_ug,
-      "Beta-carotene \n(ug)" => :beta_carotene_ug,
-      "Cryptoxanthin \n(ug)" => :cryptoxanthin_ug,
-      "Beta-carotene equivalents (provitamin A) \n(ug)" => :beta_carotene_equivalents_provitamin_a_ug,
-      "Vitamin A retinol equivalents \n(ug)" => :vitamin_a_retinol_equivalents_ug,
-      "Lutein \n(ug)" => :lutein_ug,
-      "Lycopene \n(ug)" => :lycopene_ug,
-      "Xanthophyl \n(ug)" => :xanthophyl_ug,
-      "Thiamin (B1) \n(mg)" => :thiamin_b1_mg,
-      "Riboflavin (B2) \n(mg)" => :riboflavin_b2_mg,
-      "Niacin (B3) \n(mg)" => :niacin_b3_mg,
-      "Niacin derived from tryptophan \n(mg)" => :niacin_derived_from_tryptophan_mg,
-      "Niacin derived equivalents \n(mg)" => :niacin_derived_equivalents_mg,
-      "Pantothenic acid (B5) \n(mg)" => :pantothenic_acid_b5_mg,
-      "Pyridoxine (B6) \n(mg)" => :pyridoxine_b6_mg,
-      "Biotin (B7) \n(ug)" => :biotin_b7_ug,
-      "Cobalamin (B12) \n(ug)" => :cobalamin_b12_ug,
-      "Folate, natural \n(ug)" => :folate_natural_ug,
-      "Folic acid \n(ug)" => :folic_acid_ug,
-      "Total folates \n(ug)" => :total_folates_ug,
-      "Dietary folate equivalents \n(ug)" => :dietary_folate_equivalents_ug,
-      "Vitamin C \n(mg)" => :vitamin_c_mg,
-      "Cholecalciferol (D3) \n(ug)" => :cholecalciferol_d3_ug,
-      "Ergocalciferol (D2) \n(ug)" => :ergocalciferol_d2_ug,
-      "25-hydroxy cholecalciferol (25-OH D3) \n(ug)" => :c25_hydroxy_cholecalciferol_25_oh_d3_ug,
-      "25-hydroxy ergocalciferol (25-OH D2) \n(ug)" => :c25_hydroxy_ergocalciferol_25_oh_d2_ug,
-      "Vitamin D3 equivalents \n(ug)" => :vitamin_d3_equivalents_ug,
-      "Alpha tocopherol \n(mg)" => :alpha_tocopherol_mg,
-      "Alpha tocotrienol \n(mg)" => :alpha_tocotrienol_mg,
-      "Beta tocopherol \n(mg)" => :beta_tocopherol_mg,
-      "Beta tocotrienol \n(mg)" => :beta_tocotrienol_mg,
-      "Delta tocopherol \n(mg)" => :delta_tocopherol_mg,
-      "Delta tocotrienol \n(mg)" => :delta_tocotrienol_mg,
-      "Gamma tocopherol \n(mg)" => :gamma_tocopherol_mg,
-      "Gamma tocotrienol \n(mg)" => :gamma_tocotrienol_mg,
-      "Vitamin E \n(mg)" => :vitamin_e_mg,
-      "C4 (%T)" => :c4_t,
-      "C6 (%T)" => :c6_t,
-      "C8 (%T)" => :c8_t,
-      "C10 (%T)" => :c10_t,
-      "C11 (%T)" => :c11_t,
-      "C12 (%T)" => :c12_t,
-      "C13 (%T)" => :c13_t,
-      "C14 (%T)" => :c14_t,
-      "C15 (%T)" => :c15_t,
-      "C16 (%T)" => :c16_t,
-      "C17 (%T)" => :c17_t,
-      "C18 (%T)" => :c18_t,
-      "C19 (%T)" => :c19_t,
-      "C20 (%T)" => :c20_t,
-      "C21 (%T)" => :c21_t,
-      "C22 (%T)" => :c22_t,
-      "C23 (%T)" => :c23_t,
-      "C24 (%T)" => :c24_t,
-      "Total saturated fatty acids, equated (%T)" => :total_saturated_fatty_acids_equated_t,
-      "C10:1 (%T)" => :c10_1_t,
-      "C12:1 (%T)" => :c12_1_t,
-      "C14:1 (%T)" => :c14_1_t,
-      "C15:1 (%T)" => :c15_1_t,
-      "C16:1 (%T)" => :c16_1_t,
-      "C17:1 (%T)" => :c17_1_t,
-      "C18:1 (%T)" => :c18_1_t,
-      "C18:1w5 (%T)" => :c18_1w5_t,
-      "C18:1w6 (%T)" => :c18_1w6_t,
-      "C18:1w7 (%T)" => :c18_1w7_t,
-      "C18:1w9 (%T)" => :c18_1w9_t,
-      "C20:1 (%T)" => :c20_1_t,
-      "C20:1w9 (%T)" => :c20_1w9_t,
-      "C20:1w13 (%T)" => :c20_1w13_t,
-      "C20:1w11 (%T)" => :c20_1w11_t,
-      "C22:1 (%T)" => :c22_1_t,
-      "C22:1w9 (%T)" => :c22_1w9_t,
-      "C22:1w11 (%T)" => :c22_1w11_t,
-      "C24:1 (%T)" => :c24_1_t,
-      "C24:1w9 (%T)" => :c24_1w9_t,
-      "C24:1w11 (%T)" => :c24_1w11_t,
-      "C24:1w13 (%T)" => :c24_1w13_t,
-      "Total monounsaturated fatty acids, equated (%T)" => :total_monounsaturated_fatty_acids_equated_t,
-      "C12:2 (%T)" => :c12_2_t,
-      "C16:2w4 (%T)" => :c16_2w4_t,
-      "C16:3 (%T)" => :c16_3_t,
-      "C18:2w6 (%T)" => :c18_2w6_t,
-      "C18:3w3 (%T)" => :c18_3w3_t,
-      "C18:3w4 (%T)" => :c18_3w4_t,
-      "C18:3w6 (%T)" => :c18_3w6_t,
-      "C18:4w1 (%T)" => :c18_4w1_t,
-      "C18:4w3 (%T)" => :c18_4w3_t,
-      "C20:2 (%T)" => :c20_2_t,
-      "C20:2w6 (%T)" => :c20_2w6_t,
-      "C20:3 (%T)" => :c20_3_t,
-      "C20:4 (%T)" => :c20_4_t,
-      "C20:3w3 (%T)" => :c20_3w3_t,
-      "C20:3w6 (%T)" => :c20_3w6_t,
-      "C20:4w3 (%T)" => :c20_4w3_t,
-      "C20:4w6 (%T)" => :c20_4w6_t,
-      "C20:5w3 (%T)" => :c20_5w3_t,
-      "C21:5w3 (%T)" => :c21_5w3_t,
-      "C22:2 (%T)" => :c22_2_t,
-      "C22:2w6 (%T)" => :c22_2w6_t,
-      "C22:4w6 (%T)" => :c22_4w6_t,
-      "C22:5w3 (%T)" => :c22_5w3_t,
-      "C22:5w6 (%T)" => :c22_5w6_t,
-      "C22:6w3 (%T)" => :c22_6w3_t,
-      "Total polyunsaturated fatty acids, equated (%T)" => :total_polyunsaturated_fatty_acids_equated_t,
-      "Total long chain omega 3 fatty acids, equated \n(%T)" => :total_long_chain_omega_3_fatty_acids_equated_t,
-      "Total undifferentiated fatty acids \n(%T)" => :total_undifferentiated_fatty_acids_t,
-      "Total trans fatty acids, imputed \n(%T)" => :total_trans_fatty_acids_imputed_t,
-      "C4 (g)" => :c4_g,
-      "C6 (g)" => :c6_g,
-      "C8 (g)" => :c8_g,
-      "C10 (g)" => :c10_g,
-      "C11 (g)" => :c11_g,
-      "C12 (g)" => :c12_g,
-      "C13 (g)" => :c13_g,
-      "C14 (g)" => :c14_g,
-      "C15 (g)" => :c15_g,
-      "C16 (g)" => :c16_g,
-      "C17 (g)" => :c17_g,
-      "C18 (g)" => :c18_g,
-      "C19 (g)" => :c19_g,
-      "C20 (g)" => :c20_g,
-      "C21 (g)" => :c21_g,
-      "C22 (g)" => :c22_g,
-      "C23 (g)" => :c23_g,
-      "C24 (g)" => :c24_g,
-      "Total saturated fatty acids, equated \n(g)" => :total_saturated_fatty_acids_equated_g,
-      "C10:1 (g)" => :c10_1_g,
-      "C12:1 (g)" => :c12_1_g,
-      "C14:1 (g)" => :c14_1_g,
-      "C15:1 (g)" => :c15_1_g,
-      "C16:1 (g)" => :c16_1_g,
-      "C17:1 (g)" => :c17_1_g,
-      "C18:1 (g)" => :c18_1_g,
-      "C18:1w5 (mg)" => :c18_1w5_mg,
-      "C18:1w6 (mg)" => :c18_1w6_mg,
-      "C18:1w7 (g)" => :c18_1w7_g,
-      "C18:1w9 (mg)" => :c18_1w9_mg,
-      "C20:1 (g)" => :c20_1_g,
-      "C20:1w9 (mg)" => :c20_1w9_mg,
-      "C20:1w13 (mg)" => :c20_1w13_mg,
-      "C20:1w11 (mg)" => :c20_1w11_mg,
-      "C22:1 (g)" => :c22_1_g,
-      "C22:1w9 (mg)" => :c22_1w9_mg,
-      "C22:1w11 (mg)" => :c22_1w11_mg,
-      "C24:1 (g)" => :c24_1_g,
-      "C24:1w9 (mg)" => :c24_1w9_mg,
-      "C24:1w11 (mg)" => :c24_1w11_mg,
-      "C24:1w13 (mg)" => :c24_1w13_mg,
-      "Total monounsaturated fatty acids, equated \n(g)" => :total_monounsaturated_fatty_acids_equated_g,
-      "C12:2 (g)" => :c12_2_g,
-      "C16:2w4 (mg)" => :c16_2w4_mg,
-      "C16:3 (g)" => :c16_3_g,
-      "C18:2w6 (g)" => :c18_2w6_g,
-      "C18:3w3 (g)" => :c18_3w3_g,
-      "C18:3w4 (g)" => :c18_3w4_g,
-      "C18:3w6 (mg)" => :c18_3w6_mg,
-      "C18:4w1 (g)" => :c18_4w1_g,
-      "C18:4w3 (mg)" => :c18_4w3_mg,
-      "C20:2 (mg)" => :c20_2_mg,
-      "C20:2w6 (mg)" => :c20_2w6_mg,
-      "C20:3 (mg)" => :c20_3_mg,
-      "C20:3w3 (mg)" => :c20_3w3_mg,
-      "C20:3w6 (mg)" => :c20_3w6_mg,
-      "C20:4 (g)" => :c20_4_g,
-      "C20:4w3 (mg)" => :c20_4w3_mg,
-      "C20:4w6 (mg)" => :c20_4w6_mg,
-      "C20:5w3 (mg)" => :c20_5w3_mg,
-      "C21:5w3 (g)" => :c21_5w3_g,
-      "C22:5w3 (mg)" => :c22_5w3_mg,
-      "C22:4w6 (mg)" => :c22_4w6_mg,
-      "C22:2 (g)" => :c22_2_g,
-      "C22:2w6 (mg)" => :c22_2w6_mg,
-      "C22:5w6 (g)" => :c22_5w6_g,
-      "C22:6w3 (mg)" => :c22_6w3_mg,
-      "Total polyunsaturated fatty acids, equated \n(g)" => :total_polyunsaturated_fatty_acids_equated_g,
-      "Total long chain omega 3 fatty acids, equated \n(mg)" => :total_long_chain_omega_3_fatty_acids_equated_mg,
+      "Public Food Key"                                             => :public_food_key,
+      "Classification"                                              => :classification,
+      "Food Name"                                                   => :food_name,
+      "Energy with dietary fibre, equated \n(kJ)"                   => :energy_with_dietary_fibre_equated_kj,
+      "Energy, without dietary fibre, equated \n(kJ)"               => :energy_without_dietary_fibre_equated_kj,
+      "Moisture (water) \n(g)"                                      => :moisture_water_g,
+      "Protein \n(g)"                                               => :protein_g,
+      "Nitrogen \n(g)"                                              => :nitrogen_g,
+      "Fat, total \n(g)"                                            => :fat_total_g,
+      "Ash \n(g)"                                                   => :ash_g,
+      "Total dietary fibre \n(g)"                                   => :total_dietary_fibre_g,
+      "Alcohol \n(g)"                                               => :alcohol_g,
+      "Fructose \n(g)"                                              => :fructose_g,
+      "Glucose \n(g)"                                               => :glucose_g,
+      "Sucrose\n(g)"                                                => :sucrose_g,
+      "Maltose \n(g)"                                               => :maltose_g,
+      "Lactose \n(g)"                                               => :lactose_g,
+      "Galactose \n(g)"                                             => :galactose_g,
+      "Maltotrios \n(g)"                                            => :maltotrios_g,
+      "Total sugars (g)"                                            => :total_sugars_g,
+      "Added sugars (g)"                                            => :added_sugars_g,
+      "Free sugars \n(g)"                                           => :free_sugars_g,
+      "Starch \n(g)"                                                => :starch_g,
+      "Dextrin \n(g)"                                               => :dextrin_g,
+      "Glycerol \n(g)"                                              => :glycerol_g,
+      "Glycogen \n(g)"                                              => :glycogen_g,
+      "Inulin \n(g)"                                                => :inulin_g,
+      "Erythritol \n(g)"                                            => :erythritol_g,
+      "Maltitol \n(g)"                                              => :maltitol_g,
+      "Mannitol \n(g)"                                              => :mannitol_g,
+      "Xylitol \n(g)"                                               => :xylitol_g,
+      "Maltodextrin (g)"                                            => :maltodextrin_g,
+      "Oligosaccharides  \n(g)"                                     => :oligosaccharides_g,
+      "Polydextrose \n(g)"                                          => :polydextrose_g,
+      "Raffinose \n(g)"                                             => :raffinose_g,
+      "Stachyose \n(g)"                                             => :stachyose_g,
+      "Sorbitol \n(g)"                                              => :sorbitol_g,
+      "Resistant starch \n(g)"                                      => :resistant_starch_g,
+      "Available carbohydrate, without sugar alcohols \n(g)"        => :available_carbohydrate_without_sugar_alcohols_g,
+      "Available carbohydrate, with sugar alcohols \n(g)"           => :available_carbohydrate_with_sugar_alcohols_g,
+      "Acetic acid \n(g)"                                           => :acetic_acid_g,
+      "Citric acid \n(g)"                                           => :citric_acid_g,
+      "Fumaric acid \n(g)"                                          => :fumaric_acid_g,
+      "Lactic acid \n(g)"                                           => :lactic_acid_g,
+      "Malic acid\n (g)"                                            => :malic_acid_g,
+      "Oxalic acid \n(g)"                                           => :oxalic_acid_g,
+      "Propionic acid \n(g)"                                        => :propionic_acid_g,
+      "Quinic acid \n(g)"                                           => :quinic_acid_g,
+      "Shikimic acid \n(g)"                                         => :shikimic_acid_g,
+      "Succinic acid \n(g)"                                         => :succinic_acid_g,
+      "Tartaric acid \n(g)"                                         => :tartaric_acid_g,
+      "Aluminium (Al) \n(ug)"                                       => :aluminium_al_ug,
+      "Antimony (Sb) \n(ug)"                                        => :antimony_sb_ug,
+      "Arsenic (As) \n(ug)"                                         => :arsenic_as_ug,
+      "Cadmium (Cd) \n(ug)"                                         => :cadmium_cd_ug,
+      "Calcium (Ca) \n(mg)"                                         => :calcium_ca_mg,
+      "Chromium (Cr) \n(ug)"                                        => :chromium_cr_ug,
+      "Chloride (Cl) \n(mg)"                                        => :chloride_cl_mg,
+      "Cobalt (Co) \n(ug)"                                          => :cobalt_co_ug,
+      "Copper (Cu) \n(mg)"                                          => :copper_cu_mg,
+      "Fluoride (F) \n(ug)"                                         => :fluoride_f_ug,
+      "Iodine (I) \n(ug)"                                           => :iodine_i_ug,
+      "Iron (Fe) \n(mg)"                                            => :iron_fe_mg,
+      "Lead (Pb) \n(ug)"                                            => :lead_pb_ug,
+      "Magnesium (Mg) \n(mg)"                                       => :magnesium_mg_mg,
+      "Manganese (Mn) \n(mg)"                                       => :manganese_mn_mg,
+      "Mercury (Hg) \n(ug)"                                         => :mercury_hg_ug,
+      "Molybdenum (Mo) \n(ug)"                                      => :molybdenum_mo_ug,
+      "Nickel (Ni) \n(ug)"                                          => :nickel_ni_ug,
+      "Phosphorus (P) \n(mg)"                                       => :phosphorus_p_mg,
+      "Potassium (K) \n(mg)"                                        => :potassium_k_mg,
+      "Selenium (Se) \n(ug)"                                        => :selenium_se_ug,
+      "Sodium (Na) \n(mg)"                                          => :sodium_na_mg,
+      "Sulphur (S) \n(mg)"                                          => :sulphur_s_mg,
+      "Tin (Sn) \n(ug)"                                             => :tin_sn_ug,
+      "Zinc (Zn) \n(mg)"                                            => :zinc_zn_mg,
+      "Retinol (preformed vitamin A) \n(ug)"                        => :retinol_preformed_vitamin_a_ug,
+      "Alpha-carotene \n(ug)"                                       => :alpha_carotene_ug,
+      "Beta-carotene \n(ug)"                                        => :beta_carotene_ug,
+      "Cryptoxanthin \n(ug)"                                        => :cryptoxanthin_ug,
+      "Beta-carotene equivalents (provitamin A) \n(ug)"             => :beta_carotene_equivalents_provitamin_a_ug,
+      "Vitamin A retinol equivalents \n(ug)"                        => :vitamin_a_retinol_equivalents_ug,
+      "Lutein \n(ug)"                                               => :lutein_ug,
+      "Lycopene \n(ug)"                                             => :lycopene_ug,
+      "Xanthophyl \n(ug)"                                           => :xanthophyl_ug,
+      "Thiamin (B1) \n(mg)"                                         => :thiamin_b1_mg,
+      "Riboflavin (B2) \n(mg)"                                      => :riboflavin_b2_mg,
+      "Niacin (B3) \n(mg)"                                          => :niacin_b3_mg,
+      "Niacin derived from tryptophan \n(mg)"                       => :niacin_derived_from_tryptophan_mg,
+      "Niacin derived equivalents \n(mg)"                           => :niacin_derived_equivalents_mg,
+      "Pantothenic acid (B5) \n(mg)"                                => :pantothenic_acid_b5_mg,
+      "Pyridoxine (B6) \n(mg)"                                      => :pyridoxine_b6_mg,
+      "Biotin (B7) \n(ug)"                                          => :biotin_b7_ug,
+      "Cobalamin (B12) \n(ug)"                                      => :cobalamin_b12_ug,
+      "Folate, natural \n(ug)"                                      => :folate_natural_ug,
+      "Folic acid \n(ug)"                                           => :folic_acid_ug,
+      "Total folates \n(ug)"                                        => :total_folates_ug,
+      "Dietary folate equivalents \n(ug)"                           => :dietary_folate_equivalents_ug,
+      "Vitamin C \n(mg)"                                            => :vitamin_c_mg,
+      "Cholecalciferol (D3) \n(ug)"                                 => :cholecalciferol_d3_ug,
+      "Ergocalciferol (D2) \n(ug)"                                  => :ergocalciferol_d2_ug,
+      "25-hydroxy cholecalciferol (25-OH D3) \n(ug)"                => :c25_hydroxy_cholecalciferol_25_oh_d3_ug,
+      "25-hydroxy ergocalciferol (25-OH D2) \n(ug)"                 => :c25_hydroxy_ergocalciferol_25_oh_d2_ug,
+      "Vitamin D3 equivalents \n(ug)"                               => :vitamin_d3_equivalents_ug,
+      "Alpha tocopherol \n(mg)"                                     => :alpha_tocopherol_mg,
+      "Alpha tocotrienol \n(mg)"                                    => :alpha_tocotrienol_mg,
+      "Beta tocopherol \n(mg)"                                      => :beta_tocopherol_mg,
+      "Beta tocotrienol \n(mg)"                                     => :beta_tocotrienol_mg,
+      "Delta tocopherol \n(mg)"                                     => :delta_tocopherol_mg,
+      "Delta tocotrienol \n(mg)"                                    => :delta_tocotrienol_mg,
+      "Gamma tocopherol \n(mg)"                                     => :gamma_tocopherol_mg,
+      "Gamma tocotrienol \n(mg)"                                    => :gamma_tocotrienol_mg,
+      "Vitamin E \n(mg)"                                            => :vitamin_e_mg,
+      "C4 (%T)"                                                     => :c4_t,
+      "C6 (%T)"                                                     => :c6_t,
+      "C8 (%T)"                                                     => :c8_t,
+      "C10 (%T)"                                                    => :c10_t,
+      "C11 (%T)"                                                    => :c11_t,
+      "C12 (%T)"                                                    => :c12_t,
+      "C13 (%T)"                                                    => :c13_t,
+      "C14 (%T)"                                                    => :c14_t,
+      "C15 (%T)"                                                    => :c15_t,
+      "C16 (%T)"                                                    => :c16_t,
+      "C17 (%T)"                                                    => :c17_t,
+      "C18 (%T)"                                                    => :c18_t,
+      "C19 (%T)"                                                    => :c19_t,
+      "C20 (%T)"                                                    => :c20_t,
+      "C21 (%T)"                                                    => :c21_t,
+      "C22 (%T)"                                                    => :c22_t,
+      "C23 (%T)"                                                    => :c23_t,
+      "C24 (%T)"                                                    => :c24_t,
+      "Total saturated fatty acids, equated (%T)"                   => :total_saturated_fatty_acids_equated_t,
+      "C10:1 (%T)"                                                  => :c10_1_t,
+      "C12:1 (%T)"                                                  => :c12_1_t,
+      "C14:1 (%T)"                                                  => :c14_1_t,
+      "C15:1 (%T)"                                                  => :c15_1_t,
+      "C16:1 (%T)"                                                  => :c16_1_t,
+      "C17:1 (%T)"                                                  => :c17_1_t,
+      "C18:1 (%T)"                                                  => :c18_1_t,
+      "C18:1w5 (%T)"                                                => :c18_1w5_t,
+      "C18:1w6 (%T)"                                                => :c18_1w6_t,
+      "C18:1w7 (%T)"                                                => :c18_1w7_t,
+      "C18:1w9 (%T)"                                                => :c18_1w9_t,
+      "C20:1 (%T)"                                                  => :c20_1_t,
+      "C20:1w9 (%T)"                                                => :c20_1w9_t,
+      "C20:1w13 (%T)"                                               => :c20_1w13_t,
+      "C20:1w11 (%T)"                                               => :c20_1w11_t,
+      "C22:1 (%T)"                                                  => :c22_1_t,
+      "C22:1w9 (%T)"                                                => :c22_1w9_t,
+      "C22:1w11 (%T)"                                               => :c22_1w11_t,
+      "C24:1 (%T)"                                                  => :c24_1_t,
+      "C24:1w9 (%T)"                                                => :c24_1w9_t,
+      "C24:1w11 (%T)"                                               => :c24_1w11_t,
+      "C24:1w13 (%T)"                                               => :c24_1w13_t,
+      "Total monounsaturated fatty acids, equated (%T)"             => :total_monounsaturated_fatty_acids_equated_t,
+      "C12:2 (%T)"                                                  => :c12_2_t,
+      "C16:2w4 (%T)"                                                => :c16_2w4_t,
+      "C16:3 (%T)"                                                  => :c16_3_t,
+      "C18:2w6 (%T)"                                                => :c18_2w6_t,
+      "C18:3w3 (%T)"                                                => :c18_3w3_t,
+      "C18:3w4 (%T)"                                                => :c18_3w4_t,
+      "C18:3w6 (%T)"                                                => :c18_3w6_t,
+      "C18:4w1 (%T)"                                                => :c18_4w1_t,
+      "C18:4w3 (%T)"                                                => :c18_4w3_t,
+      "C20:2 (%T)"                                                  => :c20_2_t,
+      "C20:2w6 (%T)"                                                => :c20_2w6_t,
+      "C20:3 (%T)"                                                  => :c20_3_t,
+      "C20:4 (%T)"                                                  => :c20_4_t,
+      "C20:3w3 (%T)"                                                => :c20_3w3_t,
+      "C20:3w6 (%T)"                                                => :c20_3w6_t,
+      "C20:4w3 (%T)"                                                => :c20_4w3_t,
+      "C20:4w6 (%T)"                                                => :c20_4w6_t,
+      "C20:5w3 (%T)"                                                => :c20_5w3_t,
+      "C21:5w3 (%T)"                                                => :c21_5w3_t,
+      "C22:2 (%T)"                                                  => :c22_2_t,
+      "C22:2w6 (%T)"                                                => :c22_2w6_t,
+      "C22:4w6 (%T)"                                                => :c22_4w6_t,
+      "C22:5w3 (%T)"                                                => :c22_5w3_t,
+      "C22:5w6 (%T)"                                                => :c22_5w6_t,
+      "C22:6w3 (%T)"                                                => :c22_6w3_t,
+      "Total polyunsaturated fatty acids, equated (%T)"             => :total_polyunsaturated_fatty_acids_equated_t,
+      "Total long chain omega 3 fatty acids, equated \n(%T)"        => :total_long_chain_omega_3_fatty_acids_equated_t,
+      "Total undifferentiated fatty acids \n(%T)"                   => :total_undifferentiated_fatty_acids_t,
+      "Total trans fatty acids, imputed \n(%T)"                     => :total_trans_fatty_acids_imputed_t,
+      "C4 (g)"                                                      => :c4_g,
+      "C6 (g)"                                                      => :c6_g,
+      "C8 (g)"                                                      => :c8_g,
+      "C10 (g)"                                                     => :c10_g,
+      "C11 (g)"                                                     => :c11_g,
+      "C12 (g)"                                                     => :c12_g,
+      "C13 (g)"                                                     => :c13_g,
+      "C14 (g)"                                                     => :c14_g,
+      "C15 (g)"                                                     => :c15_g,
+      "C16 (g)"                                                     => :c16_g,
+      "C17 (g)"                                                     => :c17_g,
+      "C18 (g)"                                                     => :c18_g,
+      "C19 (g)"                                                     => :c19_g,
+      "C20 (g)"                                                     => :c20_g,
+      "C21 (g)"                                                     => :c21_g,
+      "C22 (g)"                                                     => :c22_g,
+      "C23 (g)"                                                     => :c23_g,
+      "C24 (g)"                                                     => :c24_g,
+      "Total saturated fatty acids, equated \n(g)"                  => :total_saturated_fatty_acids_equated_g,
+      "C10:1 (g)"                                                   => :c10_1_g,
+      "C12:1 (g)"                                                   => :c12_1_g,
+      "C14:1 (g)"                                                   => :c14_1_g,
+      "C15:1 (g)"                                                   => :c15_1_g,
+      "C16:1 (g)"                                                   => :c16_1_g,
+      "C17:1 (g)"                                                   => :c17_1_g,
+      "C18:1 (g)"                                                   => :c18_1_g,
+      "C18:1w5 (mg)"                                                => :c18_1w5_mg,
+      "C18:1w6 (mg)"                                                => :c18_1w6_mg,
+      "C18:1w7 (g)"                                                 => :c18_1w7_g,
+      "C18:1w9 (mg)"                                                => :c18_1w9_mg,
+      "C20:1 (g)"                                                   => :c20_1_g,
+      "C20:1w9 (mg)"                                                => :c20_1w9_mg,
+      "C20:1w13 (mg)"                                               => :c20_1w13_mg,
+      "C20:1w11 (mg)"                                               => :c20_1w11_mg,
+      "C22:1 (g)"                                                   => :c22_1_g,
+      "C22:1w9 (mg)"                                                => :c22_1w9_mg,
+      "C22:1w11 (mg)"                                               => :c22_1w11_mg,
+      "C24:1 (g)"                                                   => :c24_1_g,
+      "C24:1w9 (mg)"                                                => :c24_1w9_mg,
+      "C24:1w11 (mg)"                                               => :c24_1w11_mg,
+      "C24:1w13 (mg)"                                               => :c24_1w13_mg,
+      "Total monounsaturated fatty acids, equated \n(g)"            => :total_monounsaturated_fatty_acids_equated_g,
+      "C12:2 (g)"                                                   => :c12_2_g,
+      "C16:2w4 (mg)"                                                => :c16_2w4_mg,
+      "C16:3 (g)"                                                   => :c16_3_g,
+      "C18:2w6 (g)"                                                 => :c18_2w6_g,
+      "C18:3w3 (g)"                                                 => :c18_3w3_g,
+      "C18:3w4 (g)"                                                 => :c18_3w4_g,
+      "C18:3w6 (mg)"                                                => :c18_3w6_mg,
+      "C18:4w1 (g)"                                                 => :c18_4w1_g,
+      "C18:4w3 (mg)"                                                => :c18_4w3_mg,
+      "C20:2 (mg)"                                                  => :c20_2_mg,
+      "C20:2w6 (mg)"                                                => :c20_2w6_mg,
+      "C20:3 (mg)"                                                  => :c20_3_mg,
+      "C20:3w3 (mg)"                                                => :c20_3w3_mg,
+      "C20:3w6 (mg)"                                                => :c20_3w6_mg,
+      "C20:4 (g)"                                                   => :c20_4_g,
+      "C20:4w3 (mg)"                                                => :c20_4w3_mg,
+      "C20:4w6 (mg)"                                                => :c20_4w6_mg,
+      "C20:5w3 (mg)"                                                => :c20_5w3_mg,
+      "C21:5w3 (g)"                                                 => :c21_5w3_g,
+      "C22:5w3 (mg)"                                                => :c22_5w3_mg,
+      "C22:4w6 (mg)"                                                => :c22_4w6_mg,
+      "C22:2 (g)"                                                   => :c22_2_g,
+      "C22:2w6 (mg)"                                                => :c22_2w6_mg,
+      "C22:5w6 (g)"                                                 => :c22_5w6_g,
+      "C22:6w3 (mg)"                                                => :c22_6w3_mg,
+      "Total polyunsaturated fatty acids, equated \n(g)"            => :total_polyunsaturated_fatty_acids_equated_g,
+      "Total long chain omega 3 fatty acids, equated \n(mg)"        => :total_long_chain_omega_3_fatty_acids_equated_mg,
       "Total undifferentiated fatty acids, mass basis basis \n(mg)" => :total_undifferentiated_fatty_acids_mass_basis_basis_mg,
-      "Total trans fatty acids, imputed \n(mg)" => :total_trans_fatty_acids_imputed_mg,
-      "Caffeine \n(mg)" => :caffeine_mg,
-      "Cholesterol \n(mg)" => :cholesterol_mg,
-      "Alanine \n(mg/gN)" => :alanine_mg_gn,
-      "Arginine \n(mg/gN)" => :arginine_mg_gn,
-      "Aspartic acid \n(mg/gN)" => :aspartic_acid_mg_gn,
-      "Cystine plus cysteine \n(mg/gN)" => :cystine_plus_cysteine_mg_gn,
-      "Glutamic acid \n(mg/gN)" => :glutamic_acid_mg_gn,
-      "Glycine \n(mg/gN)" => :glycine_mg_gn,
-      "Histidine \n(mg/gN)" => :histidine_mg_gn,
-      "Isoleucine \n(mg/gN)" => :isoleucine_mg_gn,
-      "Leucine \n(mg/gN)" => :leucine_mg_gn,
-      "Lysine \n(mg/gN)" => :lysine_mg_gn,
-      "Methionine \n(mg/gN)" => :methionine_mg_gn,
-      "Phenylalanine \n(mg/gN)" => :phenylalanine_mg_gn,
-      "Proline \n(mg/gN)" => :proline_mg_gn,
-      "Serine \n(mg/gN)" => :serine_mg_gn,
-      "Threonine \n(mg/gN)" => :threonine_mg_gn,
-      "Tyrosine \n(mg/gN)" => :tyrosine_mg_gn,
-      "Tryptophan \n(mg/gN)" => :tryptophan_mg_gn,
-      "Valine \n(mg/gN)" => :valine_mg_gn,
-      "Alanine \n(mg)" => :alanine_mg,
-      "Arginine \n(mg)" => :arginine_mg,
-      "Aspartic acid \n(mg)" => :aspartic_acid_mg,
-      "Cystine plus cysteine \n(mg)" => :cystine_plus_cysteine_mg,
-      "Glutamic acid \n(mg)" => :glutamic_acid_mg,
-      "Glycine \n(mg)" => :glycine_mg,
-      "Histidine \n(mg)" => :histidine_mg,
-      "Isoleucine \n(mg)" => :isoleucine_mg,
-      "Leucine \n(mg)" => :leucine_mg,
-      "Lysine \n(mg)" => :lysine_mg,
-      "Methionine \n(mg)" => :methionine_mg,
-      "Phenylalanine \n(mg)" => :phenylalanine_mg,
-      "Proline \n(mg)" => :proline_mg,
-      "Serine \n(mg)" => :serine_mg,
-      "Threonine \n(mg)" => :threonine_mg,
-      "Tyrosine \n(mg)" => :tyrosine_mg,
-      "Tryptophan \n(mg)" => :tryptophan_mg,
-      "Valine \n(mg)" => :valine_mg
+      "Total trans fatty acids, imputed \n(mg)"                     => :total_trans_fatty_acids_imputed_mg,
+      "Caffeine \n(mg)"                                             => :caffeine_mg,
+      "Cholesterol \n(mg)"                                          => :cholesterol_mg,
+      "Alanine \n(mg/gN)"                                           => :alanine_mg_gn,
+      "Arginine \n(mg/gN)"                                          => :arginine_mg_gn,
+      "Aspartic acid \n(mg/gN)"                                     => :aspartic_acid_mg_gn,
+      "Cystine plus cysteine \n(mg/gN)"                             => :cystine_plus_cysteine_mg_gn,
+      "Glutamic acid \n(mg/gN)"                                     => :glutamic_acid_mg_gn,
+      "Glycine \n(mg/gN)"                                           => :glycine_mg_gn,
+      "Histidine \n(mg/gN)"                                         => :histidine_mg_gn,
+      "Isoleucine \n(mg/gN)"                                        => :isoleucine_mg_gn,
+      "Leucine \n(mg/gN)"                                           => :leucine_mg_gn,
+      "Lysine \n(mg/gN)"                                            => :lysine_mg_gn,
+      "Methionine \n(mg/gN)"                                        => :methionine_mg_gn,
+      "Phenylalanine \n(mg/gN)"                                     => :phenylalanine_mg_gn,
+      "Proline \n(mg/gN)"                                           => :proline_mg_gn,
+      "Serine \n(mg/gN)"                                            => :serine_mg_gn,
+      "Threonine \n(mg/gN)"                                         => :threonine_mg_gn,
+      "Tyrosine \n(mg/gN)"                                          => :tyrosine_mg_gn,
+      "Tryptophan \n(mg/gN)"                                        => :tryptophan_mg_gn,
+      "Valine \n(mg/gN)"                                            => :valine_mg_gn,
+      "Alanine \n(mg)"                                              => :alanine_mg,
+      "Arginine \n(mg)"                                             => :arginine_mg,
+      "Aspartic acid \n(mg)"                                        => :aspartic_acid_mg,
+      "Cystine plus cysteine \n(mg)"                                => :cystine_plus_cysteine_mg,
+      "Glutamic acid \n(mg)"                                        => :glutamic_acid_mg,
+      "Glycine \n(mg)"                                              => :glycine_mg,
+      "Histidine \n(mg)"                                            => :histidine_mg,
+      "Isoleucine \n(mg)"                                           => :isoleucine_mg,
+      "Leucine \n(mg)"                                              => :leucine_mg,
+      "Lysine \n(mg)"                                               => :lysine_mg,
+      "Methionine \n(mg)"                                           => :methionine_mg,
+      "Phenylalanine \n(mg)"                                        => :phenylalanine_mg,
+      "Proline \n(mg)"                                              => :proline_mg,
+      "Serine \n(mg)"                                               => :serine_mg,
+      "Threonine \n(mg)"                                            => :threonine_mg,
+      "Tyrosine \n(mg)"                                             => :tyrosine_mg,
+      "Tryptophan \n(mg)"                                           => :tryptophan_mg,
+      "Valine \n(mg)"                                               => :valine_mg
     }.freeze
 
     csv_file = File.read(Rails.root.join('lib', 'tasks', 'australian_food_classification_data.csv'))

package.json

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

spec/features/admin/forums_spec.rb

@@ -29,8 +29,10 @@ describe "forums", :js do
       click_button 'Save'
     end
 
-    it { expect(page).to have_current_path forum_path(Forum.last), ignore_query: true }
-    it { expect(page).to have_content 'Forum was successfully created' }
+    it 'saves' do
+      expect(page).to have_content 'Forum was successfully created'
+      expect(page).to have_current_path forum_path(Forum.last), ignore_query: true
+    end
   end
 
   describe 'editing forum' do

spec/features/admin/plant_parts_spec.rb

@@ -28,8 +28,10 @@ describe "plant parts", :js do
       click_button 'Save'
     end
 
-    it { expect(page).to have_current_path plant_part_path(PlantPart.last), ignore_query: true }
-    it { expect(page).to have_content 'Plant part was successfully created' }
+    it 'saves' do
+      expect(page).to have_content 'Plant part was successfully created'
+      expect(page).to have_current_path plant_part_path(PlantPart.last), ignore_query: true
+    end
   end
 
   describe 'editing plant part' do

spec/features/admin/reverting_crops_spec.rb

@@ -32,7 +32,7 @@ RSpec.feature 'Reverting crops' do
 
     scenario 'Member cannot revert a crop' do
       visit admin_crops_path
-      expect(page).not_to have_link('Revert')
+      expect(page).to have_no_link('Revert')
     end
   end
 end

spec/features/signup_spec.rb

@@ -16,22 +16,15 @@ describe "signup" do
   end
 
   it "sign up for new account with existing username" do
-    visit crops_path # something other than front page, which has multiple signup links
-    click_link 'Sign up'
+    create(:member, login_name: 'person123')
+    visit new_member_registration_path
     fill_in 'Login name', with: 'person123'
-    fill_in 'Email', with: 'gardener@example.com'
-    fill_in 'Password', with: 'abc123'
-    fill_in 'Password confirmation', with: 'abc123'
-    check 'member_tos_agreement'
-    click_button 'Sign up'
-    expect(page).to have_current_path root_path, ignore_query: true
-    first('.signup a').click # click the 'Sign up' button in the middle of the page
-    fill_in 'Login name', with: 'person123'
-    fill_in 'Email', with: 'gardener@example.com'
+    fill_in 'Email', with: 'gardener2@example.com'
     fill_in 'Password', with: 'abc123'
     fill_in 'Password confirmation', with: 'abc123'
     check 'member_tos_agreement'
     click_button 'Sign up'
+    expect(page).to have_content 'has already been taken'
   end
 
   it "sign up for new account without accepting TOS" do

spec/requests/api/v1/activities_request_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Activities', type: :request do
 
   let(:member) { create(:member) }
   let(:token) do
-      member.regenerate_api_token
-      member.api_token.token
+    member.regenerate_api_token
+    member.api_token.token
   end
   let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
   let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }