Merge branch 'dev' into feature-use-test-queue

Rubocop: Style/FrozenStringLiteralComment

.github/workflows/ci.yml

@@ -108,23 +108,5 @@ jobs:
         run: bundle exec rails db:prepare
 
 
-      - name: Run rspec (lib)
-        run: bundle exec rspec spec/lib/ -fd --fail-fast
-
-      - name: Run rspec (services)
-        run: bundle exec rspec spec/services/ -fd --fail-fast
-
-      - name: Run rspec (models)
-        run: bundle exec rspec spec/models/ -fd --fail-fast
-
-      - name: Run rspec (controllers)
-        run: bundle exec rspec spec/controllers/ -fd --fail-fast
-
-      - name: Run rspec (views)
-        run: bundle exec rspec spec/views/ -fd --fail-fast
-
-      - name: Run rspec (routing)
-        run: bundle exec rspec spec/routing/ -fd --fail-fast
-
-      - name: Run rspec (request)
-        run: bundle exec rspec spec/requests/ -fd --fail-fast
+      - name: Run tests with test-queue
+        run: bundle exec test-queue rspec spec -fd

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-01 05:32:16 UTC using RuboCop version 1.85.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
@@ -71,7 +71,15 @@ FactoryBot/ExcessiveCreateList:
 # 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: 6
 # This cop supports safe autocorrection (--autocorrect).
@@ -86,6 +94,12 @@ Layout/LineLength:
     - 'db/seeds.rb'
     - 'spec/requests/api/v1/activities_request_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
@@ -228,18 +242,18 @@ 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.
@@ -267,6 +281,13 @@ RSpec/EmptyExampleGroup:
     - 'spec/views/photos/edit.html.haml_spec.rb'
     - 'spec/views/posts/_single.html.haml_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
 # Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
@@ -285,6 +306,20 @@ RSpec/ExpectInHook:
     - 'spec/features/plantings/planting_a_crop_spec.rb'
     - 'spec/features/shared_examples/append_date.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, each, example
+RSpec/HookArgument:
+  Exclude:
+    - 'spec/requests/api/v1/plantings_request_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/HooksBeforeExamples:
+  Exclude:
+    - 'spec/features/crops/creating_a_crop_spec.rb'
+
 # Offense count: 53
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/IncludeExamples:
@@ -330,6 +365,12 @@ RSpec/InstanceVariable:
 RSpec/LetSetup:
   Enabled: false
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/MatchArray:
+  Exclude:
+    - 'spec/models/post_spec.rb'
+
 # Offense count: 2
 RSpec/MessageChain:
   Exclude:
@@ -431,23 +472,6 @@ RSpec/VerifiedDoubles:
     - 'spec/controllers/gardens_controller_spec.rb'
     - 'spec/views/devise/shared/_links_spec.rb'
 
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ResponseMethods.
-# ResponseMethods: response, last_response
-RSpecRails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/harvests_spec.rb'
-
-# Offense count: 17
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpecRails/InferredSpecType:
-  Enabled: false
-
 # Offense count: 30
 # Configuration parameters: Database.
 # SupportedDatabases: mysql, postgresql
@@ -567,7 +591,6 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/scientific_names_controller.rb'
     - 'spec/features/members/deletion_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
-    - 'spec/models/harvest_spec.rb'
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -609,6 +632,15 @@ Rails/RootPathnameMethods:
     - 'lib/tasks/import.rake'
     - 'spec/rails_helper.rb'
 
+# Offense count: 4
+# Configuration parameters: ForbiddenMethods, AllowedMethods.
+# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
+    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
+    - 'db/migrate/20251128200506_add_description_to_crops.rb'
+
 # Offense count: 21
 Rails/ThreeStateBooleanColumn:
   Enabled: false
@@ -640,12 +672,6 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# 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:
@@ -702,13 +728,6 @@ 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:
-  Enabled: false
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:

Gemfile

@@ -196,6 +196,7 @@ group :test do
   gem 'rails-controller-testing'
   gem "rspec-rebound"
   gem 'selenium-webdriver'
+  gem 'test-queue'
   gem 'timecop'
   gem 'vcr'
 end

Gemfile.lock

@@ -719,6 +719,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 4)
     terser (1.2.7)
       execjs (>= 0.3.0, < 3)
+    test-queue (0.11.1)
     thor (1.5.0)
     thread_safe (0.3.6)
     tilt (2.7.0)
@@ -873,6 +874,7 @@ DEPENDENCIES
   sitemap_generator
   sprockets (< 4)
   terser
+  test-queue
   timecop
   unicorn
   validate_url

app/controllers/activities_controller.rb

@@ -82,7 +82,7 @@ class ActivitiesController < DataController
 
         repeat_times.times do |i|
           new_activity = @activity.dup
-          new_activity.due_date = @activity.due_date + ((i + 1) * repeat_weeks.weeks)
+          new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
           new_activity.save
         end
       end

app/controllers/crops_controller.rb

@@ -160,7 +160,7 @@ class CropsController < ApplicationController
              when 'youtube'
                Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
              when 'alternate_names'
-               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
+               Crop.approved.where.missing(:alternate_names).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)

app/helpers/application_helper.rb

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

app/helpers/crops_helper.rb

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

app/models/concerns/search_harvests.rb

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

app/models/concerns/search_plantings.rb

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

config/initializers/new_framework_defaults_6_0.rb

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

config/sitemap.rb

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

db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb

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

db/migrate/20240101010101_add_fields_to_crops.rb

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

db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb

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

db/migrate/20240716120000_add_social_media_to_members.rb

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

db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb

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

db/migrate/20240929041435_create_garden_collaborators.rb

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

db/migrate/20241129215300_create_australian_food_classification_data.rb

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

db/migrate/20250810120000_make_notifications_polymorphic.rb

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

db/migrate/20250824081313_change_comments_polymorphic.rb

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

db/migrate/20250901105232_add_source_to_seeds.rb

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

db/migrate/20250901110545_add_indexes_crops.rb

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

db/migrate/20250901130830_add_overall_rating_plantings.rb

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

db/migrate/20251128193317_add_en_youtube_url_to_crops.rb

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

db/migrate/20251130035700_create_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This migration creates the `versions` table for the Version class.
 # All other migrations PT provides are optional.
 class CreateVersions < ActiveRecord::Migration[7.2]

db/migrate/20251130035701_add_object_changes_to_versions.rb

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

db/migrate/20251130053104_add_public_food_key_to_crops.rb

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

lib/tasks/import.rake

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

spec/controllers/api/v1/plantings_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::PlantingsController, type: :controller do
+RSpec.describe Api::V1::PlantingsController do
   subject { JSON.parse response.body }
 
   let!(:member) { create(:member) }
@@ -42,7 +42,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
 
         it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
         it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response.status).to eq 200 }
+        it { expect(response).to have_http_status :ok }
       end
 
       context 'with photo' do
@@ -81,7 +81,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
 
         it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
         it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response.status).to eq 200 }
+        it { expect(response).to have_http_status :ok }
       end
     end
   end

spec/controllers/garden_types_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe GardenTypesController, type: :controller do
+RSpec.describe GardenTypesController do
   include Devise::Test::ControllerHelpers
 
   let(:valid_params) { { name: 'My second GardenType' } }

spec/controllers/gardens_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe GardensController, type: :controller do
+RSpec.describe GardensController do
   include Devise::Test::ControllerHelpers
 
   let(:valid_params) { { name: 'My second Garden' } }

spec/controllers/harvests_controller_spec.rb

@@ -51,7 +51,7 @@ describe HarvestsController, :search do
     describe "generates a csv" do
       before { get :index, format: "csv" }
 
-      it { expect(response.status).to eq 200 }
+      it { expect(response).to have_http_status :ok }
     end
   end
 

spec/controllers/likes_controller_spec.rb

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

spec/factories/garden_collaborators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :garden_collaborator do
     garden

spec/features/activities/creating_a_recurring_activity_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.feature 'Creating a recurring activity' do

spec/features/crops/creating_a_crop_spec.rb

@@ -33,6 +33,7 @@ describe "Crop", :js do
 
   shared_examples 'request crop' do
     describe "requesting a crop with multiple scientific and alternate name" do
+      include_examples 'fill in form'
       before do
         within "form#new_crop" do
           fill_in "request_notes", with: "This is the Philippine national flower."
@@ -40,8 +41,6 @@ describe "Crop", :js do
         end
       end
 
-      include_examples 'fill in form'
-
       it { expect(page).to have_content 'crop was successfully created.' }
       it { expect(page).to have_content "This crop is currently pending approval." }
       it { expect(page).to have_content "Jasminum sambac 2" }
@@ -51,12 +50,11 @@ describe "Crop", :js do
 
   shared_examples 'create crop' do
     describe "creating a crop with multiple scientific and alternate name" do
+      include_examples 'fill in form'
       before do
         click_button "Save"
       end
 
-      include_examples 'fill in form'
-
       it { expect(page).to have_content 'crop was successfully created.' }
       it { expect(page).to have_content "Jasminum sambac 2" }
       it { expect(page).to have_content "Matsurika" }

spec/features/percy/percy_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Test with visual testing', :js, type: :feature do
+describe 'Test with visual testing', :js do
   # Use the same random seed every time so our random data is the same
   # on every run, so doesn't trigger percy to see changes
   before { Faker::Config.random = Random.new(42) }

spec/helpers/buttons_helper_spec.rb

@@ -12,7 +12,7 @@ require 'rails_helper'
 #     end
 #   end
 # end
-RSpec.describe ButtonsHelper, type: :helper do
+RSpec.describe ButtonsHelper do
   before { allow(self).to receive(:can?).and_return(true) }
 
   let(:garden)   { create(:garden)   }

spec/helpers/event_helper_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe EventHelper, type: :helper do
+RSpec.describe EventHelper do
   subject { resolve_model(event) }
 
   let(:planting) { create(:planting) }

spec/models/ability_spec.rb

@@ -136,7 +136,6 @@ describe Ability do
       it "can manage members" do
         ability.should be_able_to(:destroy, create(:member))
       end
-
       it "cannot delete themselves" do
         ability.should_not be_able_to(:destroy, member)
       end

spec/models/crop_companion_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe CropCompanion, type: :model do
+RSpec.describe CropCompanion do
   it 'has a crop' do
     cc = described_class.new
     cc.crop_a = create :tomato

spec/models/harvest_spec.rb

@@ -144,7 +144,7 @@ describe Harvest do
     it 'lists most recent harvests first' do
       @h1 = create(:harvest, created_at: 1.day.ago)
       @h2 = create(:harvest, created_at: 1.hour.ago)
-      expect(described_class.all.order(created_at: :desc)).to eq [@h2, @h1]
+      expect(described_class.order(created_at: :desc)).to eq [@h2, @h1]
     end
   end
 

spec/models/post_spec.rb

@@ -144,7 +144,7 @@ describe Post do
     end
 
     it "does not duplicate" do
-      expect(post.crops).to contain_exactly(tomato, maize)
+      expect(post.crops).to match_array([tomato, maize])
     end
 
     it "is updated when post was modified" do

spec/requests/api/v1/activities_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Activities', type: :request do
+RSpec.describe 'Activities' do
   subject { JSON.parse response.body }
 
   let(:member) { create(:member) }
@@ -60,16 +60,16 @@ RSpec.describe 'Activities', type: :request do
     end
   end
 
-  context '#update' do
+  describe '#update' do
     let(:params) do
       {
         'data' => {
-          'type'       => 'activities',
-          'id'         => activity.id.to_s,
+          'type' => 'activities',
+          'id' => activity.id.to_s,
           'attributes' => {
             'description' => 'A new description',
-            'finished'    => true,
-            'due-date'    => '2025-10-31'
+            'finished' => true,
+            'due-date' => '2025-10-31'
           }
         }
       }

spec/requests/api/v1/crop_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Crops', type: :request do
+RSpec.describe 'Crops' do
   subject { JSON.parse response.body }
 
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }

spec/requests/api/v1/gardens_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Gardens', type: :request do
+RSpec.describe 'Gardens' do
   subject { JSON.parse response.body }
 
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }

spec/requests/api/v1/harvests_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Harvests', type: :request do
+RSpec.describe 'Harvests' do
   subject { JSON.parse response.body }
 
   let(:headers)  { { 'Accept' => 'application/vnd.api+json' } }

spec/requests/api/v1/members_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Members', type: :request do
+RSpec.describe 'Members' do
   subject { JSON.parse response.body }
 
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
@@ -13,11 +13,11 @@ RSpec.describe 'Members', type: :request do
       "links"         => { "self" => resource_url },
       "attributes"    => attributes,
       "relationships" => {
-        "gardens"    => gardens_as_json_api,
-        "harvests"   => harvests_as_json_api,
-        "photos"     => photos_as_json_api,
-        "plantings"  => plantings_as_json_api,
-        "seeds"      => seeds_as_json_api,
+        "gardens"   => gardens_as_json_api,
+        "harvests"  => harvests_as_json_api,
+        "photos"    => photos_as_json_api,
+        "plantings" => plantings_as_json_api,
+        "seeds"     => seeds_as_json_api,
         "activities" => activities_as_json_api
       } }
   end

spec/requests/api/v1/photos_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Photos', type: :request do
+RSpec.describe 'Photos' do
   subject { JSON.parse response.body }
 
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }

spec/requests/api/v1/plantings_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Plantings', type: :request do
+RSpec.describe 'Plantings' do
   subject { JSON.parse response.body }
 
   let(:headers)   { { 'Accept' => 'application/vnd.api+json' } }
@@ -211,7 +211,7 @@ RSpec.describe 'Plantings', type: :request do
   end
 
   describe "by member/owner" do
-    before do
+    before :each do
       @member1 = planting.owner
       @planting2 = create(:planting, owner: create(:owner))
       @member2 = @planting2.owner

spec/requests/api/v1/seeds_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Seeds', type: :request do
+RSpec.describe 'Seeds' do
   subject { JSON.parse response.body }
 
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }

spec/requests/garden_types_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe "GardenTypes", type: :request do
+RSpec.describe "GardenTypes" do
   describe "GET /garden_types" do
     it "works! (now write some real specs)" do
       get garden_types_path

spec/requests/harvests_spec.rb

@@ -6,7 +6,7 @@ describe "Harvests" do
   describe "GET /harvests" do
     it "works! (now write some real specs)" do
       get harvests_path
-      expect(response.status).to be 200
+      expect(response).to have_http_status :ok
     end
   end
 end

spec/tasks/import_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'rake'
 

spec/views/places/_map_attribution.html.haml_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "places/_map_attribution.html.haml", type: :view do
+describe "places/_map_attribution.html.haml" do
   before do
     render
   end