Refactor author field to include type and name

Added 'datePublished' field to social media posting data.

Gemfile

@@ -202,3 +202,6 @@ 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,6 +121,25 @@ 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
@@ -356,6 +375,7 @@ 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)
@@ -688,6 +708,8 @@ 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)
@@ -759,6 +781,7 @@ DEPENDENCIES
   active_median
   active_record_union
   active_utils
+  aws-sdk-s3 (~> 1, >= 1.114.0)
   axe-core-capybara
   axe-core-rspec
   better_errors
@@ -854,6 +877,7 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
+  sitemap_generator
   sprockets (< 4)
   terser
   timecop

app/controllers/crops_controller.rb

@@ -170,6 +170,8 @@ 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,7 +58,11 @@ module CropsHelper
         subject_of_entities << {
           '@type': "SocialMediaPosting",
           url:     post_url(post),
-          author:  post.author
+          author:  {
+            '@type': 'Person',
+            name: post.author.login_name
+          },
+          'datePublished': post.created_at 
         }
       end
 

app/models/australian_food_classification_data.rb

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

app/models/crop.rb

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

app/views/comments/index.html.haml

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

app/views/crops/_nutritional_data.html.haml

@@ -0,0 +1,38 @@
+- data = crop.australian_food_classification_data
+- if data
+  .card
+    .card-body
+      %h4.card-title Nutritional Data
+      %p.card-text A summary of nutritional data per 100g for #{data.food_name}.
+      %table.table.table-sm.table-borderless
+        %tbody
+          - if data.energy_with_dietary_fibre_equated_kj.to_f > 0
+            %tr
+              %th Energy
+              %td= "#{data.energy_with_dietary_fibre_equated_kj.to_f.round(1)} kJ"
+          - if data.protein_g.to_f > 0
+            %tr
+              %th Protein
+              %td= "#{data.protein_g.to_f.round(1)} g"
+          - if data.fat_total_g.to_f > 0
+            %tr
+              %th Fat, total
+              %td= "#{data.fat_total_g.to_f.round(1)} g"
+          - if data.available_carbohydrate_with_sugar_alcohols_g.to_f > 0
+            %tr
+              %th Carbohydrate
+              %td= "#{data.available_carbohydrate_with_sugar_alcohols_g.to_f.round(1)} g"
+          - if data.total_sugars_g.to_f > 0
+            %tr
+              %th - Sugars
+              %td= "#{data.total_sugars_g.to_f.round(1)} g"
+          - if data.total_dietary_fibre_g.to_f > 0
+            %tr
+              %th Fibre
+              %td= "#{data.total_dietary_fibre_g.to_f.round(1)} g"
+          - if data.sodium_na_mg.to_f > 0
+            %tr
+              %th Sodium
+              %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
+    .card-footer
+      = link_to "See more", "https://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", 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", public_food_key: "Public Food Key", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
 
 %ul.nav.nav-tabs
   - tabs.each do |key, value|
-    %li{class: ('active' if @active_tab == key.to_s)}
+    %li{class: "nav-item #{('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,4 +1,5 @@
 - 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,5 +1,10 @@
 = 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)
@@ -128,6 +133,8 @@
 
     = render 'openfarm_data', crop: @crop
 
+    = render 'nutritional_data', crop: @crop
+
     = cute_icon
     .card
       .card-body

app/views/harvests/index.html.haml

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

app/views/harvests/show.html.haml

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

app/views/home/index.html.haml

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

app/views/layouts/_head.html.haml

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

app/views/members/show.html.haml

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

app/views/plantings/index.html.haml

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

app/views/plantings/show.html.haml

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

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'
+      = f.text_field :wikidata_id, class: 'form-control', pattern: 'Q[1-9][0-9]*'
   .form-group
     .form-actions.col-md-offset-2.col-md-8
       = f.submit 'Save', class: 'btn btn-primary'

app/views/seeds/index.html.haml

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

app/views/seeds/show.html.haml

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

config.ru

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

config/sitemap.rb

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

db/migrate/20251201045000_add_index_to_crops_public_food_key.rb

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

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) do
+ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -564,6 +564,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) 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,45 +13,65 @@ namespace :wikidata do
     end
 
     Crop.all.each do |crop|
-      next unless crop.en_wikipedia_url.present?
+      puts "Processing crop: #{crop.name}"
+      wikidata_id = nil
 
-      begin
-        title = crop.en_wikipedia_url.split('/').last
-        puts "Processing crop: #{crop.name} (Wikipedia title: #{title})"
+      # Try to find Wikidata ID from the scientific_names table first
+      if (sci_name_with_id = crop.scientific_names.find { |sn| sn.wikidata_id.present? })
+        wikidata_id = sci_name_with_id.wikidata_id
+        puts "  Found Wikidata ID in scientific_names table: #{wikidata_id}"
+      # If not found, try the existing en_wikipedia_url method
+      elsif crop.en_wikipedia_url.present?
+        begin
+          title = crop.en_wikipedia_url.split('/').last
+          puts "  Searching for Wikidata ID using Wikipedia URL: #{crop.en_wikipedia_url}"
 
-        # Get Wikidata ID from Wikipedia API
-        wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
-        wiki_response = Net::HTTP.get(wiki_uri)
-        wiki_data = JSON.parse(wiki_response)
-        page_id = wiki_data['query']['pages'].keys.first
-        wikidata_id = wiki_data['query']['pages'][page_id]['pageprops']['wikibase_item']
+          # Get Wikidata ID from Wikipedia API
+          wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
+          wiki_response = Net::HTTP.get(wiki_uri)
+          wiki_data = JSON.parse(wiki_response)
+          pages = wiki_data['query']['pages']
+          page_id = pages.keys.first
 
-        if wikidata_id
-          puts "  Found Wikidata ID: #{wikidata_id}"
+          if page_id != "-1" && pages[page_id]['pageprops'] && pages[page_id]['pageprops']['wikibase_item']
+            wikidata_id = pages[page_id]['pageprops']['wikibase_item']
+            puts "    Found Wikidata ID via Wikipedia URL: #{wikidata_id}"
+          end
+        rescue StandardError => e
+          puts "    Error querying Wikipedia for URL #{crop.en_wikipedia_url}: #{e.message}"
+        end
+      end
+
+      if wikidata_id
+        begin
           # Get aliases from Wikidata API
           wikidata_uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=aliases&format=json")
           wikidata_response = Net::HTTP.get(wikidata_uri)
           wikidata_data = JSON.parse(wikidata_response)
 
-          aliases = wikidata_data['entities'][wikidata_id]['aliases']
-          aliases.each do |lang, values|
-            values.each do |value|
-              next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
+          aliases = wikidata_data.dig('entities', wikidata_id, 'aliases')
+          if aliases
+            aliases.each do |lang, values|
+              values.each do |value|
+                next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
 
-              AlternateName.create!(
-                name:     value['value'],
-                language: lang,
-                crop:     crop,
-                creator:  creator
-              )
-              puts "    Added alternate name: #{value['value']} (#{lang})"
+                AlternateName.create!(
+                  name:     value['value'],
+                  language: lang,
+                  crop:     crop,
+                  creator:  creator
+                )
+                puts "      Added alternate name: #{value['value']} (#{lang})"
+              end
             end
+          else
+            puts "    No aliases found for Wikidata ID: #{wikidata_id}"
           end
-        else
-          puts "  Could not find Wikidata ID for #{crop.name}"
+        rescue StandardError => e
+          puts "    Error processing Wikidata aliases for #{crop.name}: #{e.message}"
         end
-      rescue StandardError => e
-        puts "  Error processing crop #{crop.name}: #{e.message}"
+      else
+        puts "  Could not find Wikidata ID for #{crop.name}"
       end
     end
   end

public/robots.txt

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