mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-25 09:19:15 -04:00
Compare commits
148 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
929229379e | ||
|
|
ac0e52f15d | ||
|
|
c7f427fe8a | ||
|
|
50fd9ae9b0 | ||
|
|
efe39da878 | ||
|
|
1cd3c64590 | ||
|
|
b591529892 | ||
|
|
cef236d8f8 | ||
|
|
5ad0068142 | ||
|
|
b8a5ff9acf | ||
|
|
90653aa57f | ||
|
|
80a4739f34 | ||
|
|
a6cc530fe5 | ||
|
|
97f19a0038 | ||
|
|
140611d868 | ||
|
|
3fa5ffc544 | ||
|
|
eeafb4caa5 | ||
|
|
c747d46ab5 | ||
|
|
3009ed2d83 | ||
|
|
f68a15c04e | ||
|
|
06295fb9e9 | ||
|
|
c4a1806a87 | ||
|
|
fa5e151af0 | ||
|
|
13e8d1f5a5 | ||
|
|
c1836cc78e | ||
|
|
28fdb6e1ed | ||
|
|
67dec795a0 | ||
|
|
86ea8eab39 | ||
|
|
8884056ff3 | ||
|
|
d01a5d7976 | ||
|
|
66c08650ba | ||
|
|
521873b656 | ||
|
|
2060d9ab9e | ||
|
|
1795b27152 | ||
|
|
93193c9fba | ||
|
|
df7a9448b0 | ||
|
|
1b4d77e017 | ||
|
|
08e7c7dd29 | ||
|
|
5fec826c41 | ||
|
|
c29234c40c | ||
|
|
2f0cb5c815 | ||
|
|
b6cbfe25d2 | ||
|
|
d8f5876518 | ||
|
|
ae2cbf0bec | ||
|
|
c9d5c42814 | ||
|
|
b60f47f502 | ||
|
|
d86e0af5ad | ||
|
|
fc0058d677 | ||
|
|
41110f96d1 | ||
|
|
33822abf93 | ||
|
|
5877da95a6 | ||
|
|
88a119deac | ||
|
|
d07fd1a277 | ||
|
|
c96695258b | ||
|
|
2fbba52bc8 | ||
|
|
a2ae429f6b | ||
|
|
7ca76e69cf | ||
|
|
c6824b1262 | ||
|
|
2a74c057f3 | ||
|
|
85cc9e77c6 | ||
|
|
a0d6d154f0 | ||
|
|
7e9707e3b0 | ||
|
|
4fe0dba28e | ||
|
|
328037b8c0 | ||
|
|
e4ab5114f7 | ||
|
|
a5d43af899 | ||
|
|
2d384c9851 | ||
|
|
205247b136 | ||
|
|
963a182981 | ||
|
|
1090db6d21 | ||
|
|
f187b31653 | ||
|
|
809dd81378 | ||
|
|
62beec23a1 | ||
|
|
a60a5ce591 | ||
|
|
7206f99510 | ||
|
|
bf6475da57 | ||
|
|
c5971cd46b | ||
|
|
2f47eeb7b3 | ||
|
|
928749aaad | ||
|
|
1d64d4d1d2 | ||
|
|
1e86cf7662 | ||
|
|
941dab7c4a | ||
|
|
2696d12771 | ||
|
|
6bf87c243c | ||
|
|
ec63d8086f | ||
|
|
470aacd1c9 | ||
|
|
9997c365d8 | ||
|
|
eaa65fda9e | ||
|
|
e844eade94 | ||
|
|
35e7b6a5b4 | ||
|
|
6c33c335d8 | ||
|
|
26537943e3 | ||
|
|
136c082003 | ||
|
|
b3fd8e32d0 | ||
|
|
9b1b22afa8 | ||
|
|
996706ee78 | ||
|
|
9d11bcc039 | ||
|
|
b1684b0156 | ||
|
|
ec00baef0d | ||
|
|
eb585611fe | ||
|
|
9280049a84 | ||
|
|
53d7fd1479 | ||
|
|
4cc0f77bd0 | ||
|
|
5e5773aa59 | ||
|
|
2422939b4f | ||
|
|
d5a1a683f1 | ||
|
|
f5bb47e4ca | ||
|
|
8359218294 | ||
|
|
285e6edc61 | ||
|
|
f2fac9db1b | ||
|
|
cabc4fd030 | ||
|
|
20fe9e4cc5 | ||
|
|
0b8357a261 | ||
|
|
7104781d1b | ||
|
|
267f27b3f8 | ||
|
|
31a37bf6dc | ||
|
|
d1951b8b65 | ||
|
|
cd99769311 | ||
|
|
71cb3f8c5f | ||
|
|
d540342acb | ||
|
|
f66b0768e2 | ||
|
|
251f44b0c7 | ||
|
|
adf07ce5ef | ||
|
|
54b204c636 | ||
|
|
ff446c2139 | ||
|
|
62d84d7af4 | ||
|
|
92fa09a1d3 | ||
|
|
b09c4aa7a1 | ||
|
|
692ab59285 | ||
|
|
302bdba150 | ||
|
|
aa3057056f | ||
|
|
9ef40532ad | ||
|
|
70ba8c8421 | ||
|
|
3b81affbe5 | ||
|
|
9703d4e983 | ||
|
|
22e1718ce6 | ||
|
|
b90b4e42fb | ||
|
|
202f557e32 | ||
|
|
8364c8c688 | ||
|
|
3a286cd240 | ||
|
|
41dbf6fb1b | ||
|
|
47ecbe3f94 | ||
|
|
0f066ab302 | ||
|
|
8e94ddb4bf | ||
|
|
a9cedc6a8a | ||
|
|
7d6c49d8c3 | ||
|
|
0d8ca89b14 | ||
|
|
82a37d69bc |
@@ -37,9 +37,8 @@ Style/AlignParameters:
|
||||
Metrics/LineLength:
|
||||
Max: 120
|
||||
|
||||
|
||||
# See https://github.com/bbatsov/rubocop/issues/3629
|
||||
Rails/HttpPositionalArguments:
|
||||
# turn these back on in Rails 5
|
||||
Rails/HttpPositionalArguments: # See https://github.com/bbatsov/rubocop/issues/3629
|
||||
Enabled: false
|
||||
|
||||
Style/Documentation:
|
||||
@@ -65,9 +64,9 @@ Metrics/BlockLength:
|
||||
Metrics/MethodLength:
|
||||
Max: 34
|
||||
Metrics/AbcSize:
|
||||
Max: 32
|
||||
Max: 31
|
||||
Metrics/ClassLength:
|
||||
Max: 207
|
||||
Max: 179
|
||||
Metrics/CyclomaticComplexity:
|
||||
Max: 11
|
||||
Metrics/PerceivedComplexity:
|
||||
|
||||
@@ -1,23 +1,15 @@
|
||||
# This configuration was generated by
|
||||
# `rubocop --auto-gen-config --no-offense-counts`
|
||||
# on 2017-05-28 10:57:55 +1200 using RuboCop version 0.47.1.
|
||||
# on 2017-11-05 20:41:45 +1300 using RuboCop version 0.47.1.
|
||||
# The point is for the user to remove these configuration records
|
||||
# one by one as the offenses are removed from the code base.
|
||||
# Note that changes in the inspected code, or installation of new
|
||||
# versions of RuboCop, may require this file to be generated again.
|
||||
|
||||
|
||||
Lint/HandleExceptions:
|
||||
Exclude:
|
||||
- 'lib/tasks/testing.rake'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
|
||||
Lint/UnusedBlockArgument:
|
||||
Exclude:
|
||||
- 'app/controllers/sessions_controller.rb'
|
||||
- 'config/unicorn.rb'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
|
||||
Lint/UnusedMethodArgument:
|
||||
@@ -57,7 +49,6 @@ Rails/TimeZone:
|
||||
- 'spec/factories/member.rb'
|
||||
- 'spec/factories/post.rb'
|
||||
- 'spec/models/post_spec.rb'
|
||||
- 'spec/views/plantings/index.html.haml_spec.rb'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||
@@ -122,13 +113,6 @@ Style/EachForSimpleLoop:
|
||||
- 'spec/models/crop_spec.rb'
|
||||
- 'spec/views/home/_crops.html.haml_spec.rb'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||
# SupportedStyles: compact, expanded
|
||||
Style/EmptyMethod:
|
||||
Exclude:
|
||||
- 'app/controllers/roles_controller.rb'
|
||||
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||
# SupportedStyles: format, sprintf, percent
|
||||
Style/FormatString:
|
||||
@@ -146,7 +130,6 @@ Style/IdenticalConditionalBranches:
|
||||
Style/IfUnlessModifier:
|
||||
Exclude:
|
||||
- 'app/helpers/crops_helper.rb'
|
||||
- 'app/models/planting.rb'
|
||||
- 'config/initializers/geocoder.rb'
|
||||
- 'lib/tasks/growstuff.rake'
|
||||
|
||||
@@ -165,7 +148,6 @@ Style/MultilineIfModifier:
|
||||
|
||||
Style/MultilineTernaryOperator:
|
||||
Exclude:
|
||||
- 'app/controllers/notifications_controller.rb'
|
||||
- 'app/controllers/order_items_controller.rb'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
@@ -223,7 +205,6 @@ Style/RegexpLiteral:
|
||||
- 'spec/views/devise/registrations/edit_spec.rb'
|
||||
- 'spec/views/members/index.html.haml_spec.rb'
|
||||
- 'spec/views/posts/index.html.haml_spec.rb'
|
||||
- 'spec/views/posts/show.html.haml_spec.rb'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: SupportedStyles.
|
||||
@@ -243,4 +224,4 @@ Style/SymbolProc:
|
||||
# SupportedStyles: percent, brackets
|
||||
Style/WordArray:
|
||||
EnforcedStyle: percent
|
||||
MinSize: 5
|
||||
MinSize: 4
|
||||
|
||||
@@ -33,7 +33,7 @@ before_script:
|
||||
if [ "${STATIC_CHECKS}" = "true" ]; then
|
||||
./script/install_linters;
|
||||
else
|
||||
bundle exec rake db:create db:migrate db:test:prepare;
|
||||
RAILS_ENV=test bundle exec rake db:create db:migrate;
|
||||
bundle exec rake assets:precompile;
|
||||
fi
|
||||
- set +e
|
||||
|
||||
6
Gemfile
6
Gemfile
@@ -11,12 +11,18 @@ gem 'coffee-rails'
|
||||
gem 'haml'
|
||||
gem 'sass-rails'
|
||||
|
||||
# API data
|
||||
gem 'jsonapi-resources'
|
||||
|
||||
# CSS framework
|
||||
gem 'bootstrap-sass'
|
||||
gem 'font-awesome-sass'
|
||||
|
||||
gem 'uglifier' # JavaScript compressor
|
||||
|
||||
# planting and harvest predictions
|
||||
gem 'active_median'
|
||||
|
||||
gem 'flickraw'
|
||||
gem 'jquery-rails'
|
||||
gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location
|
||||
|
||||
44
Gemfile.lock
44
Gemfile.lock
@@ -23,6 +23,8 @@ GEM
|
||||
active_link_to (1.0.5)
|
||||
actionpack
|
||||
addressable
|
||||
active_median (0.1.4)
|
||||
activerecord
|
||||
active_merchant-paypal-bogus-gateway (0.1.0)
|
||||
activemerchant
|
||||
active_utils (3.3.9)
|
||||
@@ -31,7 +33,7 @@ GEM
|
||||
activejob (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
globalid (>= 0.3.0)
|
||||
activemerchant (1.74.0)
|
||||
activemerchant (1.75.0)
|
||||
activesupport (>= 3.2.14, < 6.x)
|
||||
builder (>= 2.1.2, < 4.0.0)
|
||||
i18n (>= 0.6.9)
|
||||
@@ -82,8 +84,8 @@ GEM
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.10.0)
|
||||
byebug (9.1.0)
|
||||
cancancan (2.0.0)
|
||||
capybara (2.15.4)
|
||||
cancancan (2.1.1)
|
||||
capybara (2.16.0)
|
||||
addressable
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (>= 1.3.3)
|
||||
@@ -93,7 +95,7 @@ GEM
|
||||
capybara-email (2.5.0)
|
||||
capybara (~> 2.4)
|
||||
mail
|
||||
capybara-screenshot (1.0.17)
|
||||
capybara-screenshot (1.0.18)
|
||||
capybara (>= 1.0, < 3)
|
||||
launchy
|
||||
childprocess (0.8.0)
|
||||
@@ -137,7 +139,7 @@ GEM
|
||||
term-ansicolor (~> 1.3)
|
||||
thor (~> 0.19.1)
|
||||
tins (~> 1.6)
|
||||
crass (1.0.2)
|
||||
crass (1.0.3)
|
||||
csv_shaper (1.3.0)
|
||||
activesupport (>= 3.0.0)
|
||||
d3-rails (3.5.17)
|
||||
@@ -247,7 +249,7 @@ GEM
|
||||
ruby_parser (~> 3.5)
|
||||
httparty (0.15.6)
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (0.9.0)
|
||||
i18n (0.9.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
i18n-tasks (0.9.12)
|
||||
activesupport (>= 4.0.2)
|
||||
@@ -275,6 +277,10 @@ GEM
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
json (2.1.0)
|
||||
jsonapi-resources (0.9.0)
|
||||
activerecord (>= 4.1)
|
||||
concurrent-ruby
|
||||
railties (>= 4.1)
|
||||
jwt (1.5.6)
|
||||
kaminari (1.1.1)
|
||||
activesupport (>= 4.1.0)
|
||||
@@ -305,15 +311,15 @@ GEM
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.12)
|
||||
mail (2.6.6)
|
||||
mime-types (>= 1.16, < 4)
|
||||
mail (2.7.0)
|
||||
mini_mime (>= 0.1.1)
|
||||
memcachier (0.0.2)
|
||||
method_source (0.9.0)
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mimemagic (0.3.2)
|
||||
mini_mime (0.1.4)
|
||||
mini_mime (1.0.0)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.10.3)
|
||||
moneta (0.8.1)
|
||||
@@ -321,7 +327,7 @@ GEM
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
nenv (0.3.0)
|
||||
newrelic_rpm (4.5.0.337)
|
||||
newrelic_rpm (4.6.0.338)
|
||||
nokogiri (1.8.1)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
notiffany (0.1.1)
|
||||
@@ -358,8 +364,8 @@ GEM
|
||||
cocaine (~> 0.5.5)
|
||||
mime-types
|
||||
mimemagic (~> 0.3.0)
|
||||
parser (2.4.0.0)
|
||||
ast (~> 2.2)
|
||||
parser (2.4.0.2)
|
||||
ast (~> 2.3)
|
||||
pg (0.21.0)
|
||||
phantomjs (2.1.1.0)
|
||||
platform-api (2.1.0)
|
||||
@@ -372,10 +378,10 @@ GEM
|
||||
cliver (~> 0.3.1)
|
||||
websocket-driver (>= 0.2.0)
|
||||
powerpack (0.1.1)
|
||||
pry (0.11.2)
|
||||
pry (0.11.3)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
public_suffix (3.0.0)
|
||||
public_suffix (3.0.1)
|
||||
quiet_assets (1.1.0)
|
||||
railties (>= 3.1, < 5.0)
|
||||
rack (1.6.8)
|
||||
@@ -467,13 +473,13 @@ GEM
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
sass-rails (5.0.6)
|
||||
sass-rails (5.0.7)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
selenium-webdriver (3.6.0)
|
||||
selenium-webdriver (3.7.0)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.0)
|
||||
sexp_processor (4.10.0)
|
||||
@@ -508,7 +514,7 @@ GEM
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
timecop (0.9.1)
|
||||
tins (1.15.0)
|
||||
tins (1.15.1)
|
||||
trollop (1.16.2)
|
||||
tzinfo (1.2.4)
|
||||
thread_safe (~> 0.1)
|
||||
@@ -527,7 +533,7 @@ GEM
|
||||
rack-test (>= 0.5.3)
|
||||
websocket-driver (0.7.0)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
websocket-extensions (0.1.3)
|
||||
will_paginate (3.1.6)
|
||||
xmlrpc (0.3.0)
|
||||
xpath (2.1.0)
|
||||
@@ -537,6 +543,7 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
active_median
|
||||
active_merchant-paypal-bogus-gateway
|
||||
active_utils
|
||||
activemerchant
|
||||
@@ -587,6 +594,7 @@ DEPENDENCIES
|
||||
jquery-rails
|
||||
jquery-ui-rails (~> 5.0.2)
|
||||
js-routes
|
||||
jsonapi-resources
|
||||
kaminari
|
||||
leaflet-markercluster-rails
|
||||
leaflet-rails (~> 0.7.7)
|
||||
|
||||
7
app/controllers/api/v1/base_controller.rb
Normal file
7
app/controllers/api/v1/base_controller.rb
Normal file
@@ -0,0 +1,7 @@
|
||||
module Api
|
||||
module V1
|
||||
class BaseController < JSONAPI::ResourceController
|
||||
abstract
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/crops_controller.rb
Normal file
6
app/controllers/api/v1/crops_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class CropsController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/gardens_controller.rb
Normal file
6
app/controllers/api/v1/gardens_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class GardensController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/harvests_controller.rb
Normal file
6
app/controllers/api/v1/harvests_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class HarvestsController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/members_controller.rb
Normal file
6
app/controllers/api/v1/members_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class MembersController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/photos_controller.rb
Normal file
6
app/controllers/api/v1/photos_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class PhotosController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/plantings_controller.rb
Normal file
6
app/controllers/api/v1/plantings_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class PlantingsController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
6
app/controllers/api/v1/seeds_controller.rb
Normal file
6
app/controllers/api/v1/seeds_controller.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
module Api
|
||||
module V1
|
||||
class SeedsController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -137,7 +137,7 @@ class CropsController < ApplicationController
|
||||
return unless params[param_name].present?
|
||||
destroy_names(name_type)
|
||||
params[param_name].each do |_i, value|
|
||||
create_name!(name_type, value)
|
||||
create_name!(name_type, value) unless value.empty?
|
||||
end
|
||||
end
|
||||
|
||||
@@ -154,6 +154,7 @@ class CropsController < ApplicationController
|
||||
:name,
|
||||
:parent_id,
|
||||
:creator_id,
|
||||
:perennial,
|
||||
:approval_status,
|
||||
:request_notes,
|
||||
:reason_for_rejection,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
class HarvestsController < ApplicationController
|
||||
before_action :authenticate_member!, except: [:index, :show]
|
||||
before_action :authenticate_member!, except: %i(index show)
|
||||
after_action :update_crop_medians, only: %i(create update destroy)
|
||||
load_and_authorize_resource
|
||||
respond_to :html, :json
|
||||
respond_to :csv, only: :index
|
||||
@@ -33,6 +34,7 @@ class HarvestsController < ApplicationController
|
||||
|
||||
def create
|
||||
@harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
|
||||
@harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
|
||||
@harvest.save
|
||||
respond_with(@harvest)
|
||||
end
|
||||
@@ -71,8 +73,8 @@ class HarvestsController < ApplicationController
|
||||
elsif @planting
|
||||
@planting.harvests
|
||||
else
|
||||
Harvest
|
||||
end.joins(:owner, :crop).paginate(page: params[:page])
|
||||
Harvest.all
|
||||
end.order(harvested_at: :desc).joins(:owner, :crop).paginate(page: params[:page])
|
||||
end
|
||||
|
||||
def csv_filename
|
||||
@@ -83,4 +85,13 @@ class HarvestsController < ApplicationController
|
||||
end
|
||||
"Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(:number)}.csv"
|
||||
end
|
||||
|
||||
def update_crop_medians
|
||||
# We only update medians to predict plantings
|
||||
# if this harvest is not linked to a planting, then do nothing
|
||||
return if @harvest.planting.nil?
|
||||
|
||||
@harvest.planting.update_harvest_days
|
||||
@harvest.crop.update_harvest_medians
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
class PlantingsController < ApplicationController
|
||||
before_action :authenticate_member!, except: [:index, :show]
|
||||
after_action :expire_homepage, only: [:create, :update, :destroy]
|
||||
before_action :authenticate_member!, except: %i(index show)
|
||||
after_action :expire_homepage, only: %i(create update destroy)
|
||||
after_action :update_crop_medians, only: %i(create update destroy)
|
||||
after_action :update_planting_medians, only: :update
|
||||
load_and_authorize_resource
|
||||
|
||||
respond_to :html, :json
|
||||
@@ -51,13 +53,11 @@ class PlantingsController < ApplicationController
|
||||
def create
|
||||
@planting = Planting.new(planting_params)
|
||||
@planting.owner = current_member
|
||||
@planting.calc_and_set_days_before_maturity
|
||||
@planting.save
|
||||
@planting.save!
|
||||
respond_with @planting
|
||||
end
|
||||
|
||||
def update
|
||||
@planting.calc_and_set_days_before_maturity
|
||||
@planting.update(planting_params)
|
||||
respond_with @planting
|
||||
end
|
||||
@@ -69,6 +69,14 @@ class PlantingsController < ApplicationController
|
||||
|
||||
private
|
||||
|
||||
def update_crop_medians
|
||||
@planting.crop.update_lifespan_medians
|
||||
end
|
||||
|
||||
def update_planting_medians
|
||||
@planting.update_harvest_days
|
||||
end
|
||||
|
||||
def planting_params
|
||||
params[:planted_at] = parse_date(params[:planted_at]) if params[:planted_at]
|
||||
params.require(:planting).permit(
|
||||
@@ -87,6 +95,9 @@ class PlantingsController < ApplicationController
|
||||
Planting
|
||||
end
|
||||
p = p.current unless @show_all
|
||||
p.joins(:owner, :crop, :garden).order(:created_at).paginate(page: params[:page])
|
||||
p.joins(:owner, :crop, :garden)
|
||||
.includes(:crop, :owner, :garden)
|
||||
.order(:created_at)
|
||||
.paginate(page: params[:page])
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,7 +2,7 @@ class SessionsController < Devise::SessionsController
|
||||
respond_to :json
|
||||
|
||||
def create
|
||||
super do |resource|
|
||||
super do |_resource|
|
||||
if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
|
||||
flash[:alert] = "There are crops waiting to be wrangled."
|
||||
end
|
||||
|
||||
@@ -1,18 +1,6 @@
|
||||
module PlantingsHelper
|
||||
def display_days_before_maturity(planting)
|
||||
# First try to calc from finished/finished_at
|
||||
if planting.finished? || planting.finished_at.present?
|
||||
planting.days_until_finished.to_s
|
||||
# then try to calc from planted at + maturity
|
||||
elsif planting.planted_at.present? && planting.days_before_maturity.present?
|
||||
planting.days_until_mature.to_s
|
||||
else
|
||||
"unknown"
|
||||
end
|
||||
end
|
||||
|
||||
def display_finished(planting)
|
||||
if !planting.finished_at.nil?
|
||||
if planting.finished_at.present?
|
||||
planting.finished_at
|
||||
elsif planting.finished
|
||||
"Yes (no date specified)"
|
||||
|
||||
@@ -2,11 +2,14 @@ class Crop < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
friendly_id :name, use: [:slugged, :finders]
|
||||
|
||||
has_many :scientific_names, after_add: :update_index, after_remove: :update_index
|
||||
accepts_nested_attributes_for :scientific_names,
|
||||
allow_destroy: true,
|
||||
reject_if: :all_blank
|
||||
##
|
||||
## Triggers
|
||||
before_destroy { |crop| crop.posts.clear }
|
||||
|
||||
##
|
||||
## Relationships
|
||||
has_many :scientific_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
|
||||
accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
|
||||
has_many :alternate_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
|
||||
has_many :plantings
|
||||
has_many :photos, through: :plantings
|
||||
@@ -15,33 +18,32 @@ class Crop < ActiveRecord::Base
|
||||
has_many :plant_parts, -> { uniq.reorder("plant_parts.name") }, through: :harvests
|
||||
belongs_to :creator, class_name: 'Member'
|
||||
belongs_to :requester, class_name: 'Member'
|
||||
|
||||
belongs_to :parent, class_name: 'Crop'
|
||||
has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
|
||||
has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
|
||||
before_destroy { |crop| crop.posts.clear }
|
||||
|
||||
##
|
||||
## Scopes
|
||||
default_scope { order("lower(crops.name) asc") }
|
||||
scope :recent, lambda {
|
||||
approved.reorder("created_at desc")
|
||||
}
|
||||
scope :toplevel, lambda {
|
||||
approved.where(parent_id: nil)
|
||||
}
|
||||
scope :popular, lambda {
|
||||
approved.reorder("plantings_count desc, lower(name) asc")
|
||||
}
|
||||
scope :randomized, lambda {
|
||||
# ok on sqlite and psql, but not on mysql
|
||||
approved.reorder('random()')
|
||||
}
|
||||
scope :recent, -> { approved.reorder("created_at desc") }
|
||||
scope :toplevel, -> { approved.where(parent_id: nil) }
|
||||
scope :popular, -> { approved.reorder("plantings_count desc, lower(name) asc") }
|
||||
# ok on sqlite and psql, but not on mysql
|
||||
scope :randomized, -> { approved.reorder('random()') }
|
||||
scope :pending_approval, -> { where(approval_status: "pending") }
|
||||
scope :approved, -> { where(approval_status: "approved") }
|
||||
scope :rejected, -> { where(approval_status: "rejected") }
|
||||
|
||||
scope :interesting, -> { approved.has_photos.randomized }
|
||||
scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
|
||||
|
||||
##
|
||||
## Validations
|
||||
# Reasons are only necessary when rejecting
|
||||
validates :reason_for_rejection, presence: true, if: :rejected?
|
||||
## This validation addresses a race condition
|
||||
validate :approval_status_cannot_be_changed_again
|
||||
validate :must_be_rejected_if_rejected_reasons_present
|
||||
validate :must_have_meaningful_reason_for_rejection
|
||||
## Wikipedia urls are only necessary when approving a crop
|
||||
validates :en_wikipedia_url,
|
||||
format: {
|
||||
@@ -50,16 +52,6 @@ class Crop < ActiveRecord::Base
|
||||
},
|
||||
if: :approved?
|
||||
|
||||
## Reasons are only necessary when rejecting
|
||||
validates :reason_for_rejection, presence: true, if: :rejected?
|
||||
|
||||
## This validation addresses a race condition
|
||||
validate :approval_status_cannot_be_changed_again
|
||||
|
||||
validate :must_be_rejected_if_rejected_reasons_present
|
||||
|
||||
validate :must_have_meaningful_reason_for_rejection
|
||||
|
||||
####################################
|
||||
# Elastic search configuration
|
||||
if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
|
||||
@@ -110,22 +102,11 @@ class Crop < ActiveRecord::Base
|
||||
Photo.joins(:harvests).where("harvests.crop_id": id)
|
||||
end
|
||||
|
||||
def as_indexed_json(_options = {})
|
||||
as_json(
|
||||
only: [:id, :name, :approval_status],
|
||||
include: {
|
||||
scientific_names: { only: :name },
|
||||
alternate_names: { only: :name }
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
# update the Elasticsearch index (only if we're using it in this
|
||||
# environment)
|
||||
def update_index(_name_obj)
|
||||
__elasticsearch__.index_document if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
|
||||
end
|
||||
|
||||
# End Elasticsearch section
|
||||
|
||||
def to_s
|
||||
@@ -136,7 +117,6 @@ class Crop < ActiveRecord::Base
|
||||
scientific_names.first.name unless scientific_names.empty?
|
||||
end
|
||||
|
||||
# crop.default_photo
|
||||
# currently returns the first available photo, but exists so that
|
||||
# later we can choose a default photo based on different criteria,
|
||||
# eg. popularity
|
||||
@@ -148,7 +128,6 @@ class Crop < ActiveRecord::Base
|
||||
harvest_with_photo.photos.first if harvest_with_photo
|
||||
end
|
||||
|
||||
# crop.sunniness
|
||||
# returns hash indicating whether this crop is grown in
|
||||
# sun/semi-shade/shade
|
||||
# key: sunniness (eg. 'sun')
|
||||
@@ -157,7 +136,6 @@ class Crop < ActiveRecord::Base
|
||||
count_uses_of_property 'sunniness'
|
||||
end
|
||||
|
||||
# crop.planted_from
|
||||
# returns a hash of propagation methods (seed, seedling, etc),
|
||||
# key: propagation method (eg. 'seed')
|
||||
# value: count of how many times it's been used by plantings
|
||||
@@ -165,7 +143,6 @@ class Crop < ActiveRecord::Base
|
||||
count_uses_of_property 'planted_from'
|
||||
end
|
||||
|
||||
# crop.popular_plant_parts
|
||||
# returns a hash of most harvested plant parts (fruit, seed, etc)
|
||||
# key: plant part (eg. 'fruit')
|
||||
# value: count of how many times it's been used by harvests
|
||||
@@ -177,6 +154,10 @@ class Crop < ActiveRecord::Base
|
||||
.count("harvests.id")
|
||||
end
|
||||
|
||||
def annual?
|
||||
!perennial
|
||||
end
|
||||
|
||||
def interesting?
|
||||
min_plantings = 3 # needs this many plantings to be interesting
|
||||
min_photos = 3 # needs this many photos to be interesting
|
||||
@@ -210,45 +191,24 @@ class Crop < ActiveRecord::Base
|
||||
reason_for_rejection
|
||||
end
|
||||
|
||||
# Crop.search(string)
|
||||
def update_medians
|
||||
plantings.each(&:update_harvest_days)
|
||||
update_lifespan_medians
|
||||
update_harvest_medians
|
||||
end
|
||||
|
||||
def update_lifespan_medians
|
||||
# Median lifespan of plantings
|
||||
update(median_lifespan: Planting.where(crop: self).median(:lifespan))
|
||||
end
|
||||
|
||||
def update_harvest_medians
|
||||
update(median_days_to_first_harvest: Planting.where(crop: self).median(:days_to_first_harvest))
|
||||
update(median_days_to_last_harvest: Planting.where(crop: self).median(:days_to_last_harvest))
|
||||
end
|
||||
|
||||
def self.search(query)
|
||||
if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
|
||||
search_str = query.nil? ? "" : query.downcase
|
||||
response = __elasticsearch__.search( # Finds documents which match any field, but uses the _score from
|
||||
# the best field insead of adding up _score from each field.
|
||||
query: {
|
||||
multi_match: {
|
||||
query: search_str.to_s,
|
||||
analyzer: "standard",
|
||||
fields: ["name",
|
||||
"scientific_names.scientific_name",
|
||||
"alternate_names.name"]
|
||||
}
|
||||
},
|
||||
filter: {
|
||||
term: { approval_status: "approved" }
|
||||
},
|
||||
size: 50
|
||||
)
|
||||
response.records.to_a
|
||||
else
|
||||
# if we don't have elasticsearch, just do a basic SQL query.
|
||||
# also, make sure it's an actual array not an activerecord
|
||||
# collection, so it matches what we get from elasticsearch and we can
|
||||
# manipulate it in the same ways (eg. deleting elements without deleting
|
||||
# the whole record from the db)
|
||||
matches = Crop.approved.where("name ILIKE ?", "%#{query}%").to_a
|
||||
|
||||
# we want to make sure that exact matches come first, even if not
|
||||
# using elasticsearch (eg. in development)
|
||||
exact_match = Crop.approved.find_by(name: query)
|
||||
if exact_match
|
||||
matches.delete(exact_match)
|
||||
matches.unshift(exact_match)
|
||||
end
|
||||
|
||||
matches
|
||||
end
|
||||
CropSearchService.search(query)
|
||||
end
|
||||
|
||||
def self.case_insensitive_name(name)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class Forum < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
validates :name, presence: true
|
||||
friendly_id :name, use: [:slugged, :finders]
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
|
||||
has_many :posts
|
||||
belongs_to :owner, class_name: "Member"
|
||||
|
||||
@@ -2,7 +2,7 @@ class Garden < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
include Geocodable
|
||||
include PhotoCapable
|
||||
friendly_id :garden_slug, use: [:slugged, :finders]
|
||||
friendly_id :garden_slug, use: %i(slugged finders)
|
||||
|
||||
belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
|
||||
has_many :plantings, dependent: :destroy
|
||||
@@ -41,7 +41,7 @@ class Garden < ActiveRecord::Base
|
||||
"acres" => "acre"
|
||||
}.freeze
|
||||
validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
|
||||
message: "%{value} is not a valid area unit" },
|
||||
message: "%<value>s is not a valid area unit" },
|
||||
allow_nil: true,
|
||||
allow_blank: true
|
||||
|
||||
|
||||
@@ -1,28 +1,11 @@
|
||||
class Harvest < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
include ActionView::Helpers::NumberHelper
|
||||
extend FriendlyId
|
||||
include PhotoCapable
|
||||
friendly_id :harvest_slug, use: [:slugged, :finders]
|
||||
|
||||
belongs_to :crop
|
||||
belongs_to :owner, class_name: 'Member', counter_cache: true
|
||||
belongs_to :plant_part
|
||||
belongs_to :planting
|
||||
|
||||
default_scope { joins(:owner).order(created_at: :desc) }
|
||||
validates :crop, approved: true
|
||||
|
||||
validates :crop, presence: { message: "must be present and exist in our database" }
|
||||
|
||||
validates :plant_part, presence: { message: "must be present and exist in our database" }
|
||||
|
||||
validates :quantity,
|
||||
numericality: {
|
||||
only_integer: false,
|
||||
greater_than_or_equal_to: 0
|
||||
},
|
||||
allow_nil: true
|
||||
friendly_id :harvest_slug, use: %i(slugged finders)
|
||||
|
||||
# Constants
|
||||
UNITS_VALUES = {
|
||||
"individual" => "individual",
|
||||
"bunches" => "bunch",
|
||||
@@ -35,29 +18,54 @@ class Harvest < ActiveRecord::Base
|
||||
"baskets" => "basket",
|
||||
"bushels" => "bushel"
|
||||
}.freeze
|
||||
validates :unit, inclusion: { in: UNITS_VALUES.values,
|
||||
message: "%{value} is not a valid unit" },
|
||||
allow_nil: true,
|
||||
allow_blank: true
|
||||
|
||||
validates :weight_quantity,
|
||||
numericality: { only_integer: false },
|
||||
allow_nil: true
|
||||
|
||||
WEIGHT_UNITS_VALUES = {
|
||||
"kg" => "kg",
|
||||
"lb" => "lb",
|
||||
"oz" => "oz"
|
||||
}.freeze
|
||||
validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
|
||||
message: "%{value} is not a valid unit" },
|
||||
allow_nil: true,
|
||||
allow_blank: true
|
||||
|
||||
##
|
||||
## Triggers
|
||||
after_validation :cleanup_quantities
|
||||
|
||||
before_save :set_si_weight
|
||||
|
||||
##
|
||||
## Relationships
|
||||
belongs_to :crop
|
||||
belongs_to :owner, class_name: 'Member', counter_cache: true
|
||||
belongs_to :plant_part
|
||||
belongs_to :planting
|
||||
|
||||
##
|
||||
## Scopes
|
||||
default_scope { joins(:owner) }
|
||||
|
||||
##
|
||||
## Validations
|
||||
validates :crop, approved: true
|
||||
validates :crop, presence: { message: "must be present and exist in our database" }
|
||||
validates :plant_part, presence: { message: "must be present and exist in our database" }
|
||||
validates :harvested_at, presence: true
|
||||
validates :quantity, allow_nil: true, numericality: {
|
||||
only_integer: false, greater_than_or_equal_to: 0
|
||||
}
|
||||
validates :unit, allow_nil: true, allow_blank: true, inclusion: {
|
||||
in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
|
||||
}
|
||||
validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
|
||||
validates :weight_unit, allow_nil: true, allow_blank: true, inclusion: {
|
||||
in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
|
||||
}
|
||||
validate :crop_must_match_planting
|
||||
validate :owner_must_match_planting
|
||||
validate :harvest_must_be_after_planting
|
||||
|
||||
def time_from_planting_to_harvest
|
||||
return if planting.blank?
|
||||
harvested_at - planting.planted_at
|
||||
end
|
||||
|
||||
# we're storing the harvest weight in kilograms in the db too
|
||||
# to make data manipulation easier
|
||||
def set_si_weight
|
||||
@@ -118,4 +126,20 @@ class Harvest < ActiveRecord::Base
|
||||
def default_photo
|
||||
photos.first || crop.default_photo
|
||||
end
|
||||
|
||||
def crop_must_match_planting
|
||||
return if planting.blank? # only check if we are linked to a planting
|
||||
errors.add(:planting, "must be the same crop") unless crop == planting.crop
|
||||
end
|
||||
|
||||
def owner_must_match_planting
|
||||
return if planting.blank? # only check if we are linked to a planting
|
||||
errors.add(:owner, "of harvest must be the same as planting") unless owner == planting.owner
|
||||
end
|
||||
|
||||
def harvest_must_be_after_planting
|
||||
# only check if we are linked to a planting
|
||||
return unless harvested_at.present? && planting.present? && planting.planted_at.present?
|
||||
errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
|
||||
end
|
||||
end
|
||||
|
||||
@@ -4,7 +4,7 @@ class Member < ActiveRecord::Base
|
||||
include Geocodable
|
||||
extend FriendlyId
|
||||
|
||||
friendly_id :login_name, use: [:slugged, :finders]
|
||||
friendly_id :login_name, use: %i(slugged finders)
|
||||
|
||||
has_many :posts, foreign_key: 'author_id'
|
||||
has_many :comments, foreign_key: 'author_id'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
class PlantPart < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
friendly_id :name, use: [:slugged, :finders]
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
|
||||
has_many :harvests
|
||||
has_many :crops, -> { uniq }, through: :harvests
|
||||
|
||||
@@ -1,17 +1,30 @@
|
||||
class Planting < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
include PhotoCapable
|
||||
friendly_id :planting_slug, use: [:slugged, :finders]
|
||||
friendly_id :planting_slug, use: %i(slugged finders)
|
||||
|
||||
# Constants
|
||||
SUNNINESS_VALUES = %w(sun semi-shade shade)
|
||||
PLANTED_FROM_VALUES = [
|
||||
'seed', 'seedling', 'cutting', 'root division', 'runner',
|
||||
'bulb', 'root/tuber', 'bare root plant', 'advanced plant',
|
||||
'graft', 'layering'
|
||||
]
|
||||
|
||||
##
|
||||
## Triggers
|
||||
before_save :calculate_lifespan
|
||||
|
||||
belongs_to :garden
|
||||
belongs_to :owner, class_name: 'Member', counter_cache: true
|
||||
belongs_to :crop, counter_cache: true
|
||||
has_many :harvests, dependent: :destroy
|
||||
|
||||
##
|
||||
## Scopes
|
||||
default_scope { joins(:owner).order(created_at: :desc) }
|
||||
scope :finished, -> { where(finished: true) }
|
||||
scope :current, -> { where(finished: false) }
|
||||
|
||||
scope :interesting, -> { has_photos.one_per_owner }
|
||||
scope :one_per_owner, lambda {
|
||||
joins("JOIN members m ON (m.id=plantings.owner_id)
|
||||
@@ -19,60 +32,26 @@ class Planting < ActiveRecord::Base
|
||||
ON (m.id=p2.owner_id AND plantings.id < p2.id)").where("p2 IS NULL")
|
||||
}
|
||||
|
||||
delegate :name,
|
||||
:en_wikipedia_url,
|
||||
:default_scientific_name,
|
||||
:plantings_count,
|
||||
to: :crop,
|
||||
prefix: true
|
||||
##
|
||||
## Delegations
|
||||
delegate :name, :en_wikipedia_url, :default_scientific_name, :plantings_count,
|
||||
to: :crop, prefix: true
|
||||
|
||||
##
|
||||
## Validations
|
||||
validates :garden, presence: true
|
||||
validates :crop, presence: true
|
||||
validates :crop, approved: { message: "must be present and exist in our database" }
|
||||
|
||||
validates :quantity,
|
||||
numericality: {
|
||||
only_integer: true,
|
||||
greater_than_or_equal_to: 0
|
||||
},
|
||||
allow_nil: true
|
||||
|
||||
SUNNINESS_VALUES = %w(sun semi-shade shade)
|
||||
validates :sunniness, inclusion: { in: SUNNINESS_VALUES,
|
||||
message: "%{value} is not a valid sunniness value" },
|
||||
allow_nil: true,
|
||||
allow_blank: true
|
||||
|
||||
PLANTED_FROM_VALUES = [
|
||||
'seed',
|
||||
'seedling',
|
||||
'cutting',
|
||||
'root division',
|
||||
'runner',
|
||||
'bulb',
|
||||
'root/tuber',
|
||||
'bare root plant',
|
||||
'advanced plant',
|
||||
'graft',
|
||||
'layering'
|
||||
]
|
||||
validates :planted_from, inclusion: { in: PLANTED_FROM_VALUES,
|
||||
message: "%{value} is not a valid planting method" },
|
||||
allow_nil: true,
|
||||
allow_blank: true
|
||||
|
||||
validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
|
||||
validate :finished_must_be_after_planted
|
||||
|
||||
delegate :days_until_finished, to: :predict
|
||||
delegate :days_until_mature, to: :predict
|
||||
delegate :percentage_grown, to: :predict
|
||||
delegate :start_to_finish_diff, to: :predict
|
||||
|
||||
# check that any finished_at date occurs after planted_at
|
||||
def finished_must_be_after_planted
|
||||
return unless planted_at && finished_at # only check if we have both
|
||||
errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
|
||||
end
|
||||
validate :owner_must_match_garden_owner
|
||||
validates :quantity, allow_nil: true, numericality: {
|
||||
only_integer: true, greater_than_or_equal_to: 0
|
||||
}
|
||||
validates :sunniness, allow_nil: true, allow_blank: true, inclusion: {
|
||||
in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
|
||||
}
|
||||
validates :planted_from, allow_nil: true, allow_blank: true, inclusion: {
|
||||
in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
|
||||
}
|
||||
|
||||
def planting_slug
|
||||
[
|
||||
@@ -100,13 +79,64 @@ class Planting < ActiveRecord::Base
|
||||
planted_at.present? && planted_at <= Date.current
|
||||
end
|
||||
|
||||
def calc_and_set_days_before_maturity
|
||||
self.days_before_maturity = predict.predict_days_before_maturity
|
||||
def finish_predicted_at
|
||||
planted_at + crop.median_lifespan.days if crop.median_lifespan.present? && planted_at.present?
|
||||
end
|
||||
|
||||
def calculate_lifespan
|
||||
self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
|
||||
end
|
||||
|
||||
def expected_lifespan
|
||||
if planted_at.present? && finished_at.present?
|
||||
return (finished_at - planted_at).to_i
|
||||
end
|
||||
crop.median_lifespan
|
||||
end
|
||||
|
||||
def days_since_planted
|
||||
(Time.zone.today - planted_at).to_i if planted_at.present?
|
||||
end
|
||||
|
||||
def percentage_grown
|
||||
return 100 if finished
|
||||
return if planted_at.blank? || expected_lifespan.blank?
|
||||
p = (days_since_planted / expected_lifespan.to_f) * 100
|
||||
return p if p <= 100
|
||||
100
|
||||
end
|
||||
|
||||
def update_harvest_days
|
||||
days_to_first_harvest = nil
|
||||
days_to_last_harvest = nil
|
||||
if planted_at.present? && harvests_with_dates.size.positive?
|
||||
days_to_first_harvest = (first_harvest_date - planted_at).to_i
|
||||
days_to_last_harvest = (last_harvest_date - planted_at).to_i if finished?
|
||||
end
|
||||
update(days_to_first_harvest: days_to_first_harvest, days_to_last_harvest: days_to_last_harvest)
|
||||
end
|
||||
|
||||
def first_harvest_date
|
||||
harvests_with_dates.minimum(:harvested_at)
|
||||
end
|
||||
|
||||
def last_harvest_date
|
||||
harvests_with_dates.maximum(:harvested_at)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def predict
|
||||
PlantingPredictions.new(self)
|
||||
def harvests_with_dates
|
||||
harvests.where.not(harvested_at: nil)
|
||||
end
|
||||
|
||||
# check that any finished_at date occurs after planted_at
|
||||
def finished_must_be_after_planted
|
||||
return unless planted_at && finished_at # only check if we have both
|
||||
errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
|
||||
end
|
||||
|
||||
def owner_must_match_garden_owner
|
||||
errors.add(:owner, "must be the same as garden") unless owner == garden.owner
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class Post < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
include Likeable
|
||||
friendly_id :author_date_subject, use: [:slugged, :finders]
|
||||
friendly_id :author_date_subject, use: %i(slugged finders)
|
||||
belongs_to :author, class_name: 'Member'
|
||||
belongs_to :forum
|
||||
has_many :comments, dependent: :destroy
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
class Role < ActiveRecord::Base
|
||||
extend FriendlyId
|
||||
friendly_id :name, use: [:slugged, :finders]
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
|
||||
has_and_belongs_to_many :members # rubocop:disable Rails/HasAndBelongsToMany
|
||||
|
||||
class << self
|
||||
[:crop_wranglers, :admins].each do |method|
|
||||
%i(crop_wranglers admins).each do |method|
|
||||
define_method method do
|
||||
slug = method.to_s.singularize.dasherize
|
||||
Role.where(slug: slug).try(:first).try(:members)
|
||||
|
||||
8
app/resources/api/v1/base_resource.rb
Normal file
8
app/resources/api/v1/base_resource.rb
Normal file
@@ -0,0 +1,8 @@
|
||||
module Api
|
||||
module V1
|
||||
class BaseResource < JSONAPI::Resource
|
||||
immutable
|
||||
abstract
|
||||
end
|
||||
end
|
||||
end
|
||||
22
app/resources/api/v1/crop_resource.rb
Normal file
22
app/resources/api/v1/crop_resource.rb
Normal file
@@ -0,0 +1,22 @@
|
||||
module Api
|
||||
module V1
|
||||
class CropResource < BaseResource
|
||||
immutable
|
||||
|
||||
filter :approval_status, default: 'approved'
|
||||
|
||||
has_many :plantings
|
||||
has_many :photos
|
||||
has_many :harvests
|
||||
has_one :parent
|
||||
|
||||
attribute :name
|
||||
attribute :en_wikipedia_url
|
||||
|
||||
attribute :perennial
|
||||
attribute :median_lifespan
|
||||
attribute :median_days_to_first_harvest
|
||||
attribute :median_days_to_last_harvest
|
||||
end
|
||||
end
|
||||
end
|
||||
13
app/resources/api/v1/garden_resource.rb
Normal file
13
app/resources/api/v1/garden_resource.rb
Normal file
@@ -0,0 +1,13 @@
|
||||
module Api
|
||||
module V1
|
||||
class GardenResource < BaseResource
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :plantings
|
||||
has_many :photos
|
||||
|
||||
attribute :name
|
||||
end
|
||||
end
|
||||
end
|
||||
19
app/resources/api/v1/harvest_resource.rb
Normal file
19
app/resources/api/v1/harvest_resource.rb
Normal file
@@ -0,0 +1,19 @@
|
||||
module Api
|
||||
module V1
|
||||
class HarvestResource < BaseResource
|
||||
immutable
|
||||
|
||||
has_one :crop
|
||||
has_one :planting
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :photos
|
||||
|
||||
attribute :harvested_at
|
||||
attribute :description
|
||||
attribute :unit
|
||||
attribute :weight_quantity
|
||||
attribute :weight_unit
|
||||
attribute :si_weight
|
||||
end
|
||||
end
|
||||
end
|
||||
15
app/resources/api/v1/member_resource.rb
Normal file
15
app/resources/api/v1/member_resource.rb
Normal file
@@ -0,0 +1,15 @@
|
||||
module Api
|
||||
module V1
|
||||
class MemberResource < BaseResource
|
||||
immutable
|
||||
|
||||
has_many :gardens
|
||||
has_many :plantings
|
||||
has_many :harvests
|
||||
has_many :seeds
|
||||
has_many :photos
|
||||
|
||||
attribute :login_name
|
||||
end
|
||||
end
|
||||
end
|
||||
18
app/resources/api/v1/photo_resource.rb
Normal file
18
app/resources/api/v1/photo_resource.rb
Normal file
@@ -0,0 +1,18 @@
|
||||
module Api
|
||||
module V1
|
||||
class PhotoResource < BaseResource
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :plantings
|
||||
has_many :gardens
|
||||
has_many :harvests
|
||||
|
||||
attribute :thumbnail_url
|
||||
attribute :fullsize_url
|
||||
attribute :license_name
|
||||
attribute :link_url
|
||||
attribute :title
|
||||
end
|
||||
end
|
||||
end
|
||||
28
app/resources/api/v1/planting_resource.rb
Normal file
28
app/resources/api/v1/planting_resource.rb
Normal file
@@ -0,0 +1,28 @@
|
||||
module Api
|
||||
module V1
|
||||
class PlantingResource < BaseResource
|
||||
immutable
|
||||
|
||||
has_one :garden
|
||||
has_one :crop
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :photos
|
||||
has_many :harvests
|
||||
|
||||
attribute :planted_at
|
||||
attribute :finished_at
|
||||
attribute :finished
|
||||
attribute :quantity
|
||||
attribute :description
|
||||
attribute :sunniness
|
||||
attribute :planted_from
|
||||
|
||||
# Predictions
|
||||
attribute :expected_lifespan
|
||||
attribute :finish_predicted_at
|
||||
attribute :percentage_grown
|
||||
attribute :first_harvest_date
|
||||
attribute :last_harvest_date
|
||||
end
|
||||
end
|
||||
end
|
||||
20
app/resources/api/v1/seed_resource.rb
Normal file
20
app/resources/api/v1/seed_resource.rb
Normal file
@@ -0,0 +1,20 @@
|
||||
module Api
|
||||
module V1
|
||||
class SeedResource < BaseResource
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_one :crop
|
||||
|
||||
attribute :description
|
||||
attribute :quantity
|
||||
attribute :plant_before
|
||||
attribute :tradable_to
|
||||
attribute :days_until_maturity_min
|
||||
attribute :days_until_maturity_max
|
||||
attribute :organic
|
||||
attribute :gmo
|
||||
attribute :heirloom
|
||||
end
|
||||
end
|
||||
end
|
||||
42
app/services/crop_search_service.rb
Normal file
42
app/services/crop_search_service.rb
Normal file
@@ -0,0 +1,42 @@
|
||||
class CropSearchService
|
||||
# Crop.search(string)
|
||||
def self.search(query)
|
||||
if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
|
||||
search_str = query.nil? ? "" : query.downcase
|
||||
response = Crop.__elasticsearch__.search( # Finds documents which match any field, but uses the _score from
|
||||
# the best field insead of adding up _score from each field.
|
||||
query: {
|
||||
multi_match: {
|
||||
query: search_str.to_s,
|
||||
analyzer: "standard",
|
||||
fields: ["name",
|
||||
"scientific_names.scientific_name",
|
||||
"alternate_names.name"]
|
||||
}
|
||||
},
|
||||
filter: {
|
||||
term: { approval_status: "approved" }
|
||||
},
|
||||
size: 50
|
||||
)
|
||||
response.records.to_a
|
||||
else
|
||||
# if we don't have elasticsearch, just do a basic SQL query.
|
||||
# also, make sure it's an actual array not an activerecord
|
||||
# collection, so it matches what we get from elasticsearch and we can
|
||||
# manipulate it in the same ways (eg. deleting elements without deleting
|
||||
# the whole record from the db)
|
||||
matches = Crop.approved.where("name ILIKE ?", "%#{query}%").to_a
|
||||
|
||||
# we want to make sure that exact matches come first, even if not
|
||||
# using elasticsearch (eg. in development)
|
||||
exact_match = Crop.approved.find_by(name: query)
|
||||
if exact_match
|
||||
matches.delete(exact_match)
|
||||
matches.unshift(exact_match)
|
||||
end
|
||||
|
||||
matches
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,58 +0,0 @@
|
||||
class PlantingPredictions
|
||||
def initialize(planting)
|
||||
@planting = planting
|
||||
end
|
||||
|
||||
def days_until_finished
|
||||
return 0 if @planting.finished?
|
||||
days = (@planting.finished_at - Date.current).to_i
|
||||
days.positive? ? days : 0
|
||||
end
|
||||
|
||||
def days_until_mature
|
||||
days = ((@planting.planted_at + @planting.days_before_maturity) - Date.current).to_i
|
||||
days.positive? ? days : 0
|
||||
end
|
||||
|
||||
def percentage_grown
|
||||
return nil unless @planting.days_before_maturity && @planting.planted?
|
||||
|
||||
days = (Date.current - @planting.planted_at.to_date).to_f
|
||||
|
||||
return 0 if Date.current < @planting.planted_at
|
||||
return 100 if days > @planting.days_before_maturity
|
||||
percent = (days / @planting.days_before_maturity * 100).to_i
|
||||
|
||||
percent = 100 if percent >= 100
|
||||
|
||||
percent
|
||||
end
|
||||
|
||||
def start_to_finish_diff
|
||||
(@planting.finished_at - @planting.planted_at).to_i if @planting.finished_at && @planting.planted_at
|
||||
end
|
||||
|
||||
def predict_days_before_maturity
|
||||
# calculate the number of days, from planted_at, until maturity
|
||||
if @planting.planted_at && @planting.finished_at
|
||||
start_to_finish_diff
|
||||
elsif @planting.crop_id
|
||||
plantings = other_finished_plantings_same_crop
|
||||
PlantingPredictions.mean_days_until_maturity(plantings)
|
||||
end
|
||||
end
|
||||
|
||||
def self.mean_days_until_maturity(plantings)
|
||||
## Given a set of finished plantings, calculate the average/mean time from start to finish
|
||||
differences = plantings.collect(&:start_to_finish_diff)
|
||||
differences.compact.sum / differences.compact.size unless differences.compact.empty?
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def other_finished_plantings_same_crop
|
||||
Planting.where(crop_id: @planting.crop_id)
|
||||
.where.not(id: @planting.id)
|
||||
.where.not(finished_at: nil)
|
||||
end
|
||||
end
|
||||
@@ -29,6 +29,16 @@
|
||||
Wranglers: please ensure this is singular, and capitalize
|
||||
proper nouns only.
|
||||
|
||||
.form-group
|
||||
= f.label :perennial, 'Lifespan', class: 'control-label col-md-2'
|
||||
.col-md-8
|
||||
= f.radio_button(:perennial, false)
|
||||
= f.label(:perennial_false, "Annual")
|
||||
%span.help-block Living and reproducing in a single year or less
|
||||
= f.radio_button(:perennial, true)
|
||||
= f.label(:perennial_true, "Perennial")
|
||||
%span.help-block Living more than two years
|
||||
|
||||
.form-group
|
||||
= f.label :en_wikipedia_url, 'Wikipedia URL', class: 'control-label col-md-2'
|
||||
.col-md-8
|
||||
|
||||
@@ -12,11 +12,23 @@
|
||||
%p
|
||||
%b Scientific name:
|
||||
= crop.default_scientific_name
|
||||
%p
|
||||
%b
|
||||
Planted
|
||||
= pluralize(crop.plantings.size, "time")
|
||||
by #{ENV['GROWSTUFF_SITE_NAME']} members
|
||||
|
||||
- if crop.annual? && crop.median_lifespan.present?
|
||||
%p
|
||||
Median Lifespan
|
||||
%b= crop.median_lifespan
|
||||
days
|
||||
- unless crop.median_days_to_first_harvest.nil?
|
||||
%p
|
||||
First harvest expected
|
||||
%b= crop.median_days_to_first_harvest
|
||||
days after planting
|
||||
|
||||
- if crop.annual? && crop.median_days_to_last_harvest.present?
|
||||
%p
|
||||
Last harvest expected
|
||||
%b= crop.median_days_to_last_harvest
|
||||
days after planting
|
||||
|
||||
- if can? :create, Planting
|
||||
= link_to 'Plant this', new_planting_path(params: { crop_id: crop.id }), class: 'btn btn-primary'
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
%h2 Photos of #{crop.name} harvests
|
||||
.row
|
||||
- unless crop.harvest_photos.empty?
|
||||
- crop.harvest_photos.includes(:owner).first(3).each do |p|
|
||||
.col-md-4
|
||||
- unless crop.harvest_photos.empty?
|
||||
%h3 Photos of #{crop.name} harvests
|
||||
.row
|
||||
- crop.harvest_photos.first(6).each do |p|
|
||||
.col-xs-6.col-md-2
|
||||
= render "photos/thumbnail", photo: p
|
||||
|
||||
%h2 Photos of #{crop.name} plants
|
||||
.row
|
||||
- unless crop.photos.empty?
|
||||
- crop.photos.includes(:owner).first(3).each do |p|
|
||||
.col-md-4
|
||||
- unless crop.photos.empty?
|
||||
%h3 Photos of #{crop.name} plants
|
||||
.row
|
||||
- crop.photos.first(6).each do |p|
|
||||
.col-xs-6.col-md-2
|
||||
= render "photos/thumbnail", photo: p
|
||||
.row
|
||||
= link_to "more photos", crop_photos_path(crop_id: crop.id)
|
||||
|
||||
29
app/views/crops/_predictions.html.haml
Normal file
29
app/views/crops/_predictions.html.haml
Normal file
@@ -0,0 +1,29 @@
|
||||
- unless crop.perennial.nil?
|
||||
%p
|
||||
#{crop.name} is
|
||||
- if crop.perennial == true
|
||||
= link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
|
||||
a perennial crop
|
||||
(living more than two years)
|
||||
- elsif crop.perennial == false
|
||||
= link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
|
||||
an annual crop
|
||||
(living and reproducing in a single year or less)
|
||||
|
||||
- if crop.annual? && crop.median_lifespan.present?
|
||||
%p
|
||||
Median lifespan of #{crop.name} plants is
|
||||
%strong= crop.median_lifespan
|
||||
days
|
||||
|
||||
- if crop.median_days_to_first_harvest.present?
|
||||
%p
|
||||
First harvest expected
|
||||
%strong= crop.median_days_to_first_harvest
|
||||
days after planting
|
||||
|
||||
- if crop.annual? && crop.median_days_to_last_harvest.present?
|
||||
%p
|
||||
Last harvest expected
|
||||
%strong= crop.median_days_to_last_harvest
|
||||
days after planting
|
||||
@@ -20,19 +20,17 @@
|
||||
|
||||
- if can? :create, Seed
|
||||
= link_to 'Add seeds to stash', new_seed_path(params: { crop_id: @crop.id }), class: 'btn btn-default'
|
||||
- if member_signed_in?
|
||||
= display_seed_availability(@current_member, @crop)
|
||||
= link_to "View your seeds", seeds_by_owner_path(owner: current_member.slug)
|
||||
|
||||
.row
|
||||
.col-md-9
|
||||
- unless current_member
|
||||
Learn how to grow #{@crop.name.pluralize} from growers around the world.
|
||||
#{ENV['GROWSTUFF_SITE_NAME']} has tips and advice from real-life growers,
|
||||
including when to plant #{@crop.name.pluralize}, how to harvest
|
||||
#{@crop.name.pluralize}, and more.
|
||||
- if member_signed_in?
|
||||
= display_seed_availability(@current_member, @crop)
|
||||
= link_to "View your seeds", seeds_by_owner_path(owner: current_member.slug)
|
||||
|
||||
= render partial: 'photos', locals: { crop: @crop }
|
||||
%h2 Predictions
|
||||
= render 'predictions', crop: @crop
|
||||
|
||||
%p= render 'crops/photos', crop: @crop
|
||||
|
||||
%h2
|
||||
- if !@crop.plantings.empty?
|
||||
@@ -86,18 +84,18 @@
|
||||
|
||||
%h4 How to grow #{@crop.name.pluralize}
|
||||
|
||||
= render partial: 'grown_for', locals: { crop: @crop }
|
||||
= render partial: 'planting_advice', locals: { crop: @crop }
|
||||
= render 'grown_for', crop: @crop
|
||||
= render 'planting_advice', crop: @crop
|
||||
|
||||
= render partial: 'scientific_names', locals: { crop: @crop }
|
||||
= render partial: 'alternate_names', locals: { crop: @crop }
|
||||
= render 'scientific_names', crop: @crop
|
||||
= render 'alternate_names', crop: @crop
|
||||
|
||||
%h4 #{@crop.name.capitalize} varieties
|
||||
= render partial: 'varieties', locals: { crop: @crop }
|
||||
= render 'varieties', crop: @crop
|
||||
|
||||
= render partial: 'plantings', locals: { crop: @crop }
|
||||
= render partial: 'harvests', locals: { crop: @crop }
|
||||
= render partial: 'find_seeds', locals: { crop: @crop }
|
||||
= render 'plantings', crop: @crop
|
||||
= render 'harvests', crop: @crop
|
||||
= render 'find_seeds', crop: @crop
|
||||
|
||||
|
||||
%h4 Learn more about #{@crop.name.pluralize}
|
||||
|
||||
@@ -33,10 +33,8 @@
|
||||
%dt Planted from:
|
||||
%dd= display_planted_from(planting)
|
||||
|
||||
%dt Mature in:
|
||||
%dd
|
||||
= display_days_before_maturity(planting)
|
||||
days
|
||||
%dt Finish expected:
|
||||
%dd= planting.finish_predicted_at if planting.finish_predicted_at.present?
|
||||
|
||||
%p= render 'plantings/progress', planting: planting, show_explanation: true
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
- unless planting.harvests.empty?
|
||||
Harvests:
|
||||
%ul
|
||||
- planting.harvests.each do |harvest|
|
||||
- planting.harvests.includes(:crop).each do |harvest|
|
||||
%li
|
||||
= harvest.harvested_at ? harvest.harvested_at : "undated"
|
||||
= link_to harvest, harvest_path(harvest)
|
||||
|
||||
@@ -1,19 +1,15 @@
|
||||
- if !planting.planted?
|
||||
- if planting.crop.perennial
|
||||
%p Perennial
|
||||
- elsif !planting.planted?
|
||||
- if show_explanation == true
|
||||
Progress: 0% - not planted yet
|
||||
= render "plantings/progress_bar", status: "not planted", progress: 0
|
||||
|
||||
- elsif planting.finished?
|
||||
- if show_explanation == true
|
||||
Progress: 100%
|
||||
= render "plantings/progress_bar", status: 'finished', progress: 100
|
||||
|
||||
- elsif planting.days_before_maturity.nil?
|
||||
- elsif planting.finish_predicted_at.nil?
|
||||
- if show_explanation == true
|
||||
Progress: Not calculated, days before maturity unknown
|
||||
Progress: Not enough data
|
||||
= render "plantings/progress_bar", status: "unknown", progress: nil
|
||||
|
||||
- else
|
||||
- if show_explanation == true
|
||||
Progress: #{planting.percentage_grown}%
|
||||
= render "plantings/progress_bar", status: 'growing', progress: planting.percentage_grown
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
-# haml-lint:disable InlineStyles
|
||||
%div{ class: "progress-bar progress-bar-#{status}", role: "progressbar", style: "width: #{progress}%" }
|
||||
- if progress >= 30
|
||||
#{progress}%
|
||||
#{sprintf '%.0f', progress}%
|
||||
- if progress < 30
|
||||
#{progress}%
|
||||
#{sprintf '%.0f', progress}%
|
||||
-# haml-lint:enable InlineStyles
|
||||
|
||||
@@ -28,13 +28,11 @@
|
||||
- unless @planting.owner.location.blank?
|
||||
(#{@planting.owner.location})
|
||||
%dt Quantity:
|
||||
%dd
|
||||
= display_planting_quantity(@planting)
|
||||
%dd= display_planting_quantity(@planting)
|
||||
|
||||
- unless @planting.planted_from.blank?
|
||||
%dt Planted from:
|
||||
%dd
|
||||
= display_planted_from(@planting)
|
||||
%dd= display_planted_from(@planting)
|
||||
|
||||
%dt Sun or shade?
|
||||
%dd
|
||||
@@ -42,11 +40,28 @@
|
||||
= image_tag("sunniness_#{sunniness}.png", size: "25x25", alt: sunniness, title: sunniness)
|
||||
= sunniness
|
||||
|
||||
%dt Days until maturity:
|
||||
%dd= display_days_before_maturity(@planting)
|
||||
- unless @planting.crop.perennial
|
||||
%dt Predicted finish:
|
||||
%dd
|
||||
- if @planting.finish_predicted_at.present?
|
||||
= @planting.finish_predicted_at
|
||||
- else
|
||||
%strong Set planted date to get predictions
|
||||
%dt Finished:
|
||||
%dd= display_finished(@planting)
|
||||
|
||||
%dt Finished:
|
||||
%dd= display_finished(@planting)
|
||||
- if @planting.crop.median_lifespan.present?
|
||||
%dt Expected Lifespan:
|
||||
%dd #{@planting.crop.median_lifespan} days
|
||||
- if @planting.lifespan.present?
|
||||
%dt Actual Lifespan:
|
||||
%dd #{@planting.lifespan} days
|
||||
- if @planting.days_to_first_harvest.present?
|
||||
%dt First Harvest:
|
||||
%dd #{@planting.days_to_first_harvest} days after planting
|
||||
- if @planting.days_to_last_harvest.present?
|
||||
%dt Last Harvest:
|
||||
%dd #{@planting.days_to_last_harvest} days after planting
|
||||
|
||||
%p= render 'plantings/harvests', planting: @planting
|
||||
%p= render 'plantings/progress', planting: @planting, show_explanation: true
|
||||
@@ -67,10 +82,10 @@
|
||||
#{ @planting.description != "" ? strip_tags(@planting.description) : "No description given." }
|
||||
|
||||
- if !@planting.photos.empty? || (can?(:edit, @planting) && can?(:create, Photo))
|
||||
%h2 Pictures
|
||||
%h2 Photos
|
||||
|
||||
.row
|
||||
- @planting.photos.each do |p|
|
||||
- @planting.photos.includes(:owner).each do |p|
|
||||
.col-md-2.six-across
|
||||
= render partial: 'photos/thumbnail', locals: { photo: p }
|
||||
- if can?(:create, Photo) && can?(:edit, @planting)
|
||||
|
||||
6
config/initializers/jsonapi_resources.rb
Normal file
6
config/initializers/jsonapi_resources.rb
Normal file
@@ -0,0 +1,6 @@
|
||||
JSONAPI.configure do |config|
|
||||
# built in paginators are :none, :offset, :paged
|
||||
config.default_paginator = :offset
|
||||
config.default_page_size = 10
|
||||
config.maximum_page_size = 20
|
||||
end
|
||||
@@ -96,8 +96,19 @@ Growstuff::Application.routes.draw do
|
||||
get '/admin/newsletter' => 'admin#newsletter', :as => :admin_newsletter
|
||||
get '/admin/:action' => 'admin#:action'
|
||||
|
||||
get '/.well-known/acme-challenge/:id' => 'pages#letsencrypt'
|
||||
namespace :api do
|
||||
namespace :v1 do
|
||||
jsonapi_resources :photos
|
||||
jsonapi_resources :crops
|
||||
jsonapi_resources :plantings
|
||||
jsonapi_resources :gardens
|
||||
jsonapi_resources :harvests
|
||||
jsonapi_resources :seeds
|
||||
jsonapi_resources :members
|
||||
end
|
||||
end
|
||||
|
||||
get '/.well-known/acme-challenge/:id' => 'pages#letsencrypt'
|
||||
# CMS stuff -- must remain LAST
|
||||
comfy_route :cms, path: '/', sitemap: false
|
||||
end
|
||||
|
||||
@@ -3,7 +3,7 @@ worker_processes 3
|
||||
timeout 30
|
||||
preload_app true
|
||||
|
||||
before_fork do |server, worker|
|
||||
before_fork do |_server, _worker|
|
||||
Signal.trap 'TERM' do
|
||||
puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
|
||||
Process.kill 'QUIT', Process.pid
|
||||
@@ -13,7 +13,7 @@ before_fork do |server, worker|
|
||||
ActiveRecord::Base.connection.disconnect!
|
||||
end
|
||||
|
||||
after_fork do |server, worker|
|
||||
after_fork do |_server, _worker|
|
||||
Signal.trap 'TERM' do
|
||||
puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
|
||||
end
|
||||
|
||||
22
db/migrate/20171022032108_all_the_predictions.rb
Normal file
22
db/migrate/20171022032108_all_the_predictions.rb
Normal file
@@ -0,0 +1,22 @@
|
||||
class AllThePredictions < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :crops, :perennial, :boolean, default: false
|
||||
|
||||
# time from planted, to finished
|
||||
add_column :plantings, :lifespan, :integer
|
||||
|
||||
# how old was planting at first harvest
|
||||
add_column :plantings, :days_to_first_harvest, :integer
|
||||
add_column :plantings, :days_to_last_harvest, :integer
|
||||
|
||||
# Keep the median values for the crop
|
||||
add_column :crops, :median_lifespan, :integer
|
||||
add_column :crops, :median_days_to_first_harvest, :integer
|
||||
add_column :crops, :median_days_to_last_harvest, :integer
|
||||
|
||||
remove_column :plantings, :days_before_maturity, :integer
|
||||
|
||||
create_table :median_functions do |t|
|
||||
end
|
||||
end
|
||||
end
|
||||
9
db/migrate/20171028230429_create_median_function.rb
Normal file
9
db/migrate/20171028230429_create_median_function.rb
Normal file
@@ -0,0 +1,9 @@
|
||||
class CreateMedianFunction < ActiveRecord::Migration
|
||||
def up
|
||||
ActiveMedian.create_function
|
||||
end
|
||||
|
||||
def down
|
||||
ActiveMedian.drop_function
|
||||
end
|
||||
end
|
||||
13
db/migrate/20171105011017_set_prediction_data.rb
Normal file
13
db/migrate/20171105011017_set_prediction_data.rb
Normal file
@@ -0,0 +1,13 @@
|
||||
class SetPredictionData < ActiveRecord::Migration
|
||||
def up
|
||||
say "Updating all plantings time to first harvest"
|
||||
Planting.all.each(&:update_harvest_days)
|
||||
say "Updating crop median time to first harvest, and lifespan"
|
||||
Crop.all.each do |crop|
|
||||
crop.update_lifespan_medians
|
||||
crop.update_harvest_medians
|
||||
end
|
||||
end
|
||||
|
||||
def down; end
|
||||
end
|
||||
25
db/schema.rb
25
db/schema.rb
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20170520060252) do
|
||||
ActiveRecord::Schema.define(version: 20171105011017) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
@@ -181,19 +181,23 @@ ActiveRecord::Schema.define(version: 20170520060252) do
|
||||
end
|
||||
|
||||
create_table "crops", force: :cascade do |t|
|
||||
t.string "name", null: false
|
||||
t.string "name", null: false
|
||||
t.string "en_wikipedia_url"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.string "slug"
|
||||
t.integer "parent_id"
|
||||
t.integer "plantings_count", default: 0
|
||||
t.integer "plantings_count", default: 0
|
||||
t.integer "creator_id"
|
||||
t.integer "requester_id"
|
||||
t.string "approval_status", default: "approved"
|
||||
t.string "approval_status", default: "approved"
|
||||
t.text "reason_for_rejection"
|
||||
t.text "request_notes"
|
||||
t.text "rejection_notes"
|
||||
t.boolean "perennial", default: false
|
||||
t.integer "median_lifespan"
|
||||
t.integer "median_days_to_first_harvest"
|
||||
t.integer "median_days_to_last_harvest"
|
||||
end
|
||||
|
||||
add_index "crops", ["name"], name: "index_crops_on_name", using: :btree
|
||||
@@ -290,6 +294,9 @@ ActiveRecord::Schema.define(version: 20170520060252) do
|
||||
add_index "likes", ["likeable_type", "likeable_id"], name: "index_likes_on_likeable_type_and_likeable_id", using: :btree
|
||||
add_index "likes", ["member_id"], name: "index_likes_on_member_id", using: :btree
|
||||
|
||||
create_table "median_functions", force: :cascade do |t|
|
||||
end
|
||||
|
||||
create_table "members", force: :cascade do |t|
|
||||
t.string "email", default: "", null: false
|
||||
t.string "encrypted_password", default: "", null: false
|
||||
@@ -409,8 +416,8 @@ ActiveRecord::Schema.define(version: 20170520060252) do
|
||||
end
|
||||
|
||||
create_table "plantings", force: :cascade do |t|
|
||||
t.integer "garden_id", null: false
|
||||
t.integer "crop_id", null: false
|
||||
t.integer "garden_id", null: false
|
||||
t.integer "crop_id", null: false
|
||||
t.date "planted_at"
|
||||
t.integer "quantity"
|
||||
t.text "description"
|
||||
@@ -420,9 +427,11 @@ ActiveRecord::Schema.define(version: 20170520060252) do
|
||||
t.string "sunniness"
|
||||
t.string "planted_from"
|
||||
t.integer "owner_id"
|
||||
t.boolean "finished", default: false
|
||||
t.boolean "finished", default: false
|
||||
t.date "finished_at"
|
||||
t.integer "days_before_maturity"
|
||||
t.integer "lifespan"
|
||||
t.integer "days_to_first_harvest"
|
||||
t.integer "days_to_last_harvest"
|
||||
end
|
||||
|
||||
add_index "plantings", ["slug"], name: "index_plantings_on_slug", unique: true, using: :btree
|
||||
|
||||
@@ -19,68 +19,67 @@ describe HarvestsController do
|
||||
{
|
||||
owner_id: subject.current_member.id,
|
||||
crop_id: FactoryBot.create(:crop).id,
|
||||
plant_part_id: FactoryBot.create(:plant_part).id
|
||||
plant_part_id: FactoryBot.create(:plant_part).id,
|
||||
harvested_at: '2017-01-01'
|
||||
}
|
||||
end
|
||||
|
||||
describe "GET index" do
|
||||
before do
|
||||
@member1 = FactoryBot.create(:member)
|
||||
@member2 = FactoryBot.create(:member)
|
||||
@tomato = FactoryBot.create(:tomato)
|
||||
@maize = FactoryBot.create(:maize)
|
||||
@harvest1 = FactoryBot.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
|
||||
@harvest2 = FactoryBot.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
|
||||
let(:member1) { FactoryBot.create(:member) }
|
||||
let(:member2) { FactoryBot.create(:member) }
|
||||
let(:tomato) { FactoryBot.create(:tomato) }
|
||||
let(:maize) { FactoryBot.create(:maize) }
|
||||
let(:harvest1) { FactoryBot.create(:harvest, owner_id: member1.id, crop_id: tomato.id) }
|
||||
let(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id) }
|
||||
|
||||
describe "assigns all harvests as @harvests" do
|
||||
before { get :index, {} }
|
||||
it { assigns(:harvests).should =~ [harvest1, harvest2] }
|
||||
end
|
||||
|
||||
it "assigns all harvests as @harvests" do
|
||||
get :index, {}
|
||||
assigns(:harvests).should =~ [@harvest1, @harvest2]
|
||||
describe "picks up owner from params and shows owner's harvests only" do
|
||||
before { get :index, owner: member1.slug }
|
||||
it { expect(assigns(:owner)).to eq member1 }
|
||||
it { expect(assigns(:harvests)).to eq [harvest1] }
|
||||
end
|
||||
|
||||
it "picks up owner from params and shows owner's harvests only" do
|
||||
get :index, owner: @member1.slug
|
||||
assigns(:owner).should eq @member1
|
||||
assigns(:harvests).should eq [@harvest1]
|
||||
describe "picks up crop from params and shows the harvests for the crop only" do
|
||||
before { get :index, crop: maize.name }
|
||||
it { expect(assigns(:crop)).to eq maize }
|
||||
it { expect(assigns(:harvests)).to eq [harvest2] }
|
||||
end
|
||||
|
||||
it "picks up crop from params and shows the harvests for the crop only" do
|
||||
get :index, crop: @maize.name
|
||||
assigns(:crop).should eq @maize
|
||||
assigns(:harvests).should eq [@harvest2]
|
||||
end
|
||||
|
||||
it "generates a csv" do
|
||||
get :index, format: "csv"
|
||||
response.status.should eq 200
|
||||
describe "generates a csv" do
|
||||
before { get :index, format: "csv" }
|
||||
it { expect(response.status).to eq 200 }
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET show" do
|
||||
it "assigns the requested harvest as @harvest" do
|
||||
harvest = Harvest.create! valid_attributes
|
||||
get :show, id: harvest.to_param
|
||||
assigns(:harvest).should eq(harvest)
|
||||
let(:harvest) { Harvest.create! valid_attributes }
|
||||
describe "assigns the requested harvest as @harvest" do
|
||||
before { get :show, id: harvest.to_param }
|
||||
it { expect(assigns(:harvest)).to eq(harvest) }
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET new" do
|
||||
it "assigns a new harvest as @harvest" do
|
||||
get :new, {}
|
||||
assigns(:harvest).should be_a_new(Harvest)
|
||||
before { get :new, {} }
|
||||
|
||||
describe "assigns a new harvest as @harvest" do
|
||||
it { expect(assigns(:harvest)).to be_a_new(Harvest) }
|
||||
end
|
||||
|
||||
it "sets the date of the harvest to today" do
|
||||
get :new, {}
|
||||
assigns(:harvest).harvested_at.should == Time.zone.today
|
||||
describe "sets the date of the harvest to today" do
|
||||
it { expect(assigns(:harvest).harvested_at).to eq(Time.zone.today) }
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET edit" do
|
||||
it "assigns the requested harvest as @harvest" do
|
||||
harvest = Harvest.create! valid_attributes
|
||||
get :edit, id: harvest.to_param
|
||||
assigns(:harvest).should eq(harvest)
|
||||
let(:harvest) { Harvest.create! valid_attributes }
|
||||
describe "assigns the requested harvest as @harvest" do
|
||||
before { get :edit, id: harvest.to_param }
|
||||
it { expect(assigns(:harvest)).to eq(harvest) }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -103,10 +102,10 @@ describe HarvestsController do
|
||||
response.should redirect_to(Harvest.last)
|
||||
end
|
||||
|
||||
it "links to planting" do
|
||||
planting = FactoryBot.create(:planting, owner_id: member.id)
|
||||
post :create, harvest: valid_attributes.merge(planting_id: planting.id)
|
||||
expect(Harvest.last.planting.id).to eq(planting.id)
|
||||
describe "links to planting" do
|
||||
let(:planting) { FactoryBot.create(:planting, owner_id: member.id, garden: member.gardens.first) }
|
||||
before { post :create, harvest: valid_attributes.merge(planting_id: planting.id) }
|
||||
it { expect(Harvest.last.planting.id).to eq(planting.id) }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -128,10 +127,13 @@ describe HarvestsController do
|
||||
describe "not my planting" do
|
||||
let(:not_my_planting) { FactoryBot.create(:planting) }
|
||||
let(:harvest) { FactoryBot.create(:harvest) }
|
||||
it "does not save planting_id" do
|
||||
allow(Harvest).to receive(:new).and_return(harvest)
|
||||
post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id)
|
||||
expect(harvest.planting_id).to eq(nil)
|
||||
|
||||
describe "does not save planting_id" do
|
||||
before do
|
||||
allow(Harvest).to receive(:new).and_return(harvest)
|
||||
post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id)
|
||||
end
|
||||
it { expect(harvest.planting_id).not_to eq(not_my_planting.id) }
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -180,10 +182,12 @@ describe HarvestsController do
|
||||
describe "not my planting" do
|
||||
let(:not_my_planting) { FactoryBot.create(:planting) }
|
||||
let(:harvest) { FactoryBot.create(:harvest) }
|
||||
it "does not save planting_id" do
|
||||
put :update, id: harvest.to_param,
|
||||
harvest: valid_attributes.merge(planting_id: not_my_planting.id)
|
||||
expect(harvest.planting_id).to eq(nil)
|
||||
describe "does not save planting_id" do
|
||||
before do
|
||||
put :update, id: harvest.to_param,
|
||||
harvest: valid_attributes.merge(planting_id: not_my_planting.id)
|
||||
end
|
||||
it { expect(harvest.planting_id).to eq(nil) }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -5,6 +5,13 @@ FactoryBot.define do
|
||||
approval_status "approved"
|
||||
creator
|
||||
|
||||
factory :annual_crop, parent: :crop do
|
||||
perennial false
|
||||
end
|
||||
factory :perennial_crop, parent: :crop do
|
||||
perennial true
|
||||
end
|
||||
|
||||
factory :tomato do
|
||||
name "tomato"
|
||||
en_wikipedia_url "http://en.wikipedia.org/wiki/Tomato"
|
||||
|
||||
@@ -2,15 +2,20 @@
|
||||
|
||||
FactoryBot.define do
|
||||
factory :harvest do
|
||||
crop
|
||||
crop { planting.present? ? planting.crop : FactoryBot.create(:crop) }
|
||||
plant_part
|
||||
owner
|
||||
harvested_at "2013-09-17"
|
||||
planting nil
|
||||
owner { planting.present? ? planting.owner : FactoryBot.create(:member) }
|
||||
harvested_at Time.zone.local(2015, 9, 17)
|
||||
quantity "3"
|
||||
unit "individual"
|
||||
weight_quantity 6
|
||||
weight_unit "kg"
|
||||
description "A lovely harvest"
|
||||
|
||||
factory :harvest_with_planting do
|
||||
planting
|
||||
end
|
||||
end
|
||||
|
||||
trait :long_description do
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
FactoryBot.define do
|
||||
factory :planting do
|
||||
garden
|
||||
owner
|
||||
garden { FactoryBot.create :garden, owner: owner }
|
||||
crop
|
||||
planted_at Time.zone.today
|
||||
planted_at Time.zone.local(2014, 7, 30)
|
||||
quantity 33
|
||||
description "This is a *really* good plant."
|
||||
|
||||
@@ -33,8 +33,8 @@ FactoryBot.define do
|
||||
|
||||
factory :finished_planting do
|
||||
finished true
|
||||
planted_at '2014-07-30'
|
||||
finished_at '2014-08-30'
|
||||
planted_at Time.zone.local(2014, 7, 30)
|
||||
finished_at Time.zone.local(2014, 8, 30)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -168,4 +168,106 @@ feature "crop detail page", js: true do
|
||||
expect(current_path).to eq seeds_by_owner_path(owner: member.slug)
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples "predicts harvest" do
|
||||
describe 'with harvest history data' do
|
||||
before do
|
||||
# 50 days to harvest
|
||||
FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop: planting.crop,
|
||||
planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
|
||||
# 20 days to harvest
|
||||
FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop: planting.crop,
|
||||
planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
|
||||
# 10 days to harvest
|
||||
FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop: planting.crop,
|
||||
planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
|
||||
end
|
||||
it "predicts harvest" do
|
||||
is_expected.to have_text("First harvest expected 20 days after planting")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
subject do
|
||||
# Update the medians after all the
|
||||
# data has been loaded
|
||||
crop.reload
|
||||
crop.update_medians
|
||||
|
||||
visit crop_path(crop)
|
||||
page
|
||||
end
|
||||
|
||||
context 'predictions' do
|
||||
let!(:planting) do
|
||||
FactoryBot.create(:planting, crop: crop,
|
||||
planted_at: 100.days.ago,
|
||||
finished_at: 1.day.ago)
|
||||
end
|
||||
context 'crop is an annual' do
|
||||
let(:crop) { FactoryBot.create(:annual_crop) }
|
||||
|
||||
describe 'with no harvests' do
|
||||
end
|
||||
|
||||
describe 'with harvests' do
|
||||
include_examples "predicts harvest"
|
||||
end
|
||||
|
||||
it "predicts lifespan" do
|
||||
is_expected.to have_text "Median lifespan of #{crop.name} plants is 99 days"
|
||||
end
|
||||
|
||||
it "describes annual crops" do
|
||||
is_expected.to have_text(
|
||||
"#{crop.name} is an annual crop (living and reproducing in a single year or less)"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'crop is perennial' do
|
||||
let(:crop) { FactoryBot.create :perennial_crop }
|
||||
|
||||
describe 'with no harvests' do
|
||||
end
|
||||
|
||||
describe 'with harvests' do
|
||||
include_examples "predicts harvest"
|
||||
end
|
||||
|
||||
it "describes perennial crops" do
|
||||
is_expected.to have_text("#{crop.name} is a perennial crop (living more than two years)")
|
||||
end
|
||||
end
|
||||
|
||||
context 'crop perennial value is null' do
|
||||
let(:crop) { FactoryBot.create :crop, perennial: nil }
|
||||
|
||||
describe 'with no harvests' do
|
||||
end
|
||||
|
||||
describe 'with harvests' do
|
||||
include_examples "predicts harvest"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'annual and perennial' do
|
||||
before { visit crop_path(crop) }
|
||||
context 'crop is an annual' do
|
||||
let(:crop) { FactoryBot.create :annual_crop }
|
||||
it { expect(page).to have_text 'annual crop (living and reproducing in a single year or less)' }
|
||||
it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
|
||||
end
|
||||
context 'crop is perennial' do
|
||||
let(:crop) { FactoryBot.create :perennial_crop }
|
||||
it { expect(page).to have_text 'perennial crop (living more than two years)' }
|
||||
it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
|
||||
end
|
||||
context 'crop perennial value is null' do
|
||||
let(:crop) { FactoryBot.create :crop, perennial: nil }
|
||||
it { expect(page).not_to have_text 'perennial crop (living more than two years)' }
|
||||
it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,9 +2,9 @@ require 'rails_helper'
|
||||
|
||||
feature "Planting a crop", js: true do
|
||||
let!(:garden) { create :garden }
|
||||
let!(:planting) { create :planting, garden: garden, planted_at: Date.parse("2013-3-10") }
|
||||
let!(:planting) { create :planting, garden: garden, owner: garden.owner, planted_at: Date.parse("2013-3-10") }
|
||||
let!(:tomato) { create :tomato }
|
||||
let!(:finished_planting) { create :finished_planting, garden: garden, crop: tomato }
|
||||
let!(:finished_planting) { create :finished_planting, owner: garden.owner, garden: garden, crop: tomato }
|
||||
|
||||
background do
|
||||
login_as garden.owner
|
||||
|
||||
@@ -5,7 +5,9 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
let(:member) { create :member }
|
||||
let!(:maize) { create :maize }
|
||||
let(:garden) { create :garden, owner: member }
|
||||
let!(:planting) { create :planting, garden: garden, planted_at: Date.parse("2013-3-10") }
|
||||
let!(:planting) do
|
||||
create :planting, garden: garden, owner: member, planted_at: Date.parse("2013-3-10")
|
||||
end
|
||||
|
||||
background do
|
||||
login_as member
|
||||
@@ -43,7 +45,7 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
end
|
||||
|
||||
expect(page).to have_content "planting was successfully created"
|
||||
expect(page).to have_content "Progress: Not calculated, days before maturity unknown"
|
||||
expect(page).to have_content "Progress: Not enough data"
|
||||
end
|
||||
|
||||
scenario "Clicking link to owner's profile" do
|
||||
@@ -91,8 +93,7 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
end
|
||||
|
||||
expect(page).to have_content "planting was successfully created"
|
||||
expect(page).to have_content "Progress: Not calculated, days before maturity unknown"
|
||||
expect(page).to have_content "Days until maturity: unknown"
|
||||
expect(page).to have_content "Progress: Not enough data"
|
||||
end
|
||||
|
||||
it "should show that planting is in progress" do
|
||||
@@ -110,7 +111,7 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
|
||||
expect(page).to have_content "planting was successfully created"
|
||||
expect(page).to_not have_content "Progress: 0% - not planted yet"
|
||||
expect(page).to_not have_content "Progress: Not calculated, days before maturity unknown"
|
||||
expect(page).to_not have_content "Not enough data"
|
||||
end
|
||||
|
||||
it "should show that planting is 100% complete (no date specified)" do
|
||||
@@ -127,9 +128,8 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
end
|
||||
|
||||
expect(page).to have_content "planting was successfully created"
|
||||
expect(page).to have_content "Progress: 100%"
|
||||
expect(page).to have_content "100%"
|
||||
expect(page).to have_content "Yes (no date specified)"
|
||||
expect(page).to have_content "Days until maturity: 0"
|
||||
end
|
||||
|
||||
it "should show that planting is 100% complete (date specified)" do
|
||||
@@ -146,8 +146,7 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
end
|
||||
|
||||
expect(page).to have_content "planting was successfully created"
|
||||
expect(page).to have_content "Progress: 100%"
|
||||
expect(page).to have_content "Days until maturity: 0"
|
||||
expect(page).to have_content "100%"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -173,13 +172,13 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
|
||||
scenario "Editing a planting to fill in the finished date" do
|
||||
visit planting_path(planting)
|
||||
expect(page).to have_content "Progress: Not calculated, days before maturity unknown"
|
||||
expect(page).to have_content "Progress: Not enough data"
|
||||
click_link "Edit"
|
||||
check "finished"
|
||||
fill_in "Finished date", with: "2015-06-25"
|
||||
click_button "Save"
|
||||
expect(page).to have_content "planting was successfully updated"
|
||||
expect(page).to_not have_content "Progress: Not calculated, days before maturity unknown"
|
||||
expect(page).to_not have_content "Progress: Not enough data"
|
||||
end
|
||||
|
||||
scenario "Marking a planting as finished" do
|
||||
@@ -232,7 +231,7 @@ feature "Planting a crop", :js, :elasticsearch do
|
||||
end
|
||||
expect(page).to have_content "planting was successfully created"
|
||||
expect(page).to have_content "Finished: Yes (no date specified)"
|
||||
expect(page).to have_content "Progress: 100%"
|
||||
expect(page).to have_content "100%"
|
||||
end
|
||||
|
||||
describe "Planting sunniness" do
|
||||
|
||||
@@ -1,64 +1,6 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe PlantingsHelper do
|
||||
describe "display_days_before_maturity" do
|
||||
it "handles nil planted_at, nil finished_at, non-nil days_until_maturity" do
|
||||
planting = FactoryBot.build(:planting,
|
||||
quantity: 5,
|
||||
planted_at: nil,
|
||||
finished_at: nil,
|
||||
days_before_maturity: 17)
|
||||
result = helper.display_days_before_maturity(planting)
|
||||
expect(result).to eq "unknown"
|
||||
end
|
||||
|
||||
it "handles non-nil planted_at and d_b_m, nil finished_at" do
|
||||
planting = FactoryBot.build(:planting,
|
||||
quantity: 5,
|
||||
planted_at: Date.current,
|
||||
finished_at: nil,
|
||||
days_before_maturity: 17)
|
||||
result = helper.display_days_before_maturity(planting)
|
||||
expect(result).to eq "17"
|
||||
end
|
||||
|
||||
it "handles completed plantings" do
|
||||
planting = FactoryBot.build(:planting, finished: true)
|
||||
result = helper.display_days_before_maturity(planting)
|
||||
expect(result).to eq "0"
|
||||
end
|
||||
|
||||
it "handles plantings that should have finished" do
|
||||
planting = FactoryBot.build(:planting,
|
||||
quantity: 5,
|
||||
planted_at: Date.new(0, 1, 1),
|
||||
finished_at: nil,
|
||||
days_before_maturity: "17")
|
||||
result = helper.display_days_before_maturity(planting)
|
||||
expect(result).to eq "0"
|
||||
end
|
||||
|
||||
it "handles nil d_b_m and nil finished_at" do
|
||||
planting = FactoryBot.build(:planting,
|
||||
quantity: 5,
|
||||
planted_at: Date.new(2012, 5, 12),
|
||||
finished_at: nil,
|
||||
days_before_maturity: nil)
|
||||
result = helper.display_days_before_maturity(planting)
|
||||
expect(result).to eq "unknown"
|
||||
end
|
||||
|
||||
it "handles finished_at dates in the future" do
|
||||
planting = FactoryBot.build(:planting,
|
||||
quantity: 5,
|
||||
planted_at: Date.current,
|
||||
finished_at: Date.current + 5,
|
||||
days_before_maturity: nil)
|
||||
result = helper.display_days_before_maturity(planting)
|
||||
expect(result).to eq "5"
|
||||
end
|
||||
end
|
||||
|
||||
describe "display_planting" do
|
||||
let!(:member) { FactoryBot.build(:member, login_name: 'crop_lady') }
|
||||
|
||||
|
||||
@@ -348,7 +348,23 @@ describe Crop do
|
||||
end
|
||||
end
|
||||
|
||||
let(:maize) { FactoryBot.create(:maize) }
|
||||
let(:pp1) { FactoryBot.create(:plant_part) }
|
||||
let(:pp2) { FactoryBot.create(:plant_part) }
|
||||
|
||||
context "harvests" do
|
||||
let(:h1) do
|
||||
FactoryBot.create(:harvest,
|
||||
crop: maize,
|
||||
plant_part: pp1)
|
||||
end
|
||||
|
||||
let(:h2) do
|
||||
FactoryBot.create(:harvest,
|
||||
crop: maize,
|
||||
plant_part: pp2)
|
||||
end
|
||||
|
||||
it "has harvests" do
|
||||
crop = FactoryBot.create(:crop)
|
||||
harvest = FactoryBot.create(:harvest, crop: crop)
|
||||
@@ -356,20 +372,6 @@ describe Crop do
|
||||
end
|
||||
end
|
||||
|
||||
it 'has plant_parts' do
|
||||
@maize = FactoryBot.create(:maize)
|
||||
@pp1 = FactoryBot.create(:plant_part)
|
||||
@pp2 = FactoryBot.create(:plant_part)
|
||||
@h1 = FactoryBot.create(:harvest,
|
||||
crop: @maize,
|
||||
plant_part: @pp1)
|
||||
@h2 = FactoryBot.create(:harvest,
|
||||
crop: @maize,
|
||||
plant_part: @pp2)
|
||||
@maize.plant_parts.should include @pp1
|
||||
@maize.plant_parts.should include @pp2
|
||||
end
|
||||
|
||||
it "doesn't duplicate plant_parts" do
|
||||
@maize = FactoryBot.create(:maize)
|
||||
@pp1 = FactoryBot.create(:plant_part)
|
||||
@@ -385,9 +387,7 @@ describe Crop do
|
||||
context "search", :elasticsearch do
|
||||
let(:mushroom) { FactoryBot.create(:crop, name: 'mushroom') }
|
||||
|
||||
before do
|
||||
sync_elasticsearch([mushroom])
|
||||
end
|
||||
before { sync_elasticsearch([mushroom]) }
|
||||
|
||||
it "finds exact matches" do
|
||||
Crop.search('mushroom').should eq [mushroom]
|
||||
|
||||
@@ -64,30 +64,30 @@ describe Garden do
|
||||
let(:walnut) { FactoryBot.create(:walnut) }
|
||||
|
||||
it "should fetch < 4 featured plantings if insufficient exist" do
|
||||
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden)
|
||||
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden)
|
||||
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden, owner: garden.owner)
|
||||
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden, owner: garden.owner)
|
||||
|
||||
garden.featured_plantings.should eq [@p2, @p1]
|
||||
end
|
||||
|
||||
it "should fetch most recent 4 featured plantings" do
|
||||
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden)
|
||||
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden)
|
||||
@p3 = FactoryBot.create(:planting, crop: chard, garden: garden)
|
||||
@p4 = FactoryBot.create(:planting, crop: apple, garden: garden)
|
||||
@p5 = FactoryBot.create(:planting, crop: walnut, garden: garden)
|
||||
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden, owner: garden.owner)
|
||||
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden, owner: garden.owner)
|
||||
@p3 = FactoryBot.create(:planting, crop: chard, garden: garden, owner: garden.owner)
|
||||
@p4 = FactoryBot.create(:planting, crop: apple, garden: garden, owner: garden.owner)
|
||||
@p5 = FactoryBot.create(:planting, crop: walnut, garden: garden, owner: garden.owner)
|
||||
|
||||
garden.featured_plantings.should eq [@p5, @p4, @p3, @p2]
|
||||
end
|
||||
|
||||
it "should skip repeated plantings" do
|
||||
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden)
|
||||
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden)
|
||||
@p3 = FactoryBot.create(:planting, crop: chard, garden: garden)
|
||||
@p4 = FactoryBot.create(:planting, crop: apple, garden: garden)
|
||||
@p5 = FactoryBot.create(:planting, crop: walnut, garden: garden)
|
||||
@p6 = FactoryBot.create(:planting, crop: apple, garden: garden)
|
||||
@p7 = FactoryBot.create(:planting, crop: pear, garden: garden)
|
||||
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden, owner: garden.owner)
|
||||
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden, owner: garden.owner)
|
||||
@p3 = FactoryBot.create(:planting, crop: chard, garden: garden, owner: garden.owner)
|
||||
@p4 = FactoryBot.create(:planting, crop: apple, garden: garden, owner: garden.owner)
|
||||
@p5 = FactoryBot.create(:planting, crop: walnut, garden: garden, owner: garden.owner)
|
||||
@p6 = FactoryBot.create(:planting, crop: apple, garden: garden, owner: garden.owner)
|
||||
@p7 = FactoryBot.create(:planting, crop: pear, garden: garden, owner: garden.owner)
|
||||
|
||||
garden.featured_plantings.should eq [@p7, @p6, @p5, @p3]
|
||||
end
|
||||
@@ -103,8 +103,8 @@ describe Garden do
|
||||
|
||||
it "destroys plantings when deleted" do
|
||||
garden = FactoryBot.create(:garden, owner: owner)
|
||||
@planting1 = FactoryBot.create(:planting, garden: garden)
|
||||
@planting2 = FactoryBot.create(:planting, garden: garden)
|
||||
@planting1 = FactoryBot.create(:planting, garden: garden, owner: garden.owner)
|
||||
@planting2 = FactoryBot.create(:planting, garden: garden, owner: garden.owner)
|
||||
garden.plantings.size.should eq(2)
|
||||
all = Planting.count
|
||||
garden.destroy
|
||||
@@ -185,8 +185,8 @@ describe Garden do
|
||||
|
||||
it "marks plantings as finished when garden is inactive" do
|
||||
garden = FactoryBot.create(:garden)
|
||||
p1 = FactoryBot.create(:planting, garden: garden)
|
||||
p2 = FactoryBot.create(:planting, garden: garden)
|
||||
p1 = FactoryBot.create(:planting, garden: garden, owner: garden.owner)
|
||||
p2 = FactoryBot.create(:planting, garden: garden, owner: garden.owner)
|
||||
|
||||
p1.finished.should eq false
|
||||
p2.finished.should eq false
|
||||
@@ -203,8 +203,8 @@ describe Garden do
|
||||
it "doesn't mark the wrong plantings as finished" do
|
||||
g1 = FactoryBot.create(:garden)
|
||||
g2 = FactoryBot.create(:garden)
|
||||
p1 = FactoryBot.create(:planting, garden: g1)
|
||||
p2 = FactoryBot.create(:planting, garden: g2)
|
||||
p1 = FactoryBot.create(:planting, garden: g1, owner: g1.owner)
|
||||
p2 = FactoryBot.create(:planting, garden: g2, owner: g2.owner)
|
||||
|
||||
# mark the garden as inactive
|
||||
g1.active = false
|
||||
|
||||
@@ -142,7 +142,7 @@ describe Harvest do
|
||||
it 'lists most recent harvests first' do
|
||||
@h1 = FactoryBot.create(:harvest, created_at: 1.day.ago)
|
||||
@h2 = FactoryBot.create(:harvest, created_at: 1.hour.ago)
|
||||
Harvest.all.should eq [@h2, @h1]
|
||||
Harvest.all.order(created_at: :desc).should eq [@h2, @h1]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -4,43 +4,146 @@ describe Planting do
|
||||
let(:crop) { FactoryBot.create(:tomato) }
|
||||
let(:garden_owner) { FactoryBot.create(:member) }
|
||||
let(:garden) { FactoryBot.create(:garden, owner: garden_owner) }
|
||||
let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden) }
|
||||
let(:finished_planting) { FactoryBot.create :planting, planted_at: 4.days.ago, finished_at: 2.days.ago }
|
||||
let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden, owner: garden.owner) }
|
||||
let(:finished_planting) do
|
||||
FactoryBot.create :planting, planted_at: 4.days.ago, finished_at: 2.days.ago, finished: true
|
||||
end
|
||||
|
||||
describe 'maturity calculations' do
|
||||
describe 'start_to_finish_diff' do
|
||||
it { expect(finished_planting.start_to_finish_diff).to eq(2) }
|
||||
describe 'planting lifespan predictions' do
|
||||
context 'no predications data yet' do
|
||||
describe 'planting planted, not finished' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: nil, finished: false }
|
||||
it { expect(planting.crop.median_lifespan).to eq(nil) }
|
||||
it { expect(planting.expected_lifespan).to eq(nil) }
|
||||
it { expect(planting.days_since_planted).to eq(30) }
|
||||
it { expect(planting.percentage_grown).to eq(nil) }
|
||||
end
|
||||
describe 'planting not planted yet' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: nil, finished: false }
|
||||
it { expect(planting.crop.median_lifespan).to eq(nil) }
|
||||
it { expect(planting.expected_lifespan).to eq(nil) }
|
||||
it { expect(planting.days_since_planted).to eq(nil) }
|
||||
it { expect(planting.percentage_grown).to eq(nil) }
|
||||
end
|
||||
describe 'planting finished, no planted_at' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: 1.day.ago, finished: true }
|
||||
it { expect(planting.crop.median_lifespan).to eq(nil) }
|
||||
it { expect(planting.expected_lifespan).to eq(nil) }
|
||||
it { expect(planting.days_since_planted).to eq(nil) }
|
||||
it { expect(planting.percentage_grown).to eq(100) }
|
||||
end
|
||||
describe 'planting all finished' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: 1.day.ago, finished: true }
|
||||
it { expect(planting.crop.median_lifespan).to eq(nil) }
|
||||
it { expect(planting.expected_lifespan).to eq(29) }
|
||||
it { expect(planting.days_since_planted).to eq(30) }
|
||||
it { expect(planting.percentage_grown).to eq(100) }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'other_finished_plantings_same_crop' do
|
||||
context 'lots of data' do
|
||||
before do
|
||||
# eight finished plantings
|
||||
8.times { FactoryBot.create :planting, crop: crop, planted_at: 10.days.ago, finished_at: 2.days.ago }
|
||||
# eight not finished plantings
|
||||
8.times { FactoryBot.create :planting, crop: crop, finished_at: nil }
|
||||
FactoryBot.create :planting, crop: planting.crop, planted_at: 10.days.ago
|
||||
FactoryBot.create :planting, crop: planting.crop, planted_at: 100.days.ago, finished_at: 50.days.ago
|
||||
FactoryBot.create :planting, crop: planting.crop, planted_at: 100.days.ago, finished_at: 51.days.ago
|
||||
FactoryBot.create :planting, crop: planting.crop, planted_at: 2.years.ago, finished_at: 50.days.ago
|
||||
FactoryBot.create :planting, crop: planting.crop, planted_at: 150.days.ago, finished_at: 100.days.ago
|
||||
planting.crop.update_lifespan_medians
|
||||
end
|
||||
let!(:planting_with_diff_crop) { FactoryBot.create :planting, planted_at: 10.days.ago, finished_at: 2.days.ago }
|
||||
let(:planting_predictions) { PlantingPredictions.new(planting) }
|
||||
it { expect(planting_predictions.send(:other_finished_plantings_same_crop).size).to eq(8) }
|
||||
it { expect(planting_predictions.send(:other_finished_plantings_same_crop)).not_to include(planting) }
|
||||
it do
|
||||
expect(planting_predictions.send(:other_finished_plantings_same_crop))
|
||||
.not_to include(planting_with_diff_crop)
|
||||
|
||||
it { expect(planting.crop.median_lifespan).to eq 50 }
|
||||
|
||||
describe 'planting 30 days ago, not finished' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago }
|
||||
|
||||
# 30 / 50
|
||||
it { expect(planting.percentage_grown).to eq 60.0 }
|
||||
it { expect(planting.days_since_planted).to eq 30 }
|
||||
end
|
||||
|
||||
describe 'planting not planted yet' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: nil }
|
||||
it { expect(planting.percentage_grown).to eq nil }
|
||||
end
|
||||
|
||||
describe 'planting finished 10 days, but was never planted' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: 10.days.ago }
|
||||
it { expect(planting.percentage_grown).to eq nil }
|
||||
end
|
||||
|
||||
describe 'planted 30 days ago, finished 10 days ago' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: 10.days.ago }
|
||||
it { expect(planting.days_since_planted).to eq 30 }
|
||||
it { expect(planting.percentage_grown).to eq 100 }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'mean_days_until_maturity' do
|
||||
let(:plantings) do
|
||||
FactoryBot.create_list(:planting, 10, crop: crop, planted_at: 12.days.ago, finished_at: 2.days.ago)
|
||||
end
|
||||
it { expect(plantings.size).to eq(10) }
|
||||
it { expect(PlantingPredictions.mean_days_until_maturity(plantings)).to eq(10) }
|
||||
describe 'planting first harvest preductions' do
|
||||
context 'no data' do
|
||||
let(:planting) { FactoryBot.create :planting }
|
||||
it { expect(planting.crop.median_days_to_first_harvest).to eq(nil) }
|
||||
it { expect(planting.crop.median_days_to_last_harvest).to eq(nil) }
|
||||
it { expect(planting.days_to_first_harvest).to eq(nil) }
|
||||
it { expect(planting.days_to_last_harvest).to eq(nil) }
|
||||
it { expect(planting.expected_lifespan).to eq(nil) }
|
||||
end
|
||||
|
||||
describe 'saving planting calculates days_before_maturity' do
|
||||
before { 5.times { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: 9.days.ago, crop: crop } }
|
||||
before { planting.calc_and_set_days_before_maturity }
|
||||
it { expect(planting.days_before_maturity).to eq(21) }
|
||||
context 'lots of data' do
|
||||
def one_hundred_day_old_planting
|
||||
FactoryBot.create(:planting, crop: planting.crop, planted_at: 100.days.ago)
|
||||
end
|
||||
before do
|
||||
# 50 days to harvest
|
||||
FactoryBot.create(:harvest, harvested_at: 50.days.ago, crop: planting.crop,
|
||||
planting: one_hundred_day_old_planting)
|
||||
# 20 days to harvest
|
||||
FactoryBot.create(:harvest, harvested_at: 80.days.ago, crop: planting.crop,
|
||||
planting: one_hundred_day_old_planting)
|
||||
# 10 days to harvest
|
||||
FactoryBot.create(:harvest, harvested_at: 90.days.ago, crop: planting.crop,
|
||||
planting: one_hundred_day_old_planting)
|
||||
planting.crop.plantings.each(&:update_harvest_days)
|
||||
planting.crop.update_lifespan_medians
|
||||
planting.crop.update_harvest_medians
|
||||
end
|
||||
it { expect(planting.crop.median_days_to_first_harvest).to eq(20) }
|
||||
end
|
||||
describe 'planting has no harvests' do
|
||||
before do
|
||||
planting.update_harvest_days
|
||||
planting.crop.update_harvest_medians
|
||||
end
|
||||
let(:planting) { FactoryBot.create :planting }
|
||||
it { expect(planting.days_to_first_harvest).to eq(nil) }
|
||||
it { expect(planting.days_to_last_harvest).to eq(nil) }
|
||||
end
|
||||
describe 'planting has first harvest' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: 100.days.ago }
|
||||
before do
|
||||
FactoryBot.create(:harvest,
|
||||
planting: planting,
|
||||
crop: planting.crop,
|
||||
harvested_at: 10.days.ago)
|
||||
planting.update_harvest_days
|
||||
planting.crop.update_harvest_medians
|
||||
end
|
||||
it { expect(planting.days_to_first_harvest).to eq(90) }
|
||||
it { expect(planting.days_to_last_harvest).to eq(nil) }
|
||||
it { expect(planting.crop.median_days_to_first_harvest).to eq(90) }
|
||||
it { expect(planting.crop.median_days_to_last_harvest).to eq(nil) }
|
||||
end
|
||||
describe 'planting has last harvest' do
|
||||
let(:planting) { FactoryBot.create :planting, planted_at: 100.days.ago, finished_at: 1.day.ago, finished: true }
|
||||
before do
|
||||
FactoryBot.create :harvest, planting: planting, crop: planting.crop, harvested_at: 90.days.ago
|
||||
FactoryBot.create :harvest, planting: planting, crop: planting.crop, harvested_at: 10.days.ago
|
||||
planting.update_harvest_days
|
||||
planting.crop.update_harvest_medians
|
||||
end
|
||||
it { expect(planting.days_to_first_harvest).to eq(10) }
|
||||
it { expect(planting.days_to_last_harvest).to eq(90) }
|
||||
it { expect(planting.crop.median_days_to_first_harvest).to eq(10) }
|
||||
it { expect(planting.crop.median_days_to_last_harvest).to eq(90) }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -48,12 +151,6 @@ describe Planting do
|
||||
planting.owner.should be_an_instance_of Member
|
||||
end
|
||||
|
||||
it "owner isn't necessarily the garden owner" do
|
||||
# a new owner should be created automatically by FactoryBot
|
||||
# note that formerly, the planting belonged to an owner through the garden
|
||||
planting.owner.should_not eq garden_owner
|
||||
end
|
||||
|
||||
it "generates a location" do
|
||||
planting.location.should eq "#{garden_owner.login_name}'s #{garden.name}"
|
||||
end
|
||||
@@ -88,41 +185,6 @@ describe Planting do
|
||||
end
|
||||
end
|
||||
|
||||
describe '#percentage_grown' do
|
||||
it 'should not be more than 100%' do
|
||||
@planting = FactoryBot.build(:planting, days_before_maturity: 1, planted_at: 1.day.ago)
|
||||
|
||||
Timecop.freeze(2.days.from_now) do
|
||||
@planting.percentage_grown.should be 100
|
||||
end
|
||||
end
|
||||
|
||||
it 'should not be less than 0%' do
|
||||
@planting = FactoryBot.build(:planting, days_before_maturity: 1, planted_at: 1.day.ago)
|
||||
|
||||
Timecop.freeze(2.days.ago) do
|
||||
@planting.percentage_grown.should be nil
|
||||
end
|
||||
end
|
||||
|
||||
it 'should reflect the current growth' do
|
||||
@planting = FactoryBot.build(:planting, days_before_maturity: 10, planted_at: 4.days.ago)
|
||||
expect(@planting.percentage_grown).to eq 40
|
||||
end
|
||||
|
||||
it 'should not be calculated for unplanted plantings' do
|
||||
@planting = FactoryBot.build(:planting, planted_at: nil)
|
||||
|
||||
@planting.planted?.should be false
|
||||
@planting.percentage_grown.should be nil
|
||||
end
|
||||
|
||||
it 'should not be calculated for plantings with an unknown days before maturity' do
|
||||
@planting = FactoryBot.build(:planting, days_before_maturity: nil)
|
||||
@planting.percentage_grown.should be nil
|
||||
end
|
||||
end
|
||||
|
||||
context 'delegation' do
|
||||
it 'system name' do
|
||||
planting.crop_name.should eq planting.crop.name
|
||||
@@ -290,7 +352,8 @@ describe Planting do
|
||||
# this one is newer, and has the same owner, through the garden
|
||||
@planting2 = FactoryBot.create(:planting,
|
||||
created_at: 1.minute.ago,
|
||||
owner_id: @planting1.owner.id)
|
||||
garden: @planting1.garden,
|
||||
owner: @planting1.owner)
|
||||
@planting2.photos << FactoryBot.create(:photo)
|
||||
@planting2.save
|
||||
|
||||
@@ -355,4 +418,14 @@ describe Planting do
|
||||
planting.owner.destroy
|
||||
expect(Planting.joins(:owner).all).not_to include(planting)
|
||||
end
|
||||
|
||||
# it 'predicts harvest times' do
|
||||
# crop = FactoryBot.create :crop
|
||||
# 10.times do
|
||||
# planting = FactoryBot.create :planting, crop: crop, planted_at: Time.zone.local(2013, 1, 1)
|
||||
# FactoryBot.create :harvest, crop: crop, planting: planting, harvested_at: Time.zone.local(2013, 2, 1)
|
||||
# end
|
||||
# planting = FactoryBot.create :planting, planted_at: Time.zone.local(2017, 1, 1), crop: crop
|
||||
# expect(planting.harvest_predicted_at).to eq Time.zone.local(2017, 2, 1)
|
||||
# end
|
||||
end
|
||||
|
||||
@@ -38,7 +38,7 @@ describe Seed do
|
||||
|
||||
context 'tradable' do
|
||||
it 'all valid tradable_to values should work' do
|
||||
['nowhere', 'locally', 'nationally', 'internationally'].each do |t|
|
||||
%w(nowhere locally nationally internationally).each do |t|
|
||||
@seed = FactoryBot.build(:seed, tradable_to: t)
|
||||
@seed.should be_valid
|
||||
end
|
||||
|
||||
87
spec/requests/api/v1/crop_request_spec.rb
Normal file
87
spec/requests/api/v1/crop_request_spec.rb
Normal file
@@ -0,0 +1,87 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Plantings', type: :request do
|
||||
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,
|
||||
"photos" => photos_as_json_api,
|
||||
"harvests" => harvests_as_json_api
|
||||
} }
|
||||
end
|
||||
|
||||
let(:resource_url) { "http://www.example.com/api/v1/crops/#{crop.id}" }
|
||||
|
||||
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
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
describe '#index' do
|
||||
before { get '/api/v1/crops', {}, headers }
|
||||
it { expect(subject['data']).to include(crop_encoded_as_json_api) }
|
||||
end
|
||||
|
||||
describe '#show' do
|
||||
before { get "/api/v1/crops/#{crop.id}", {}, 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("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
|
||||
|
||||
describe '#create' do
|
||||
before { post '/api/v1/crops', { 'crop' => { 'name' => 'can i make this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#update' do
|
||||
before { post "/api/v1/crops/#{crop.id}", { 'crop' => { 'name' => 'can i modify this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#delete' do
|
||||
before { delete "/api/v1/crops/#{crop.id}", {}, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
end
|
||||
64
spec/requests/api/v1/gardens_request_spec.rb
Normal file
64
spec/requests/api/v1/gardens_request_spec.rb
Normal file
@@ -0,0 +1,64 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Gardens', type: :request do
|
||||
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(:plantings_as_json_api) do
|
||||
{ "links" =>
|
||||
{ "self" =>
|
||||
"#{resource_url}/relationships/plantings",
|
||||
"related" => "#{resource_url}/plantings" } }
|
||||
end
|
||||
|
||||
let(:owner_as_json_api) do
|
||||
{ "links" =>
|
||||
{ "self" => "#{resource_url}/relationships/owner",
|
||||
"related" => "#{resource_url}/owner" } }
|
||||
end
|
||||
|
||||
let(:photos_as_json_api) do
|
||||
{ "links" =>
|
||||
{ "self" => "#{resource_url}/relationships/photos",
|
||||
"related" => "#{resource_url}/photos" } }
|
||||
end
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
scenario '#index' do
|
||||
get '/api/v1/gardens', {}, headers
|
||||
expect(subject['data']).to include(garden_encoded_as_json_api)
|
||||
end
|
||||
|
||||
scenario '#show' do
|
||||
get "/api/v1/gardens/#{garden.id}", {}, headers
|
||||
expect(subject['data']).to include(garden_encoded_as_json_api)
|
||||
end
|
||||
|
||||
scenario '#create' do
|
||||
post '/api/v1/gardens', { 'garden' => { 'name' => 'can i make this' } }, headers
|
||||
expect(response.code).to eq "404"
|
||||
end
|
||||
|
||||
scenario '#update' do
|
||||
post "/api/v1/gardens/#{garden.id}", { 'garden' => { 'name' => 'can i modify this' } }, headers
|
||||
expect(response.code).to eq "404"
|
||||
end
|
||||
|
||||
scenario '#delete' do
|
||||
delete "/api/v1/gardens/#{garden.id}", {}, headers
|
||||
expect(response.code).to eq "404"
|
||||
end
|
||||
end
|
||||
88
spec/requests/api/v1/harvest_request_spec.rb
Normal file
88
spec/requests/api/v1/harvest_request_spec.rb
Normal file
@@ -0,0 +1,88 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Harvests', type: :request do
|
||||
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
|
||||
|
||||
let(:resource_url) { "http://www.example.com/api/v1/harvests/#{harvest.id}" }
|
||||
|
||||
let(:crop_as_json_api) do
|
||||
{ "links" =>
|
||||
{ "self" =>
|
||||
"#{resource_url}/relationships/crop",
|
||||
"related" => "#{resource_url}/crop" } }
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
describe '#index' do
|
||||
before { get '/api/v1/harvests', {}, headers }
|
||||
it { expect(subject['data']).to include(harvest_encoded_as_json_api) }
|
||||
end
|
||||
|
||||
describe '#show' do
|
||||
before { get "/api/v1/harvests/#{harvest.id}", {}, 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
|
||||
|
||||
describe '#create' do
|
||||
before { post '/api/v1/harvests', { 'harvest' => { 'description' => 'can i make this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#update' do
|
||||
before { post "/api/v1/harvests/#{harvest.id}", { 'harvest' => { 'description' => 'can i modify this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#delete' do
|
||||
before { delete "/api/v1/harvests/#{harvest.id}", {}, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
end
|
||||
88
spec/requests/api/v1/member_request_spec.rb
Normal file
88
spec/requests/api/v1/member_request_spec.rb
Normal file
@@ -0,0 +1,88 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Members', type: :request do
|
||||
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
|
||||
|
||||
let(:resource_url) { "http://www.example.com/api/v1/members/#{member.id}" }
|
||||
|
||||
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
|
||||
}
|
||||
end
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
describe '#index' do
|
||||
before { get '/api/v1/members', {}, headers }
|
||||
it { expect(subject['data']).to include(member_encoded_as_json_api) }
|
||||
end
|
||||
|
||||
describe '#show' do
|
||||
before { get "/api/v1/members/#{member.id}", {}, 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
|
||||
|
||||
describe '#create' do
|
||||
before { post '/api/v1/members', { 'member' => { 'login_name' => 'can i make this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#update' do
|
||||
before { post "/api/v1/members/#{member.id}", { 'member' => { 'login_name' => 'can i modify this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#delete' do
|
||||
before { delete "/api/v1/members/#{member.id}", {}, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
end
|
||||
85
spec/requests/api/v1/photos_request_spec.rb
Normal file
85
spec/requests/api/v1/photos_request_spec.rb
Normal file
@@ -0,0 +1,85 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Photos', type: :request do
|
||||
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
|
||||
|
||||
let(:resource_url) { "http://www.example.com/api/v1/photos/#{photo.id}" }
|
||||
|
||||
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
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
describe '#index' do
|
||||
before { get '/api/v1/photos', {}, headers }
|
||||
it { expect(subject['data']).to include(photo_encoded_as_json_api) }
|
||||
end
|
||||
|
||||
describe '#show' do
|
||||
before { get "/api/v1/photos/#{photo.id}", {}, 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
|
||||
|
||||
describe '#create' do
|
||||
before { post '/api/v1/photos', { 'photo' => { 'name' => 'can i make this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#update' do
|
||||
before { post "/api/v1/photos/#{photo.id}", { 'photo' => { 'name' => 'can i modify this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#delete' do
|
||||
before { delete "/api/v1/photos/#{photo.id}", {}, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
end
|
||||
99
spec/requests/api/v1/plantings_request_spec.rb
Normal file
99
spec/requests/api/v1/plantings_request_spec.rb
Normal file
@@ -0,0 +1,99 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Plantings', type: :request do
|
||||
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
|
||||
|
||||
let(:resource_url) { "http://www.example.com/api/v1/plantings/#{planting.id}" }
|
||||
|
||||
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(: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
|
||||
{
|
||||
"planted-at" => "2014-07-30",
|
||||
"finished-at" => nil,
|
||||
"finished" => false,
|
||||
"quantity" => 33,
|
||||
"description" => planting.description,
|
||||
"sunniness" => nil,
|
||||
"planted-from" => nil,
|
||||
"expected-lifespan" => nil,
|
||||
"finish-predicted-at" => nil,
|
||||
"percentage-grown" => nil,
|
||||
"first-harvest-date" => nil,
|
||||
"last-harvest-date" => nil
|
||||
}
|
||||
end
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
scenario '#index' do
|
||||
get '/api/v1/plantings', {}, headers
|
||||
expect(subject['data']).to include(planting_encoded_as_json_api)
|
||||
end
|
||||
|
||||
scenario '#show' do
|
||||
get "/api/v1/plantings/#{planting.id}", {}, 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
|
||||
|
||||
scenario '#create' do
|
||||
post '/api/v1/plantings', { 'planting' => { 'description' => 'can i make this' } }, headers
|
||||
expect(response.code).to eq "404"
|
||||
end
|
||||
|
||||
scenario '#update' do
|
||||
post "/api/v1/plantings/#{planting.id}", { 'planting' => { 'description' => 'can i modify this' } }, headers
|
||||
expect(response.code).to eq "404"
|
||||
end
|
||||
|
||||
scenario '#delete' do
|
||||
delete "/api/v1/plantings/#{planting.id}", {}, headers
|
||||
expect(response.code).to eq "404"
|
||||
end
|
||||
end
|
||||
73
spec/requests/api/v1/seeds_request_spec.rb
Normal file
73
spec/requests/api/v1/seeds_request_spec.rb
Normal file
@@ -0,0 +1,73 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Photos', type: :request do
|
||||
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
|
||||
|
||||
let(:resource_url) { "http://www.example.com/api/v1/seeds/#{seed.id}" }
|
||||
|
||||
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(: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
|
||||
|
||||
subject { JSON.parse response.body }
|
||||
describe '#index' do
|
||||
before { get '/api/v1/seeds', {}, headers }
|
||||
it { expect(subject['data']).to include(seed_encoded_as_json_api) }
|
||||
end
|
||||
|
||||
describe '#show' do
|
||||
before { get "/api/v1/seeds/#{seed.id}", {}, headers }
|
||||
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
|
||||
|
||||
describe '#create' do
|
||||
before { post '/api/v1/seeds', { 'seed' => { 'name' => 'can i make this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#update' do
|
||||
before { post "/api/v1/seeds/#{seed.id}", { 'seed' => { 'name' => 'can i modify this' } }, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
|
||||
describe '#delete' do
|
||||
before { delete "/api/v1/seeds/#{seed.id}", {}, headers }
|
||||
it { expect(response.code).to eq "404" }
|
||||
end
|
||||
end
|
||||
@@ -13,17 +13,17 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe "crops/_grown_for" do
|
||||
before(:each) do
|
||||
@crop = FactoryBot.create(:crop)
|
||||
@pp = FactoryBot.create(:plant_part)
|
||||
@harvest = FactoryBot.create(:harvest,
|
||||
crop: @crop,
|
||||
plant_part: @pp)
|
||||
let(:crop) { FactoryBot.create(:crop) }
|
||||
let(:plant_path) { FactoryBot.create(:plant_part) }
|
||||
let!(:harvest) do
|
||||
FactoryBot.create(:harvest,
|
||||
crop: crop,
|
||||
plant_part: plant_path)
|
||||
end
|
||||
|
||||
it 'shows plant parts' do
|
||||
render partial: 'crops/grown_for', locals: { crop: @crop }
|
||||
rendered.should have_content @pp.name
|
||||
assert_select "a", href: plant_part_path(@pp)
|
||||
render partial: 'crops/grown_for', locals: { crop: crop }
|
||||
rendered.should have_content plant_path.name
|
||||
assert_select "a", href: plant_part_path(plant_path)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -13,58 +13,62 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe "crops/_planting_advice" do
|
||||
before(:each) do
|
||||
@owner = FactoryBot.create(:member)
|
||||
@crop = FactoryBot.create(:crop)
|
||||
@garden = FactoryBot.create(:garden, owner: @owner)
|
||||
@planting = FactoryBot.create(:planting,
|
||||
garden: @garden,
|
||||
crop: @crop)
|
||||
let(:planting) { FactoryBot.create(:planting) }
|
||||
subject { rendered }
|
||||
|
||||
shared_examples "render planting_advice" do
|
||||
before { render 'crops/planting_advice', crop: planting.crop }
|
||||
end
|
||||
|
||||
context "sunniness" do
|
||||
it "doesn't show sunniness if none are set" do
|
||||
render partial: 'crops/planting_advice', locals: { crop: @crop }
|
||||
rendered.should have_content "Plant in: not known."
|
||||
describe "sunniness" do
|
||||
context "with no sunniness set" do
|
||||
include_examples "render planting_advice"
|
||||
it "doesn't show sunniness" do
|
||||
is_expected.to have_content "Plant in: not known."
|
||||
end
|
||||
end
|
||||
|
||||
it "shows sunniness frequencies" do
|
||||
FactoryBot.create(:sunny_planting, crop: @crop)
|
||||
render partial: 'crops/planting_advice', locals: { crop: @crop }
|
||||
rendered.should have_content "Plant in:"
|
||||
rendered.should have_content "sun (1)"
|
||||
context "with sunniness frequencies" do
|
||||
before { FactoryBot.create(:sunny_planting, crop: planting.crop) }
|
||||
include_examples "render planting_advice"
|
||||
it { is_expected.to have_content "Plant in:" }
|
||||
it { is_expected.to have_content "sun (1)" }
|
||||
end
|
||||
|
||||
it "shows multiple sunniness frequencies" do
|
||||
FactoryBot.create(:sunny_planting, crop: @crop)
|
||||
FactoryBot.create(:sunny_planting, crop: @crop)
|
||||
FactoryBot.create(:shady_planting, crop: @crop)
|
||||
render partial: 'crops/planting_advice', locals: { crop: @crop }
|
||||
rendered.should have_content "Plant in:"
|
||||
rendered.should have_content "sun (2), shade (1)"
|
||||
context "with multiple sunniness frequencies" do
|
||||
before do
|
||||
FactoryBot.create_list(:sunny_planting, 2, crop: planting.crop)
|
||||
FactoryBot.create(:shady_planting, crop: planting.crop)
|
||||
end
|
||||
include_examples "render planting_advice"
|
||||
it { is_expected.to have_content "Plant in:" }
|
||||
it { is_expected.to have_content "sun (2), shade (1)" }
|
||||
end
|
||||
end
|
||||
|
||||
context "planted from" do
|
||||
it "doesn't show planted_from if none are set" do
|
||||
render partial: 'crops/planting_advice', locals: { crop: @crop }
|
||||
rendered.should have_content "Plant from: not known."
|
||||
describe "planted from" do
|
||||
context "when none are set" do
|
||||
include_examples "render planting_advice"
|
||||
it "doesn't show planted_from " do
|
||||
is_expected.to have_content "Plant from: not known."
|
||||
end
|
||||
end
|
||||
|
||||
it "shows planted_from frequencies" do
|
||||
FactoryBot.create(:seed_planting, crop: @crop)
|
||||
render partial: 'crops/planting_advice', locals: { crop: @crop }
|
||||
rendered.should have_content "Plant from:"
|
||||
rendered.should have_content "seed (1)"
|
||||
context "with planted_from frequencies" do
|
||||
before { FactoryBot.create(:seed_planting, crop: planting.crop) }
|
||||
include_examples "render planting_advice"
|
||||
it { is_expected.to have_content "Plant from:" }
|
||||
it { is_expected.to have_content "seed (1)" }
|
||||
end
|
||||
|
||||
it "shows multiple planted_from frequencies" do
|
||||
FactoryBot.create(:seed_planting, crop: @crop)
|
||||
FactoryBot.create(:seed_planting, crop: @crop)
|
||||
FactoryBot.create(:cutting_planting, crop: @crop)
|
||||
render partial: 'crops/planting_advice', locals: { crop: @crop }
|
||||
rendered.should have_content "Plant from:"
|
||||
rendered.should have_content "seed (2), cutting (1)"
|
||||
context "with multiple planted_from frequencies" do
|
||||
before do
|
||||
FactoryBot.create_list(:seed_planting, 2, crop: planting.crop)
|
||||
FactoryBot.create(:cutting_planting, crop: planting.crop)
|
||||
end
|
||||
include_examples "render planting_advice"
|
||||
it { is_expected.to have_content "Plant from:" }
|
||||
it { is_expected.to have_content "seed (2), cutting (1)" }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -17,7 +17,7 @@ describe "gardens/show" do
|
||||
@owner = FactoryBot.create(:member)
|
||||
controller.stub(:current_user) { @owner }
|
||||
@garden = FactoryBot.create(:garden, owner: @owner)
|
||||
@planting = FactoryBot.create(:planting, garden: @garden)
|
||||
@planting = FactoryBot.create(:planting, garden: @garden, owner: @garden.owner)
|
||||
assign(:garden, @garden)
|
||||
assign(:current_plantings, [@planting])
|
||||
assign(:finished_plantings, [])
|
||||
|
||||
@@ -13,16 +13,19 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe "harvests/show" do
|
||||
before(:each) do
|
||||
let!(:harvest) { FactoryBot.create(:harvest) }
|
||||
|
||||
before do
|
||||
controller.stub(:current_user) { nil }
|
||||
@crop = FactoryBot.create(:tomato)
|
||||
@harvest = assign(:harvest, FactoryBot.create(:harvest, crop: @crop))
|
||||
assign(:harvest, harvest)
|
||||
render
|
||||
end
|
||||
|
||||
it "renders attributes" do
|
||||
rendered.should have_content @crop.name
|
||||
rendered.should have_content @harvest.harvested_at.to_s
|
||||
rendered.should have_content @harvest.plant_part.to_s
|
||||
subject { render }
|
||||
|
||||
describe "renders attributes" do
|
||||
it { is_expected.to have_content harvest.crop.name }
|
||||
it { is_expected.to have_content harvest.harvested_at.to_s }
|
||||
it { is_expected.to have_content harvest.plant_part.to_s }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -24,6 +24,7 @@ describe "plantings/_form" do
|
||||
@planting = FactoryBot.create(:planting,
|
||||
garden: @garden,
|
||||
crop: @crop,
|
||||
owner: @member,
|
||||
planted_at: Date.new(2013, 3, 1))
|
||||
render
|
||||
end
|
||||
|
||||
@@ -28,7 +28,7 @@ describe "plantings/edit" do
|
||||
@garden2 = FactoryBot.create(:garden_a, owner: @member)
|
||||
|
||||
@planting = assign(:planting,
|
||||
FactoryBot.create(:planting, garden: @garden, crop: @tomato))
|
||||
FactoryBot.create(:planting, garden: @garden, crop: @tomato, owner: @member))
|
||||
end
|
||||
|
||||
context "logged in" do
|
||||
|
||||
@@ -13,31 +13,33 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe "plantings/index" do
|
||||
let(:member) { FactoryBot.create(:member) }
|
||||
let(:garden) { FactoryBot.create(:garden, owner: member) }
|
||||
let(:tomato) { FactoryBot.create(:tomato) }
|
||||
let(:maize) { FactoryBot.create(:maize) }
|
||||
before(:each) do
|
||||
controller.stub(:current_user) { nil }
|
||||
@member = FactoryBot.create(:member)
|
||||
@garden = FactoryBot.create(:garden, owner: @member)
|
||||
@tomato = FactoryBot.create(:tomato)
|
||||
@maize = FactoryBot.create(:maize)
|
||||
page = 1
|
||||
per_page = 3
|
||||
total_entries = 3
|
||||
plantings = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
|
||||
pager.replace([
|
||||
FactoryBot.create(:planting,
|
||||
garden: @garden,
|
||||
crop: @tomato,
|
||||
owner: @member),
|
||||
garden: garden,
|
||||
crop: tomato,
|
||||
owner: member),
|
||||
FactoryBot.create(:planting,
|
||||
garden: @garden,
|
||||
crop: @maize,
|
||||
garden: garden,
|
||||
crop: maize,
|
||||
owner: garden.owner,
|
||||
description: '',
|
||||
planted_at: Time.local(2013, 1, 13)),
|
||||
planted_at: Time.zone.local(2013, 1, 13)),
|
||||
FactoryBot.create(:planting,
|
||||
garden: @garden,
|
||||
crop: @tomato,
|
||||
planted_at: Time.local(2013, 1, 13),
|
||||
finished_at: Time.local(2013, 1, 20),
|
||||
garden: garden,
|
||||
owner: garden.owner,
|
||||
crop: tomato,
|
||||
planted_at: Time.zone.local(2013, 1, 13),
|
||||
finished_at: Time.zone.local(2013, 1, 20),
|
||||
finished: true)
|
||||
])
|
||||
end
|
||||
@@ -46,10 +48,10 @@ describe "plantings/index" do
|
||||
end
|
||||
|
||||
it "renders a list of plantings" do
|
||||
rendered.should have_content @tomato.name
|
||||
rendered.should have_content @maize.name
|
||||
rendered.should have_content @member.login_name
|
||||
rendered.should have_content @garden.name
|
||||
rendered.should have_content tomato.name
|
||||
rendered.should have_content maize.name
|
||||
rendered.should have_content member.login_name
|
||||
rendered.should have_content garden.name
|
||||
end
|
||||
|
||||
it "displays planting time" do
|
||||
@@ -69,14 +71,14 @@ describe "plantings/index" do
|
||||
end
|
||||
|
||||
it "displays member's name in title" do
|
||||
assign(:owner, @member)
|
||||
assign(:owner, member)
|
||||
render
|
||||
view.content_for(:title).should have_content @member.login_name
|
||||
view.content_for(:title).should have_content member.login_name
|
||||
end
|
||||
|
||||
it "displays crop's name in title" do
|
||||
assign(:crop, @tomato)
|
||||
assign(:crop, tomato)
|
||||
render
|
||||
view.content_for(:title).should have_content @tomato.name
|
||||
view.content_for(:title).should have_content tomato.name
|
||||
end
|
||||
end
|
||||
|
||||
@@ -25,7 +25,8 @@ describe "plantings/new" do
|
||||
|
||||
assign(:planting, FactoryBot.create(:planting,
|
||||
garden: @garden_a,
|
||||
crop: @crop2))
|
||||
crop: @crop2,
|
||||
owner: @member))
|
||||
end
|
||||
|
||||
context "logged in" do
|
||||
|
||||
@@ -13,25 +13,22 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe "plantings/show" do
|
||||
def create_planting_for(member)
|
||||
@garden = FactoryBot.create(:garden, owner: @member)
|
||||
@crop = FactoryBot.create(:tomato)
|
||||
@planting = assign(:planting,
|
||||
FactoryBot.create(:planting, garden: @garden, crop: @crop,
|
||||
planted_from: 'cutting'))
|
||||
let(:crop) { FactoryBot.create(:tomato) }
|
||||
let(:member) { FactoryBot.create(:member) }
|
||||
let(:garden) { FactoryBot.create(:garden, owner: member) }
|
||||
let(:planting) do
|
||||
FactoryBot.create(:planting, garden: garden, crop: crop,
|
||||
owner: garden.owner,
|
||||
planted_from: 'cutting')
|
||||
end
|
||||
|
||||
before(:each) do
|
||||
@member = FactoryBot.create(:member)
|
||||
controller.stub(:current_user) { @member }
|
||||
@p = create_planting_for(@member)
|
||||
assign(:planting, planting)
|
||||
controller.stub(:current_user) { member }
|
||||
end
|
||||
|
||||
context 'sunniness' do
|
||||
before(:each) do
|
||||
@p = assign(:planting,
|
||||
FactoryBot.create(:sunny_planting))
|
||||
end
|
||||
let(:planting) { FactoryBot.create(:sunny_planting) }
|
||||
|
||||
it "shows the sunniness" do
|
||||
render
|
||||
@@ -41,10 +38,7 @@ describe "plantings/show" do
|
||||
end
|
||||
|
||||
context 'planted from' do
|
||||
before(:each) do
|
||||
@p = assign(:planting, FactoryBot.create(:cutting_planting))
|
||||
end
|
||||
|
||||
let(:planting) { FactoryBot.create(:cutting_planting) }
|
||||
it "shows planted_from" do
|
||||
render
|
||||
rendered.should have_content 'Planted from:'
|
||||
@@ -52,8 +46,7 @@ describe "plantings/show" do
|
||||
end
|
||||
|
||||
it "doesn't show planted_from if blank" do
|
||||
@p.planted_from = ''
|
||||
@p.save
|
||||
planting.update(planted_from: '')
|
||||
render
|
||||
rendered.should_not have_content 'Planted from:'
|
||||
rendered.should_not have_content 'cutting'
|
||||
@@ -61,10 +54,10 @@ describe "plantings/show" do
|
||||
end
|
||||
|
||||
it "shows photos" do
|
||||
@photo = FactoryBot.create(:photo, owner: @member)
|
||||
@p.photos << @photo
|
||||
photo = FactoryBot.create(:photo, owner: member)
|
||||
planting.photos << photo
|
||||
render
|
||||
assert_select "img[src='#{@photo.thumbnail_url}']"
|
||||
assert_select "img[src='#{photo.thumbnail_url}']"
|
||||
end
|
||||
|
||||
it "shows a link to add photos" do
|
||||
@@ -96,13 +89,12 @@ describe "plantings/show" do
|
||||
|
||||
context "location set" do
|
||||
before(:each) do
|
||||
@p.owner.location = 'Greenwich, UK'
|
||||
@p.owner.save
|
||||
planting.owner.update(location: 'Greenwich, UK')
|
||||
render
|
||||
end
|
||||
|
||||
it "shows the member's location in parentheses" do
|
||||
rendered.should have_content "(#{@p.owner.location})"
|
||||
rendered.should have_content "(#{planting.owner.location})"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user