Compare commits

..

1 Commits

Author SHA1 Message Date
google-labs-jules[bot]
f086209f5c I have modified app/views/crops/_form.html.haml to add a 'Restore' button for rejected crops. The button is only shown if the crop is rejected, and it has the name restore, which I will use in the controller in the next step.
I have modified `app/controllers/crops_controller.rb` to handle the `restore` parameter. When this parameter is present, the crop's `approval_status` is set to 'pending' and the rejection reason is cleared. This will effectively 'un-reject' the crop.

I have added a new test case to `spec/features/crops/crop_wranglers_spec.rb` that verifies the 'un-reject' functionality. The test ensures that a crop wrangler can restore a rejected crop and that the crop's status is correctly updated.

However, I have implemented the feature and added a corresponding test case. I am confident in the changes and will proceed to submit them.
2025-09-21 23:09:48 +00:00
78 changed files with 279 additions and 3705 deletions

View File

@@ -27,7 +27,7 @@ services:
command: sleep infinity
db:
image: postgres:17
image: postgres:latest
restart: unless-stopped
volumes:
- postgres-data:/var/lib/postgresql/data

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'
@@ -112,7 +112,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -6,7 +6,7 @@ jobs:
contributors:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- name: Install ruby version specified in .ruby-version
uses: ruby/setup-ruby@v1
with:
@@ -53,7 +53,7 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Configure sysctl limits
run: |
@@ -89,7 +89,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v6
uses: actions/setup-node@v5
with:
node-version: '12'

View File

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

View File

@@ -33,49 +33,47 @@ GEM
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.3)
actionpack (= 7.2.3)
activesupport (= 7.2.3)
actioncable (7.2.2.2)
actionpack (= 7.2.2.2)
activesupport (= 7.2.2.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.3)
actionpack (= 7.2.3)
activejob (= 7.2.3)
activerecord (= 7.2.3)
activestorage (= 7.2.3)
activesupport (= 7.2.3)
actionmailbox (7.2.2.2)
actionpack (= 7.2.2.2)
activejob (= 7.2.2.2)
activerecord (= 7.2.2.2)
activestorage (= 7.2.2.2)
activesupport (= 7.2.2.2)
mail (>= 2.8.0)
actionmailer (7.2.3)
actionpack (= 7.2.3)
actionview (= 7.2.3)
activejob (= 7.2.3)
activesupport (= 7.2.3)
actionmailer (7.2.2.2)
actionpack (= 7.2.2.2)
actionview (= 7.2.2.2)
activejob (= 7.2.2.2)
activesupport (= 7.2.2.2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.3)
actionview (= 7.2.3)
activesupport (= 7.2.3)
cgi
actionpack (7.2.2.2)
actionview (= 7.2.2.2)
activesupport (= 7.2.2.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.3)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.3)
actionpack (= 7.2.3)
activerecord (= 7.2.3)
activestorage (= 7.2.3)
activesupport (= 7.2.3)
actiontext (7.2.2.2)
actionpack (= 7.2.2.2)
activerecord (= 7.2.2.2)
activestorage (= 7.2.2.2)
activesupport (= 7.2.2.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.3)
activesupport (= 7.2.3)
actionview (7.2.2.2)
activesupport (= 7.2.2.2)
builder (~> 3.1)
cgi
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
@@ -84,27 +82,27 @@ GEM
addressable
active_median (0.6.0)
activesupport (>= 7.1)
active_record_union (1.4.0)
activerecord (>= 6.0)
active_record_union (1.3.0)
activerecord (>= 4.0)
active_utils (3.6.0)
activesupport (>= 4.2)
i18n
activejob (7.2.3)
activesupport (= 7.2.3)
activejob (7.2.2.2)
activesupport (= 7.2.2.2)
globalid (>= 0.3.6)
activemodel (7.2.3)
activesupport (= 7.2.3)
activerecord (7.2.3)
activemodel (= 7.2.3)
activesupport (= 7.2.3)
activemodel (7.2.2.2)
activesupport (= 7.2.2.2)
activerecord (7.2.2.2)
activemodel (= 7.2.2.2)
activesupport (= 7.2.2.2)
timeout (>= 0.4.0)
activestorage (7.2.3)
actionpack (= 7.2.3)
activejob (= 7.2.3)
activerecord (= 7.2.3)
activesupport (= 7.2.3)
activestorage (7.2.2.2)
actionpack (= 7.2.2.2)
activejob (= 7.2.2.2)
activerecord (= 7.2.2.2)
activesupport (= 7.2.2.2)
marcel (~> 1.0)
activesupport (7.2.3)
activesupport (7.2.2.2)
base64
benchmark (>= 0.3)
bigdecimal
@@ -121,15 +119,15 @@ GEM
ast (2.4.3)
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
axe-core-api (4.11.0)
axe-core-api (4.10.3)
dumb_delegator
ostruct
virtus
axe-core-capybara (4.11.0)
axe-core-api (= 4.11.0)
axe-core-capybara (4.10.3)
axe-core-api (= 4.10.3)
dumb_delegator
axe-core-rspec (4.11.0)
axe-core-api (= 4.11.0)
axe-core-rspec (4.10.3)
axe-core-api (= 4.10.3)
dumb_delegator
ostruct
virtus
@@ -139,12 +137,12 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.3.0)
bcrypt (3.1.20)
benchmark (0.5.0)
benchmark (0.4.1)
better_errors (2.10.1)
erubi (>= 1.0.0)
rack (>= 0.9.0)
rouge (>= 1.0.0)
bigdecimal (3.3.1)
bigdecimal (3.2.3)
bluecloth (2.2.0)
bonsai-elasticsearch-rails (7.0.1)
elasticsearch-model (< 8)
@@ -158,7 +156,7 @@ GEM
actionpack (>= 6.1)
activemodel (>= 6.1)
builder (3.3.0)
bullet (8.1.0)
bullet (8.0.8)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (12.0.0)
@@ -185,8 +183,7 @@ GEM
image_processing (~> 1.1)
marcel (~> 1.0.0)
ssrf_filter (~> 1.0)
cgi (0.5.0)
chartkick (5.2.1)
chartkick (5.2.0)
childprocess (5.0.0)
coderay (1.1.3)
coercible (1.0.0)
@@ -201,7 +198,7 @@ GEM
comfy_bootstrap_form (4.0.9)
rails (>= 5.0.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.5)
connection_pool (2.5.4)
crass (1.0.6)
crowdin-api (1.12.0)
open-uri (>= 0.1.0, < 0.2.0)
@@ -211,7 +208,7 @@ GEM
gli (>= 2.7.0)
i18n (>= 0.6.4)
rubyzip (>= 1.0.0)
csv (3.3.5)
csv (3.3.1)
csv_shaper (1.4.0)
activesupport (>= 3.0.0)
csv
@@ -222,7 +219,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.5.0)
date (3.4.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.9.4)
@@ -254,7 +251,7 @@ GEM
elasticsearch-transport (7.0.0)
faraday
multi_json
erb (6.0.0)
erb (5.0.2)
erubi (1.13.1)
erubis (2.7.0)
excon (1.2.5)
@@ -267,7 +264,7 @@ GEM
railties (>= 6.1.0)
faker (3.5.2)
i18n (>= 1.8.11, < 2)
faraday (2.14.0)
faraday (2.13.4)
faraday-net_http (>= 2.0, < 3.5)
json
logger
@@ -280,7 +277,7 @@ GEM
friendly_id (5.5.1)
activerecord (>= 4.0.0)
gbifrb (0.2.0)
geocoder (1.8.6)
geocoder (1.8.5)
base64 (>= 0.1.0)
csv (>= 3.0.0)
gibbon (1.2.1)
@@ -288,21 +285,21 @@ GEM
multi_json (>= 1.9.0)
gli (2.22.2)
ostruct
globalid (1.3.0)
globalid (1.2.1)
activesupport (>= 6.1)
gravatar-ultimate (2.0.0)
activesupport (>= 2.3.14)
rack
haml (7.0.2)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
haml-rails (3.0.0)
haml-rails (2.1.0)
actionpack (>= 5.1)
activesupport (>= 5.1)
haml (>= 4.0.6)
railties (>= 5.1)
haml_lint (0.67.0)
haml_lint (0.66.0)
haml (>= 5.0)
parallel (~> 1.10)
rainbow
@@ -327,21 +324,20 @@ GEM
multi_xml (>= 0.5.2)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
i18n-tasks (1.1.2)
i18n-tasks (1.0.15)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
erubi
highline (>= 3.0.0)
highline (>= 2.0.0)
i18n
parser (>= 3.2.2.1)
prism
rails-i18n
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.8, >= 1.8.1)
terminal-table (>= 1.5.1)
i18n_data (1.1.0)
simple_po_parser (~> 1.1)
icalendar (2.12.1)
icalendar (2.11.2)
base64
ice_cube (~> 0.16)
logger
@@ -352,18 +348,17 @@ GEM
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.8.1)
irb (1.15.3)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jquery-rails (4.6.1)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.16.0)
json-schema (6.0.0)
json (2.13.2)
json-schema (5.1.0)
addressable (~> 2.8)
bigdecimal (~> 3.1)
jsonapi-resources (0.10.7)
activerecord (>= 4.1)
concurrent-ruby
@@ -389,8 +384,7 @@ GEM
loofah (2.24.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.9.0)
logger
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
@@ -417,7 +411,7 @@ GEM
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (5.26.2)
minitest (5.25.5)
moneta (1.0.0)
msgpack (1.8.0)
multi_json (1.15.0)
@@ -425,7 +419,7 @@ GEM
bigdecimal (~> 3.1)
net-http (0.6.0)
uri
net-imap (0.5.12)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
@@ -435,14 +429,14 @@ GEM
net-smtp (0.5.1)
net-protocol
netrc (0.11.0)
nio4r (2.7.5)
nokogiri (1.18.10)
nio4r (2.7.4)
nokogiri (1.18.9)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
nokogiri (1.18.9-x86_64-linux-gnu)
racc (~> 1.4)
oauth (0.5.6)
oj (3.16.12)
oj (3.16.11)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
omniauth (1.9.2)
@@ -457,11 +451,8 @@ 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)
parser (3.3.9.0)
ast (~> 2.4.1)
racc
percy-capybara (5.0.0)
@@ -473,22 +464,22 @@ GEM
moneta (~> 1.0.0)
rate_throttle_client (~> 0.1.0)
popper_js (2.11.8)
pp (0.6.3)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
prism (1.6.0)
prism (1.4.0)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.2.6)
date
stringio
public_suffix (6.0.2)
puma (7.1.0)
public_suffix (6.0.1)
puma (7.0.3)
nio4r (~> 2.0)
query_diet (0.7.3)
query_diet (0.7.2)
racc (1.8.1)
rack (2.2.21)
rack (2.2.17)
rack-cors (2.0.2)
rack (>= 2.0.0)
rack-protection (3.2.0)
@@ -501,20 +492,20 @@ GEM
rackup (1.0.1)
rack (< 3)
webrick
rails (7.2.3)
actioncable (= 7.2.3)
actionmailbox (= 7.2.3)
actionmailer (= 7.2.3)
actionpack (= 7.2.3)
actiontext (= 7.2.3)
actionview (= 7.2.3)
activejob (= 7.2.3)
activemodel (= 7.2.3)
activerecord (= 7.2.3)
activestorage (= 7.2.3)
activesupport (= 7.2.3)
rails (7.2.2.2)
actioncable (= 7.2.2.2)
actionmailbox (= 7.2.2.2)
actionmailer (= 7.2.2.2)
actionpack (= 7.2.2.2)
actiontext (= 7.2.2.2)
actionview (= 7.2.2.2)
activejob (= 7.2.2.2)
activemodel (= 7.2.2.2)
activerecord (= 7.2.2.2)
activestorage (= 7.2.2.2)
activesupport (= 7.2.2.2)
bundler (>= 1.15.0)
railties (= 7.2.3)
railties (= 7.2.2.2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -534,44 +525,39 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (7.2.3)
actionpack (= 7.2.3)
activesupport (= 7.2.3)
cgi
railties (7.2.2.2)
actionpack (= 7.2.2.2)
activesupport (= 7.2.2.2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
tsort (>= 0.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
raindrops (0.20.1)
rake (13.3.1)
rake (13.3.0)
rate_throttle_client (0.1.2)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.16.1)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
tsort
recaptcha (5.21.1)
redis-client (0.23.2)
connection_pool
regexp_parser (2.11.3)
reline (0.6.3)
regexp_parser (2.11.2)
reline (0.6.2)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
responders (3.2.0)
actionpack (>= 7.0)
railties (>= 7.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.4.4)
rexml (3.4.2)
rouge (4.1.2)
rspec (3.13.0)
rspec-core (~> 3.13.0)
@@ -581,7 +567,7 @@ GEM
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.13.6)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
@@ -599,23 +585,23 @@ GEM
rspec-support (~> 3.13)
rspec-rebound (0.2.1)
rspec-core (~> 3.3)
rspec-support (3.13.6)
rspec-support (3.13.4)
rspectre (0.2.0)
parser (>= 3.3.7.1)
prism (~> 1.3)
rspec (~> 3.10)
rswag-api (2.17.0)
activesupport (>= 5.2, < 8.2)
railties (>= 5.2, < 8.2)
rswag-specs (2.17.0)
activesupport (>= 5.2, < 8.2)
json-schema (>= 2.2, < 7.0)
railties (>= 5.2, < 8.2)
rswag-api (2.16.0)
activesupport (>= 5.2, < 8.1)
railties (>= 5.2, < 8.1)
rswag-specs (2.16.0)
activesupport (>= 5.2, < 8.1)
json-schema (>= 2.2, < 6.0)
railties (>= 5.2, < 8.1)
rspec-core (>= 2.14)
rswag-ui (2.17.0)
actionpack (>= 5.2, < 8.2)
railties (>= 5.2, < 8.2)
rubocop (1.81.7)
rswag-ui (2.16.0)
actionpack (>= 5.2, < 8.1)
railties (>= 5.2, < 8.1)
rubocop (1.80.2)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
@@ -623,19 +609,19 @@ GEM
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.47.1, < 2.0)
rubocop-ast (>= 1.46.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.48.0)
rubocop-ast (1.46.0)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-capybara (2.22.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-factory_bot (2.28.0)
rubocop-factory_bot (2.27.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.34.2)
rubocop-rails (2.33.3)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
@@ -644,10 +630,10 @@ GEM
rubocop-rake (0.7.1)
lint_roller (~> 1.1)
rubocop (>= 1.72.1)
rubocop-rspec (3.8.0)
rubocop-rspec (3.7.0)
lint_roller (~> 1.1)
rubocop (~> 1.81)
rubocop-rspec_rails (2.32.0)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec_rails (2.31.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec (~> 3.5)
@@ -655,7 +641,7 @@ GEM
ruby-units (4.1.0)
ruby-vips (2.2.1)
ffi (~> 1.12)
rubyzip (3.2.1)
rubyzip (3.0.1)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
@@ -669,13 +655,13 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
scout_apm (5.8.0)
scout_apm (5.7.1)
parser
searchkick (5.3.1)
activemodel (>= 6.1)
hashie
securerandom (0.4.1)
selenium-webdriver (4.38.0)
selenium-webdriver (4.35.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
@@ -697,7 +683,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
ssrf_filter (1.1.2)
stringio (3.1.8)
stringio (3.1.7)
sysexits (1.2.0)
temple (0.10.4)
terminal-table (4.0.0)
@@ -708,17 +694,16 @@ GEM
thread_safe (0.3.6)
tilt (2.6.1)
timecop (0.9.10)
timeout (0.4.4)
tsort (0.2.0)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.1.0)
unicode-display_width (3.1.5)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
unicorn (6.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.18.0)
uniform_notifier (1.17.0)
uri (1.0.3)
useragent (0.16.11)
validate_url (1.0.15)
@@ -736,7 +721,7 @@ GEM
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
webrick (1.9.2)
webrick (1.9.1)
websocket (1.2.11)
websocket-driver (0.8.0)
base64
@@ -818,7 +803,6 @@ 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,6 +25,7 @@ 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

@@ -1,19 +0,0 @@
# 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

@@ -1,24 +0,0 @@
# 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,8 +73,6 @@ 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"))
@@ -123,6 +121,11 @@ class CropsController < ApplicationController
if can?(:wrangle, @crop)
@crop.approval_status = 'rejected' if params.fetch("reject", false)
@crop.approval_status = 'approved' if params.fetch("approve", false)
if params.fetch("restore", false)
@crop.approval_status = 'pending'
@crop.reason_for_rejection = nil
@crop.rejection_notes = nil
end
end
@crop.creator = current_member if @crop.approval_status == "pending"
@@ -149,32 +152,6 @@ 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
@@ -216,12 +193,10 @@ class CropsController < ApplicationController
def crop_params
params.require(:crop).permit(
:name, :en_wikipedia_url, :en_youtube_url,
:name, :en_wikipedia_url,
:parent_id, :perennial,
: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, :wikidata_id)
params.require(:scientific_name).permit(:crop_id, :name, :gbif_key)
end
def gbif_service

View File

@@ -1,19 +1,6 @@
# frozen_string_literal: true
module CropsHelper
def crop_or_parent(crop, attribute)
default = crop.send(attribute)
return default if default.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
end
def display_seed_availability(member, crop)
seeds = member.seeds.where(crop:)
total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
@@ -30,59 +17,4 @@ module CropsHelper
def crop_ebay_seeds_url(crop)
"https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
end
def youtube_video_id(url)
return unless url
regex = %r{(?:youtube(?:-nocookie)?\.com/(?:[^/\n\s]+/\S+/|(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)([a-zA-Z0-9_-]{11})}
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

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

View File

@@ -19,6 +19,10 @@ module OpenFarmData
fetch_attr('tags_array')
end
def description
fetch_attr('description')
end
def common_names
fetch_attr('common_names')
end

View File

@@ -1,7 +1,6 @@
# frozen_string_literal: true
class Crop < ApplicationRecord
has_paper_trail
extend FriendlyId
include PhotoCapable
include OpenFarmData
@@ -56,12 +55,6 @@ class Crop < ApplicationRecord
message: 'is not a valid English Wikipedia URL'
},
if: :approved?
validates :en_youtube_url,
format: {
with: %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
message: 'is not a valid YouTube URL'
},
allow_blank: true
validates :name, uniqueness: { scope: :approval_status }, if: :pending?
def to_s
@@ -163,17 +156,11 @@ class Crop < ApplicationRecord
def all_companions
return companions unless parent
(companions + parent.all_companions).uniq
(companions + parent.companions).uniq
end
before_destroy :destroy_reverse_companionships
private
def destroy_reverse_companionships
CropCompanion.where(crop_b: self).destroy_all
end
def count_uses_of_property(col_name)
plantings.unscoped
.where(crop_id: id)

View File

@@ -7,9 +7,9 @@ module Api
@model.owner = context[:current_user]
end
has_one :owner, class_name: 'Member', always_include_linkage_data: true
has_one :garden, always_include_linkage_data: true
has_one :planting, always_include_linkage_data: true
has_one :owner, class_name: 'Member'
has_one :garden
has_one :planting
attribute :name
attribute :description

View File

@@ -12,7 +12,7 @@ module Api
has_many :photos
has_one :parent, class_name: 'Crop', always_include_linkage_data: true
has_one :parent, class_name: 'Crop'
attribute :name
attribute :en_wikipedia_url

View File

@@ -7,7 +7,7 @@ module Api
@model.owner = context[:current_user]
end
has_one :owner, class_name: 'Member', always_include_linkage_data: true
has_one :owner, class_name: 'Member'
has_many :plantings
has_many :photos

View File

@@ -10,9 +10,9 @@ module Api
@model.plant_part = PlantPart.first
end
has_one :crop, always_include_linkage_data: true
has_one :planting, always_include_linkage_data: true
has_one :owner, class_name: 'Member', always_include_linkage_data: true
has_one :crop
has_one :planting
has_one :owner, class_name: 'Member'
# has_one :plant_part
has_many :photos

View File

@@ -9,7 +9,6 @@ module Api
has_many :plantings, foreign_key: 'owner_id'
has_many :harvests, foreign_key: 'owner_id'
has_many :seeds, foreign_key: 'owner_id'
has_many :activities, foreign_key: 'owner_id'
has_many :photos

View File

@@ -8,7 +8,7 @@ module Api
@model.owner = context[:current_user]
end
has_one :owner, class_name: 'Member', always_include_linkage_data: true
has_one :owner, class_name: 'Member'
has_many :plantings
has_many :gardens
has_many :harvests

View File

@@ -7,9 +7,9 @@ module Api
@model.owner = context[:current_user]
end
has_one :garden, always_include_linkage_data: true
has_one :crop, always_include_linkage_data: true
has_one :owner, class_name: 'Member', always_include_linkage_data: true
has_one :garden
has_one :crop
has_one :owner, class_name: 'Member'
has_many :photos
has_many :harvests

View File

@@ -7,8 +7,8 @@ module Api
@model.owner = context[:current_user]
end
has_one :owner, class_name: 'Member', always_include_linkage_data: true
has_one :crop, always_include_linkage_data: true
has_one :owner, class_name: 'Member'
has_one :crop
attribute :description
attribute :quantity

View File

@@ -1,56 +0,0 @@
- 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

@@ -1,10 +0,0 @@
%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

@@ -41,47 +41,19 @@
= f.radio_button(:perennial, true, label: "Perennial")
%span.help-block Living more than two years
%h2 Data
- 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'
%h2 OpenFarm Data
= f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
= f.number_field :spread, label: 'Spread (cm)', min: 0
= f.number_field :height, label: 'Height (cm)', min: 0
= f.text_field :sowing_method
= f.text_field :sun_requirements
= f.number_field :growing_degree_days, min: 0
- unless @crop.approved?
= link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
- 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.
= 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).
-# Only crop wranglers see the crop hierarchy (for now)
- if can? :wrangle, @crop
@@ -148,6 +120,8 @@
.text-right
- if @crop.approved?
= f.submit 'Save'
- elsif @crop.rejected?
= f.submit 'Restore', class: 'btn btn-warning', name: 'restore'
- else
= f.submit 'Reject', class: 'btn btn-danger', name: 'reject'
= f.submit 'Approve and save', class: 'btn btn-success', name: 'approve'

View File

@@ -1,16 +0,0 @@
%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

@@ -6,14 +6,14 @@
- unless @crop.approved?
%badge.badge-warning=@crop.approval_status
%small.text-muted= @crop.default_scientific_name
- if crop_or_parent(@crop, :sowing_method).present?
- if @crop.sowing_method.present?
%p
%strong How to sow #{@crop.name}:
= crop_or_parent(@crop, :sowing_method)
- if crop_or_parent(@crop, :sun_requirements).present?
= @crop.sowing_method
- if @crop.sun_requirements.present?
%p
%strong Sun requirement for #{@crop}:
Plant in #{crop_or_parent(@crop, :sun_requirements)}
Plant in #{@crop.sun_requirements}
%p.text-muted
- if !@crop.plantings.empty?
#{@crop.name.titleize} has been planted
@@ -21,11 +21,8 @@
by #{ENV['GROWSTUFF_SITE_NAME']} members.
- else
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")
- if @crop.description.present?
%p= simple_format @crop.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

@@ -1,7 +1,7 @@
%h2 #{photo_icon} Photos
- [Crop, Planting, Harvest, Seed].each do |model_name|
- if crop_or_parent(crop, :photos).by_model(model_name).any?
- if crop.photos.by_model(model_name).any?
%h3 #{@crop.name.capitalize} #{t("activerecord.models.#{model_name.to_s.downcase}.other")}
= render 'photos/gallery', photos: crop_or_parent(crop, :photos).by_model(model_name).includes(:owner).order(likes_count: :desc).limit(5)
= render 'photos/gallery', photos: crop.photos.by_model(model_name).includes(:owner).order(likes_count: :desc).limit(5)
- if crop.photos.count.positive?
= link_to 'more photos »', crop_photos_path(@crop), class: 'btn'

View File

@@ -54,7 +54,3 @@
- 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

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

View File

@@ -4,28 +4,25 @@
%p None known.
- else
- crop.scientific_names.each do |sn|
.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')
- 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"
- 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"
- 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'
.badge= sn.name
%p.text-right
- if can? :edit, crop

View File

@@ -1,13 +0,0 @@
%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,7 +3,6 @@
- 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,4 +1,3 @@
= render 'schema_org', crop: @crop
- content_for :title, @crop.name
- content_for :opengraph do
= tag("meta", property: "og:image", content: crop_image_path(@crop))
@@ -12,8 +11,6 @@
- content_for :breadcrumbs do
%li.breadcrumb-item= link_to 'Crops', crops_path
- if @crop.parent
%li.breadcrumb-item.active= link_to @crop.parent.name.capitalize, @crop.parent
%li.breadcrumb-item.active= link_to @crop.name.capitalize, @crop
= render 'approval_status_message', crop: @crop
@@ -33,17 +30,6 @@
- @crop.all_companions.each do |companion|
= render 'crops/tiny', crop: companion
- if crop_or_parent(@crop, :en_youtube_url).present?
%section.youtube
%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
= render 'crops/photos', crop: @crop
@@ -82,7 +68,6 @@
%section.posts= render 'crops/posts', crop: @crop
= render 'history', crop: @crop
.col-md-3
= cute_icon
.card
@@ -140,12 +125,6 @@
= 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",
@@ -178,10 +157,3 @@
= icon 'fas', 'external-link-alt'
Wikihow instructions
%li.list-group-item
= link_to "https://www.youtube.com/results?search_query=#{CGI.escape "growing #{@crop.name}"}",
target: "_blank",
class: 'card-link',
rel: "noopener noreferrer" do
= icon 'fab', 'youtube'
YouTube

View File

@@ -17,9 +17,6 @@
%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,9 +7,6 @@
= 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,8 +16,6 @@
"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,10 +24,6 @@
= 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,8 +8,6 @@
= 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

@@ -1,17 +0,0 @@
- 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,14 +89,6 @@ 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

@@ -1,301 +0,0 @@
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

@@ -1,5 +0,0 @@
class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
def change
add_column :crops, :en_youtube_url, :string
end
end

View File

@@ -1,25 +0,0 @@
# frozen_string_literal: true
class AddDescriptionToCrops < ActiveRecord::Migration[7.2]
# Temporary model to avoid validation issues
class Crop < ApplicationRecord
end
def up
add_column :crops, :description, :text
# Ensure the new column is available to the temporary model
Crop.reset_column_information
Crop.find_each do |crop|
next if crop.openfarm_data.blank?
description = crop.openfarm_data.dig('attributes', 'description')
crop.update_column(:description, description) if description.present?
end
end
def down
remove_column :crops, :description
end
end

View File

@@ -1,41 +0,0 @@
# 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

@@ -1,12 +0,0 @@
# 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

@@ -1,5 +0,0 @@
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_30_053104) do
ActiveRecord::Schema[7.2].define(version: 2025_09_01_144900) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -73,305 +73,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) 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
@@ -558,9 +259,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) do
t.string "sowing_method"
t.string "sun_requirements"
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"
@@ -885,6 +583,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) do
t.integer "harvests_count", default: 0
t.integer "likes_count", default: 0
t.boolean "failed", default: false, null: false
t.boolean "from_other_source"
t.integer "overall_rating"
t.index ["crop_id"], name: "index_plantings_on_crop_id"
t.index ["garden_id"], name: "index_plantings_on_garden_id"
@@ -958,17 +657,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) 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

View File

@@ -1,325 +0,0 @@
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

@@ -1,142 +0,0 @@
# robots.txt for based on the one for http://www.wikipedia.org/ and friends
# Observed spamming large amounts of https://en.wikipedia.org/?curid=NNNNNN
# and ignoring 429 ratelimit responses, claims to respect robots:
# http://mj12bot.com/
User-agent: MJ12bot
Disallow: /
# advertising-related bots:
User-agent: Mediapartners-Google*
Disallow: /
# Wikipedia work bots:
User-agent: IsraBot
Disallow:
User-agent: Orthogaffe
Disallow:
# Crawlers that are kind enough to obey, but which we'd rather not have
# unless they're feeding search engines.
User-agent: UbiCrawler
Disallow: /
User-agent: DOC
Disallow: /
User-agent: Zao
Disallow: /
# Some bots are known to be trouble, particularly those designed to copy
# entire sites. Please obey robots.txt.
User-agent: sitecheck.internetseer.com
Disallow: /
User-agent: Zealbot
Disallow: /
User-agent: MSIECrawler
Disallow: /
User-agent: SiteSnagger
Disallow: /
User-agent: WebStripper
Disallow: /
User-agent: WebCopier
Disallow: /
User-agent: Fetch
Disallow: /
User-agent: Offline Explorer
Disallow: /
User-agent: Teleport
Disallow: /
User-agent: TeleportPro
Disallow: /
User-agent: WebZIP
Disallow: /
User-agent: linko
Disallow: /
User-agent: HTTrack
Disallow: /
User-agent: Microsoft.URL.Control
Disallow: /
User-agent: Xenu
Disallow: /
User-agent: larbin
Disallow: /
User-agent: libwww
Disallow: /
User-agent: ZyBORG
Disallow: /
User-agent: Download Ninja
Disallow: /
# Misbehaving: requests much too fast:
User-agent: fast
Disallow: /
#
# Sorry, wget in its recursive mode is a frequent problem.
# Please read the man page and use it properly; there is a
# --wait option you can use to set the delay between hits,
# for instance.
#
User-agent: wget
Disallow: /
#
# The 'grub' distributed client has been *very* poorly behaved.
#
User-agent: grub-client
Disallow: /
#
# Doesn't follow robots.txt anyway, but...
#
User-agent: k2spider
Disallow: /
#
# Hits many times per second, not acceptable
# http://www.nameprotect.com/botinfo.html
User-agent: NPBot
Disallow: /
# A capture bot, downloads gazillions of pages with no public benefit
# http://www.webreaper.net/
User-agent: WebReaper
Disallow: /
# Per their statement, semrushbot respects crawl-delay directives
# We want them to overall stay within reasonable request rates to
# the backend (20 rps); keeping in mind that the crawl-delay will
# be applied by site and not globally by the bot, 5 seconds seem
# like a reasonable approximation
User-agent: SemrushBot
Crawl-delay: 5
#
# Friendly, low-speed bots are welcome viewing pages, but not
# dynamically-generated pages please.
#
# Another exception is for REST API documentation, located at
# /api/rest_v1/?doc.
#
User-agent: *
Disallow: /api/

View File

@@ -101,7 +101,7 @@ describe CropsController do
it { expect { subject }.to change(AlternateName, :count).by(2) }
it { expect { subject }.to change(ScientificName, :count).by(1) }
context 'with data' do
context 'with openfarm data' do
let(:crop_params) do
{
crop: {
@@ -110,18 +110,16 @@ describe CropsController do
row_spacing: 10,
spread: 20,
height: 30,
description: 'hello',
sowing_method: 'direct',
sun_requirements: 'full sun',
growing_degree_days: 100,
en_youtube_url: 'https://www.youtube.com/watch?v=INZybkX8tLI'
growing_degree_days: 100
},
alt_name: { '1': "egg plant", '2': "purple apple" },
sci_name: { '1': "fancy sci name", '2': "" }
}
end
it 'saves data' do
it 'saves openfarm data' do
subject
crop = Crop.last
expect(crop.row_spacing).to eq(10)
@@ -130,8 +128,6 @@ describe CropsController do
expect(crop.sowing_method).to eq('direct')
expect(crop.sun_requirements).to eq('full sun')
expect(crop.growing_degree_days).to eq(100)
expect(crop.description).to eq 'hello'
expect(crop.en_youtube_url).to eq 'https://www.youtube.com/watch?v=INZybkX8tLI'
end
end
end

View File

@@ -1,38 +0,0 @@
# 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(find('.index-cards.facts')).to have_text 'Perennial' }
it { expect(page).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(find('.index-cards.facts')).to have_no_text 'Perennial' }
it { expect(page).to have_no_text 'Perennial' }
it { expect(page).to have_no_text 'Annual' }
end
end

View File

@@ -66,6 +66,15 @@ describe "crop wranglers", :js do
visit crop_path(rejected_crop)
expect(page).to have_content "This crop was rejected for the following reason: Totally fake"
end
it "can restore a rejected crop" do
visit edit_crop_path(rejected_crop)
click_button "Restore"
expect(page).to have_content "crop was successfully updated"
rejected_crop.reload
expect(rejected_crop).to be_pending
expect(rejected_crop.reason_for_rejection).to be_nil
end
end
end

View File

@@ -544,20 +544,6 @@ describe Crop do
end
end
context "destroying a crop" do
let!(:crop_a) { FactoryBot.create(:crop) }
let!(:crop_b) { FactoryBot.create(:crop) }
before do
CropCompanion.create(crop_a: crop_a, crop_b: crop_b)
CropCompanion.create(crop_a: crop_b, crop_b: crop_a)
end
it "destroys companion links" do
expect { crop_a.destroy }.to change { CropCompanion.count }.from(2).to(0)
end
end
context "crop rejections" do
let!(:rejected_reason) do
FactoryBot.create(:crop, name: 'tomato',

View File

@@ -5,14 +5,8 @@ require 'rails_helper'
RSpec.describe 'Activities', type: :request do
subject { JSON.parse response.body }
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let!(:activity) { FactoryBot.create(:activity, owner: member, garden: create(:garden, owner: member), planting: create(:planting, owner: member)) }
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:activity) { FactoryBot.create(:activity, garden: create(:garden), planting: create(:planting)) }
let!(:activity2) { FactoryBot.create(:activity) }
it '#index' do
@@ -59,37 +53,4 @@ RSpec.describe 'Activities', type: :request do
expect(subject['data'][1]['id']).to eq(activity2.id.to_s)
end
end
context '#update' do
let(:params) do
{
'data' => {
'type' => 'activities',
'id' => activity.id.to_s,
'attributes' => {
'description' => 'A new description',
'finished' => true,
'due-date' => '2025-10-31'
}
}
}
end
it 'updates the activity' do
patch "/api/v1/activities/#{activity.id}", params: params.to_json, headers: auth_headers
expect(response).to have_http_status(:ok)
# Check response
expect(subject['data']['attributes']['description']).to eq('A new description')
expect(subject['data']['attributes']['finished']).to eq(true)
expect(subject['data']['attributes']['due-date']).to eq('2025-10-31')
# Check database
activity.reload
expect(activity.description).to eq('A new description')
expect(activity.finished).to eq(true)
expect(activity.due_date.to_s).to eq('2025-10-31')
end
end
end

View File

@@ -85,7 +85,7 @@ RSpec.describe 'Gardens', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:garden_params) do
{
data: {
@@ -116,7 +116,7 @@ RSpec.describe 'Gardens', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:garden) { create(:garden, owner: member) }
let(:other_member_garden) { create(:garden) }
let(:update_params) do
@@ -164,7 +164,7 @@ RSpec.describe 'Gardens', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let!(:garden) { create(:garden, owner: member) }
let(:other_member_garden) { create(:garden) }

View File

@@ -117,7 +117,7 @@ RSpec.describe 'Harvests', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:crop) { create(:crop) }
let(:planting) { create(:planting, owner: member) }
let(:plant_part) { create(:plant_part) }
@@ -156,7 +156,7 @@ RSpec.describe 'Harvests', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:harvest) { create(:harvest, owner: member) }
let(:other_member_harvest) { create(:harvest) }
let(:update_params) do
@@ -205,7 +205,7 @@ RSpec.describe 'Harvests', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let!(:harvest) { create(:harvest, owner: member) }
let(:other_member_harvest) { create(:harvest) }

View File

@@ -17,8 +17,7 @@ RSpec.describe 'Members', type: :request do
"harvests" => harvests_as_json_api,
"photos" => photos_as_json_api,
"plantings" => plantings_as_json_api,
"seeds" => seeds_as_json_api,
"activities" => activities_as_json_api
"seeds" => seeds_as_json_api
} }
end
@@ -42,12 +41,6 @@ RSpec.describe 'Members', type: :request do
"related" => "#{resource_url}/seeds" } }
end
let(:activities_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/activities",
"related" => "#{resource_url}/activities" } }
end
let(:plantings_as_json_api) do
{ "links" =>
{ "self" =>
@@ -81,7 +74,6 @@ RSpec.describe 'Members', type: :request do
it { expect(subject['data']['relationships']).to include("seeds" => seeds_as_json_api) }
it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) }
it { expect(subject['data']['relationships']).to include("photos" => photos_as_json_api) }
it { expect(subject['data']['relationships']).to include("activities" => activities_as_json_api) }
it { expect(subject['data']).to eq(member_encoded_as_json_api) }
end

View File

@@ -102,7 +102,7 @@ RSpec.describe 'Plantings', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:crop) { create(:crop) }
let(:garden) { create(:garden, owner: member) }
let(:planting_params) do
@@ -140,7 +140,7 @@ RSpec.describe 'Plantings', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:planting) { create(:planting, owner: member) }
let(:other_member_planting) { create(:planting) }
let(:update_params) do
@@ -189,7 +189,7 @@ RSpec.describe 'Plantings', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let!(:planting) { create(:planting, owner: member) }
let(:other_member_planting) { create(:planting) }

View File

@@ -68,7 +68,7 @@ RSpec.describe 'Seeds', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:crop) { create(:crop) }
let(:seed_params) do
{
@@ -103,7 +103,7 @@ RSpec.describe 'Seeds', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:crop) { create(:crop) }
let(:seed) { create(:seed, owner: member, crop: crop) }
let(:other_member_seed) { create(:seed) }
@@ -152,7 +152,7 @@ RSpec.describe 'Seeds', type: :request do
member.api_token.token
end
let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
let(:auth_headers) { headers.merge('Authorization' => "Token token=#{token}") }
let(:crop) { create(:crop) }
let!(:seed) { create(:seed, owner: member, crop: crop) }
let(:other_member_seed) { create(:seed) }

View File

@@ -1,26 +0,0 @@
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,7 +12,6 @@ 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

View File

@@ -1006,9 +1006,9 @@ js-tokens@^4.0.0:
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
js-yaml@^3.13.0:
version "3.14.2"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"