Node 26

Node 14

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.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: '26'
 
       - 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,39 @@
 # 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: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_no, not_to
+Capybara/NegationMatcher:
+  Exclude:
+    - 'spec/features/admin/reverting_crops_spec.rb'
+
+# 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 +46,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 +63,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 +87,91 @@ 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: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
+Layout/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'db/migrate/20251130035700_create_versions.rb'
+
+# Offense count: 312
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/models/concerns/search_harvests.rb'
+    - 'app/models/concerns/search_plantings.rb'
+    - 'app/models/crop.rb'
+    - 'config/sitemap.rb'
+    - 'lib/tasks/import.rake'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+    - 'spec/requests/api/v1/members_request_spec.rb'
+
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+Layout/HeredocIndentation:
+  Exclude:
+    - 'db/migrate/20190712003735_add_like_counter_caches.rb'
+    - 'db/migrate/20191226024813_crop_harvest_counter_cache.rb'
+    - 'db/migrate/20191226024957_crop_photo_counter_cache.rb'
+    - 'db/migrate/20191226025124_plant_part_harvest_counter_cache.rb'
+    - 'db/migrate/20191226025225_post_comment_counter_cache.rb'
+    - 'db/migrate/20250824085224_add_photos_comment_count.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
+# SupportedStylesAlignWith: start_of_line, relative_to_receiver
+Layout/IndentationWidth:
+  Exclude:
+    - 'spec/requests/api/v1/activities_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: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'Gemfile'
+    - 'app/helpers/crops_helper.rb'
+
+# 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 +179,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 +237,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 +355,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 +377,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 +413,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 +453,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 +484,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 +504,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 +536,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 +557,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 +580,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 +628,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,16 +676,28 @@ 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'
     - 'lib/tasks/i18n.rake'
     - 'lib/tasks/testing.rake'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Rails/RedirectBackOrTo:
+  Exclude:
+    - 'app/controllers/follows_controller.rb'
+
 # Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
@@ -513,7 +709,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 +722,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 +738,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 +793,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 +835,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 +901,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 +918,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 +947,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

@@ -136,6 +136,11 @@ gem "gbifrb"
 
 gem "msgpack"
 
+# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
+# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
+# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
+gem "connection_pool", "< 3" 
+
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
@@ -195,8 +200,9 @@ group :test do
   gem 'vcr'
 end
 
-group :travis do
-  gem 'platform-api'
-end
-
 gem "i18n_data", "~> 1.1"
+
+gem "paper_trail", "~> 17.0"
+
+gem 'sitemap_generator'
+gem 'aws-sdk-s3', '~> 1', '>= 1.114.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,23 +113,42 @@ 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)
-    axe-core-api (4.11.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    axe-core-api (4.11.2)
       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
@@ -138,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)
@@ -158,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
@@ -175,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)
@@ -185,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)
@@ -200,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)
@@ -215,29 +236,30 @@ 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)
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
     domain_name (0.6.20240107)
-    dotenv (3.1.8)
-    dotenv-rails (3.1.8)
-      dotenv (= 3.1.8)
+    dotenv (3.2.0)
+    dotenv-rails (3.2.0)
+      dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
     dumb_delegator (1.1.0)
@@ -254,30 +276,28 @@ 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.2)
+    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)
-    friendly_id (5.5.1)
+    friendly_id (5.6.0)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
     geocoder (1.8.6)
@@ -293,7 +313,7 @@ GEM
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (7.0.2)
+    haml (7.2.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -302,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)
@@ -341,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
@@ -351,19 +365,21 @@ 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)
     jquery-rails (4.6.1)
       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
@@ -373,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)
@@ -404,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)
@@ -417,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
@@ -436,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.12)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -457,35 +474,35 @@ GEM
     open-uri (0.1.0)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    paper_trail (17.0.0)
+      activerecord (>= 7.1)
+      request_store (~> 1.4)
+    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)
@@ -498,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)
@@ -520,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)
@@ -531,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)
@@ -543,21 +560,22 @@ 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.16.1)
+    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)
+      rack (>= 1.4)
     responders (3.2.0)
       actionpack (>= 7.0)
       railties (>= 7.0)
@@ -581,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)
@@ -610,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.1)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -639,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)
@@ -650,7 +668,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.2.1)
+    rubyzip (3.2.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -664,25 +682,27 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.8.0)
+    scout_apm (6.2.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.38.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)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -692,35 +712,34 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.8)
+    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)
-    timeout (0.4.4)
+    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)
@@ -740,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
@@ -754,6 +774,7 @@ DEPENDENCIES
   active_median
   active_record_union
   active_utils
+  aws-sdk-s3 (~> 1, >= 1.114.0)
   axe-core-capybara
   axe-core-rspec
   better_errors
@@ -772,6 +793,7 @@ DEPENDENCIES
   chartkick
   coffee-rails
   comfortable_mexican_sofa!
+  connection_pool (< 3)
   crowdin-cli
   csv_shaper
   dalli
@@ -813,9 +835,9 @@ DEPENDENCIES
   oj
   omniauth (~> 1.3)
   omniauth-flickr (>= 0.0.15)
+  paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
-  platform-api
   pry
   puma
   query_diet
@@ -848,6 +870,7 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
+  sitemap_generator
   sprockets (< 4)
   terser
   timecop
@@ -860,7 +883,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22

README.md

@@ -25,7 +25,6 @@ Vibe Coding is more than okay, just make sure you indicate if you have done so a
 
 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
   working on, known bugs, etc)
-* [![Gitter](https://badges.gitter.im/Growstuff/growstuff.svg)](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 * [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)
 
 ## For coders

app/assets/stylesheets/application.scss

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

app/controllers/admin/crops_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Admin::CropsController < ApplicationController
+  before_action :authenticate_member!
+  before_action :authorize_admin!
+
+  def index
+    @versions = PaperTrail::Version.where(item_type: 'Crop').order(created_at: :desc).limit(100)
+    member_ids = @versions.map(&:whodunnit).compact.map(&:to_i)
+    @members = Member.where(id: member_ids).index_by(&:id)
+    @crop_wranglers = Role.crop_wranglers
+  end
+
+  private
+
+  def authorize_admin!
+    authorize! :wrangle, Crop
+  end
+end

app/controllers/admin/versions_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Admin
+  class VersionsController < ApplicationController
+    before_action :authenticate_member!
+    before_action :authorize_admin!
+
+    def revert
+      @version = PaperTrail::Version.find(params[:id])
+      @object = @version.reify
+      if @object.save
+        redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
+      else
+        redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
+      end
+    end
+
+    private
+
+    def authorize_admin!
+      authorize! :wrangle, Crop
+    end
+  end
+end

app/controllers/crops_controller.rb

@@ -73,6 +73,8 @@ class CropsController < ApplicationController
       format.html do
         @posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
         @companions = @crop.companions.approved
+        member_ids = @crop.versions.map(&:whodunnit).compact.map(&:to_i)
+        @version_members = Member.where(id: member_ids).index_by(&:id)
       end
       format.svg do
         icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
@@ -147,6 +149,34 @@ class CropsController < ApplicationController
     respond_with @crop
   end
 
+  def data_improvement
+    @active_tab = params[:tab] || 'photos'
+
+    @crops = case @active_tab
+             when 'photos'
+               Crop.approved.where(photo_associations_count: 0).order(plantings_count: :desc)
+             when 'descriptions'
+               Crop.approved.where(description: [nil, '']).order(plantings_count: :desc)
+             when 'youtube'
+               Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
+             when 'alternate_names'
+               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
+             when 'wikidata'
+               crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
+               Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
+             when 'row_spacing'
+               Crop.approved.where(row_spacing: nil).order(plantings_count: :desc)
+             when 'sun_requirements'
+               Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
+             when 'height'
+               Crop.approved.where(height: nil).order(plantings_count: :desc)
+             when 'public_food_key'
+               Crop.approved.where(public_food_key: [nil, '']).order(plantings_count: :desc)
+             else
+               Crop.none
+             end
+  end
+
   private
 
   def notifier
@@ -193,6 +223,7 @@ class CropsController < ApplicationController
       :request_notes, :reason_for_rejection,
       :rejection_notes,
       :description,
+      :public_food_key,
       :row_spacing, :spread, :height,
       :sowing_method, :sun_requirements, :growing_degree_days,
       scientific_names_attributes: %i(scientific_name _destroy id)

app/controllers/home_controller.rb

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

app/controllers/scientific_names_controller.rb

@@ -74,7 +74,7 @@ class ScientificNamesController < ApplicationController
   end
 
   def scientific_name_params
-    params.require(:scientific_name).permit(:crop_id, :name, :gbif_key)
+    params.require(:scientific_name).permit(:crop_id, :name, :gbif_key, :wikidata_id)
   end
 
   def gbif_service

app/helpers/crops_helper.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module CropsHelper
-
   def crop_or_parent(crop, attribute)
     default = crop.send(attribute)
     return default if default.present?
-    while parent = crop.parent do
+
+    parent = crop
+    while parent = parent.parent
       return parent.send(attribute) if parent&.send(attribute).present?
     end
 
@@ -37,4 +38,55 @@ module CropsHelper
     match = url.match(regex)
     match[1] if match
   end
+
+  def crop_jsonld_data(crop, full_attributes: true)
+    same_as_urls = [crop.en_wikipedia_url]
+    crop.scientific_names.each do |scientific_name|
+      same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}" if scientific_name.wikidata_id.present?
+    end
+
+    subject_of_entities = []
+    if full_attributes
+      if crop.en_youtube_url.present?
+        subject_of_entities << {
+          '@type': "VideoObject",
+          url:     crop.en_youtube_url
+        }
+      end
+
+      crop.posts.each do |post|
+        subject_of_entities << {
+          '@type': "SocialMediaPosting",
+          url:     post_url(post),
+          author:  {
+            '@type': 'Person',
+            name: post.author.login_name
+          },
+          'datePublished': post.created_at 
+        }
+      end
+
+      images = []
+      crop.photos.each do |photo|
+        images << photo.fullsize_url
+      end
+    end
+
+    # TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
+    # has_many :plantings, dependent: :destroy
+    # has_many :seeds, dependent: :destroy
+    # has_many :harvests, dependent: :destroy
+
+    {
+      '@context':     "https://schema.org",
+      '@type':        "BioChemEntity",
+      name:           crop.name,
+      taxonomicRange: crop.scientific_names.map(&:name),
+      description:    crop.description,
+      sameAs:         same_as_urls,
+      alternateName:  crop.alternate_names.map(&:name),
+      subjectOf:      subject_of_entities,
+      image:          images
+    }.compact
+  end
 end

app/models/australian_food_classification_data.rb

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

app/models/concerns/search_harvests.rb

@@ -53,7 +53,9 @@ module SearchHarvests
       owners = []
       1..limit.times do
         where = {
-          photos_count: { gt: 0 },
+          # 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 }
         }
         one_record = search('*',

app/models/concerns/search_plantings.rb

@@ -66,7 +66,9 @@ module SearchPlantings
       owners = []
       1..limit.times do
         where = {
-          photos_count: { gt: 0 },
+          # 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 }
         }
         one_record = search('*',

app/models/crop.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Crop < ApplicationRecord
+  has_paper_trail
   extend FriendlyId
   include PhotoCapable
   include OpenFarmData
@@ -27,6 +28,10 @@ class Crop < ApplicationRecord
   has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
   has_many :crop_posts, dependent: :delete_all
   has_many :posts, through: :crop_posts, dependent: :delete_all
+  has_one :australian_food_classification_data,
+          foreign_key: :public_food_key,
+          primary_key: :public_food_key,
+          inverse_of:  :crop
 
   accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
 

app/views/admin/crops/index.html.haml

@@ -0,0 +1,56 @@
+- content_for :title, "Crop Wrangling"
+
+%h1 Crop Wrangling
+
+%nav.nav
+  = link_to "Full crop hierarchy", hierarchy_crops_path, class: 'nav-link'
+  = link_to "Add Crop", new_crop_path, class: 'btn'
+
+%section.crop_wranglers
+  %h2 Crop Wranglers
+  - @crop_wranglers.each do |crop_wrangler|
+    = render 'members/tiny', member: crop_wrangler
+
+%hr/
+
+%section
+  %h2 Crops
+
+
+  %ul#myTab.nav.nav-tabs{role: "tablist"}
+    %li.nav-item
+      %a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: 'active'}
+        Recently edited
+    %li.nav-item
+      %a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab"}
+        Recently added
+    %li.nav-item
+      %a#profile-tab.nav-link{ href: wrangle_crops_path(approval_status: "pending"), role: "tab"}
+        Pending approval
+    %li.nav-item
+      %a#contact-tab.nav-link{ href: wrangle_crops_path(approval_status: "rejected"), role: "tab"}
+        Rejected
+
+  .card
+    %ul.list-group.list-group-flush
+      - @versions.each do |version|
+        - crop = version.item || version.reify
+        - if crop
+          %li.list-group-item
+            .d-flex.w-100.justify-content-between
+              %h5.mb-1
+                - if version.event == "destroy"
+                  = crop.name
+                - else
+                  = link_to crop.name, crop
+                %small.text-muted= "was #{version.event}d"
+              .d-inline-block
+                %small.mr-2= time_ago_in_words(version.created_at) + " ago"
+                - if can?(:wrangle, Crop)
+                  = link_to "Revert", revert_admin_version_path(version), method: :post, class: "btn btn-sm btn-outline-danger"
+            - member = @members[version.whodunnit.to_i]
+            - if member
+              %p.mb-1
+                Made by
+                = link_to member.name, member
+            = render 'shared/version_changeset', version: version

app/views/comments/index.html.haml

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

app/views/crops/_crop_list.html.haml

@@ -0,0 +1,10 @@
+%table.table.table-striped
+  %thead
+    %tr
+      %th Name
+      %th Plantings
+  %tbody
+    - crops.each do |crop|
+      %tr
+        %td= link_to crop.name, crop
+        %td= crop.plantings_count

app/views/crops/_form.html.haml

@@ -42,36 +42,46 @@
         %span.help-block Living more than two years
 
       %h2 Data
-      = f.text_area :description, label: 'Description'
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.description}
-      = f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.row_spacing}
-      = f.number_field :spread, label: 'Spread (cm)', min: 0
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.spread}
-      = f.number_field :height, label: 'Height (cm)', min: 0
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.height}
-      = f.text_field :sowing_method
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.sowing_method}
-      = f.text_field :sun_requirements
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.sun_requirements}
-      = f.number_field :growing_degree_days, min: 0
-      - if @crop.parent
-        %span.help-block Parent: #{@crop.parent.growing_degree_days}
+      - if @crop.description.blank? || can?(:wrangle, @crop)
+        = f.text_area :description, label: 'Description'
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.description}
+      - if @crop.row_spacing.blank? || can?(:wrangle, @crop)
+        = f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.row_spacing}
+      - if @crop.spread.blank? || can?(:wrangle, @crop)
+        = f.number_field :spread, label: 'Spread (cm)', min: 0
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.spread}
+      - if @crop.height.blank? || can?(:wrangle, @crop)
+        = f.number_field :height, label: 'Height (cm)', min: 0
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.height}
+      - if @crop.sowing_method.blank? || can?(:wrangle, @crop)
+        = f.text_field :sowing_method
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.sowing_method}
+      - if @crop.sun_requirements.blank? || can?(:wrangle, @crop)
+        = f.text_field :sun_requirements
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.sun_requirements}
+      - if @crop.growing_degree_days.blank? || can?(:wrangle, @crop)
+        = f.number_field :growing_degree_days, min: 0
+        - if @crop.parent
+          %span.help-block Parent: #{@crop.parent.growing_degree_days}
+      = f.text_field :public_food_key, label: 'Australian Food Composition Database Public Food Key'
 
       - unless @crop.approved?
         = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
-      = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
-      %span.help-block
-        Link to the crop's page on the English language Wikipedia (required).
-      = f.url_field :en_youtube_url, label: 'YouTube URL'
-      %span.help-block
-        Link to a YouTube video about the crop in English.
+      - if @crop.en_wikipedia_url.blank? || can?(:wrangle, @crop)
+        = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
+        %span.help-block
+          Link to the crop's page on the English language Wikipedia (required).
+      - if @crop.en_youtube_url.blank? || can?(:wrangle, @crop)
+        = f.url_field :en_youtube_url, label: 'YouTube URL'
+        %span.help-block
+          Link to a YouTube video about the crop in English.
 
       -# Only crop wranglers see the crop hierarchy (for now)
       - if can? :wrangle, @crop

app/views/crops/_history.html.haml

@@ -0,0 +1,16 @@
+%section.history
+  %h2 History
+  .card
+    %ul.list-group.list-group-flush
+      - crop.versions.reorder(created_at: :desc).each do |version|
+        - if version.changeset.present?
+          %li.list-group-item
+            .d-flex.w-100.justify-content-between
+              %h5.mb-1= version.event.humanize
+              %small= time_ago_in_words(version.created_at) + " ago"
+            - member = @version_members.present? && @version_members[version.whodunnit.to_i]
+            - if member
+              %p.mb-1
+                Made by
+                = link_to member.name, member
+            = render 'shared/version_changeset', version: version

app/views/crops/_info.haml

@@ -23,6 +23,9 @@
         Nobody is growing this yet. You could be the first!
     - if crop_or_parent(@crop, :description).present?
       %p= simple_format crop_or_parent(@crop, :description)
+    - else
+      - if member_signed_in?
+        %p= link_to "Add a description.", edit_crop_path(@crop, anchor: ":~:text=Description")
   .col-md-3
     = image_tag crop_image_path(@crop),
       class: 'img-responsive shadow rounded crop-hero-photo', alt: "Image of #{@crop.name}"

app/views/crops/_nutritional_data.html.haml

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

app/views/crops/_predictions.html.haml

@@ -54,3 +54,7 @@
   - if crop.growing_degree_days.present?
     = render 'layouts/fact_card',
       title: 'Growing Degree Days', value: crop.growing_degree_days, description: nil
+  - if member_signed_in? && (!crop.height.present? || !crop.spread.present? || !crop.row_spacing.present? || !crop.growing_degree_days.present?)
+    .card.fact-card
+      .card-body.text-center
+        %p= link_to "Add more attributes.", edit_crop_path(@crop, anchor: ":~:text=Data")

app/views/crops/_schema_org.html.haml

@@ -0,0 +1,2 @@
+%script{type: "application/ld+json"}
+  = crop_jsonld_data(crop).to_json.html_safe

app/views/crops/_scientific_names.html.haml

@@ -4,25 +4,28 @@
     %p None known.
   - else
     - crop.scientific_names.each do |sn|
-      - if can? :edit, sn
-        .dropdown.planting-actions
-          %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
-          .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
-            = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
-              = edit_icon
-              = t('.edit')
-            .dropdown-divider
-            = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
-              = delete_icon
-              = t('.delete')
-      - else
-        - if sn.gbif_key
-          = link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
-                  class: 'card-link',
-                  target: "_blank",
-                  rel: "noopener noreferrer"
+      .d-inline-block
+        - if can? :edit, sn
+          .dropdown.planting-actions.d-inline-block
+            %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
+            .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
+              = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
+                = edit_icon
+                = t('.edit')
+              .dropdown-divider
+              = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
+                = delete_icon
+                = t('.delete')
         - else
-          .badge= sn.name
+          - if sn.gbif_key
+            = link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
+                    class: 'card-link',
+                    target: "_blank",
+                    rel: "noopener noreferrer"
+          - else
+            .badge= sn.name
+      - if sn.wikidata_id.present?
+        = link_to "WD", "https://www.wikidata.org/wiki/#{sn.wikidata_id}", class: 'badge badge-info ms-1', target: '_blank', rel: 'noopener noreferrer', title: 'Wikidata'
 
   %p.text-right
     - if can? :edit, crop

app/views/crops/data_improvement.html.haml

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

app/views/crops/index.html.haml

@@ -1,8 +1,10 @@
 - content_for :title, t('.title')
+- content_for :meta_description, "Browse and search for crops."
 
 - content_for :buttonbar do
   - if can? :wrangle, Crop
     = link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
+  = link_to 'Data Improvement', data_improvement_crops_path, class: 'btn btn-info'
   - if can? :create, Crop
     = link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'
 

app/views/crops/show.html.haml

@@ -1,4 +1,13 @@
-- content_for :title, @crop.name
+= render 'schema_org', crop: @crop
+- content_for :title do
+  = @crop.name.titleize
+  - if @crop.default_scientific_name.present?
+    = " (#{@crop.default_scientific_name})"
+- content_for :meta_description do
+  - if @crop.description.present?
+    = @crop.description
+  - else
+    = "Learn how to grow #{@crop.name}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: crop_image_path(@crop))
   = tag("meta", property: "og:title", content: @crop.name)
@@ -37,6 +46,11 @@
         %h2 Video
         .embed-responsive.embed-responsive-16by9
           %iframe.embed-responsive-item{ src: "https://www.youtube.com/embed/#{youtube_video_id(crop_or_parent(@crop, :en_youtube_url))}", allowfullscreen: true }
+    - else
+      - if member_signed_in?
+        %section.youtube
+          %h2 Video
+          %p= link_to "Submit a video.", edit_crop_path(@crop, anchor: ":~:text=Youtube")
 
     %section.photos
       = cute_icon
@@ -76,6 +90,7 @@
 
     %section.posts= render 'crops/posts', crop: @crop
 
+    = render 'history', crop: @crop
   .col-md-3
     = cute_icon
     .card
@@ -121,6 +136,8 @@
 
     = render 'openfarm_data', crop: @crop
 
+    = render 'nutritional_data', crop: @crop
+
     = cute_icon
     .card
       .card-body
@@ -133,6 +150,12 @@
             = icon 'fas', 'external-link-alt'
             Wikipedia (English)
 
+        - if @crop.public_food_key.present?
+          %li.list-group-item
+            = link_to "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{@crop.public_food_key}", target: "_blank", rel: "noopener noreferrer" do
+              = icon 'fas', 'external-link-alt'
+              Australian Food Composition Database
+
         %li.list-group-item
           = link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
                     target: "_blank",

app/views/crops/wrangle.html.haml

@@ -17,6 +17,9 @@
   %h2 Crops
 
   %ul#myTab.nav.nav-tabs{role: "tablist"}
+    %li.nav-item
+      %a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: ''}
+        Recently edited
     %li.nav-item
       %a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab", class: @approval_status.blank? ? 'active' : ''}
         Recently added

app/views/harvests/index.html.haml

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

app/views/harvests/show.html.haml

@@ -1,4 +1,9 @@
 = content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
+- content_for :meta_description do
+  - if @harvest.description.present?
+    = @harvest.description
+  - else
+    = "#{@harvest.crop} harvested by #{@harvest.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: harvest_image_path(@harvest))
   = tag("meta", property: "og:image:user_generated", content: "true")
@@ -7,6 +12,9 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
+%script{type: "application/ld+json"}
+  = crop_jsonld_data(@harvest.crop, full_attributes: false).to_json.html_safe
+
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Harvests', harvests_path
   %li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
@@ -68,3 +76,4 @@
 
     .col-md-4.col-xs-12
       = render @harvest.crop
+      = render 'crops/nutritional_data', crop: @harvest.crop

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}"

app/views/home/community_gardens.html.haml

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

app/views/home/index.html.haml

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

app/views/layouts/_head.html.haml

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

app/views/layouts/_menu.haml

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

app/views/members/show.html.haml

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

app/views/plantings/index.html.haml

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

app/views/plantings/show.html.haml

@@ -1,4 +1,9 @@
 = content_for :title, "#{@planting.crop} in #{@planting.location}"
+- content_for :meta_description do
+  - if @planting.description.present?
+    = @planting.description
+  - else
+    = "#{@planting.crop} planted in #{@planting.location} by #{@planting.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: planting_image_path(@planting))
   = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
@@ -16,6 +21,8 @@
           "ratingValue": "#{@planting.overall_rating}",
           "bestRating": "5"
         }
+  %script{type: "application/ld+json"}
+    = crop_jsonld_data(@planting.crop, full_attributes: false).to_json.html_safe
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Plantings', plantings_path

app/views/scientific_names/_form.html.haml

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

app/views/seeds/index.html.haml

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

app/views/seeds/show.html.haml

@@ -1,4 +1,9 @@
 - content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
+- content_for :meta_description do
+  - if @seed.description.present?
+    = @seed.description
+  - else
+    = "Seeds for #{@seed.crop.name}, shared by #{@seed.owner}."
 - content_for :opengraph do
   = tag("meta", property: "og:image", content: seed_image_path(@seed))
   - if @seed.description
@@ -8,6 +13,8 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
+%script{type: "application/ld+json"}
+  = crop_jsonld_data(@seed.crop, full_attributes: false).to_json.html_safe
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Seeds', seeds_path

app/views/shared/_version_changeset.html.haml

@@ -0,0 +1,17 @@
+- if version.changeset.present?
+  .changes
+    - version.changeset.each do |field, changes|
+      - if field != "updated_at"
+        .row
+          .col-md-3
+            %strong= field.humanize
+          .col-md-9
+            - if changes[0].present?
+              %em= changes[0]
+            - else
+              %em (blank)
+            %span.text-muted ->
+            - if changes[1].present?
+              %em= changes[1]
+            - else
+              %em (blank)

config.ru

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

config/locales/en.yml

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

config/routes.rb

@@ -23,6 +23,7 @@ Rails.application.routes.draw do
   resources :authentications, only: %i(create destroy)
 
   get "home/index"
+  get '/community-gardens', to: 'home#community_gardens'
   root to: 'home#index'
 
   concern :has_photos do
@@ -89,6 +90,14 @@ Rails.application.routes.draw do
       get 'wrangle'
       get 'hierarchy'
       get 'search'
+      get 'data_improvement'
+    end
+  end
+
+  namespace :admin do
+    resources :crops, only: [:index]
+    resources :versions, only: [] do
+      post :revert, on: :member, as: :revert
     end
   end
 

config/sitemap.rb

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

db/migrate/20241129215300_create_australian_food_classification_data.rb

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

db/migrate/20251130035700_create_versions.rb

@@ -0,0 +1,41 @@
+# 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,
+  # when serializing very large objects, `text` might not be big enough.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    create_table :versions do |t|
+      # Consider using bigint type for performance if you are going to store only numeric ids.
+      # t.bigint   :whodunnit
+      t.string   :whodunnit
+
+      # Known issue in MySQL: fractional second precision
+      # -------------------------------------------------
+      #
+      # MySQL timestamp columns do not support fractional seconds unless
+      # defined with "fractional seconds precision". MySQL users should manually
+      # add fractional seconds precision to this migration, specifically, to
+      # the `created_at` column.
+      # (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
+      #
+      # MySQL users should also upgrade to at least rails 4.2, which is the first
+      # version of ActiveRecord with support for fractional seconds in MySQL.
+      # (https://github.com/rails/rails/pull/14359)
+      #
+      # MySQL users should use the following line for `created_at`
+      # t.datetime :created_at, limit: 6
+      t.datetime :created_at
+
+      t.bigint   :item_id,   null: false
+      t.string   :item_type, null: false
+      t.string   :event,     null: false
+      t.text     :object, limit: TEXT_BYTES
+    end
+    add_index :versions, %i[item_type item_id]
+  end
+end

db/migrate/20251130035701_add_object_changes_to_versions.rb

@@ -0,0 +1,12 @@
+# This migration adds the optional `object_changes` column, in which PaperTrail
+# will store the `changes` diff for each update event. See the readme for
+# details.
+class AddObjectChangesToVersions < ActiveRecord::Migration[7.2]
+  # The largest text column available in all supported RDBMS.
+  # See `create_versions.rb` for details.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    add_column :versions, :object_changes, :text, limit: TEXT_BYTES
+  end
+end

db/migrate/20251130053104_add_public_food_key_to_crops.rb

@@ -0,0 +1,5 @@
+class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
+  def change
+    add_column :crops, :public_food_key, :string
+  end
+end

db/migrate/20251201045000_add_index_to_crops_public_food_key.rb

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

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
+ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -73,6 +73,305 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
     t.index ["language"], name: "index_alternate_names_on_language"
   end
 
+  create_table "australian_food_classification_data", force: :cascade do |t|
+    t.string "public_food_key"
+    t.string "classification"
+    t.string "food_name"
+    t.decimal "energy_with_dietary_fibre_equated_kj"
+    t.decimal "energy_without_dietary_fibre_equated_kj"
+    t.decimal "moisture_water_g"
+    t.decimal "protein_g"
+    t.decimal "nitrogen_g"
+    t.decimal "fat_total_g"
+    t.decimal "ash_g"
+    t.decimal "total_dietary_fibre_g"
+    t.decimal "alcohol_g"
+    t.decimal "fructose_g"
+    t.decimal "glucose_g"
+    t.decimal "sucrose_g"
+    t.decimal "maltose_g"
+    t.decimal "lactose_g"
+    t.decimal "galactose_g"
+    t.decimal "maltotrios_g"
+    t.decimal "total_sugars_g"
+    t.decimal "added_sugars_g"
+    t.decimal "free_sugars_g"
+    t.decimal "starch_g"
+    t.decimal "dextrin_g"
+    t.decimal "glycerol_g"
+    t.decimal "glycogen_g"
+    t.decimal "inulin_g"
+    t.decimal "erythritol_g"
+    t.decimal "maltitol_g"
+    t.decimal "mannitol_g"
+    t.decimal "xylitol_g"
+    t.decimal "maltodextrin_g"
+    t.decimal "oligosaccharides_g"
+    t.decimal "polydextrose_g"
+    t.decimal "raffinose_g"
+    t.decimal "stachyose_g"
+    t.decimal "sorbitol_g"
+    t.decimal "resistant_starch_g"
+    t.decimal "available_carbohydrate_without_sugar_alcohols_g"
+    t.decimal "available_carbohydrate_with_sugar_alcohols_g"
+    t.decimal "acetic_acid_g"
+    t.decimal "citric_acid_g"
+    t.decimal "fumaric_acid_g"
+    t.decimal "lactic_acid_g"
+    t.decimal "malic_acid_g"
+    t.decimal "oxalic_acid_g"
+    t.decimal "propionic_acid_g"
+    t.decimal "quinic_acid_g"
+    t.decimal "shikimic_acid_g"
+    t.decimal "succinic_acid_g"
+    t.decimal "tartaric_acid_g"
+    t.decimal "aluminium_al_ug"
+    t.decimal "antimony_sb_ug"
+    t.decimal "arsenic_as_ug"
+    t.decimal "cadmium_cd_ug"
+    t.decimal "calcium_ca_mg"
+    t.decimal "chromium_cr_ug"
+    t.decimal "chloride_cl_mg"
+    t.decimal "cobalt_co_ug"
+    t.decimal "copper_cu_mg"
+    t.decimal "fluoride_f_ug"
+    t.decimal "iodine_i_ug"
+    t.decimal "iron_fe_mg"
+    t.decimal "lead_pb_ug"
+    t.decimal "magnesium_mg_mg"
+    t.decimal "manganese_mn_mg"
+    t.decimal "mercury_hg_ug"
+    t.decimal "molybdenum_mo_ug"
+    t.decimal "nickel_ni_ug"
+    t.decimal "phosphorus_p_mg"
+    t.decimal "potassium_k_mg"
+    t.decimal "selenium_se_ug"
+    t.decimal "sodium_na_mg"
+    t.decimal "sulphur_s_mg"
+    t.decimal "tin_sn_ug"
+    t.decimal "zinc_zn_mg"
+    t.decimal "retinol_preformed_vitamin_a_ug"
+    t.decimal "alpha_carotene_ug"
+    t.decimal "beta_carotene_ug"
+    t.decimal "cryptoxanthin_ug"
+    t.decimal "beta_carotene_equivalents_provitamin_a_ug"
+    t.decimal "vitamin_a_retinol_equivalents_ug"
+    t.decimal "lutein_ug"
+    t.decimal "lycopene_ug"
+    t.decimal "xanthophyl_ug"
+    t.decimal "thiamin_b1_mg"
+    t.decimal "riboflavin_b2_mg"
+    t.decimal "niacin_b3_mg"
+    t.decimal "niacin_derived_from_tryptophan_mg"
+    t.decimal "niacin_derived_equivalents_mg"
+    t.decimal "pantothenic_acid_b5_mg"
+    t.decimal "pyridoxine_b6_mg"
+    t.decimal "biotin_b7_ug"
+    t.decimal "cobalamin_b12_ug"
+    t.decimal "folate_natural_ug"
+    t.decimal "folic_acid_ug"
+    t.decimal "total_folates_ug"
+    t.decimal "dietary_folate_equivalents_ug"
+    t.decimal "vitamin_c_mg"
+    t.decimal "cholecalciferol_d3_ug"
+    t.decimal "ergocalciferol_d2_ug"
+    t.decimal "c25_hydroxy_cholecalciferol_25_oh_d3_ug"
+    t.decimal "c25_hydroxy_ergocalciferol_25_oh_d2_ug"
+    t.decimal "vitamin_d3_equivalents_ug"
+    t.decimal "alpha_tocopherol_mg"
+    t.decimal "alpha_tocotrienol_mg"
+    t.decimal "beta_tocopherol_mg"
+    t.decimal "beta_tocotrienol_mg"
+    t.decimal "delta_tocopherol_mg"
+    t.decimal "delta_tocotrienol_mg"
+    t.decimal "gamma_tocopherol_mg"
+    t.decimal "gamma_tocotrienol_mg"
+    t.decimal "vitamin_e_mg"
+    t.decimal "c4_t"
+    t.decimal "c6_t"
+    t.decimal "c8_t"
+    t.decimal "c10_t"
+    t.decimal "c11_t"
+    t.decimal "c12_t"
+    t.decimal "c13_t"
+    t.decimal "c14_t"
+    t.decimal "c15_t"
+    t.decimal "c16_t"
+    t.decimal "c17_t"
+    t.decimal "c18_t"
+    t.decimal "c19_t"
+    t.decimal "c20_t"
+    t.decimal "c21_t"
+    t.decimal "c22_t"
+    t.decimal "c23_t"
+    t.decimal "c24_t"
+    t.decimal "total_saturated_fatty_acids_equated_t"
+    t.decimal "c10_1_t"
+    t.decimal "c12_1_t"
+    t.decimal "c14_1_t"
+    t.decimal "c15_1_t"
+    t.decimal "c16_1_t"
+    t.decimal "c17_1_t"
+    t.decimal "c18_1_t"
+    t.decimal "c18_1w5_t"
+    t.decimal "c18_1w6_t"
+    t.decimal "c18_1w7_t"
+    t.decimal "c18_1w9_t"
+    t.decimal "c20_1_t"
+    t.decimal "c20_1w9_t"
+    t.decimal "c20_1w13_t"
+    t.decimal "c20_1w11_t"
+    t.decimal "c22_1_t"
+    t.decimal "c22_1w9_t"
+    t.decimal "c22_1w11_t"
+    t.decimal "c24_1_t"
+    t.decimal "c24_1w9_t"
+    t.decimal "c24_1w11_t"
+    t.decimal "c24_1w13_t"
+    t.decimal "total_monounsaturated_fatty_acids_equated_t"
+    t.decimal "c12_2_t"
+    t.decimal "c16_2w4_t"
+    t.decimal "c16_3_t"
+    t.decimal "c18_2w6_t"
+    t.decimal "c18_3w3_t"
+    t.decimal "c18_3w4_t"
+    t.decimal "c18_3w6_t"
+    t.decimal "c18_4w1_t"
+    t.decimal "c18_4w3_t"
+    t.decimal "c20_2_t"
+    t.decimal "c20_2w6_t"
+    t.decimal "c20_3_t"
+    t.decimal "c20_4_t"
+    t.decimal "c20_3w3_t"
+    t.decimal "c20_3w6_t"
+    t.decimal "c20_4w3_t"
+    t.decimal "c20_4w6_t"
+    t.decimal "c20_5w3_t"
+    t.decimal "c21_5w3_t"
+    t.decimal "c22_2_t"
+    t.decimal "c22_2w6_t"
+    t.decimal "c22_4w6_t"
+    t.decimal "c22_5w3_t"
+    t.decimal "c22_5w6_t"
+    t.decimal "c22_6w3_t"
+    t.decimal "total_polyunsaturated_fatty_acids_equated_t"
+    t.decimal "total_long_chain_omega_3_fatty_acids_equated_t"
+    t.decimal "total_undifferentiated_fatty_acids_t"
+    t.decimal "total_trans_fatty_acids_imputed_t"
+    t.decimal "c4_g"
+    t.decimal "c6_g"
+    t.decimal "c8_g"
+    t.decimal "c10_g"
+    t.decimal "c11_g"
+    t.decimal "c12_g"
+    t.decimal "c13_g"
+    t.decimal "c14_g"
+    t.decimal "c15_g"
+    t.decimal "c16_g"
+    t.decimal "c17_g"
+    t.decimal "c18_g"
+    t.decimal "c19_g"
+    t.decimal "c20_g"
+    t.decimal "c21_g"
+    t.decimal "c22_g"
+    t.decimal "c23_g"
+    t.decimal "c24_g"
+    t.decimal "total_saturated_fatty_acids_equated_g"
+    t.decimal "c10_1_g"
+    t.decimal "c12_1_g"
+    t.decimal "c14_1_g"
+    t.decimal "c15_1_g"
+    t.decimal "c16_1_g"
+    t.decimal "c17_1_g"
+    t.decimal "c18_1_g"
+    t.decimal "c18_1w5_mg"
+    t.decimal "c18_1w6_mg"
+    t.decimal "c18_1w7_g"
+    t.decimal "c18_1w9_mg"
+    t.decimal "c20_1_g"
+    t.decimal "c20_1w9_mg"
+    t.decimal "c20_1w13_mg"
+    t.decimal "c20_1w11_mg"
+    t.decimal "c22_1_g"
+    t.decimal "c22_1w9_mg"
+    t.decimal "c22_1w11_mg"
+    t.decimal "c24_1_g"
+    t.decimal "c24_1w9_mg"
+    t.decimal "c24_1w11_mg"
+    t.decimal "c24_1w13_mg"
+    t.decimal "total_monounsaturated_fatty_acids_equated_g"
+    t.decimal "c12_2_g"
+    t.decimal "c16_2w4_mg"
+    t.decimal "c16_3_g"
+    t.decimal "c18_2w6_g"
+    t.decimal "c18_3w3_g"
+    t.decimal "c18_3w4_g"
+    t.decimal "c18_3w6_mg"
+    t.decimal "c18_4w1_g"
+    t.decimal "c18_4w3_mg"
+    t.decimal "c20_2_mg"
+    t.decimal "c20_2w6_mg"
+    t.decimal "c20_3_mg"
+    t.decimal "c20_3w3_mg"
+    t.decimal "c20_3w6_mg"
+    t.decimal "c20_4_g"
+    t.decimal "c20_4w3_mg"
+    t.decimal "c20_4w6_mg"
+    t.decimal "c20_5w3_mg"
+    t.decimal "c21_5w3_g"
+    t.decimal "c22_5w3_mg"
+    t.decimal "c22_4w6_mg"
+    t.decimal "c22_2_g"
+    t.decimal "c22_2w6_mg"
+    t.decimal "c22_5w6_g"
+    t.decimal "c22_6w3_mg"
+    t.decimal "total_polyunsaturated_fatty_acids_equated_g"
+    t.decimal "total_long_chain_omega_3_fatty_acids_equated_mg"
+    t.decimal "total_undifferentiated_fatty_acids_mass_basis_basis_mg"
+    t.decimal "total_trans_fatty_acids_imputed_mg"
+    t.decimal "caffeine_mg"
+    t.decimal "cholesterol_mg"
+    t.decimal "alanine_mg_gn"
+    t.decimal "arginine_mg_gn"
+    t.decimal "aspartic_acid_mg_gn"
+    t.decimal "cystine_plus_cysteine_mg_gn"
+    t.decimal "glutamic_acid_mg_gn"
+    t.decimal "glycine_mg_gn"
+    t.decimal "histidine_mg_gn"
+    t.decimal "isoleucine_mg_gn"
+    t.decimal "leucine_mg_gn"
+    t.decimal "lysine_mg_gn"
+    t.decimal "methionine_mg_gn"
+    t.decimal "phenylalanine_mg_gn"
+    t.decimal "proline_mg_gn"
+    t.decimal "serine_mg_gn"
+    t.decimal "threonine_mg_gn"
+    t.decimal "tyrosine_mg_gn"
+    t.decimal "tryptophan_mg_gn"
+    t.decimal "valine_mg_gn"
+    t.decimal "alanine_mg"
+    t.decimal "arginine_mg"
+    t.decimal "aspartic_acid_mg"
+    t.decimal "cystine_plus_cysteine_mg"
+    t.decimal "glutamic_acid_mg"
+    t.decimal "glycine_mg"
+    t.decimal "histidine_mg"
+    t.decimal "isoleucine_mg"
+    t.decimal "leucine_mg"
+    t.decimal "lysine_mg"
+    t.decimal "methionine_mg"
+    t.decimal "phenylalanine_mg"
+    t.decimal "proline_mg"
+    t.decimal "serine_mg"
+    t.decimal "threonine_mg"
+    t.decimal "tyrosine_mg"
+    t.decimal "tryptophan_mg"
+    t.decimal "valine_mg"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["public_food_key"], name: "index_australian_food_classification_data_on_public_food_key"
+  end
+
   create_table "authentications", id: :serial, force: :cascade do |t|
     t.integer "member_id", null: false
     t.string "provider", null: false
@@ -261,9 +560,11 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
     t.integer "growing_degree_days"
     t.string "en_youtube_url"
     t.text "description"
+    t.string "public_food_key"
     t.index ["creator_id"], name: "index_crops_on_creator_id"
     t.index ["name"], name: "index_crops_on_name"
     t.index ["parent_id"], name: "index_crops_on_parent_id"
+    t.index ["public_food_key"], name: "index_crops_on_public_food_key"
     t.index ["requester_id"], name: "index_crops_on_requester_id"
     t.index ["slug"], name: "index_crops_on_slug", unique: true
   end
@@ -658,6 +959,17 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
     t.index ["source"], name: "index_seeds_on_source"
   end
 
+  create_table "versions", force: :cascade do |t|
+    t.string "whodunnit"
+    t.datetime "created_at"
+    t.bigint "item_id", null: false
+    t.string "item_type", null: false
+    t.string "event", null: false
+    t.text "object"
+    t.text "object_changes"
+    t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
+  end
+
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "harvests", "plantings"

lib/tasks/import.rake

@@ -0,0 +1,325 @@
+require 'csv'
+
+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,
+      "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
+    }.freeze
+
+    csv_file = File.read(Rails.root.join('lib', 'tasks', 'australian_food_classification_data.csv'))
+    csv = CSV.parse(csv_file, headers: true)
+
+    csv.each do |row|
+      record = AustralianFoodClassificationData.find_or_initialize_by(
+        public_food_key: row.fetch("Public Food Key")
+      )
+
+      attributes = {}
+      HEADER_MAP.each do |csv_header, db_column|
+        raw_value = row[csv_header]
+        value = if raw_value&.match?(/\A-?[\d,.]+\z/)
+                  raw_value.gsub(',', '')
+                else
+                  raw_value
+                end
+        attributes[db_column] = value
+      end
+
+      record.assign_attributes(attributes)
+      record.save!
+    end
+  end
+end

lib/tasks/wikidata.rake

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

public/robots.txt

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

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.feature 'Reverting crops' do
+  let(:wrangler) { create(:crop_wrangling_member) }
+  let(:member) { create(:member) }
+  let!(:crop) { create(:crop, name: 'Initial Name') }
+
+  before do
+    crop.update(name: 'Updated Name')
+  end
+
+  context 'when logged in as an wrangler' do
+    before do
+      login_as(wrangler, scope: :member)
+    end
+
+    scenario 'Admin reverts a crop' do
+      visit admin_crops_path
+      click_link 'Revert', match: :first
+      expect(page).to have_content('Reverted to version from')
+      crop.reload
+      expect(crop.name).to eq('Initial Name')
+    end
+  end
+
+  context 'when logged in as a regular member' do
+    before do
+      login_as(member, scope: :member)
+    end
+
+    scenario 'Member cannot revert a crop' do
+      visit admin_crops_path
+      expect(page).not_to have_link('Revert')
+    end
+  end
+end

spec/features/crops/crop_detail_page_spec.rb

@@ -196,7 +196,7 @@ describe "crop detail page", :js do
     context 'crop is Perennial' do
       let(:crop) { FactoryBot.create(:perennial_crop) }
 
-      it { expect(page).to have_text 'Perennial' }
+      it { expect(find('.index-cards.facts')).to have_text 'Perennial' }
       it { expect(page).to have_text 'living more than two years' }
       it { expect(page).to have_no_text 'Annual' }
     end
@@ -204,7 +204,7 @@ describe "crop detail page", :js do
     context 'crop Perennial value is null' do
       let(:crop) { FactoryBot.create(:crop, perennial: nil) }
 
-      it { expect(page).to have_no_text 'Perennial' }
+      it { expect(find('.index-cards.facts')).to have_no_text 'Perennial' }
       it { expect(page).to have_no_text 'Annual' }
     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/models/planting_spec.rb

@@ -605,7 +605,7 @@ describe Planting do
 
     before { described_class.reindex }
 
-    it { expect(subject.count).to eq 2 }
-    it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s]) }
+    it { expect(subject.count).to eq 3 }
+    it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s, planting.id.to_s]) }
   end
 end

spec/tasks/import_spec.rb

@@ -0,0 +1,26 @@
+require 'rails_helper'
+require 'rake'
+
+describe 'import:australian_food_classification_data' do
+  before :all do
+    Rails.application.load_tasks
+  end
+
+  it "imports the data from the CSV file" do
+    Rake::Task['import:australian_food_classification_data'].invoke
+    expect(AustralianFoodClassificationData.count).to eq(2)
+
+    first_record = AustralianFoodClassificationData.find_by(public_food_key: 'F002258')
+    expect(first_record.food_name).to eq('Cardamom seed, dried, ground')
+    expect(first_record.protein_g).to eq(BigDecimal('10.8'))
+
+    second_record = AustralianFoodClassificationData.find_by(public_food_key: 'F002893')
+    expect(second_record.food_name).to eq('Chilli (chili), dried, ground')
+    expect(second_record.fat_total_g).to eq(BigDecimal('14.3'))
+
+    # Test idempotency
+    Rake::Task['import:australian_food_classification_data'].reenable
+    Rake::Task['import:australian_food_classification_data'].invoke
+    expect(AustralianFoodClassificationData.count).to eq(2)
+  end
+end

spec/views/crops/show.html.haml_spec.rb

@@ -12,6 +12,7 @@ describe "crops/show" do
     @current_member = @member
     @harvest = FactoryBot.create(:harvest, owner: @member)
     controller.stub(:current_user) { @member }
+    assign(:version_members, {})
   end
 
   it "hides sunniness block if no sunniness" do

yarn.lock

@@ -284,9 +284,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"
+  integrity sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -347,7 +347,7 @@ cli-width@^2.0.0:
 cli@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14"
-  integrity sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=
+  integrity sha512-41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==
   dependencies:
     exit "0.1.2"
     glob "^7.1.1"
@@ -398,12 +398,12 @@ color-name@~1.1.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 console-browserify@1.1.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
+  integrity sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==
   dependencies:
     date-now "^0.1.4"
 
@@ -466,7 +466,7 @@ csslint@^1.0.5:
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
+  integrity sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==
 
 debug@^4.0.1, debug@^4.1.1:
   version "4.3.4"
@@ -513,21 +513,21 @@ domelementtype@1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
 domhandler@2.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
-  integrity sha1-LeWaCCLVAn+r/28DLCsloqir5zg=
+  integrity sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==
   dependencies:
     domelementtype "1"
 
 domutils@1.5:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -552,7 +552,7 @@ end-of-stream@^1.1.0:
 entities@1.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
-  integrity sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=
+  integrity sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==
 
 entities@^2.0.0:
   version "2.2.0"
@@ -684,7 +684,7 @@ esutils@^2.0.2:
 exit@0.1.2, exit@0.1.x:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 external-editor@^3.0.3:
   version "3.1.0"
@@ -799,7 +799,7 @@ flatted@^2.0.0:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -830,7 +830,19 @@ glob-parent@^5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.1:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -874,7 +886,7 @@ has@^1.0.3:
 htmlparser2@3.8.x:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
-  integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg=
+  integrity sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==
   dependencies:
     domelementtype "1"
     domhandler "2.3"
@@ -922,7 +934,7 @@ imurmurhash@^0.1.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -993,7 +1005,7 @@ is-number@^7.0.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -1014,9 +1026,9 @@ js-yaml@^3.13.0:
     esprima "^4.0.0"
 
 jshint@^2.9.4:
-  version "2.13.4"
-  resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.13.4.tgz#cee025a57c3f393d5455532d9ec7ccb018f890db"
-  integrity sha512-HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw==
+  version "2.13.6"
+  resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.13.6.tgz#3679a2687a3066fa9034ef85d8c305613a31eec6"
+  integrity sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==
   dependencies:
     cli "~1.0.0"
     console-browserify "1.1.x"
@@ -1067,9 +1079,9 @@ locate-path@^5.0.0:
     p-locate "^4.1.0"
 
 lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@~4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+  version "4.17.23"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
+  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
 
 mdbootstrap@^4.20.0:
   version "4.20.0"
@@ -1125,10 +1137,10 @@ minimatch@3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+minimatch@^3.0.4, minimatch@^3.1.1:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
+  integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -1174,7 +1186,7 @@ nice-try@^1.0.4:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -1251,7 +1263,7 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-is-inside@1.0.2, path-is-inside@^1.0.2:
   version "1.0.2"
@@ -1294,9 +1306,9 @@ pend@~1.2.0:
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
 picomatch@^2.3.0, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -1346,7 +1358,7 @@ range-parser@1.2.0:
 readable-stream@1.1:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
-  integrity sha1-9u73ZPUUyJ4rniMUanW6EGdW0j4=
+  integrity sha512-E98tWzqShvKDGpR2MbjsDkDQWLW2TfWUC15H4tNQhIJ5Lsta84l8nUGL9/ybltGwe+wZzWPpc1Kmd2wQP4bdCA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -1544,7 +1556,7 @@ string-width@^4.1.0, string-width@^4.2.0:
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
 
 strip-ansi@^4.0.0:
   version "4.0.0"
@@ -1570,7 +1582,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 strip-json-comments@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
-  integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=
+  integrity sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==
 
 strip-json-comments@^2.0.1:
   version "2.0.1"
@@ -1683,7 +1695,7 @@ wrap-ansi@^6.2.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write@1.0.3:
   version "1.0.3"