Compare commits

..

44 Commits

Author SHA1 Message Date
Daniel O'Connor
75807ba2af Merge branch 'dev' of https://github.com/Growstuff/growstuff into datepicker 2025-09-01 13:22:47 +00:00
Daniel O'Connor
62406a6573 Merge branch 'dev' into datepicker 2025-03-29 14:24:22 +10:30
Daniel O'Connor
53e90f57dd Merge branch 'dev' into datepicker 2024-10-14 00:41:45 +10:30
Daniel O'Connor
54acc2c108 Merge branch 'dev' into datepicker 2024-10-14 00:10:34 +10:30
Daniel O'Connor
0639cd5ab8 Merge branch 'dev' into datepicker 2024-10-13 23:54:46 +10:30
Daniel O'Connor
41c4ae1448 Merge branch 'dev' into datepicker 2024-10-13 23:51:09 +10:30
Daniel O'Connor
99221d7cf3 Merge branch 'dev' into datepicker 2024-10-13 23:40:14 +10:30
Daniel O'Connor
eeb8c84c31 Merge branch 'dev' into datepicker 2024-10-13 23:30:36 +10:30
Daniel O'Connor
e65dd4ef85 Merge branch 'dev' into datepicker 2024-10-13 23:05:10 +10:30
Daniel O'Connor
40ed3c8007 Merge branch 'dev' into datepicker 2024-10-13 22:54:03 +10:30
Daniel O'Connor
035decb132 Update spec/features/plantings/planting_a_crop_spec.rb 2024-10-13 22:53:17 +10:30
Daniel O'Connor
7102552bfe Update spec/features/seeds/adding_seeds_spec.rb 2024-10-13 22:52:39 +10:30
Daniel O'Connor
e1270512dc Update app/views/seeds/_form.html.haml 2024-10-13 22:52:05 +10:30
Daniel O'Connor
8d40355355 Update app/views/harvests/_form.html.haml 2024-10-13 22:51:04 +10:30
Daniel O'Connor
919c3dbf37 Merge branch 'dev' into datepicker 2024-10-13 22:47:40 +10:30
Daniel O'Connor
3e7a58fcfc Merge branch 'dev' into datepicker 2024-10-13 22:38:28 +10:30
Daniel O'Connor
fc301558e1 Merge branch 'dev' into datepicker 2024-10-13 22:21:39 +10:30
Daniel O'Connor
2523bea154 Merge branch 'dev' into datepicker 2024-10-13 22:11:42 +10:30
Daniel O'Connor
f89d64ac3a Mark spec pending 2024-10-13 10:28:29 +00:00
Daniel O'Connor
65a0540e3d Mark spec pending 2024-10-13 10:19:51 +00:00
Daniel O'Connor
654aa318c4 Fix specs 2024-10-13 10:05:52 +00:00
Daniel O'Connor
5128c8be0e Fix specs 2024-10-13 09:55:20 +00:00
Daniel O'Connor
0e1578aeef Fix specs 2024-10-13 09:45:10 +00:00
Daniel O'Connor
c6b5cc61da Fix specs 2024-10-13 09:30:36 +00:00
Daniel O'Connor
dddc85c338 Fix specs 2024-10-13 09:19:10 +00:00
Daniel O'Connor
69e764dd63 Fix specs 2024-10-13 09:01:29 +00:00
Daniel O'Connor
8aa0f98196 Fix specs 2024-10-13 09:00:00 +00:00
Daniel O'Connor
4c8c54eadd Fix specs 2024-10-13 08:48:42 +00:00
Daniel O'Connor
9c6797e850 Swap to html5 control 2024-10-13 08:17:40 +00:00
Daniel O'Connor
a5f774f043 Spec no longer possible 2024-10-13 03:59:12 +00:00
Daniel O'Connor
fe0d4295be Spec no longer possible 2024-10-13 03:57:53 +00:00
Daniel O'Connor
c5bdac4a5c Merge branch 'dev' of https://github.com/Growstuff/growstuff into datepicker 2024-10-13 03:56:30 +00:00
Daniel O'Connor
195602288c Fix test 2024-10-13 03:29:29 +00:00
Daniel O'Connor
c78a347002 Mark required 2024-10-13 02:59:41 +00:00
Daniel O'Connor
5178e1257e Merge branch 'dev' into datepicker 2024-10-13 13:16:22 +10:30
Daniel O'Connor
03f8acdd1d Add placehikder 2024-10-13 02:41:22 +00:00
Daniel O'Connor
426cb3ed37 Remove redundant UI element 2024-10-13 02:36:16 +00:00
Daniel O'Connor
4716b33d82 Mark required 2024-10-13 02:33:35 +00:00
Daniel O'Connor
329c3ddddd Mark required 2024-10-13 02:31:59 +00:00
Daniel O'Connor
3405d224b4 Add input validations 2024-10-13 02:29:17 +00:00
Daniel O'Connor
bd858a0b23 Mark required 2024-10-13 02:26:27 +00:00
Daniel O'Connor
defc3def4f Allow autosuggests to be required 2024-10-13 02:26:16 +00:00
Daniel O'Connor
4b0e228525 Swap to native datepicker 2024-10-13 02:24:20 +00:00
Daniel O'Connor
0f9e151c15 Swap to native datepicker 2024-10-13 02:22:49 +00:00
93 changed files with 4162 additions and 4267 deletions

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (admin/)
run: bundle exec rspec spec/features/admin/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (comments/)
run: bundle exec rspec spec/features/comments/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -101,9 +101,3 @@ jobs:
- name: Run rspec (conversations/)
run: bundle exec rspec spec/features/conversations/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (crops/)
run: bundle exec rspec spec/features/crops/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (gardens/)
run: bundle exec rspec spec/features/gardens/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -99,11 +99,4 @@ jobs:
run: bundle exec rails search:reindex
- name: Run rspec (harvests/)
run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots
run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -99,11 +99,4 @@ jobs:
run: bundle exec rails search:reindex
- name: Run rspec (home/)
run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots
run: bundle exec rspec spec/features/home/ -fd -t ~@flaky

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -99,11 +99,4 @@ jobs:
run: bundle exec rails search:reindex
- name: Run rspec (members/)
run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots
run: bundle exec rspec spec/features/members/ -fd -t ~@flaky

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (places/)
run: bundle exec rspec spec/features/places/ -fd
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (plantings/)
run: bundle exec rspec spec/features/plantings/ -fd
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -1,4 +1,4 @@
name: CI Features - Posts
name: CI Features - Admin
on: [pull_request]
@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (posts/)
run: bundle exec rspec spec/features/posts/ -fd
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -100,10 +100,3 @@ jobs:
- name: Run rspec (seeds/)
run: bundle exec rspec spec/features/seeds/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -99,11 +99,4 @@ jobs:
run: bundle exec rails search:reindex
- name: Run rspec (timeline/)
run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots
run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky

View File

@@ -74,7 +74,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'
@@ -108,11 +108,4 @@ jobs:
run: bundle exec rspec spec/features/photos/ -fd
- name: Run rspec (rss/)
run: bundle exec rspec spec/features/rss/ -fd
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tmp/screenshots
run: bundle exec rspec spec/features/rss/ -fd

View File

@@ -89,7 +89,7 @@ jobs:
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: '12'

View File

@@ -1,5 +1,5 @@
inherit_from: .rubocop_todo.yml
plugins:
require:
- rubocop-factory_bot
- rubocop-capybara
- rubocop-rails

View File

@@ -314,7 +314,7 @@ RSpec/MultipleExpectations:
# Offense count: 138
# Configuration parameters: AllowSubject.
RSpec/MultipleMemoizedHelpers:
Max: 20
Max: 14
# Offense count: 133
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.

View File

@@ -142,7 +142,7 @@ GEM
erubi (>= 1.0.0)
rack (>= 0.9.0)
rouge (>= 1.0.0)
bigdecimal (3.2.3)
bigdecimal (3.2.2)
bluecloth (2.2.0)
bonsai-elasticsearch-rails (7.0.1)
elasticsearch-model (< 8)
@@ -198,7 +198,7 @@ GEM
comfy_bootstrap_form (4.0.9)
rails (>= 5.0.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
connection_pool (2.5.3)
crass (1.0.6)
crowdin-api (1.12.0)
open-uri (>= 0.1.0, < 0.2.0)
@@ -257,9 +257,9 @@ GEM
excon (1.2.5)
logger
execjs (2.10.0)
factory_bot (6.5.5)
factory_bot (6.5.4)
activesupport (>= 6.1.0)
factory_bot_rails (6.5.1)
factory_bot_rails (6.5.0)
factory_bot (~> 6.5)
railties (>= 6.1.0)
faker (3.5.2)
@@ -457,8 +457,8 @@ GEM
racc
percy-capybara (5.0.0)
capybara (>= 3)
pg (1.6.2)
pg (1.6.2-x86_64-linux)
pg (1.6.1)
pg (1.6.1-x86_64-linux)
platform-api (3.8.0)
heroics (~> 0.1.1)
moneta (~> 1.0.0)
@@ -475,7 +475,7 @@ GEM
date
stringio
public_suffix (6.0.1)
puma (7.0.2)
puma (6.6.1)
nio4r (~> 2.0)
query_diet (0.7.2)
racc (1.8.1)
@@ -601,7 +601,7 @@ GEM
rswag-ui (2.16.0)
actionpack (>= 5.2, < 8.1)
railties (>= 5.2, < 8.1)
rubocop (1.80.2)
rubocop (1.80.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
@@ -630,7 +630,7 @@ GEM
rubocop-rake (0.7.1)
lint_roller (~> 1.1)
rubocop (>= 1.72.1)
rubocop-rspec (3.7.0)
rubocop-rspec (3.6.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec_rails (2.31.0)

View File

@@ -17,9 +17,7 @@ encourage participation from people of all backgrounds and skill levels.
## Want to contribute?
Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
Dive on in and submit your PRs!
Vibe Coding is more than okay, just make sure you indicate if you have done so and ensure there are tests.
Dive on in and submit your PRs.
## Important links
@@ -37,10 +35,6 @@ frontend features. We welcome contributions -- see
* To set up your development environment, see [Getting started](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
* You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).
### For Home Automation enthusiasts
https://github.com/Growstuff/homeassistant-growstuff/
## For designers, writers, researchers, data wranglers, and other contributors
There are heaps of ways to get involved and contribute no matter what

View File

@@ -132,8 +132,6 @@ section {
border-radius: 5%;
margin: 0.5em 0.5em 0.5em 0;
width: 200px;
align-items: stretch;
justify-content: space-between;
.img-card {
border-top-left-radius: 5%;

View File

@@ -29,7 +29,7 @@ class ActivitiesController < DataController
def new
@activity = Activity.new(
owner: current_member,
owner: current_member,
due_date: Date.today
)
if params[:garden_id]

View File

@@ -1,8 +0,0 @@
# frozen_string_literal: true
module Api
module V1
class ActivitiesController < BaseController
end
end
end

View File

@@ -4,40 +4,6 @@ module Api
module V1
class BaseController < JSONAPI::ResourceController
abstract
protect_from_forgery with: :null_session
before_action :authenticate_member_from_token!
before_action :enforce_member_for_write_operations!, only: %i(create update destroy)
rescue_from CanCan::AccessDenied do
head :forbidden
end
def context
{
current_user: current_user,
current_ability: current_ability,
controller: self,
action: params[:action]
}
end
private
attr_reader :current_user
def enforce_member_for_write_operations!
head :unauthorized unless current_user
end
def authenticate_member_from_token!
authenticate_with_http_token do |token, _options|
auth = Authentication.find_by(token: token, provider: 'api')
if auth.present?
@current_user = auth.member
return true
end
end
end
end
end
end

View File

@@ -192,8 +192,6 @@ class CropsController < ApplicationController
:parent_id, :perennial,
:request_notes, :reason_for_rejection,
:rejection_notes,
:row_spacing, :spread, :height,
:sowing_method, :sun_requirements, :growing_degree_days,
scientific_names_attributes: %i(scientific_name _destroy id)
)
end

View File

@@ -20,7 +20,6 @@ class GardensController < DataController
def show
@current_plantings = @garden.plantings.current.where.not(failed: true).includes(:crop, :owner).order(planted_at: :desc)
@current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
@finished_activities = @garden.activities.finished.includes(:owner).order(created_at: :desc)
@finished_plantings = @garden.plantings.finished.includes(:crop)
@suggested_companions = Crop.approved.where(
id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)

View File

@@ -37,7 +37,6 @@ class PlantingsController < DataController
@photos = @planting.photos.includes(:owner).order(date_taken: :desc)
@harvests = Harvest.search(where: { planting_id: @planting.id })
@current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
@finished_activities = @planting.activities.finished.includes(:owner).order(created_at: :desc)
@matching_seeds = matching_seeds
@crop = @planting.crop
@@ -134,7 +133,7 @@ class PlantingsController < DataController
:crop_id, :description, :garden_id, :planted_at,
:parent_seed_id,
:quantity, :sunniness, :planted_from, :finished,
:finished_at, :failed, :overall_rating
:finished_at, :failed
)
end

View File

@@ -6,7 +6,7 @@ class RegistrationsController < Devise::RegistrationsController
prepend_before_action :check_captcha, only: [:create] # Change this to be any actions you want to protect with recaptcha.
def edit
@flickr_auth = current_member.auth('flickr')
@flickr_auth = current_member.auth('flickr')
render "edit"
end
@@ -38,12 +38,6 @@ class RegistrationsController < Devise::RegistrationsController
end
end
def regenerate_api_token
current_member.regenerate_api_token
set_flash_message :notice, :api_token_regenerated
redirect_to edit_member_registration_path + '#apps'
end
def destroy
if @member.valid_password?(params.require(:member)[:current_password])
@member.discard

View File

@@ -21,28 +21,6 @@ module ApplicationHelper
classes
end
# Similar to Rails' time_ago_in_words, but gives a more standard
# output like "in 3 days" or "5 months ago".
# Also handles the case where from_time is a Date and to_time is a Date
# (in which case it just says "today" if they're the same date).
#
# NOTE: This is similar to distance_of_time_in_words but different enough
# that I think it's worth having a separate helper for it.
#
# from_time - the starting time (Time or Date)
# to_time - the ending time (Time or Date). Default: now (Time.zone.now)
# include_seconds - whether to include seconds in the calculation
#
# Returns a string like "in 3 days" or "5 months ago"
def standard_time_distance(from_time, to_time = 0, include_seconds = false)
return 'today' if from_time.is_a?(Date) && (from_time == to_time)
return 'now' if from_time == to_time
return "#{distance_of_time_in_words(from_time, to_time, include_seconds:)} ago" if from_time < to_time
"in #{distance_of_time_in_words(from_time, to_time, include_seconds:)}"
end
def count_github_contibutors
File.open(Rails.root.join('CONTRIBUTORS.md')).readlines.grep(/^-/).size
end

View File

@@ -30,20 +30,4 @@ class Activity < ApplicationRecord
def to_s
name
end
def garden_name
garden&.name
end
def garden_slug
garden&.slug
end
def planting_name
planting&.crop&.name
end
def planting_slug
planting&.crop&.slug
end
end

View File

@@ -8,6 +8,14 @@ module OpenFarmData
fetch_attr('main_image_path')
end
def height
fetch_attr('height')
end
def spread
fetch_attr('spread')
end
def svg_icon
icon = fetch_attr('svg_icon')
return icon if icon.present?
@@ -23,6 +31,10 @@ module OpenFarmData
fetch_attr('description')
end
def row_spacing
fetch_attr('row_spacing')
end
def common_names
fetch_attr('common_names')
end
@@ -31,10 +43,22 @@ module OpenFarmData
fetch_attr('binomial_name')
end
def sowing_method
fetch_attr('sowing_method')
end
def main_image_path
fetch_attr('main_image_path')
end
def sun_requirements
fetch_attr('sun_requirements')
end
def growing_degree_days
fetch_attr('growing_degree_days')
end
def processing_pictures
fetch_attr('processing_pictures')
end

View File

@@ -9,9 +9,7 @@ module SearchActivities
mappings: {
properties: {
active: { type: :boolean },
created_at: { type: :integer },
updated_at: { type: :integer },
due_date: { type: :date }
created_at: { type: :integer }
}
}
@@ -25,10 +23,8 @@ module SearchActivities
category:,
garden_id:,
garden_name: garden&.name,
garden_slug: garden&.garden_slug,
planting_id:,
planting_name: planting&.crop&.name,
planting_slug: planting&.slug,
description:,
# owner

View File

@@ -24,20 +24,6 @@ class Member < ApplicationRecord
has_many :notifications, foreign_key: 'recipient_id', inverse_of: :recipient
has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender, class_name: "Notification"
has_many :authentications, dependent: :destroy
has_one :api_token, -> { where(provider: 'api') }, class_name: 'Authentication', dependent: :destroy
def api_token?
api_token.present?
end
def regenerate_api_token
api_token.destroy if api_token?
create_api_token(
provider: 'api',
uid: id,
token: SecureRandom.hex(16)
)
end
has_many :photos, inverse_of: :owner
has_many :likes, dependent: :destroy

View File

@@ -46,8 +46,7 @@ class Photo < ApplicationRecord
flickr = owner.flickr
info = flickr.photos.getInfo(photo_id: source_id)
licenses = flickr.photos.licenses.getInfo
license = licenses.find { |l| l.id.to_i == info.license.to_i }
Rails.logger.error("Cannot find license: " + [info.license, licenses].inspect) unless license
license = licenses.find { |l| l.id == info.license }
{
title: calculate_title(info),
license_name: license.name,

View File

@@ -83,9 +83,6 @@ class Planting < ApplicationRecord
validates :planted_from, allow_blank: true, inclusion: {
in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
}
validates :overall_rating, allow_blank: true, numericality: {
only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
}
def planting_slug
[

View File

@@ -1,29 +0,0 @@
# frozen_string_literal: true
module Api
module V1
class ActivityResource < BaseResource
before_create do
@model.owner = context[:current_user]
end
has_one :owner, class_name: 'Member'
has_one :garden
has_one :planting
attribute :name
attribute :description
attribute :category
attribute :finished
attribute :due_date
filter :owner
filter :owner_id
filter :garden
filter :garden_id
filter :planting
filter :planting_id
filter :category
end
end
end

View File

@@ -3,7 +3,8 @@
module Api
module V1
class CropResource < BaseResource
immutable # TODO: Re-evaluate this later
immutable
filter :approval_status, default: 'approved'
has_many :plantings

View File

@@ -3,22 +3,13 @@
module Api
module V1
class GardenResource < BaseResource
before_create do
@model.owner = context[:current_user]
end
immutable
has_one :owner, class_name: 'Member'
has_many :plantings
has_many :photos
attribute :name
filter :owner
filter :owner_id
filter :active
filter :garden_type
filter :location
filter :slug
end
end
end

View File

@@ -3,17 +3,11 @@
module Api
module V1
class HarvestResource < BaseResource
before_save do
@model.owner = context[:current_user]
@model.crop_id = @model.planting.crop_id if @model.planting_id
@model.harvested_at = Time.zone.now if @model.harvested_at.blank?
@model.plant_part = PlantPart.first
end
immutable
has_one :crop
has_one :planting
has_one :owner, class_name: 'Member'
# has_one :plant_part
has_many :photos
attribute :harvested_at
@@ -22,15 +16,6 @@ module Api
attribute :weight_quantity
attribute :weight_unit
attribute :si_weight
filter :owner
filter :owner_id
filter :crop
filter :crop_id
filter :planting
filter :planting_id
filter :plant_part
filter :harvested_at
end
end
end

View File

@@ -3,10 +3,7 @@
module Api
module V1
class PhotoResource < BaseResource
immutable # TODO: Re-evaluate this.
before_create do
@model.owner = context[:current_user]
end
immutable
has_one :owner, class_name: 'Member'
has_many :plantings

View File

@@ -3,9 +3,7 @@
module Api
module V1
class PlantingResource < BaseResource
before_create do
@model.owner = context[:current_user]
end
immutable
has_one :garden
has_one :crop
@@ -38,10 +36,6 @@ module Api
filter :owner
filter :owner_id
filter :finished
filter :active, apply: ->(records, _value, _options) { records.active }
filter :failed, apply: ->(records, _value, _options) { records.failed }
filter :sunniness
filter :perennial, apply: ->(records, _value, _options) { records.perennial }
attribute :percentage_grown
delegate :percentage_grown, to: :@model

View File

@@ -3,9 +3,7 @@
module Api
module V1
class SeedResource < BaseResource
before_create do
@model.owner = context[:current_user]
end
immutable
has_one :owner, class_name: 'Member'
has_one :crop
@@ -19,15 +17,6 @@ module Api
attribute :organic
attribute :gmo
attribute :heirloom
filter :owner
filter :owner_id
filter :crop
filter :crop_id
filter :tradable_to
filter :organic
filter :gmo
filter :heirloom
end
end
end

View File

@@ -1,16 +1,6 @@
# frozen_string_literal: true
class BaseResource < JSONAPI::Resource
immutable
abstract
[:create, :update, :remove].each do |action|
set_callback action, :before, :authorize
end
# Check authorisation for write operations.
# NOTE: At a later time, we may require API tokens for READ operations.
def authorize
# context[:action] is simply context[:controller].params[:action]
context[:current_ability].authorize! context[:action].to_sym, @model
end
end

View File

@@ -20,24 +20,16 @@
- if can? :destroy, activity
.dropdown-divider
= delete_button(activity, classes: 'dropdown-item text-danger')
.card-body
= link_to activity_path(slug: activity.slug) do
= link_to activity_path(slug: activity.slug) do
.card-body.text-center
%h4= activity.name
- if activity.due_date
%small.due-date{title: activity.due_date}
= standard_time_distance(activity.due_date.to_date, Time.zone.now.to_date)
%div
%small.text-justify{title: activity.description}= activity.description.truncate(150)
%p
%ul.list-unstyled
- if activity.garden_name && activity.garden_slug
%li
%small= link_to activity.garden_name, garden_path(slug: activity.garden_slug)
- if activity.planting_name && activity.planting_slug
%li
%small= link_to activity.planting_name, planting_path(slug: activity.planting_slug)
.text-center= activity.description
- if activity.garden
.text-center= activity.garden
- if activity.planting
.text-center= activity.planting
.card-footer
%small.chip.member-chip
= link_to member_path(slug: activity.owner_slug) do
= activity.owner_login_name
.float-right
%span.chip.member-chip
= link_to member_path(slug: activity.owner_slug) do
= activity.owner_login_name

View File

@@ -27,21 +27,19 @@
.row
.col-md-4
= f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active.order_by_name,
= f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active,
:id, :name,
label: 'Is this for a specific garden?')
= link_to "Add a garden.", new_garden_path
.col-md-4
= f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active.recent,
= f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active,
:id, :crop_name,
label: 'Is this for a specific planting?')
= link_to "Add a planting.", new_planting_path
.col-md-4
= f.date_field :due_date,
value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
label: 'When?'
= f.date_field :due_date, value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '', label: 'When?'
%hr

View File

@@ -41,14 +41,6 @@
= f.radio_button(:perennial, true, label: "Perennial")
%span.help-block Living more than two years
%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'
= f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'

View File

@@ -12,7 +12,7 @@
#{harvest.owner} harvested #{display_quantity(harvest)}.
.float-right= render 'members/location', member: harvest.owner
.harvest-timeago
%small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
%small #{distance_of_time_in_words(harvest.harvested_at, Time.zone.now)} ago.
%li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
- if crop.approved?
- if current_member

View File

@@ -1,33 +0,0 @@
- if crop.row_spacing || crop.spread || crop.height || crop.sowing_method || crop.sun_requirements || crop.growing_degree_days
= cute_icon
.card
.card-body
%h4 OpenFarm Data
%ul.list-group.list-group-flush
- if crop.row_spacing
%li.list-group-item
%strong Row Spacing:
= crop.row_spacing
cm
- if crop.spread
%li.list-group-item
%strong Spread:
= crop.spread
cm
- if crop.height
%li.list-group-item
%strong Height:
= crop.height
cm
- if crop.sowing_method
%li.list-group-item
%strong Sowing Method:
= crop.sowing_method
- if crop.sun_requirements
%li.list-group-item
%strong Sun Requirements:
= crop.sun_requirements
- if crop.growing_degree_days
%li.list-group-item
%strong Growing Degree Days:
= crop.growing_degree_days

View File

@@ -111,8 +111,6 @@
= render 'harvests', crop: @crop
= render 'find_seeds', crop: @crop
= render 'openfarm_data', crop: @crop
= cute_icon
.card
.card-body

View File

@@ -15,16 +15,3 @@
method: :delete, class: "remove btn btn-danger"
- else
= link_to 'Connect to Flickr', '/members/auth/flickr', class: 'btn'
%hr
.row
.col-md-12
%p
= image_tag "icons/post.svg", size: "32x32", alt: 'API logo'
- if current_member.api_token?
Your API token is
%code= current_member.api_token.token
= link_to "Regenerate", regenerate_api_token_path,
data: { confirm: "Are you sure? Your old token will stop working immediately." },
method: :post, class: "remove btn btn-danger"
- else
= link_to 'Generate API Token', regenerate_api_token_path, method: :post, class: 'btn btn-primary'

View File

@@ -16,8 +16,3 @@
.col-md-12
%p Nothing has been planted here.
- if @finished_activities&.size&.positive?
%h2 Finished activities in garden
.index-cards
- @finished_activities.each do |activity|
= render "activities/card", activity: activity

View File

@@ -11,9 +11,6 @@
.row
.col-md-2
%small
%a{href: "#content"}
Skip to main content
= render 'layouts/nav', model: Garden
%label
= link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all) do
@@ -23,7 +20,7 @@
%hr/
= render @owner
.col-md-10#content
.col-md-10
- if @gardens.empty?
%p There are no gardens to display.
- if can?(:create, Garden) && @owner == current_member

View File

@@ -30,7 +30,7 @@
= link_to "Request new crops.", new_crop_path
.col-md-4
= f.date_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '', label: 'When?'
= f.date_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '', label: 'When?', required: true
.col-12
= f.form_group :plant_part_id, label: { text: "Harvested Plant Part" } do
.row

View File

@@ -5,8 +5,3 @@
- @matching_plantings.each do |planting|
= f.radio_button :planting_id, planting.id, label: planting
= f.submit "save", class: 'btn btn-sm'
- if @harvest.planting.present? && @harvest.planting.overall_rating.blank?
.alert.alert-info{role: "alert"}
This harvest is from a planting that hasn't been rated yet.
= link_to "Rate this planting", edit_planting_path(@harvest.planting, anchor: "planting_overall_rating"), class: 'alert-link'

View File

@@ -46,7 +46,7 @@
%h3
Harvested
= editable :date, @harvest, :harvested_at, display_field: '.harvested_at'
%strong.harvested_at #{standard_time_distance @harvest.harvested_at, Time.zone.now.to_date}
%strong.harvested_at #{distance_of_time_in_words @harvest.harvested_at, Time.zone.now.to_date} ago
%span.harvested_at= I18n.l @harvest.harvested_at
.card{class: @harvest.quantity.present? ? '' : 'text-muted'}

View File

@@ -11,11 +11,11 @@
%br
%p
- if current_member.plantings.active.any?
= link_to member_path(current_member, anchor: "content"), class: 'btn btn-dark' do
= link_to member_path(current_member, anchor: "#content"), class: 'btn btn-dark' do
= planting_icon
Track my plantings
%p
= link_to member_gardens_path(current_member, anchor: "content"), class: 'btn btn-dark' do
= link_to member_gardens_path(current_member), class: 'btn btn-dark' do
= garden_icon
Show me my garden
- else

View File

@@ -2,10 +2,10 @@
%ul.navbar-nav.mr-auto.bg-dark
- if signed_in?
%li.nav-item
= link_to timeline_index_path, method: :get, class: 'nav-link text-white', title: "Timeline" do
= link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
= image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
%li.nav-item
= link_to member_gardens_path(current_member, anchor: "content"), class: 'nav-link text-white', title: "My gardens" do
= link_to member_gardens_path(current_member), class: 'nav-link text-white', title: "My gardens" do
= image_icon 'gardens'
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}

View File

@@ -83,14 +83,14 @@
.row
%section.order-3.order-md-1.col-12= render "map", member: @member
- if @harvesting.size.positive?
%section.harvests.order-2.order-md-1.col-12#harvests
%section.harvests.order-2.order-md-1.col-12
%h2 Ready to harvest
.index-cards
- @harvesting.each do |planting|
= render 'plantings/thumbnail', planting: planting
- if @others.size.positive?
%section.planting-progress.order-2.order-md-1.col-12#planting-progress
%section.planting-progress.order-2.order-md-1.col-12
%h2 Progress report
%p Still growing and not ready for harvesting.
.list-group
@@ -99,7 +99,7 @@
%span= render 'plantings/tiny', planting: planting
%span= render 'plantings/progress', planting: planting
- if @late.size.positive?
%section.late.order-2.order-md-1.col-12#late
%section.late.order-2.order-md-1.col-12
%h2 Late
%p
These plantings are at the end of their lifecycle.
@@ -109,7 +109,7 @@
- @late.each do |planting|
= render 'plantings/thumbnail', planting: planting
- if @super_late.any?
%section.superlate.order-2.order-md-1.col-12#superlate
%section.superlate.order-2.order-md-1.col-12
%h2 Super late
%p
We suspect the following plantings finished long ago and no longer need tracking.
@@ -122,14 +122,14 @@
planted on #{planting.planted_at.to_date}
- if @harvests.any?
%section.havests.order-2.order-md-1.col-12#recent-harvests
%section.havests.order-2.order-md-1.col-12
%h2 Recent Harvests
.index-cards
- @harvests.each do |harvest|
= render 'harvests/thumbnail', harvest: harvest
- if @activity.any?
%section.activity.order-2.order-md-1.col-12#activity
%section.activity.order-2.order-md-1.col-12
%h2 Activity
.list-group
- @activity.each do |event|

View File

@@ -89,9 +89,3 @@
- if planting.finished_at.present?
%span.plantingfact--finish
= planting.finished_at.year
- if planting.overall_rating.present?
.card.fact-card
.card-body
%h3 Overall Rating
%p.card-text
%strong= "#{planting.overall_rating}/5"

View File

@@ -27,12 +27,12 @@
.row
.col-md-8
= f.collection_radio_buttons(:garden_id, @planting.owner.gardens.active.order_by_name,
= f.collection_radio_buttons(:garden_id, @planting.owner.gardens.active,
:id, :name, required: true,
label: 'Where did you plant it?')
= link_to "Add a garden.", new_garden_path
.col-md-4
= f.text_field :planted_at,
= f.date_field :planted_at,
value: @planting.planted_at ? @planting.planted_at.to_fs(:ymd) : '',
class: 'add-datepicker', label: 'When?', title: "Plan out your future plantings by forward dating, and subscribe to your iCalendar feed for reminders to plant"
@@ -43,15 +43,6 @@
= f.select(:sunniness, Planting::SUNNINESS_VALUES, { include_blank: '', label: 'Sun or shade?' } )
.col-md-4
= f.number_field :quantity, label: 'How many?', min: 1
.col-md-12
= f.range_field :overall_rating, min: 1, max: 5, include_blank: 'Leave blank', label: 'Overall Rating', list: "rating-list", title: "How well is the planting going?"
%datalist{"id": "rating-list"}
%option{"value": "1"} Poor
%option{"value": "2"}
%option{"value": "3"}
%option{"value": "4"}
%option{"value": "5"} Great
= f.text_area :description, rows: 6, label: 'Tell us more about it'
.row
@@ -59,9 +50,8 @@
= f.check_box :finished, label: t('buttons.mark_as_finished'), title: t('.finish_helper')
.col-md-6
= f.text_field :finished_at,
= f.date_field :finished_at,
value: @planting.finished_at ? @planting.finished_at.to_fs(:ymd) : '',
class: 'add-datepicker',
label: 'Finished date',
placeholder: 'optional'
.row

View File

@@ -9,7 +9,7 @@
%p Which garden is the planting in?
%ul.list-group
- planting.owner.gardens.active.order_by_name.each do |garden|
- planting.owner.gardens.active.order(:name).each do |garden|
%li.list-group-item
= link_to plantings_path(planting: {crop_id: planting.crop_id, garden_id: garden.id}), method: :post do
.md-v-line

View File

@@ -7,15 +7,6 @@
= tag("meta", property: "og:type", content: "website")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
- if @planting.overall_rating.present?
%script{type: "application/ld+json"}
:plain
{
"@context": "http://schema.org",
"@type": "Rating",
"ratingValue": "#{@planting.overall_rating}",
"bestRating": "5"
}
- content_for :breadcrumbs do
%li.breadcrumb-item= link_to 'Plantings', plantings_path
@@ -89,11 +80,7 @@
- else
.col-md-12
%p Nothing is currently planned here.
- if @finished_activities&.size&.positive?
%h2 Finished activities for planting
.index-cards
- @finished_activities.each do |activity|
= render "activities/card", activity: activity
.col-md-4.col-xs-12
= render @planting.crop

View File

@@ -28,23 +28,23 @@
= link_to "Request new crops.", new_crop_path
.row
.col-12.col-md-4
= f.text_field :saved_at,
= f.date_field :saved_at,
value: @seed.saved_at ? @seed.saved_at.to_fs(:ymd) : '',
class: 'add-datepicker', label: 'When were the seeds harvested/saved?'
label: 'When were the seeds harvested/saved?'
.col-12.col-md-4= f.number_field :quantity, label: 'Quantity', min: 1
.col-12.col-md-4
= f.text_field :plant_before, class: 'add-datepicker',
value: @seed.plant_before ? @seed.plant_before.to_fs(:ymd) : ''
= f.date_field :plant_before, value: @seed.plant_before ? @seed.plant_before.to_fs(:ymd) : ''
.row
.col-12.col-md-4
= f.check_box :finished, label: t('buttons.mark_as_finished')
.col-12.col-md-4
= f.text_field :finished_at, class: 'add-datepicker', value: @seed.finished_at ? @seed.finished_at.to_fs(:ymd) : ''
= f.date_field :finished_at, value: @seed.finished_at ? @seed.finished_at.to_fs(:ymd) : ''
.col-12.col-md-4
%span.help-inline= t('.finish_helper')
.row
-# TODO: Range control?
.col-md-6= f.number_field :days_until_maturity_min, label_as_placeholder: true, label: 'min', prepend: 'Days until maturity', min: 1
.col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days", min: 1

View File

@@ -5,6 +5,5 @@
= edit_icon
.hide{id: "date--#{model.id}-#{field.to_s}"}
= bootstrap_form_for(model) do |f|
= f.date_field field,
value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
= f.date_field field, value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
= f.submit :save

View File

@@ -12,6 +12,5 @@
- elsif field_type == :select
= f.select field, collection
- elsif field_type == :date
= f.date_field field,
value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
= f.date_field field, value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
= f.submit :save

View File

@@ -1,27 +1,31 @@
default: &default
adapter: postgresql
encoding: unicode
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
development:
<<: *default
adapter: postgresql
database: growstuff_dev
user: postgres
password: postgres
host: <%= ENV.fetch("DATABASE_HOST") { 'db' } %>
host: db
test:
<<: *default
adapter: postgresql
database: growstuff_test
user: postgres
password: postgres
host: <%= ENV.fetch("DATABASE_HOST") { 'db' } %>
host: db
production:
<<: *default
url: <%= ENV['DATABASE_URL'] %>
adapter: postgresql
database: growstuff_prod
pool: 5
timeout: 5000
username: growstuff
host: localhost
password: thisisnottherealpassword
staging:
<<: *default
url: <%= ENV['DATABASE_URL'] %>
adapter: postgresql
database: growstuff_prod
pool: 5
timeout: 5000
username: growstuff
host: localhost
password: thisisnottherealpassword

View File

@@ -1,10 +1,8 @@
# frozen_string_literal: true
class UnauthorisedError < JSONAPI::Error
end
JSONAPI.configure do |config|
# built in paginators are :none, :offset, :paged
config.default_paginator = :offset
config.default_page_size = 10
config.maximum_page_size = 100
config.exception_class_whitelist = [CanCan::AccessDenied, UnauthorisedError]
end

View File

@@ -54,7 +54,6 @@ en:
You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm
link to finalize confirming your new email address.
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
api_token_regenerated: 'Your API token has been regenerated.'
unlocks:
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'

View File

@@ -16,7 +16,6 @@ Rails.application.routes.draw do
}
devise_scope :member do
get '/members/unsubscribe/:message' => 'members#unsubscribe', as: 'unsubscribe_member'
post '/members/regenerate_api_token' => 'registrations#regenerate_api_token', as: 'regenerate_api_token'
end
match '/members/:id/finish_signup' => 'members#finish_signup', via: %i(get patch), as: :finish_signup
@@ -142,7 +141,6 @@ Rails.application.routes.draw do
namespace :api do
namespace :v1 do
jsonapi_resources :activities
jsonapi_resources :crops
jsonapi_resources :gardens
jsonapi_resources :harvests

View File

@@ -1,10 +0,0 @@
class AddFieldsToCrops < ActiveRecord::Migration[5.2]
def change
add_column :crops, :row_spacing, :integer
add_column :crops, :spread, :integer
add_column :crops, :height, :integer
add_column :crops, :sowing_method, :string
add_column :crops, :sun_requirements, :string
add_column :crops, :growing_degree_days, :integer
end
end

View File

@@ -1,21 +0,0 @@
class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
def up
Crop.find_each do |crop|
if crop.openfarm_data.present?
attributes = crop.openfarm_data.fetch('attributes', {})
crop.update_columns(
row_spacing: attributes['row_spacing'],
spread: attributes['spread'],
height: attributes['height'],
sowing_method: attributes['sowing_method'],
sun_requirements: attributes['sun_requirements'],
growing_degree_days: attributes['growing_degree_days']
)
end
end
end
def down
# This migration is not reversible.
end
end

View File

@@ -4,6 +4,7 @@ class AddIndexesCrops < ActiveRecord::Migration[7.2]
add_index :alternate_names, :creator_id
add_index :alternate_names, :language
add_index :comments, %i(commentable_type commentable_id)
add_index :comments, :author_id
add_index :crop_companions, %i(crop_a_id crop_b_id)

View File

@@ -1,5 +0,0 @@
class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
def change
add_column :plantings, :overall_rating, :integer
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_09_01_130830) do
ActiveRecord::Schema[7.2].define(version: 2025_09_01_110545) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -252,12 +252,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
t.jsonb "openfarm_data"
t.integer "harvests_count", default: 0
t.integer "photo_associations_count", default: 0
t.integer "row_spacing"
t.integer "spread"
t.integer "height"
t.string "sowing_method"
t.string "sun_requirements"
t.integer "growing_degree_days"
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"
@@ -561,6 +555,16 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
t.index ["slug"], name: "index_plant_parts_on_slug", unique: true
end
create_table "planting_problems", force: :cascade do |t|
t.bigint "planting_id"
t.bigint "problem_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["planting_id", "problem_id"], name: "index_planting_problems_on_planting_id_and_problem_id", unique: true
t.index ["planting_id"], name: "index_planting_problems_on_planting_id"
t.index ["problem_id"], name: "index_planting_problems_on_problem_id"
end
create_table "plantings", id: :serial, force: :cascade do |t|
t.integer "garden_id", null: false
t.integer "crop_id", null: false
@@ -582,7 +586,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
t.integer "harvests_count", default: 0
t.integer "likes_count", default: 0
t.boolean "failed", default: false, null: false
t.integer "overall_rating"
t.index ["crop_id"], name: "index_plantings_on_crop_id"
t.index ["garden_id"], name: "index_plantings_on_garden_id"
t.index ["owner_id"], name: "index_plantings_on_owner_id"
@@ -605,6 +608,32 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
t.index ["slug"], name: "index_posts_on_slug", unique: true
end
create_table "problem_posts", force: :cascade do |t|
t.bigint "problem_id"
t.bigint "post_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["post_id"], name: "index_problem_posts_on_post_id"
t.index ["problem_id", "post_id"], name: "index_problem_posts_on_problem_id_and_post_id", unique: true
t.index ["problem_id"], name: "index_problem_posts_on_problem_id"
end
create_table "problems", force: :cascade do |t|
t.string "name"
t.string "reason_for_rejection"
t.string "rejection_notes"
t.string "approval_status", default: "pending", null: false
t.bigint "requester_id"
t.bigint "creator_id"
t.string "slug"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["creator_id"], name: "index_problems_on_creator_id"
t.index ["name"], name: "index_problems_on_name"
t.index ["requester_id"], name: "index_problems_on_requester_id"
t.index ["slug"], name: "index_problems_on_slug"
end
create_table "roles", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.text "description"
@@ -663,6 +692,12 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
add_foreign_key "mailboxer_receipts", "mailboxer_notifications", column: "notification_id", name: "receipts_on_notification_id"
add_foreign_key "photo_associations", "crops"
add_foreign_key "photo_associations", "photos"
add_foreign_key "planting_problems", "plantings"
add_foreign_key "planting_problems", "problems"
add_foreign_key "plantings", "seeds", column: "parent_seed_id", name: "parent_seed", on_delete: :nullify
add_foreign_key "problem_posts", "posts"
add_foreign_key "problem_posts", "problems"
add_foreign_key "problems", "members", column: "creator_id"
add_foreign_key "problems", "members", column: "requester_id"
add_foreign_key "seeds", "plantings", column: "parent_planting_id", name: "parent_planting", on_delete: :nullify
end

View File

@@ -36,21 +36,21 @@ namespace :wikidata do
aliases = wikidata_data['entities'][wikidata_id]['aliases']
aliases.each do |lang, values|
values.each do |value|
next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
AlternateName.create!(
name: value['value'],
language: lang,
crop: crop,
creator: creator
)
puts " Added alternate name: #{value['value']} (#{lang})"
unless AlternateName.exists?(name: value['value'], language: lang, crop: crop)
AlternateName.create!(
name: value['value'],
language: lang,
crop: crop,
creator: creator
)
puts " Added alternate name: #{value['value']} (#{lang})"
end
end
end
else
puts " Could not find Wikidata ID for #{crop.name}"
end
rescue StandardError => e
rescue => e
puts " Error processing crop #{crop.name}: #{e.message}"
end
end

View File

@@ -100,36 +100,6 @@ describe CropsController do
it { expect { subject }.to change(Crop, :count).by(1) }
it { expect { subject }.to change(AlternateName, :count).by(2) }
it { expect { subject }.to change(ScientificName, :count).by(1) }
context 'with openfarm data' do
let(:crop_params) do
{
crop: {
name: 'aubergine',
en_wikipedia_url: "https://en.wikipedia.org/wiki/Eggplant",
row_spacing: 10,
spread: 20,
height: 30,
sowing_method: 'direct',
sun_requirements: 'full sun',
growing_degree_days: 100
},
alt_name: { '1': "egg plant", '2': "purple apple" },
sci_name: { '1': "fancy sci name", '2': "" }
}
end
it 'saves openfarm data' do
subject
crop = Crop.last
expect(crop.row_spacing).to eq(10)
expect(crop.spread).to eq(20)
expect(crop.height).to eq(30)
expect(crop.sowing_method).to eq('direct')
expect(crop.sun_requirements).to eq('full sun')
expect(crop.growing_degree_days).to eq(100)
end
end
end
end

View File

@@ -19,14 +19,6 @@ describe "Crop", :js do
click_button class: "add-altname-row"
fill_in "alt_name[3]", with: "Jazmin"
fill_in "alt_name[4]", with: "Matsurika"
fill_in "crop_row_spacing", with: "12"
fill_in "crop_spread", with: "30"
fill_in "crop_height", with: "10"
fill_in "crop_sowing_method", with: "directly into final position"
fill_in "crop_sun_requirements", with: "full sun"
fill_in "crop_growing_degree_days", with: 100
end
end
end

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "footer" do
describe "footer", :js do
before { visit root_path }
it "footer is on home page" do

View File

@@ -1,38 +0,0 @@
# frozen_string_literal: true
require 'rails_helper'
describe "member token management", :js do
include_context 'signed in member'
before do
visit edit_member_registration_path
click_on "Apps"
end
it "can generate an API token" do
expect(page).to have_no_content("Your API token is")
click_on "Generate API Token"
expect(page).to have_content("Your API token is")
member.reload
expect(member.api_token).to be_present
end
context "with an existing token" do
before do
member.regenerate_api_token
visit edit_member_registration_path
click_on "Apps"
end
it "can regenerate an API token" do
old_token = member.api_token.token
expect(page).to have_content("Your API token is")
accept_confirm do
click_on "Regenerate"
end
expect(page).to have_content("Your API token is")
expect(member.reload.api_token.token).not_to eq(old_token)
end
end
end

View File

@@ -62,9 +62,9 @@ describe "Planting a crop", :js, :search do
before do
visit new_planting_path
@a_past_date = 15.days.ago.strftime("%Y-%m-%d")
@right_now = Time.zone.today.strftime("%Y-%m-%d")
@a_future_date = 1.year.from_now.strftime("%Y-%m-%d")
@a_past_date = 15.days.ago
@right_now = Time.zone.today
@a_future_date = 1.year.from_now
end
it "shows that it is not planted yet" do
@@ -111,7 +111,7 @@ describe "Planting a crop", :js, :search do
fill_in "How many?", with: 42
select "cutting", from: "Planted from"
select "semi-shade", from: "Sun or shade?"
fill_in "When?", with: '2013-03-10'
fill_in "When?", with: Time.new(2013, 3, 10)
fill_in "Tell us more about it", with: "It's rad."
fill_in "Finished date", with: @a_future_date
click_button "Save"
@@ -185,7 +185,7 @@ describe "Planting a crop", :js, :search do
click_link 'Actions'
click_link "Edit"
check "finished"
fill_in "Finished date", with: "2015-06-25"
fill_in "Finished date", with: Time.new(2015, 06, 25)
click_button "Save"
expect(page).to have_content "planting was successfully updated"
expect(page).to have_content "Finished"
@@ -196,10 +196,9 @@ describe "Planting a crop", :js, :search do
select_from_autocomplete "maize"
choose(member.gardens.first.name)
within "form#new_planting" do
fill_in "When?", with: "2014-07-01"
fill_in "When?", with: Time.new(2014, 7, 1)
check "Mark as finished"
find_by_id('planting_overall_rating').set 4
fill_in "Finished date", with: "2014-08-30"
fill_in "Finished date", with: Time.new(2014, 8, 30)
uncheck 'Mark as finished'
end
@@ -221,7 +220,6 @@ describe "Planting a crop", :js, :search do
expect(page).to have_content "planting was successfully created"
expect(page).to have_content "Finished"
expect(page).to have_content "Aug 2014"
expect(page).to have_content "4/5"
# ensure we've indexed in elastic search
planting.reindex(refresh: true)
@@ -278,7 +276,7 @@ describe "Planting a crop", :js, :search do
fill_autocomplete "crop", with: "mai"
select_from_autocomplete "maize"
within "form#new_planting" do
fill_in "When", with: "2015-10-15"
fill_in "When", with: Time.new(2015, 10, 15)
fill_in "How many?", with: 42
select "cutting", from: "Planted from"
select "sun", from: "Sun or shade?"

View File

@@ -33,7 +33,7 @@ describe "Seeds", :js, :search do
select_from_autocomplete "maize"
within "form#new_seed" do
fill_in "Quantity", with: 42
fill_in "Plant before", with: "2014-06-15"
fill_in "Plant before", with: TIme.new(2014, 6, 15)
fill_in "min", with: 999
fill_in "max", with: 1999
select "certified organic", from: "Organic?"

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "signin" do
describe "signin", :js do
let(:member) { FactoryBot.create(:member) }
let(:recipient) { FactoryBot.create(:member) }
let(:wrangler) { FactoryBot.create(:crop_wrangling_member) }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "signup" do
describe "signup", :js do
it "sign up for new account from top menubar" do
visit crops_path # something other than front page, which has multiple signup links
click_link 'Sign up'

View File

@@ -1,95 +0,0 @@
# frozen_string_literal: true
require 'swagger_helper'
RSpec.describe 'Activities API', type: :request do
path '/api/v1/activities' do
get 'Lists activities' do
tags 'Activities'
produces 'application/vnd.api+json'
parameter name: 'filter[owner-id]', in: :query, type: :string, required: false
parameter name: 'filter[garden-id]', in: :query, type: :string, required: false
parameter name: 'filter[planting-id]', in: :query, type: :string, required: false
parameter name: 'filter[category]', in: :query, type: :string, required: false
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string },
description: { type: :string },
category: { type: :string },
finished: { type: :boolean },
'due-date': { type: :string, format: 'date-time' }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
garden: { '$ref' => '#/components/schemas/relationship' },
planting: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:activity) { FactoryBot.create(:activity, garden: create(:garden), planting: create(:planting)) }
run_test!
end
end
end
path '/api/v1/activities/{id}' do
get 'Retrieves an activity' do
tags 'Activities'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string },
description: { type: :string },
category: { type: :string },
finished: { type: :boolean },
'due-date': { type: :string, format: 'date-time' }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
garden: { '$ref' => '#/components/schemas/relationship' },
planting: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:activity) { FactoryBot.create(:activity, garden: create(:garden), planting: create(:planting)) }
let(:id) { activity.id }
run_test!
end
end
end
end

View File

@@ -1,98 +1,103 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Crops API', type: :request do
path '/api/v1/crops' do
get 'Lists crops' do
tags 'Crops'
produces 'application/vnd.api+json'
parameter name: 'filter[approval_status]', in: :query, type: :string, required: false, description: 'Filter by approval status. Defaults to "approved".'
RSpec.describe 'Crops', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string },
'en-wikipedia-url': { type: :string, format: 'uri', 'x-nullable': true },
perennial: { type: :boolean, 'x-nullable': true },
'median-lifespan': { type: :integer, 'x-nullable': true },
'median-days-to-first-harvest': { type: :integer, 'x-nullable': true },
'median-days-to-last-harvest': { type: :integer, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
plantings: { '$ref' => '#/components/schemas/relationship' },
parent: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' },
seeds: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:crop) { FactoryBot.create(:crop) }
run_test!
end
end
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:crop) { FactoryBot.create(:crop) }
let(:crop_encoded_as_json_api) do
{ "id" => crop.id.to_s,
"type" => "crops",
"links" => { "self" => resource_url },
"attributes" => attributes,
"relationships" => {
"plantings" => plantings_as_json_api,
"parent" => parent_as_json_api,
"harvests" => harvests_as_json_api,
"seeds" => seeds_as_json_api,
"photos" => photos_as_json_api
} }
end
path '/api/v1/crops/{id}' do
get 'Retrieves a crop' do
tags 'Crops'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:resource_url) { "http://www.example.com/api/v1/crops/#{crop.id}" }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string },
'en-wikipedia-url': { type: :string, format: 'uri', 'x-nullable': true },
perennial: { type: :boolean, 'x-nullable': true },
'median-lifespan': { type: :integer, 'x-nullable': true },
'median-days-to-first-harvest': { type: :integer, 'x-nullable': true },
'median-days-to-last-harvest': { type: :integer, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
plantings: { '$ref' => '#/components/schemas/relationship' },
parent: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' },
seeds: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:crop) { FactoryBot.create(:crop) }
let(:id) { crop.id }
run_test!
end
end
let(:seeds_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/seeds",
"related" => "#{resource_url}/seeds" } }
end
let(:harvests_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/harvests",
"related" => "#{resource_url}/harvests" } }
end
let(:parent_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/parent",
"related" => "#{resource_url}/parent" } }
end
let(:plantings_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/plantings",
"related" => "#{resource_url}/plantings" } }
end
let(:photos_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/photos",
"related" => "#{resource_url}/photos" } }
end
let(:attributes) do
{
"name" => crop.name,
"en-wikipedia-url" => crop.en_wikipedia_url,
"perennial" => false,
"median-lifespan" => nil,
"median-days-to-first-harvest" => nil,
"median-days-to-last-harvest" => nil
}
end
describe '#index' do
before { get '/api/v1/crops', params: {}, headers: }
it { expect(subject['data']).to include(crop_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/crops/#{crop.id}", params: {}, headers: }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) }
it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) }
it { expect(subject['data']['relationships']).to include("seeds" => seeds_as_json_api) }
it { expect(subject['data']['relationships']).to include("photos" => photos_as_json_api) }
it { expect(subject['data']['relationships']).to include("parent" => parent_as_json_api) }
it { expect(subject['data']).to eq(crop_encoded_as_json_api) }
end
it '#create' do
expect do
post '/api/v1/crops', params: { 'crop' => { 'name' => 'can i make this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#update' do
expect do
post "/api/v1/crops/#{crop.id}", params: { 'crop' => { 'name' => 'can i modify this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#delete' do
expect do
delete "/api/v1/crops/#{crop.id}", params: {}, headers:
end.to raise_error ActionController::RoutingError
end
end

View File

@@ -1,223 +1,70 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Gardens API', type: :request do
path '/api/v1/gardens' do
get 'Lists gardens' do
tags 'Gardens'
produces 'application/vnd.api+json'
parameter name: 'filter[active]', in: :query, type: :string, required: false
parameter name: 'filter[garden_type]', in: :query, type: :string, required: false
parameter name: 'filter[owner_id]', in: :query, type: :string, required: false
RSpec.describe 'Gardens', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
plantings: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:garden) { FactoryBot.create(:garden) }
let(:garden_encoded_as_json_api) do
{ "id" => garden.id.to_s,
"type" => "gardens",
"links" => { "self" => resource_url },
"attributes" => { "name" => garden.name },
"relationships" =>
{
"owner" => owner_as_json_api,
"plantings" => plantings_as_json_api,
"photos" => photos_as_json_api
} }
end
let(:resource_url) { "http://www.example.com/api/v1/gardens/#{garden.id}" }
let!(:garden) { FactoryBot.create(:garden) }
run_test!
end
end
post 'Creates a garden' do
tags 'Gardens'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :garden, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string }
},
required: ['name']
}
},
required: ['type', 'attributes']
}
},
required: ['data']
}
response '201', 'created' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:garden) { { data: { type: 'gardens', attributes: { name: 'My API Garden' } } } }
run_test!
end
response '401', 'unauthorized' do
let(:garden) { { data: { type: 'gardens', attributes: { name: 'My API Garden' } } } }
run_test!
end
end
let(:plantings_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/plantings",
"related" => "#{resource_url}/plantings" } }
end
path '/api/v1/gardens/{id}' do
get 'Retrieves a garden' do
tags 'Gardens'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:owner_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/owner",
"related" => "#{resource_url}/owner" } }
end
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
plantings: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:garden) { FactoryBot.create(:garden) }
let(:id) { garden.id }
run_test!
end
end
let(:photos_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/photos",
"related" => "#{resource_url}/photos" } }
end
patch 'Updates a garden' do
tags 'Gardens'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
parameter name: :garden, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string },
attributes: {
type: :object,
properties: {
name: { type: :string }
}
}
},
required: ['type', 'id']
}
},
required: ['data']
}
it '#index' do
get('/api/v1/gardens', params: {}, headers:)
expect(subject['data']).to include(garden_encoded_as_json_api)
end
response '200', 'ok' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:garden_to_update) { create(:garden, owner: member) }
let(:id) { garden_to_update.id }
let(:garden) { { data: { type: 'gardens', id: id, attributes: { name: 'An updated garden' } } } }
run_test!
end
it '#show' do
get("/api/v1/gardens/#{garden.id}", params: {}, headers:)
expect(subject['data']).to include(garden_encoded_as_json_api)
end
response '401', 'unauthorized' do
let(:garden_to_update) { create(:garden) }
let(:id) { garden_to_update.id }
let(:garden) { { data: { type: 'gardens', id: id, attributes: { name: 'An updated garden' } } } }
run_test!
end
it '#create' do
expect do
post '/api/v1/gardens', params: { 'garden' => { 'name' => 'can i make this' } }, headers:
end.to raise_error ActionController::RoutingError
end
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_garden) { create(:garden) }
let(:id) { other_member_garden.id }
let(:garden) { { data: { type: 'gardens', id: id, attributes: { name: 'An updated garden' } } } }
run_test!
end
end
it '#update' do
expect do
post "/api/v1/gardens/#{garden.id}", params: { 'garden' => { 'name' => 'can i modify this' } }, headers:
end.to raise_error ActionController::RoutingError
end
delete 'Deletes a garden' do
tags 'Gardens'
parameter name: :id, in: :path, type: :string
response '204', 'no content' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:garden_to_delete) { create(:garden, owner: member) }
let(:id) { garden_to_delete.id }
run_test!
end
response '401', 'unauthorized' do
let(:garden_to_delete) { create(:garden) }
let(:id) { garden_to_delete.id }
run_test!
end
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_garden) { create(:garden) }
let(:id) { other_member_garden.id }
run_test!
end
end
it '#delete' do
expect do
delete "/api/v1/gardens/#{garden.id}", params: {}, headers:
end.to raise_error ActionController::RoutingError
end
end

View File

@@ -1,257 +1,100 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Harvests API', type: :request do
path '/api/v1/harvests' do
get 'Lists harvests' do
tags 'Harvests'
produces 'application/vnd.api+json'
parameter name: 'filter[crop_id]', in: :query, type: :string, required: false
parameter name: 'filter[planting_id]', in: :query, type: :string, required: false
parameter name: 'filter[plant_part]', in: :query, type: :string, required: false
parameter name: 'filter[owner_id]', in: :query, type: :string, required: false
RSpec.describe 'Harvests', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
'harvested-at': { type: :string, format: 'date' },
description: { type: :string, 'x-nullable': true },
unit: { type: :string, 'x-nullable': true },
'weight-quantity': { type: :string, 'x-nullable': true },
'weight-unit': { type: :string, 'x-nullable': true },
'si-weight': { type: :number, format: :float, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
crop: { '$ref' => '#/components/schemas/relationship' },
planting: { '$ref' => '#/components/schemas/relationship' },
owner: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:harvest) { FactoryBot.create(:harvest) }
run_test!
end
end
post 'Creates a harvest' do
tags 'Harvests'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :harvest, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string }
}
},
relationships: {
type: :object,
properties: {
planting: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string }
},
required: ['type', 'id']
}
},
required: ['data']
}
},
required: ['planting']
}
},
required: ['type', 'attributes', 'relationships']
}
},
required: ['data']
}
response '201', 'created' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:planting) { create(:planting, owner: member) }
let(:harvest) { { data: { type: 'harvests', attributes: { description: 'My API harvest' }, relationships: { planting: { data: { type: 'plantings', id: planting.id } } } } } }
run_test!
end
response '401', 'unauthorized' do
let(:planting) { create(:planting) }
let(:harvest) { { data: { type: 'harvests', attributes: { description: 'My API harvest' }, relationships: { planting: { data: { type: 'plantings', id: planting.id } } } } } }
run_test!
end
end
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:harvest) { FactoryBot.create(:harvest) }
let(:harvest_encoded_as_json_api) do
{ "id" => harvest.id.to_s,
"type" => "harvests",
"links" => { "self" => resource_url },
"attributes" => attributes,
"relationships" => {
"crop" => crop_as_json_api,
"planting" => planting_as_json_api,
"owner" => owner_as_json_api,
"photos" => photos_as_json_api
} }
end
path '/api/v1/harvests/{id}' do
get 'Retrieves a harvest' do
tags 'Harvests'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:resource_url) { "http://www.example.com/api/v1/harvests/#{harvest.id}" }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
'harvested-at': { type: :string, format: 'date' },
description: { type: :string, 'x-nullable': true },
unit: { type: :string, 'x-nullable': true },
'weight-quantity': { type: :string, 'x-nullable': true },
'weight-unit': { type: :string, 'x-nullable': true },
'si-weight': { type: :number, format: :float, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
crop: { '$ref' => '#/components/schemas/relationship' },
planting: { '$ref' => '#/components/schemas/relationship' },
owner: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:harvest) { FactoryBot.create(:harvest) }
let(:id) { harvest.id }
run_test!
end
end
let(:crop_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/crop",
"related" => "#{resource_url}/crop" } }
end
patch 'Updates a harvest' do
tags 'Harvests'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
parameter name: :harvest, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string }
}
}
},
required: ['type', 'id']
}
},
required: ['data']
let(:owner_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/owner",
"related" => "#{resource_url}/owner" } }
end
let(:planting_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/planting",
"related" => "#{resource_url}/planting" } }
end
let(:photos_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/photos",
"related" => "#{resource_url}/photos" } }
end
let(:attributes) do
{
"harvested-at" => "2015-09-17",
"description" => harvest.description,
"unit" => harvest.unit,
"weight-quantity" => harvest.weight_quantity.to_s,
"weight-unit" => harvest.weight_unit,
"si-weight" => harvest.si_weight
}
end
describe '#index' do
before { get '/api/v1/harvests', params: {}, headers: }
it { expect(subject['data']).to include(harvest_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/harvests/#{harvest.id}", params: {}, headers: }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("planting" => planting_as_json_api) }
it { expect(subject['data']['relationships']).to include("crop" => crop_as_json_api) }
it { expect(subject['data']['relationships']).to include("photos" => photos_as_json_api) }
it { expect(subject['data']['relationships']).to include("owner" => owner_as_json_api) }
it { expect(subject['data']).to eq(harvest_encoded_as_json_api) }
end
it '#create' do
expect do
put '/api/v1/harvests', headers:, params: {
'harvest' => { 'description' => 'can i make this' }
}
end.to raise_error ActionController::RoutingError
end
response '200', 'ok' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:harvest_to_update) { create(:harvest, owner: member) }
let(:id) { harvest_to_update.id }
let(:harvest) { { data: { type: 'harvests', id: id, attributes: { description: 'An updated harvest' } } } }
run_test!
end
it '#update' do
expect do
post "/api/v1/harvests/#{harvest.id}", headers:, params: {
'harvest' => { 'description' => 'can i modify this' }
}
end.to raise_error ActionController::RoutingError
end
response '401', 'unauthorized' do
let(:harvest_to_update) { create(:harvest) }
let(:id) { harvest_to_update.id }
let(:harvest) { { data: { type: 'harvests', id: id, attributes: { description: 'An updated harvest' } } } }
run_test!
end
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_harvest) { create(:harvest) }
let(:id) { other_member_harvest.id }
let(:harvest) { { data: { type: 'harvests', id: id, attributes: { description: 'An updated harvest' } } } }
run_test!
end
end
delete 'Deletes a harvest' do
tags 'Harvests'
parameter name: :id, in: :path, type: :string
response '204', 'no content' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:harvest_to_delete) { create(:harvest, owner: member) }
let(:id) { harvest_to_delete.id }
run_test!
end
response '401', 'unauthorized' do
let(:harvest_to_delete) { create(:harvest) }
let(:id) { harvest_to_delete.id }
run_test!
end
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_harvest) { create(:harvest) }
let(:id) { other_member_harvest.id }
run_test!
end
end
it '#delete' do
expect do
delete "/api/v1/harvests/#{harvest.id}", headers:, params: {}
end.to raise_error ActionController::RoutingError
end
end

View File

@@ -1,91 +1,100 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Members API', type: :request do
path '/api/v1/members' do
get 'Lists members' do
tags 'Members'
produces 'application/vnd.api+json'
parameter name: 'filter[login_name]', in: :query, type: :string, required: false
parameter name: 'filter[slug]', in: :query, type: :string, required: false
RSpec.describe 'Members', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
'login-name': { type: :string },
slug: { type: :string }
}
},
relationships: {
type: :object,
properties: {
gardens: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' },
plantings: { '$ref' => '#/components/schemas/relationship' },
seeds: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:member) { FactoryBot.create(:member) }
run_test!
end
end
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:member) { FactoryBot.create(:member) }
let(:member_encoded_as_json_api) do
{ "id" => member.id.to_s,
"type" => "members",
"links" => { "self" => resource_url },
"attributes" => attributes,
"relationships" => {
"gardens" => gardens_as_json_api,
"harvests" => harvests_as_json_api,
"photos" => photos_as_json_api,
"plantings" => plantings_as_json_api,
"seeds" => seeds_as_json_api
} }
end
path '/api/v1/members/{id}' do
get 'Retrieves a member' do
tags 'Members'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:resource_url) { "http://www.example.com/api/v1/members/#{member.id}" }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
'login-name': { type: :string },
slug: { type: :string }
}
},
relationships: {
type: :object,
properties: {
gardens: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' },
plantings: { '$ref' => '#/components/schemas/relationship' },
seeds: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:member) { FactoryBot.create(:member) }
let(:id) { member.id }
run_test!
end
end
let(:harvests_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/harvests",
"related" => "#{resource_url}/harvests" } }
end
let(:photos_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/photos",
"related" => "#{resource_url}/photos" } }
end
let(:seeds_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/seeds",
"related" => "#{resource_url}/seeds" } }
end
let(:plantings_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/plantings",
"related" => "#{resource_url}/plantings" } }
end
let(:gardens_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/gardens",
"related" => "#{resource_url}/gardens" } }
end
let(:attributes) do
{
"login-name" => member.login_name,
"slug" => member.slug
}
end
describe '#index' do
before { get '/api/v1/members', params: {}, headers: }
it { expect(subject['data']).to include(member_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/members/#{member.id}", params: {}, headers: }
it { expect(subject['data']['relationships']).to include("gardens" => gardens_as_json_api) }
it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) }
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']).to eq(member_encoded_as_json_api) }
end
it '#create' do
expect do
post '/api/v1/members', params: { 'member' => { 'login_name' => 'can i make this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#update' do
expect do
post "/api/v1/members/#{member.id}", params: {
'member' => { 'login_name' => 'can i modify this' }
},
headers:
end.to raise_error ActionController::RoutingError
end
it '#delete' do
expect do
delete "/api/v1/members/#{member.id}", params: {}, headers:
end.to raise_error ActionController::RoutingError
end
end

View File

@@ -1,93 +1,93 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Photos API', type: :request do
path '/api/v1/photos' do
get 'Lists photos' do
tags 'Photos'
produces 'application/vnd.api+json'
RSpec.describe 'Photos', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
'thumbnail-url': { type: :string, format: :uri },
'fullsize-url': { type: :string, format: :uri },
'license-name': { type: :string },
'link-url': { type: :string, format: :uri },
title: { type: :string }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
plantings: { '$ref' => '#/components/schemas/relationship' },
gardens: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:photo) { FactoryBot.create(:photo) }
run_test!
end
end
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:photo) { FactoryBot.create(:photo) }
let(:photo_encoded_as_json_api) do
{ "id" => photo.id.to_s,
"type" => "photos",
"links" => { "self" => resource_url },
"attributes" => attributes,
"relationships" => {
"owner" => owner_as_json_api,
"plantings" => plantings_as_json_api,
"harvests" => harvests_as_json_api,
"gardens" => gardens_as_json_api
} }
end
path '/api/v1/photos/{id}' do
get 'Retrieves a photo' do
tags 'Photos'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:resource_url) { "http://www.example.com/api/v1/photos/#{photo.id}" }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
'thumbnail-url': { type: :string, format: :uri },
'fullsize-url': { type: :string, format: :uri },
'license-name': { type: :string },
'link-url': { type: :string, format: :uri },
title: { type: :string }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
plantings: { '$ref' => '#/components/schemas/relationship' },
gardens: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:photo) { FactoryBot.create(:photo) }
let(:id) { photo.id }
run_test!
end
end
let(:owner_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/owner",
"related" => "#{resource_url}/owner" } }
end
let(:harvests_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/harvests",
"related" => "#{resource_url}/harvests" } }
end
let(:gardens_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/gardens",
"related" => "#{resource_url}/gardens" } }
end
let(:plantings_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/plantings",
"related" => "#{resource_url}/plantings" } }
end
let(:attributes) do
{
"thumbnail-url" => photo.thumbnail_url,
"fullsize-url" => photo.fullsize_url,
"link-url" => photo.link_url,
"license-name" => photo.license_name,
"title" => photo.title
}
end
describe '#index' do
before { get '/api/v1/photos', params: {}, headers: }
it { expect(subject['data']).to include(photo_encoded_as_json_api) }
end
describe '#show' do
before { get "/api/v1/photos/#{photo.id}", params: {}, headers: }
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) }
it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) }
it { expect(subject['data']['relationships']).to include("owner" => owner_as_json_api) }
it { expect(subject['data']).to eq(photo_encoded_as_json_api) }
end
it '#create' do
expect do
post '/api/v1/photos', params: { 'photo' => { 'name' => 'can i make this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#update' do
expect do
post "/api/v1/photos/#{photo.id}", params: { 'photo' => { 'name' => 'can i modify this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#delete' do
expect do
delete "/api/v1/photos/#{photo.id}", params: {}, headers:
end.to raise_error ActionController::RoutingError
end
end

View File

@@ -1,300 +1,142 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Plantings API', type: :request do
path '/api/v1/plantings' do
get 'Lists plantings' do
tags 'Plantings'
produces 'application/vnd.api+json'
parameter name: 'filter[failed]', in: :query, type: :string, required: false
parameter name: 'filter[sunniness]', in: :query, type: :string, required: false
parameter name: 'filter[perennial]', in: :query, type: :string, required: false
parameter name: 'filter[active]', in: :query, type: :string, required: false
RSpec.describe 'Plantings', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
slug: { type: :string },
'planted-at': { type: :string, format: 'date' },
failed: { type: :boolean },
finished: { type: :boolean },
'finished-at': { type: :string, format: 'date-time', 'x-nullable': true },
quantity: { type: :integer },
description: { type: :string, 'x-nullable': true },
sunniness: { type: :string, 'x-nullable': true },
'planted-from': { type: :string, 'x-nullable': true },
'expected-lifespan': { type: :integer, 'x-nullable': true },
'finish-predicted-at': { type: :string, format: 'date-time', 'x-nullable': true },
'first-harvest-date': { type: :string, format: 'date', 'x-nullable': true },
'last-harvest-date': { type: :string, format: 'date', 'x-nullable': true },
'crop-name': { type: :string },
'crop-slug': { type: :string },
thumbnail: { type: :string, format: :uri, 'x-nullable': true },
location: { type: :string, 'x-nullable': true },
longitude: { type: :number, format: :float, 'x-nullable': true },
latitude: { type: :number, format: :float, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
garden: { '$ref' => '#/components/schemas/relationship' },
crop: { '$ref' => '#/components/schemas/relationship' },
owner: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:planting) { FactoryBot.create(:planting) }
run_test!
end
end
post 'Creates a planting' do
tags 'Plantings'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :planting, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string }
}
},
relationships: {
type: :object,
properties: {
crop: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string }
},
required: ['type', 'id']
}
},
required: ['data']
},
garden: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string }
},
required: ['type', 'id']
}
},
required: ['data']
}
},
required: ['crop', 'garden']
}
},
required: ['type', 'attributes', 'relationships']
}
},
required: ['data']
}
response '201', 'created' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:crop) { create(:crop) }
let(:garden) { create(:garden, owner: member) }
let(:planting) { { data: { type: 'plantings', attributes: { description: 'My API planting' }, relationships: { crop: { data: { type: 'crops', id: crop.id } }, garden: { data: { type: 'gardens', id: garden.id } } } } } }
run_test!
end
response '401', 'unauthorized' do
let(:crop) { create(:crop) }
let(:garden) { create(:garden) }
let(:planting) { { data: { type: 'plantings', attributes: { description: 'My API planting' }, relationships: { crop: { data: { type: 'crops', id: crop.id } }, garden: { data: { type: 'gardens', id: garden.id } } } } } }
run_test!
end
end
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:planting) { FactoryBot.create(:planting) }
let(:planting_encoded_as_json_api) do
{ "id" => planting.id.to_s,
"type" => "plantings",
"links" => { "self" => resource_url },
"attributes" => attributes,
"relationships" => {
"garden" => garden_as_json_api,
"crop" => crop_as_json_api,
"owner" => owner_as_json_api,
"photos" => photos_as_json_api,
"harvests" => harvests_as_json_api
} }
end
path '/api/v1/plantings/{id}' do
get 'Retrieves a planting' do
tags 'Plantings'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:resource_url) { "http://www.example.com/api/v1/plantings/#{planting.id}" }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
slug: { type: :string },
'planted-at': { type: :string, format: 'date' },
failed: { type: :boolean },
finished: { type: :boolean },
'finished-at': { type: :string, format: 'date-time', 'x-nullable': true },
quantity: { type: :integer },
description: { type: :string, 'x-nullable': true },
sunniness: { type: :string, 'x-nullable': true },
'planted-from': { type: :string, 'x-nullable': true },
'expected-lifespan': { type: :integer, 'x-nullable': true },
'finish-predicted-at': { type: :string, format: 'date-time', 'x-nullable': true },
'first-harvest-date': { type: :string, format: 'date', 'x-nullable': true },
'last-harvest-date': { type: :string, format: 'date', 'x-nullable': true },
'crop-name': { type: :string },
'crop-slug': { type: :string },
thumbnail: { type: :string, format: :uri, 'x-nullable': true },
location: { type: :string, 'x-nullable': true },
longitude: { type: :number, format: :float, 'x-nullable': true },
latitude: { type: :number, format: :float, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
garden: { '$ref' => '#/components/schemas/relationship' },
crop: { '$ref' => '#/components/schemas/relationship' },
owner: { '$ref' => '#/components/schemas/relationship' },
photos: { '$ref' => '#/components/schemas/relationship' },
harvests: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:planting) { FactoryBot.create(:planting) }
let(:id) { planting.id }
run_test!
end
end
let(:harvests_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/harvests",
"related" => "#{resource_url}/harvests" } }
end
patch 'Updates a planting' do
tags 'Plantings'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
parameter name: :planting, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string }
}
}
},
required: ['type', 'id']
}
},
required: ['data']
let(:photos_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/photos",
"related" => "#{resource_url}/photos" } }
end
let(:owner_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/owner",
"related" => "#{resource_url}/owner" } }
end
let(:crop_as_json_api) do
{ "links" =>
{ "self" =>
"#{resource_url}/relationships/crop",
"related" => "#{resource_url}/crop" } }
end
let(:garden_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/garden",
"related" => "#{resource_url}/garden" } }
end
let(:attributes) do
{
"slug" => planting.slug,
"planted-at" => "2014-07-30",
"failed" => false,
"finished-at" => nil,
"finished" => false,
"quantity" => 33,
"description" => planting.description,
"crop-name" => planting.crop.name,
"crop-slug" => planting.crop.slug,
"sunniness" => nil,
"planted-from" => nil,
"expected-lifespan" => nil,
"finish-predicted-at" => nil,
"percentage-grown" => nil,
"first-harvest-date" => nil,
"last-harvest-date" => nil,
"thumbnail" => nil,
"location" => planting.garden.location,
"longitude" => planting.garden.longitude,
"latitude" => planting.garden.latitude
}
end
it '#index' do
get('/api/v1/plantings', params: {}, headers:)
expect(subject['data'][0].keys).to eq(planting_encoded_as_json_api.keys)
expect(subject['data'][0]['attributes'].keys.sort!).to eq(planting_encoded_as_json_api['attributes'].keys.sort!)
expect(subject['data']).to include(planting_encoded_as_json_api)
end
it '#show' do
get("/api/v1/plantings/#{planting.id}", params: {}, headers:)
expect(subject['data']['relationships']).to include("garden" => garden_as_json_api)
expect(subject['data']['relationships']).to include("crop" => crop_as_json_api)
expect(subject['data']['relationships']).to include("owner" => owner_as_json_api)
expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api)
expect(subject['data']['relationships']).to include("photos" => photos_as_json_api)
expect(subject['data']).to eq(planting_encoded_as_json_api)
end
it '#create' do
expect do
post '/api/v1/plantings', params: { 'planting' => { 'description' => 'can i make this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#update' do
expect do
post "/api/v1/plantings/#{planting.id}", headers:, params: {
'planting' => { 'description' => 'can i modify this' }
}
end.to raise_error ActionController::RoutingError
end
response '200', 'ok' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:planting_to_update) { create(:planting, owner: member) }
let(:id) { planting_to_update.id }
let(:planting) { { data: { type: 'plantings', id: id, attributes: { description: 'An updated planting' } } } }
run_test!
end
it '#delete' do
expect do
delete "/api/v1/plantings/#{planting.id}", params: {}, headers:
end.to raise_error ActionController::RoutingError
end
response '401', 'unauthorized' do
let(:planting_to_update) { create(:planting) }
let(:id) { planting_to_update.id }
let(:planting) { { data: { type: 'plantings', id: id, attributes: { description: 'An updated planting' } } } }
run_test!
end
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_planting) { create(:planting) }
let(:id) { other_member_planting.id }
let(:planting) { { data: { type: 'plantings', id: id, attributes: { description: 'An updated planting' } } } }
run_test!
end
describe "by member/owner" do
before :each do
@member1 = planting.owner
@planting2 = create(:planting, owner: create(:owner))
@member2 = @planting2.owner
end
delete 'Deletes a planting' do
tags 'Plantings'
parameter name: :id, in: :path, type: :string
describe "#show" do
it "locates the correct member" do
get "/api/v1/plantings?filter[owner-id]=#{@member1.id}"
expect(JSON.parse(response.body)['data'][0]['id']).to eq(planting.id.to_s)
response '204', 'no content' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:planting_to_delete) { create(:planting, owner: member) }
let(:id) { planting_to_delete.id }
run_test!
end
get "/api/v1/plantings?filter[owner-id]=#{@member2.id}"
expect(JSON.parse(response.body)['data'][0]['id']).to eq(@planting2.id.to_s)
response '401', 'unauthorized' do
let(:planting_to_delete) { create(:planting) }
let(:id) { planting_to_delete.id }
run_test!
end
pending "The below should be identical to the above, but aren't."
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_planting) { create(:planting) }
let(:id) { other_member_planting.id }
run_test!
get "/api/v1/members/#{@member1.id}/plantings"
expect(JSON.parse(response.body)['data'][0]['id']).to eq(planting.id.to_s)
get "/api/v1/members/#{@member2.id}/plantings"
expect(JSON.parse(response.body)['data'][0]['id']).to eq(@planting2.id.to_s)
end
end
end

View File

@@ -1,261 +1,81 @@
# frozen_string_literal: true
require 'swagger_helper'
require 'rails_helper'
RSpec.describe 'Seeds API', type: :request do
path '/api/v1/seeds' do
get 'Lists seeds' do
tags 'Seeds'
produces 'application/vnd.api+json'
parameter name: 'filter[crop]', in: :query, type: :string, required: false
parameter name: 'filter[tradable_to]', in: :query, type: :string, required: false
parameter name: 'filter[organic]', in: :query, type: :string, required: false
parameter name: 'filter[gmo]', in: :query, type: :string, required: false
parameter name: 'filter[heirloom]', in: :query, type: :string, required: false
parameter name: 'filter[owner_id]', in: :query, type: :string, required: false
RSpec.describe 'Seeds', type: :request do
subject { JSON.parse response.body }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :array,
items: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string, 'x-nullable': true },
quantity: { type: :integer, 'x-nullable': true },
'plant-before': { type: :string, format: 'date', 'x-nullable': true },
'tradable-to': { type: :string, 'x-nullable': true },
'days-until-maturity-min': { type: :integer, 'x-nullable': true },
'days-until-maturity-max': { type: :integer, 'x-nullable': true },
organic: { type: :string, 'x-nullable': true },
gmo: { type: :string, 'x-nullable': true },
heirloom: { type: :string, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
crop: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
}
let!(:seed) { FactoryBot.create(:seed) }
run_test!
end
end
post 'Creates a seed' do
tags 'Seeds'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :seed, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string }
}
},
relationships: {
type: :object,
properties: {
crop: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string }
},
required: ['type', 'id']
}
},
required: ['data']
}
},
required: ['crop']
}
},
required: ['type', 'attributes', 'relationships']
}
},
required: ['data']
}
response '201', 'created' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:crop) { create(:crop) }
let(:seed) { { data: { type: 'seeds', attributes: { description: 'My API seed' }, relationships: { crop: { data: { type: 'crops', id: crop.id } } } } } }
run_test!
end
response '401', 'unauthorized' do
let(:crop) { create(:crop) }
let(:seed) { { data: { type: 'seeds', attributes: { description: 'My API seed' }, relationships: { crop: { data: { type: 'crops', id: crop.id } } } } } }
run_test!
end
end
let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
let!(:seed) { FactoryBot.create(:seed) }
let(:seed_encoded_as_json_api) do
{ "id" => seed.id.to_s,
"type" => "seeds",
"links" => { "self" => resource_url },
"attributes" => attributes,
"relationships" => {
"owner" => owner_as_json_api,
"crop" => crop_as_json_api
} }
end
path '/api/v1/seeds/{id}' do
get 'Retrieves a seed' do
tags 'Seeds'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
let(:resource_url) { "http://www.example.com/api/v1/seeds/#{seed.id}" }
response '200', 'successful' do
schema type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string, 'x-nullable': true },
quantity: { type: :integer, 'x-nullable': true },
'plant-before': { type: :string, format: 'date', 'x-nullable': true },
'tradable-to': { type: :string, 'x-nullable': true },
'days-until-maturity-min': { type: :integer, 'x-nullable': true },
'days-until-maturity-max': { type: :integer, 'x-nullable': true },
organic: { type: :string, 'x-nullable': true },
gmo: { type: :string, 'x-nullable': true },
heirloom: { type: :string, 'x-nullable': true }
}
},
relationships: {
type: :object,
properties: {
owner: { '$ref' => '#/components/schemas/relationship' },
crop: { '$ref' => '#/components/schemas/relationship' }
}
}
}
}
}
let(:seed) { FactoryBot.create(:seed) }
let(:id) { seed.id }
run_test!
end
end
let(:owner_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/owner",
"related" => "#{resource_url}/owner" } }
end
patch 'Updates a seed' do
tags 'Seeds'
consumes 'application/vnd.api+json'
produces 'application/vnd.api+json'
parameter name: :id, in: :path, type: :string
parameter name: :seed, in: :body, schema: {
type: :object,
properties: {
data: {
type: :object,
properties: {
type: { type: :string },
id: { type: :string },
attributes: {
type: :object,
properties: {
description: { type: :string }
}
}
},
required: ['type', 'id']
}
},
required: ['data']
}
let(:crop_as_json_api) do
{ "links" =>
{ "self" => "#{resource_url}/relationships/crop",
"related" => "#{resource_url}/crop" } }
end
response '200', 'ok' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:seed_to_update) { create(:seed, owner: member) }
let(:id) { seed_to_update.id }
let(:seed) { { data: { type: 'seeds', id: id, attributes: { description: 'An updated seed' } } } }
run_test!
end
let(:attributes) do
{
"description" => seed.description,
"quantity" => seed.quantity,
"plant-before" => "2013-07-15",
"tradable-to" => seed.tradable_to,
"days-until-maturity-min" => seed.days_until_maturity_min,
"days-until-maturity-max" => seed.days_until_maturity_max,
"organic" => seed.organic,
"gmo" => seed.gmo,
"heirloom" => seed.heirloom
}
end
response '401', 'unauthorized' do
let(:seed_to_update) { create(:seed) }
let(:id) { seed_to_update.id }
let(:seed) { { data: { type: 'seeds', id: id, attributes: { description: 'An updated seed' } } } }
run_test!
end
describe '#index' do
before { get '/api/v1/seeds', params: {}, headers: }
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_seed) { create(:seed) }
let(:id) { other_member_seed.id }
let(:seed) { { data: { type: 'seeds', id: id, attributes: { description: 'An updated seed' } } } }
run_test!
end
end
it { expect(subject['data']).to include(seed_encoded_as_json_api) }
end
delete 'Deletes a seed' do
tags 'Seeds'
parameter name: :id, in: :path, type: :string
describe '#show' do
before { get "/api/v1/seeds/#{seed.id}", params: {}, headers: }
response '204', 'no content' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:seed_to_delete) { create(:seed, owner: member) }
let(:id) { seed_to_delete.id }
run_test!
end
it { expect(subject['data']['attributes']).to eq(attributes) }
it { expect(subject['data']['relationships']).to include("owner" => owner_as_json_api) }
it { expect(subject['data']['relationships']).to include("crop" => crop_as_json_api) }
it { expect(subject['data']).to eq(seed_encoded_as_json_api) }
end
response '401', 'unauthorized' do
let(:seed_to_delete) { create(:seed) }
let(:id) { seed_to_delete.id }
run_test!
end
it '#create' do
expect do
post '/api/v1/seeds', params: { 'seed' => { 'name' => 'can i make this' } }, headers:
end.to raise_error ActionController::RoutingError
end
response '403', 'forbidden' do
let(:member) { create(:member) }
let(:token) do
member.regenerate_api_token
member.api_token.token
end
let(:Authorization) { "Token token=#{token}" }
let(:other_member_seed) { create(:seed) }
let(:id) { other_member_seed.id }
run_test!
end
end
it '#update' do
expect do
post "/api/v1/seeds/#{seed.id}", params: { 'seed' => { 'name' => 'can i modify this' } }, headers:
end.to raise_error ActionController::RoutingError
end
it '#delete' do
expect do
delete "/api/v1/seeds/#{seed.id}", params: {}, headers:
end.to raise_error ActionController::RoutingError
end
end

View File

@@ -15,29 +15,13 @@ RSpec.configure do |config|
# document below. You can override this behavior by adding a swagger_doc tag to the
# the root example_group in your specs, e.g. describe '...', swagger_doc: 'v2/swagger.json'
config.swagger_docs = {
'v1/swagger.json' => {
'v1/swagger.yaml' => {
openapi: '3.0.1',
info: {
title: 'API V1',
version: 'v1'
},
paths: {},
components: {
schemas: {
relationship: {
type: :object,
properties: {
data: {
type: :object,
properties: {
id: { type: :string },
type: { type: :string }
}
}
}
}
}
}
paths: {}
}
}
@@ -45,5 +29,5 @@ RSpec.configure do |config|
# The swagger_docs configuration option has the filename including format in
# the key, this may want to be changed to avoid putting yaml in json files.
# Defaults to json. Accepts ':json' and ':yaml'.
config.swagger_format = :json
config.swagger_format = :yaml
end

View File

@@ -22,6 +22,6 @@ describe "plantings/_form" do
end
it "has a free-form text field containing the planting date in ISO format" do
assert_select "input#planting_planted_at[type='text'][value='2013-03-01']"
assert_select "input#planting_planted_at[type='date'][value='2013-03-01']"
end
end

View File

File diff suppressed because it is too large Load Diff