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

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

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

Gemfile

@@ -202,6 +202,3 @@ end
 gem "i18n_data", "~> 1.1"
 
 gem "paper_trail", "~> 17.0"
-
-gem 'sitemap_generator'
-gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'

Gemfile.lock

@@ -121,25 +121,6 @@ GEM
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1189.0)
-    aws-sdk-core (3.239.2)
-      aws-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.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.205.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.1)
-      aws-eventstream (~> 1, >= 1.0.2)
     axe-core-api (4.11.0)
       dumb_delegator
       ostruct
@@ -375,7 +356,6 @@ GEM
       pp (>= 0.6.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)
@@ -708,8 +688,6 @@ GEM
       rack (>= 2.2.4)
       redis-client (>= 0.22.2)
     simple_po_parser (1.1.6)
-    sitemap_generator (6.3.0)
-      builder (~> 3.0)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -781,7 +759,6 @@ DEPENDENCIES
   active_median
   active_record_union
   active_utils
-  aws-sdk-s3 (~> 1, >= 1.114.0)
   axe-core-capybara
   axe-core-rspec
   better_errors
@@ -877,7 +854,6 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
-  sitemap_generator
   sprockets (< 4)
   terser
   timecop

app/controllers/crops_controller.rb

@@ -170,8 +170,6 @@ class CropsController < ApplicationController
                Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
              when 'height'
                Crop.approved.where(height: nil).order(plantings_count: :desc)
-             when 'public_food_key'
-               Crop.approved.where(public_food_key: [nil, '']).order(plantings_count: :desc)
              else
                Crop.none
              end

app/helpers/crops_helper.rb

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

app/models/australian_food_classification_data.rb

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

app/models/crop.rb

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

app/views/comments/index.html.haml

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

app/views/crops/_nutritional_data.html.haml

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

app/views/crops/data_improvement.html.haml

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

app/views/crops/index.html.haml

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

app/views/crops/show.html.haml

@@ -1,10 +1,5 @@
 = render 'schema_org', crop: @crop
 - content_for :title, @crop.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)
@@ -133,8 +128,6 @@
 
     = render 'openfarm_data', crop: @crop
 
-    = render 'nutritional_data', crop: @crop
-
     = cute_icon
     .card
       .card-body

app/views/harvests/index.html.haml

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

app/views/harvests/show.html.haml

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

app/views/home/index.html.haml

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

app/views/layouts/_head.html.haml

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

app/views/members/show.html.haml

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

app/views/plantings/index.html.haml

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

app/views/plantings/show.html.haml

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

app/views/scientific_names/_form.html.haml

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

app/views/seeds/index.html.haml

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

app/views/seeds/show.html.haml

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

config.ru

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

config/sitemap.rb

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

db/migrate/20251129212800_create_australian_food_classification_data.rb

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

db/migrate/20251201045000_add_index_to_crops_public_food_key.rb

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

db/schema.rb

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

lib/tasks/wikidata.rake

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

public/robots.txt

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