Compare commits

..

41 Commits

Author SHA1 Message Date
google-labs-jules[bot]
620337fbac Merge pull request #4353 from Growstuff/feat/import-australian-food-data
Add Rake Task to Import Australian Food Data
2025-12-01 19:43:14 +10:30
Daniel O'Connor
4de062838b Merge pull request #4354 from Growstuff/fix-crops-show-spec
Fix crops/show view spec
2025-12-01 19:42:56 +10:30
Daniel O'Connor
2aaca7b713 Bump rubocop-rails from 2.34.1 to 2.34.2 (#4355)
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.34.1 to 2.34.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.34.1...v2.34.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.34.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-01 19:42:04 +10:30
google-labs-jules[bot]
323c7dc3ee Optimize Data Improvement Page (#4356)
* feat: Add data improvement page to crops controller

This commit introduces a new data improvement page to the crops controller. The page displays tabbed lists of crops with missing data, allowing users to easily identify areas for data quality improvement.

The following data quality categories are included:
- Crops without photos
- Crops without descriptions
- Crops without a youtube video
- Crops without alternate names
- Crops without a scientific name with a wikidata id
- Crops without row spacing
- Crops without sun requirements
- Crops without height

All lists are sorted by planting count in descending order.

* refactor: Optimize data improvement page to load tab data on demand

This commit refactors the data improvement page to load data for each tab on demand, rather than loading all queries at once. This improves the performance of the page by only executing the query for the currently active tab.

The controller action now uses a `case` statement based on a `tab` URL parameter to execute the appropriate query. The view has been updated to pass this parameter when a tab is clicked.

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
2025-12-01 19:41:28 +10:30
Daniel O'Connor
d1509a303e Merge branch 'dev' into fix-crops-show-spec 2025-12-01 19:02:11 +10:30
dependabot[bot]
05e4ae7fbf Bump rubocop-rails from 2.34.1 to 2.34.2
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.34.1 to 2.34.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.34.1...v2.34.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.34.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 07:54:43 +00:00
google-labs-jules[bot]
30e7c5d01c Merge pull request #4352 from Growstuff/add-public-food-key
feat: Add Public Food Key to Crop model
2025-12-01 18:02:33 +10:30
Daniel O'Connor
ff6a6e2e11 Remove defunct gitter 2025-12-01 18:00:44 +10:30
google-labs-jules[bot]
6f0d0afdb8 Fix(specs): Initialize @version_members in crops/show view spec
The `crops/show` view spec was failing with a `NoMethodError` because
the `@version_members` instance variable was `nil`. This variable is used
in the `_history` partial, which is rendered by the `show` view.

This commit fixes the spec by initializing `@version_members` to an
empty hash in the `before` block of the spec. This ensures that the
view can render without errors during the test run.
2025-12-01 02:34:46 +00:00
Daniel O'Connor
c31d9cd09c Check presence of version members before accessing 2025-12-01 13:03:25 +10:30
Daniel O'Connor
3ba3c0077f Merge branch 'mainline' into dev 2025-11-30 15:05:43 +10:30
google-labs-jules[bot]
460daf36f9 Add revert functionality to admin crops page (#4346)
* feat(admin): add revert functionality to crops page

This change adds a "Revert" button to the admin crops page, allowing crop wranglers to revert changes to a previous version.

It introduces a new `Admin::VersionsController` with a `revert` action that uses `paper_trail`'s `reify` method to restore a previous version of a `Crop` object.

The view is updated to include a "Revert" button, which is guarded by a `can?(:wrangle, Crop)` check to ensure only authorized users can see it.

The controller also includes an authorization check to prevent unauthorized users from accessing the revert action directly.

A feature spec is added to test the new functionality, including the authorization logic.

* Consistent UX

* Specs

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
2025-11-30 15:05:13 +10:30
google-labs-jules[bot]
13a8276313 Add version tracking to crops model (#4343)
* feat: Add version tracking to Crop model

This commit introduces version tracking for the Crop model using the PaperTrail gem.

Key changes include:
- Integrating `has_paper_trail` into the `Crop` model.
- Adding a "History" section to the crop show page to display a timeline of changes for that specific crop.
- Creating a new admin page for users with the "crop_wrangler" role to view a log of all recent crop edits, creations, and deletions.
- Fixing several N+1 query performance issues by eager-loading associated `Member` records in both the `CropsController` and the new `Admin::CropsController`.
- Refactoring view logic into a shared partial to reduce code duplication.

* Add papertrail

* Admin UI

* Add papertrail DB

* Add papertrail DB

* Rearrange

* Fix permissions

* Fix permissions

* Fix UI

* Fix UI

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
2025-11-30 14:47:46 +10:30
Daniel O'Connor
756c79b1e0 Merge pull request #4344 from Growstuff/feature/add-schema-org-to-crops-page
Fix rendering
2025-11-30 14:15:18 +10:30
Daniel O'Connor
d2ac7bad15 Fix rendering 2025-11-30 03:44:52 +00:00
Daniel O'Connor
315af0aa7e Merge pull request #4342 from Growstuff/feature/add-schema-org-to-crops-page
Styling
2025-11-30 14:11:41 +10:30
Daniel O'Connor
b53bda136f Render less on some pages 2025-11-30 03:41:15 +00:00
Daniel O'Connor
7ef0ed6131 Document future 2025-11-30 03:38:55 +00:00
Daniel O'Connor
6ce3d1c069 Render images 2025-11-30 03:38:29 +00:00
Daniel O'Connor
d659df1814 Styling 2025-11-30 03:11:32 +00:00
Daniel O'Connor
0709baa4f8 Merge pull request #4340 from Growstuff/feature/add-schema-org-to-crops-page
Add schema.org markup to crop pages
2025-11-30 13:40:11 +10:30
Daniel O'Connor
d72a3989b5 Specific form links 2025-11-30 03:09:55 +00:00
Daniel O'Connor
bf9f67667d Merge branch 'dev' of https://github.com/Growstuff/growstuff into feature/add-schema-org-to-crops-page 2025-11-30 03:08:09 +00:00
Daniel O'Connor
58bad7eeb0 Add more schema.org 2025-11-30 03:02:10 +00:00
Daniel O'Connor
38aa245290 Move to crops helper 2025-11-30 02:59:04 +00:00
Daniel O'Connor
d570b27a7b Update _schema_org.html.haml 2025-11-30 13:26:37 +10:30
Daniel O'Connor
7d43d4d9e2 Merge pull request #4341 from Growstuff/feature/add-wikidata-id
Allow Wikidata ID to be set when editing a scientific name
2025-11-30 13:25:03 +10:30
Daniel O'Connor
e8dbcb0916 Delete db/migrate/20251129185029_add_wikidata_id_to_scientific_names.rb 2025-11-30 13:24:42 +10:30
google-labs-jules[bot]
d31a6ec221 feat: Add Wikidata ID to scientific names
This commit introduces the ability to store and display the Wikidata ID for scientific names.

Changes include:
- A database migration to add the `wikidata_id` column to the `scientific_names` table.
- An update to the `scientific_names_controller` to permit the `wikidata_id` parameter.
- An update to the scientific name form to include a field for the Wikidata ID.
- An update to the crop show page to display a link to the Wikidata page for a scientific name.
2025-11-30 02:53:19 +00:00
Daniel O'Connor
a000ea835d Merge pull request #4339 from Growstuff/feature/add-contribution-links
Add Contribution Links and Conditional Edit Form
2025-11-30 13:17:09 +10:30
google-labs-jules[bot]
b204030f70 feat: Add schema.org markup to crop pages
Adds schema.org markup to the crop pages using the BioChemEntity type. The taxonomicRange attribute is used to list the scientific names of the crop, which will improve SEO.
2025-11-30 02:45:46 +00:00
google-labs-jules[bot]
63477ee59d feat: Add contribution links and conditional edit form
This commit introduces a series of changes to encourage user contributions for missing crop data.

On the crop show page, it adds links for logged-in users to:
- Add a description if one is not present.
- Add a YouTube video if one is not present.
- Add more attributes in the predictions section if any are missing.

On the crop edit page, the form now conditionally displays fields. For standard users, it only shows fields for attributes that are currently empty. For privileged users (wranglers), it displays all fields, allowing them to edit existing data.
2025-11-30 02:38:05 +00:00
Daniel O'Connor
b27e263fdf Merge pull request #4338 from Growstuff/CloCkWeRX-patch-2
Update crops_helper.rb
2025-11-29 19:54:05 +10:30
Daniel O'Connor
e3a2bdd6aa Update crops_helper.rb 2025-11-29 19:53:49 +10:30
Daniel O'Connor
6ae241dc0d Merge pull request #4336 from Growstuff/dev
release 76
2025-11-29 19:40:38 +10:30
Daniel O'Connor
313e240eb9 Merge pull request #4337 from Growstuff/recursive-fallback
More recursive companions
2025-11-29 19:39:31 +10:30
Daniel O'Connor
14aa673440 Merge branch 'mainline' into dev 2025-11-29 19:31:17 +10:30
Daniel O'Connor
cef23b8212 More recursive companions 2025-11-29 08:55:29 +00:00
Daniel O'Connor
3b45dca6e2 Merge pull request #4335 from Growstuff/recursive-fallback
Recursive parent lookup
2025-11-29 19:17:12 +10:30
Daniel O'Connor
9060c45aed Recursive parent lookup 2025-11-29 08:36:43 +00:00
Daniel O'Connor
d4401b402a Merge pull request #4334 from Growstuff/dev
release 75
2025-11-29 18:21:22 +10:30
39 changed files with 3187 additions and 54 deletions

View File

@@ -200,3 +200,5 @@ group :travis do
end
gem "i18n_data", "~> 1.1"
gem "paper_trail", "~> 17.0"

View File

@@ -457,6 +457,9 @@ GEM
open-uri (0.1.0)
orm_adapter (0.5.0)
ostruct (0.6.3)
paper_trail (17.0.0)
activerecord (>= 7.1)
request_store (~> 1.4)
parallel (1.27.0)
parser (3.3.10.0)
ast (~> 2.4.1)
@@ -558,6 +561,8 @@ GEM
regexp_parser (2.11.3)
reline (0.6.3)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
responders (3.2.0)
actionpack (>= 7.0)
railties (>= 7.0)
@@ -630,7 +635,7 @@ GEM
rubocop-factory_bot (2.28.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.34.1)
rubocop-rails (2.34.2)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
@@ -813,6 +818,7 @@ DEPENDENCIES
oj
omniauth (~> 1.3)
omniauth-flickr (>= 0.0.15)
paper_trail (~> 17.0)
percy-capybara (~> 5.0.0)
pg
platform-api

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,2 @@
class AustralianFoodClassificationData < ApplicationRecord
end

View File

@@ -1,6 +1,7 @@
# frozen_string_literal: true
class Crop < ApplicationRecord
has_paper_trail
extend FriendlyId
include PhotoCapable
include OpenFarmData
@@ -162,7 +163,7 @@ class Crop < ApplicationRecord
def all_companions
return companions unless parent
(companions + parent.companions).uniq
(companions + parent.all_companions).uniq
end
before_destroy :destroy_reverse_companionships

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,13 @@
%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" }
%ul.nav.nav-tabs
- tabs.each do |key, value|
%li{class: ('active' if @active_tab == key.to_s)}
= link_to value, data_improvement_crops_path(tab: key)
.tab-content
.tab-pane.active
%h2= "Crops without #{tabs[@active_tab.to_sym]}"
= render 'crop_list', crops: @crops

View File

@@ -3,6 +3,7 @@
- content_for :buttonbar do
- if can? :wrangle, Crop
= link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
= link_to 'Data Improvement', data_improvement_crops_path, class: 'btn btn-info'
- if can? :create, Crop
= link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'

View File

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

View File

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

View File

@@ -7,6 +7,9 @@
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
%script{type: "application/ld+json"}
= crop_jsonld_data(@harvest.crop, full_attributes: false).to_json.html_safe
- content_for :breadcrumbs do
%li.breadcrumb-item= link_to 'Harvests', harvests_path
%li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)

View File

@@ -16,6 +16,8 @@
"ratingValue": "#{@planting.overall_rating}",
"bestRating": "5"
}
%script{type: "application/ld+json"}
= crop_jsonld_data(@planting.crop, full_attributes: false).to_json.html_safe
- content_for :breadcrumbs do
%li.breadcrumb-item= link_to 'Plantings', plantings_path

View File

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

View File

@@ -8,6 +8,8 @@
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
%script{type: "application/ld+json"}
= crop_jsonld_data(@seed.crop, full_attributes: false).to_json.html_safe
- content_for :breadcrumbs do
%li.breadcrumb-item= link_to 'Seeds', seeds_path

View File

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

View File

@@ -89,6 +89,14 @@ Rails.application.routes.draw do
get 'wrangle'
get 'hierarchy'
get 'search'
get 'data_improvement'
end
end
namespace :admin do
resources :crops, only: [:index]
resources :versions, only: [] do
post :revert, on: :member, as: :revert
end
end

View File

@@ -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

View File

@@ -0,0 +1,41 @@
# This migration creates the `versions` table for the Version class.
# All other migrations PT provides are optional.
class CreateVersions < ActiveRecord::Migration[7.2]
# The largest text column available in all supported RDBMS is
# 1024^3 - 1 bytes, roughly one gibibyte. We specify a size
# so that MySQL will use `longtext` instead of `text`. Otherwise,
# when serializing very large objects, `text` might not be big enough.
TEXT_BYTES = 1_073_741_823
def change
create_table :versions do |t|
# Consider using bigint type for performance if you are going to store only numeric ids.
# t.bigint :whodunnit
t.string :whodunnit
# Known issue in MySQL: fractional second precision
# -------------------------------------------------
#
# MySQL timestamp columns do not support fractional seconds unless
# defined with "fractional seconds precision". MySQL users should manually
# add fractional seconds precision to this migration, specifically, to
# the `created_at` column.
# (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
#
# MySQL users should also upgrade to at least rails 4.2, which is the first
# version of ActiveRecord with support for fractional seconds in MySQL.
# (https://github.com/rails/rails/pull/14359)
#
# MySQL users should use the following line for `created_at`
# t.datetime :created_at, limit: 6
t.datetime :created_at
t.bigint :item_id, null: false
t.string :item_type, null: false
t.string :event, null: false
t.text :object, limit: TEXT_BYTES
end
add_index :versions, %i[item_type item_id]
end
end

View File

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

View File

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

View File

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

View File

File diff suppressed because it is too large Load Diff

325
lib/tasks/import.rake Normal file
View File

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

View File

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

View File

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

26
spec/tasks/import_spec.rb Normal file
View File

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

View File

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