Bump font-awesome-sass from 5.5.0 to 5.5.0.1

Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

.overcommit.yml

@@ -51,9 +51,6 @@ PreCommit:
     command: ['bundle', 'exec', 'haml-lint']
   JsonSyntax:
     enabled: true
-  BundleOutdated:
-    enabled: true
-    on_warn: warn
   BundleAudit:
     enabled: true
     on_warn: warn

.travis.yml

@@ -11,16 +11,20 @@ env:
     - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false
     - STATIC_CHECKS=true
   global:
+    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
     - GROWSTUFF_SITE_NAME="Growstuff (travis)"
     - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 before_install:
   - ./script/install_phantomjs.sh
   - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
   - ./script/install_codeclimate.sh
   - ./script/install_linters.sh
-  # Force Travis to use Elastic Search 2.4.0
-  - ./script/install_elasticsearch.sh
+  - VERSION="6.2.3" ./script/install_elasticsearch.sh
+before_script:
+  - >
+    if [ "${COVERAGE}" = "true" ]; then
+      ./cc-test-reporter before-build
+    fi
 script:
   - set -e
   - >
@@ -28,7 +32,7 @@ script:
       ./script/check_static.rb
     else
       set +e;
-      RAILS_ENV=test bundle exec rake db:create db:migrate;
+      RAILS_ENV=test bundle exec rake db:create db:migrate search:create;
       bundle exec rake assets:precompile;
       bundle exec rspec --tag $RSPEC_TAG spec/;
     fi;

CONTRIBUTORS.md

@@ -84,7 +84,12 @@ submit the change with your pull request.
 - Logan Gingerich / [logangingerich](https://github.com/logangingerich)
 - Mark Taffman / [mftaff](https://github.com/mftaff)
 - Jennifer Kruse / [jenkr55](https://github.com/jenkr55)
+- Christopher Bazin / [RobotScissors](https://github.com/robotscissors)
+- Ahmed Shahin / [codeminator](https://www.github.com/codeminator)
 
 ## Bots
 
-- Security and Dependency Updates / [deppbot](https://github.com/deppbot)
+### Security and Dependency Updates
+- DeppBot / [deppbot](https://github.com/deppbot)
+- dependabot[bot] / [dependabot-bot] / [dependabot] (https://github.com/dependabot-bot)
+- dependabot / [dependabot](https://github.com/dependabot)

Gemfile

@@ -86,9 +86,9 @@ gem "chartkick"
 # Project does not use semver, so we want to be in sync with the version of
 # elasticsearch we use
 # See https://github.com/elastic/elasticsearch-ruby#compatibility
-gem "elasticsearch-api", "~> 2.0.0"
-gem "elasticsearch-model"
-gem "elasticsearch-rails"
+gem "elasticsearch-api", ">= 6.0.0"
+gem "elasticsearch-model", ">= 6.0.0"
+gem "elasticsearch-rails", ">= 6.0.0"
 gem "hashie", ">= 3.5.3"
 
 gem 'rake', '>= 10.0.0'

Gemfile.lock

@@ -26,7 +26,7 @@ GEM
       addressable
     active_median (0.1.4)
       activerecord
-    active_utils (3.3.11)
+    active_utils (3.3.12)
       activesupport (>= 3.2, < 6.0)
       i18n
     activejob (4.2.10)
@@ -51,9 +51,9 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     ast (2.4.0)
-    autoprefixer-rails (8.2.0)
+    autoprefixer-rails (8.6.4)
       execjs
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     better_errors (2.2.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -72,11 +72,11 @@ GEM
       sass (>= 3.3.4)
     bootstrap_form (2.7.0)
     builder (3.2.3)
-    bullet (5.7.5)
+    bullet (5.8.1)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.11.0)
+      uniform_notifier (~> 1.11)
     byebug (10.0.2)
-    cancancan (2.1.3)
+    cancancan (2.3.0)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -84,18 +84,18 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    capybara-email (2.5.0)
-      capybara (~> 2.4)
+    capybara-email (3.0.1)
+      capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.18)
-      capybara (>= 1.0, < 3)
+    capybara-screenshot (1.0.22)
+      capybara (>= 1.0, < 4)
       launchy
-    chartkick (2.3.3)
+    chartkick (3.0.1)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.2.0)
     cliver (0.3.2)
-    codeclimate-test-reporter (1.0.8)
+    codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     codemirror-rails (5.16.0)
       railties (>= 3.0, < 6.0)
@@ -107,7 +107,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    comfortable_mexican_sofa (1.12.10)
+    comfortable_mexican_sofa (1.12.11)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -123,20 +123,20 @@ GEM
       rails-i18n (>= 4.0.0)
       sass-rails (>= 4.0.3)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6)
-    crass (1.0.3)
+    crass (1.0.4)
     csv_shaper (1.3.0)
       activesupport (>= 3.0.0)
-    dalli (2.7.7)
-    database_cleaner (1.6.2)
+    dalli (2.7.9)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
-    devise (4.4.3)
+    devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
@@ -147,41 +147,41 @@ GEM
     easy_translate (0.5.1)
       thread
       thread_safe
-    elasticsearch (2.0.2)
-      elasticsearch-api (= 2.0.2)
-      elasticsearch-transport (= 2.0.2)
-    elasticsearch-api (2.0.2)
+    elasticsearch (6.1.0)
+      elasticsearch-api (= 6.1.0)
+      elasticsearch-transport (= 6.1.0)
+    elasticsearch-api (6.1.0)
       multi_json
-    elasticsearch-model (5.0.0)
+    elasticsearch-model (6.0.0)
       activesupport (> 3)
       elasticsearch (> 1)
       hashie
-    elasticsearch-rails (5.0.2)
-    elasticsearch-transport (2.0.2)
+    elasticsearch-rails (6.0.0)
+    elasticsearch-transport (6.1.0)
       faraday
       multi_json
     erubis (2.7.0)
     excon (0.62.0)
     execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (1.8.7)
+    faker (1.9.1)
       i18n (>= 0.7)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     figaro (1.1.1)
       thor (~> 0.14)
     flickraw (0.9.9)
-    font-awesome-sass (5.0.9)
-      sass (>= 3.2)
+    font-awesome-sass (5.5.0.1)
+      sassc (>= 1.11)
     formatador (0.2.5)
-    friendly_id (5.2.3)
+    friendly_id (5.2.4)
       activerecord (>= 4.0.0)
-    geocoder (1.4.7)
+    geocoder (1.4.9)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
@@ -226,7 +226,7 @@ GEM
       rubocop (>= 0.49.0)
       sysexits (~> 1.1)
     hashie (3.5.7)
-    heroics (0.0.24)
+    heroics (0.0.25)
       erubis (~> 2.0)
       excon
       moneta
@@ -251,7 +251,7 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -261,7 +261,7 @@ GEM
       railties (>= 3.2)
       sprockets-rails
     json (2.1.0)
-    jsonapi-resources (0.9.0)
+    jsonapi-resources (0.9.3)
       activerecord (>= 4.1)
       concurrent-ruby
       railties (>= 4.1)
@@ -279,7 +279,7 @@ GEM
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
     kgio (2.11.2)
-    kramdown (1.16.2)
+    kramdown (1.17.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     leaflet-rails (1.3.1)
@@ -290,7 +290,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
@@ -302,16 +302,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    moneta (0.8.1)
+    moneta (1.0.0)
     multi_json (1.11.3)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    newrelic_rpm (5.0.0.342)
-    nokogiri (1.8.2)
+    newrelic_rpm (5.4.0.347)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -326,7 +326,7 @@ GEM
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (4.0.0)
+    omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-flickr (0.0.19)
       multi_json (~> 1.11.0)
@@ -341,19 +341,19 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    paperclip (6.0.0)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
     pg (0.21.0)
-    platform-api (2.1.0)
-      heroics (~> 0.0.23)
-      moneta (~> 0.8.1)
+    platform-api (2.2.0)
+      heroics (~> 0.0.25)
+      moneta (~> 1.0.0)
     plupload-rails (1.2.1)
       rails (>= 3.1)
     poltergeist (1.17.0)
@@ -364,11 +364,11 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.9)
-    rack-protection (2.0.1)
+    rack (1.6.11)
+    rack-protection (2.0.4)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -383,9 +383,9 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.10)
       sprockets-rails
-    rails-assets-leaflet (1.3.1)
-    rails-assets-leaflet.markercluster (1.3.0)
-      rails-assets-leaflet (>= 1.0.3)
+    rails-assets-leaflet (1.3.4)
+    rails-assets-leaflet.markercluster (1.4.1)
+      rails-assets-leaflet (>= 1.3.1)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
@@ -413,35 +413,35 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    redis (4.0.1)
+    redis (4.0.2)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-activemodel-mocks (1.0.3)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-activemodel-mocks (1.1.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -450,12 +450,12 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    ruby-units (2.3.0)
+    ruby-units (2.3.1)
     ruby_dep (1.5.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
-    rubyzip (1.2.1)
-    sass (3.5.6)
+    rubyzip (1.2.2)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -466,14 +466,16 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (3.11.0)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
+    selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
-      rubyzip (~> 1.2)
-    sexp_processor (4.10.1)
+      rubyzip (~> 1.2, >= 1.2.2)
+    sexp_processor (4.11.0)
     shellany (0.0.1)
-    sidekiq (5.1.2)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+    sidekiq (5.2.2)
+      connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     simplecov (0.12.0)
@@ -481,9 +483,9 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sparkpost_rails (1.5.0)
-      rails (>= 4.0, < 5.2)
-    sprockets (3.7.1)
+    sparkpost_rails (1.5.1)
+      rails (>= 4.0, < 5.3)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -507,13 +509,13 @@ GEM
     trollop (1.16.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.8)
+    uglifier (4.1.15)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
-    unicorn (5.4.0)
+    unicode-display_width (1.3.2)
+    unicorn (5.4.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.11.0)
+    uniform_notifier (1.12.1)
     warden (1.2.7)
       rack (>= 1.0)
     webrat (0.7.3)
@@ -525,7 +527,7 @@ GEM
     websocket-extensions (0.1.3)
     will_paginate (3.1.6)
     xmlrpc (0.3.0)
-    xpath (3.0.0)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -558,9 +560,9 @@ DEPENDENCIES
   dalli
   database_cleaner
   devise
-  elasticsearch-api (~> 2.0.0)
-  elasticsearch-model
-  elasticsearch-rails
+  elasticsearch-api (>= 6.0.0)
+  elasticsearch-model (>= 6.0.0)
+  elasticsearch-rails (>= 6.0.0)
   factory_bot_rails
   faker
   figaro
@@ -623,4 +625,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

README.md

@@ -1,7 +1,7 @@
 # Growstuff
 
 [![Build Status](https://travis-ci.org/Growstuff/growstuff.svg?branch=dev)](https://travis-ci.org/Growstuff/growstuff)
-[![Coverage Status](https://coveralls.io/repos/Growstuff/growstuff/badge.png)](https://coveralls.io/r/Growstuff/growstuff)
+[![Coverage Status](https://coveralls.io/repos/github/Growstuff/growstuff/badge.svg?branch=dev)](https://coveralls.io/github/Growstuff/growstuff?branch=dev)
 [![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.

app/assets/stylesheets/custom_bootstrap/variables.sass

@@ -1,7 +1,7 @@
 // Use this file to override Twitter Bootstrap variables or define own variables.
 
 // Import original variables so they can be used in overrides
-//@import 'bootstrap/variables.scss'
+@import 'bootstrap/variables.scss'
 
 // Base colours
 
@@ -10,7 +10,7 @@ $brown: #413f3b
 
 $green:  #5f8e43
 $blue:   #2f4365
-$red:    #8e4d43
+$red:    #ff4d43
 $orange: #ffa500
 $yellow: #b2935c
 $white:  #ffffff

app/assets/stylesheets/overrides.sass

@@ -12,6 +12,10 @@ body
 .list-inline > li.first
   padding-left: 0px
 
+.activity-list
+  list-style-type: none
+  padding: 0
+
 h2
   font-size: 150%
 
@@ -34,6 +38,21 @@ h3
   max-width: 100%
   height: auto
 
+.profile-sidebar
+  margin-top: -5rem
+  .avatar
+    border-radius: 50%
+    border-radius: 50%
+    z-index: 2
+    position: relative
+
+.profile-activity
+  background: white
+  padding: 2em
+  margin-top: 2em
+  .container
+    width: 100%
+
 .sidebar
   border-left: 1px solid darken($beige, 10%)
   margin-left: -1px
@@ -74,7 +93,7 @@ p.stats
   flex: none
   flex-wrap: wrap
 
-.seeds-row
+.card-row
   display: grid
   grid-template-columns: 50% 50%
   grid-gap: 25px
@@ -93,19 +112,47 @@ p.stats
   padding-left: 1em
   width: 15em
 
+.progress
+  border-radius: 0
+
+.badge-super-late
+  background-color: $red
+.badge-harvest
+  background-color: $blue
+
+.planting-super-late
+.planting-late
+  background-color: $beige
+
 .planting
+  .planting-badges
+    position: absolute
+
+  .planting-thumbnail
+    padding: 0
+    border: 1px solid darken($beige, 10%)
+    border-radius: 4px
+  .planting-actions
+    top: -8em
+  .planting-name
+    position: relative
+    top: -1em
+
   dl.planting-attributes
     dt
       text-align: left
     dd
       margin-left: auto
 
+.layout-actions
+  width: 100%
 
 #placesmap, #cropmap
   height: 500px
 
 #membermap
   height: 250px
+  z-index: 0
 
 .location-not-set
   height: 250px
@@ -153,6 +200,7 @@ p.stats
   text-align: center
   margin-bottom: 1.5em
   max-width: 160px
+  max-height: 200px
 
   .member-thumbnail
     text-align: left
@@ -199,6 +247,9 @@ li.crop-hierarchy
 .navbar-bottom
   margin: 40px 0px 0px 0px !important
 
+.post-actions
+  margin-bottom: 1rem
+
 // footer
 footer
   #footer1, #footer2, #footer3

app/controllers/harvests_controller.rb

@@ -3,7 +3,7 @@ class HarvestsController < ApplicationController
   after_action :update_crop_medians, only: %i(create update destroy)
   load_and_authorize_resource
   respond_to :html, :json
-  respond_to :csv, only: :index
+  respond_to :csv, :rss, only: :index
   responders :flash
 
   def index
@@ -92,7 +92,7 @@ class HarvestsController < ApplicationController
     # if this harvest is not linked to a planting, then do nothing
     return if @harvest.planting.nil?
 
-    @harvest.planting.update_harvest_days
+    @harvest.planting.update_harvest_days!
     @harvest.crop.update_harvest_medians
   end
 end

app/controllers/members_controller.rb

@@ -20,6 +20,7 @@ class MembersController < ApplicationController
     @facebook_auth = @member.auth('facebook')
     @posts         = @member.posts
     @gardens       = @member.gardens.active.order(:name)
+    @harvests      = @member.harvests
 
     # The garden form partial is called from the "New Garden" tab;
     # it requires a garden to be passed in @garden.

app/controllers/plantings_controller.rb

@@ -77,7 +77,7 @@ class PlantingsController < ApplicationController
   end
 
   def update_planting_medians
-    @planting.update_harvest_days
+    @planting.update_harvest_days!
   end
 
   def planting_params

app/helpers/application_helper.rb

@@ -1,26 +1,9 @@
 module ApplicationHelper
-  def price_in_dollars(price)
-    format('%.2f', price / 100.0)
-  end
-
-  # 999 cents becomes 9.99 AUD -- for products/orders/etc
-  def price_with_currency(price)
-    format('%.2f %s', price / 100.0, Growstuff::Application.config.currency)
-  end
-
   def parse_date(str)
     str ||= '' # Date.parse barfs on nil
     str == '' ? nil : Date.parse(str)
   end
 
-  def forex_link(price)
-    pid = price_in_dollars(price)
-    currency = Growstuff::Application.config.currency
-    link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}"
-
-    link_to "(convert)", link, target: "_blank", rel: "noopener noreferrer"
-  end
-
   def build_alert_classes(alert_type = :info)
     classes = 'alert alert-dismissable '
     case alert_type.to_sym
@@ -86,11 +69,15 @@ module ApplicationHelper
   def show_inactive_tickbox_path(type, owner, show_all)
     all = show_all ? '' : 1
     if owner
-      plantings_by_owner_path(owner: owner.slug, all: all) if type == 'plantings'
-      gardens_by_owner_path(owner: owner.slug, all: all) if type == 'gardens'
-    else
-      plantings_path(all: all) if type == 'plantings'
-      gardens_path(all: all) if type == 'gardens'
+      if type == 'plantings'
+        plantings_by_owner_path(owner: owner.slug, all: all)
+      elsif type == 'gardens'
+        gardens_by_owner_path(owner: owner.slug, all: all)
+      end
+    elsif type == 'plantings'
+      plantings_path(all: all)
+    elsif type == 'gardens'
+      gardens_path(all: all)
     end
   end
 

app/helpers/plantings_helper.rb

@@ -32,4 +32,24 @@ module PlantingsHelper
   def plantings_active_tickbox_path(owner, show_all)
     show_inactive_tickbox_path('plantings', owner, show_all)
   end
+
+  def days_from_now_to_finished(planting)
+    return unless planting.finish_is_predicatable?
+    (planting.finish_predicted_at - Time.zone.today).to_i
+  end
+
+  def days_from_now_to_first_harvest(planting)
+    return unless planting.planted_at.present? && planting.first_harvest_predicted_at.present?
+    (planting.first_harvest_predicted_at - Time.zone.today).to_i
+  end
+
+  def planting_classes(planting)
+    classes = []
+    classes << 'planting-growing' if planting.growing?
+    classes << 'planting-finished' if planting.finished?
+    classes << 'planting-harvest-time' if planting.harvest_time?
+    classes << 'planting-late' if planting.late?
+    classes << 'planting-super-late' if planting.super_late?
+    classes.join(' ')
+  end
 end

app/mailers/notifier.rb

@@ -26,8 +26,8 @@ class Notifier < ActionMailer::Base
   def planting_reminder(member)
     @member = member
 
-    @plantings = @member.plantings.first(5)
-    @harvests = @member.harvests.first(5)
+    @plantings = @member.plantings.order(planted_at: :desc).first(5)
+    @harvests = @member.harvests.order(harvested_at: :desc).first(5)
 
     # Encrypting
     message = { member_id: @member.id, type: :send_planting_reminder }

app/models/concerns/predict_harvest.rb

@@ -0,0 +1,61 @@
+module PredictHarvest
+  extend ActiveSupport::Concern
+
+  included do # rubocop:disable Metrics/BlockLength
+    # dates
+    def first_harvest_date
+      harvests_with_dates.minimum(:harvested_at)
+    end
+
+    def last_harvest_date
+      harvests_with_dates.maximum(:harvested_at)
+    end
+
+    def first_harvest_predicted_at
+      return unless crop.median_days_to_first_harvest.present? && planted_at.present?
+      planted_at + crop.median_days_to_first_harvest.days
+    end
+
+    def last_harvest_predicted_at
+      return unless crop.median_days_to_last_harvest.present? && planted_at.present?
+      planted_at + crop.median_days_to_last_harvest.days
+    end
+
+    # actions
+    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
+
+    # status
+    def harvest_time?
+      return false if crop.perennial || finished
+
+      # We have harvests but haven't finished
+      harvests.size.positive? ||
+
+        # or, we don't have harvests, but we predict we should by now
+        (first_harvest_predicted_at.present? &&
+          harvests.empty? &&
+          first_harvest_predicted_at < Time.zone.today)
+    end
+
+    def before_harvest_time?
+      first_harvest_predicted_at.present? &&
+        harvests.empty? &&
+        first_harvest_predicted_at.present? &&
+        first_harvest_predicted_at > Time.zone.today
+    end
+
+    private
+
+    def harvests_with_dates
+      harvests.where.not(harvested_at: nil)
+    end
+  end
+end

app/models/concerns/predict_planting.rb

@@ -0,0 +1,80 @@
+module PredictPlanting
+  extend ActiveSupport::Concern
+
+  included do # rubocop:disable Metrics/BlockLength
+    ## Triggers
+    before_save :calculate_lifespan
+
+    def calculate_lifespan
+      self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
+    end
+
+    # dates
+    def finish_predicted_at
+      if planted_at.blank?
+        nil
+      elsif crop.median_lifespan.present?
+        planted_at + crop.median_lifespan.days
+      elsif crop.parent.present? && crop.parent.median_lifespan.present?
+        planted_at + crop.parent.median_lifespan.days
+      end
+    end
+
+    # days
+    def expected_lifespan
+      if actual_lifespan.present?
+        actual_lifespan
+      elsif crop.median_lifespan.present?
+        crop.median_lifespan
+      elsif crop.parent.present? && crop.parent.median_lifespan.present?
+        crop.parent.median_lifespan
+      end
+    end
+
+    def actual_lifespan
+      return unless planted_at.present? && finished_at.present?
+      (finished_at - planted_at).to_i
+    end
+
+    def days_since_planted
+      (Time.zone.today - planted_at).to_i if planted_at.present?
+    end
+
+    # progress
+    def percentage_grown
+      if finished?
+        100
+      elsif !finish_is_predicatable?
+        nil
+      elsif growing?
+        calculate_percentage_grown
+      elsif planted?
+        0
+      end
+    end
+
+    # states
+    def finish_is_predicatable?
+      crop.annual? && planted_at.present? && finish_predicted_at.present?
+    end
+
+    # Planting has live more then 90 days past predicted finish
+    def super_late?
+      late? && (finish_predicted_at + 90.days) < Time.zone.today
+    end
+
+    def late?
+      crop.annual? && !finished &&
+        planted_at.present? &&
+        finish_predicted_at.present? &&
+        finish_predicted_at <= Time.zone.today
+    end
+
+    private
+
+    def calculate_percentage_grown
+      percent = (days_since_planted / expected_lifespan.to_f) * 100
+      (percent > 100 ? 100 : percent)
+    end
+  end
+end

app/models/crop.rb

@@ -78,18 +78,18 @@ class Crop < ActiveRecord::Base
              } do
       mappings dynamic: 'false' do
         indexes :id, type: 'long'
-        indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
-        indexes :approval_status, type: 'string'
+        indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer'
+        indexes :approval_status, type: 'text'
         indexes :scientific_names do
           indexes :name,
-            type: 'string',
+            type: 'text',
             analyzer: 'gs_edgeNGram_analyzer',
             # Disabling field-length norm (norm). If the norm option is turned on(by default),
             # higher weigh would be given for shorter fields, which in our case is irrelevant.
             norms: { enabled: false }
         end
         indexes :alternate_names do
-          indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
+          indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer'
         end
       end
     end
@@ -185,7 +185,7 @@ class Crop < ActiveRecord::Base
   end
 
   def update_medians
-    plantings.each(&:update_harvest_days)
+    plantings.each(&:update_harvest_days!)
     update_lifespan_medians
     update_harvest_medians
   end

app/models/plant_part.rb

@@ -5,6 +5,8 @@ class PlantPart < ActiveRecord::Base
   has_many :harvests
   has_many :crops, -> { uniq }, through: :harvests
 
+  validates :name, presence: true, uniqueness: true
+
   def to_s
     name
   end

app/models/planting.rb

@@ -3,6 +3,8 @@ class Planting < ActiveRecord::Base
   include PhotoCapable
   include Finishable
   include Ownable
+  include PredictPlanting
+  include PredictHarvest
   friendly_id :planting_slug, use: %i(slugged finders)
 
   # Constants
@@ -13,10 +15,6 @@ class Planting < ActiveRecord::Base
     'graft', 'layering'
   ].freeze
 
-  ##
-  ## Triggers
-  before_save :calculate_lifespan
-
   belongs_to :garden
   belongs_to :crop, counter_cache: true
   has_many :harvests, dependent: :destroy
@@ -59,6 +57,10 @@ class Planting < ActiveRecord::Base
     in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
   }
 
+  def age_in_days
+    (Time.zone.today - planted_at).to_i if planted_at.present?
+  end
+
   def planting_slug
     [
       owner.login_name,
@@ -81,61 +83,20 @@ class Planting < ActiveRecord::Base
     photos.order(created_at: :desc).first
   end
 
+  def finished?
+    finished || (finished_at.present? && finished_at <= Time.zone.today)
+  end
+
   def planted?
-    planted_at.present? && planted_at <= Date.current
+    planted_at.present? && planted_at <= Time.zone.today
   end
 
-  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)
+  def growing?
+    planted? && !finished?
   end
 
   private
 
-  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

app/services/crop_search_service.rb

@@ -3,21 +3,19 @@ class CropSearchService
   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.
+      response = Crop.__elasticsearch__.search(
         query: {
-          multi_match: {
-            query: search_str.to_s,
-            analyzer: "standard",
-            fields: ["name",
-                     "scientific_names.scientific_name",
-                     "alternate_names.name"]
+          bool: {
+            filter: {
+              term: { "approval_status" => "approved" }
+            },
+            must: {
+              query_string: {
+                query: "*#{search_str}*"
+              }
+            }
           }
-        },
-        filter: {
-          term: { approval_status: "approved" }
-        },
-        size: 50
+        }
       )
       response.records.to_a
     else

app/views/gardens/_overview.html.haml

@@ -13,12 +13,9 @@
       .col-md-10
         .row
           - if garden.plantings.current.size.positive?
-            - garden.plantings.current.includes(:crop).each do |planting|
-              .col-md-2.col-sm-6.col-xs-6
-                .hover-wrapper
-                  .text
-                    = render 'plantings/actions', planting: planting
-                  = render partial: "plantings/thumbnail", locals: { planting: planting }
+            - garden.plantings.current.order(created_at: :desc).includes(:crop, :photos).each do |planting|
+              .col-md-2.col-sm-4.col-xs-6
+                = render "plantings/thumbnail", planting: planting
           - else
             .col-md-2.col-sm-6.col-xs-6 no plantings
   - if can?(:edit, garden)

app/views/harvests/_card.html.haml

@@ -21,8 +21,8 @@
           %dd= display_quantity(harvest)
           %dt Harvest date :
           %dd= harvest.harvested_at
-          %dd Notes:
-          %dt=display_harvest_description(harvest)
+          %dt Notes:
+          %dd= display_harvest_description(harvest)
           - if harvest.planting.present?
             %dt Harvested from
             %dd= link_to(harvest.planting, planting_path(harvest.planting))

app/views/harvests/index.html.haml

@@ -24,8 +24,10 @@
   %ul.list-inline
     %li The data on this page is available in the following formats:
     - if @owner
+      %li= link_to "RSS", harvests_by_owner_path(@owner, format: 'rss')
       %li= link_to "CSV", harvests_by_owner_path(@owner, format: 'csv')
       %li= link_to "JSON", harvests_by_owner_path(@owner, format: 'json')
     - else
+      %li= link_to "RSS", harvests_path(format: 'rss')
       %li= link_to "CSV", harvests_path(format: 'csv')
       %li= link_to "JSON", harvests_path(format: 'json')

app/views/harvests/index.rss.haml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{ version: 2.0 }
+  %channel
+    %title
+      Recent harvests from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
+    %link= harvests_url
+    - @harvests.each do |harvest|
+      %item
+        %title #{harvest.owner.login_name}'s #{harvest.crop.name}
+        %pubdate= harvest.harvested_at.to_s(:rfc822)
+        %description
+          :escaped
+            <p>Crop: #{harvest.crop ? harvest.crop : 'unknown' }</p>
+            <p>Quantity: #{harvest.quantity ? harvest.quantity : 'unknown' }</p>
+            <p>Harvested on: #{harvest.harvested_at ? harvest.harvested_at : 'unknown' }</p>
+          :escaped_markdown
+            #{ strip_tags harvest.description }
+        %link= harvest_url(harvest)
+        %guid= harvest_url(harvest)

app/views/members/_gardens.html.haml

@@ -1,4 +1,3 @@
-%h2 #{member.login_name}'s gardens
 .tabbable
   %ul.nav.nav-tabs
     - first_garden = true
@@ -45,10 +44,10 @@
                   = link_to "Add photo", new_photo_path(type: "garden", id: g.id), class: 'btn btn-primary'
 
           %h3 What's planted here?
-          .row
+          .card-row
             - unless g.featured_plantings.empty?
               - g.featured_plantings.each.with_index do |planting|
-                .col-xs-12.col-lg-6
+                .card
                   = render partial: "plantings/card", locals: { planting: planting }
 
           %p

app/views/members/_harvests.html.haml

@@ -0,0 +1,6 @@
+.card-row-short
+  - harvests.each do |harvest|
+    .card
+      = render partial: "harvests/card", locals: { harvest: harvest }
+- if !harvests.any?
+  #{member.login_name} hasn't harvested anything yet.

app/views/members/_map.html.haml

@@ -1,6 +1,6 @@
 - if member.latitude && member.longitude
   #membermap
-  %p
+  %p.pull-right
     See other members, plantings, seeds and more near
     = link_to member.location, place_path(member.location, anchor: "members")
 - else

app/views/members/_stats.html.haml

@@ -7,7 +7,7 @@
 
 %h3 Activity
 
-%ul.list-inline
+%ul.activity-list
   %li
     - if !member.plantings.empty?
       = link_to localize_plural(member.plantings, Planting), plantings_by_owner_path(owner: member)

app/views/members/show.html.haml

@@ -9,31 +9,40 @@
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 - content_for :buttonbar do
   - if can? :update, @member
-    = link_to 'Edit profile', edit_member_registration_path, class: 'btn btn-default'
+    = link_to 'Edit profile', edit_member_registration_path, class: 'btn btn-default pull-right'
   - if can?(:create, Notification) && current_member != @member
-    = link_to 'Send message', new_notification_path(recipient_id: @member.id), class: 'btn btn-default'
+    = link_to 'Send message', new_notification_path(recipient_id: @member.id), class: 'btn btn-default pull-right'
 
   - if current_member && current_member != @member # must be logged in, can't follow yourself
     - follow = current_member.get_follow(@member)
     - if !follow && can?(:create, Follow) # not already following
-      = link_to 'Follow', follows_path(followed_id: @member.id), method: :post, class: 'btn btn-default'
+      = link_to 'Follow', follows_path(followed_id: @member.id), method: :post, class: 'btn btn-default pull-right'
     - if follow && can?(:destroy, follow) # already following
-      = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-default'
+      = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-default pull-right'
 
 - content_for :member_rss_login_name, @member.login_name
 - content_for :member_rss_slug, @member.slug
 
 .row
-
-  .col-md-9
-    = render partial: "map", locals: { member: @member }
-    = render partial: "bio", locals: { member: @member }
-    = render partial: "gardens", locals: { member: @member, gardens: @gardens }
-  .col-md-3
+  = render partial: "map", locals: { member: @member }
+  .col-md-2.profile-sidebar
     = render partial: "avatar", locals: { member: @member }
+    = render partial: "bio", locals: { member: @member }
     = render partial: "roles", locals: { member: @member }
     = render partial: "stats", locals: { member: @member }
     = render partial: "contact", locals: { member: @member,
                                           twitter_auth: @twitter_auth,
                                           flickr_auth: @flickr_auth,
                                           facebook_auth: @facebook_auth }
+
+  .col-md-10
+    %ul.nav.nav-pills.nav-justified
+      %li.active
+        %a{ "data-toggle" => "tab", href: "#gardens" } Gardens
+      %li
+        %a{ "data-toggle" => "tab", href: "#harvests" } Harvests
+    .tab-content.profile-activity
+      .tab-pane.active#gardens
+        = render partial: "gardens", locals: { member: @member, gardens: @gardens }
+      .tab-pane#harvests
+        = render partial: "harvests", locals: { member: @member, harvests: @harvests }

app/views/plantings/_actions.html.haml

@@ -8,5 +8,5 @@
       = render 'shared/buttons/harvest_planting', planting: planting
       = render 'shared/buttons/save_seeds', planting: planting
 
-  - if can? :destroy, planting
-    = render 'shared/buttons/delete', path: planting
+    - if can? :destroy, planting
+      = render 'shared/buttons/delete', path: planting

app/views/plantings/_badges.html.haml

@@ -0,0 +1,20 @@
+// Finish times
+- if planting.finish_is_predicatable?
+  - if planting.super_late?
+    %span.badge.badge-super-late= t('.super_late')
+    = render 'shared/buttons/finish_planting', planting: planting
+  - elsif planting.late?
+    %span.badge.badge-late= t('.late_finishing')
+  - else
+    %span.badge
+      = days_from_now_to_finished(planting)
+      = t('.days_until_finished')
+
+// Harvest times
+- unless planting.super_late?
+  - if planting.harvest_time?
+    %span.badge.badge-harvest= t('.harvesting_now')
+  - elsif planting.before_harvest_time?
+    %span.badge
+      = days_from_now_to_first_harvest(planting)
+      = t('.days_until_harvest')

app/views/plantings/_nav.haml

@@ -15,4 +15,3 @@
     = link_to 'Plant something', new_planting_path, class: 'btn btn-primary'
 - else
   = render partial: 'shared/signin_signup', locals: { to: "track what you've planted" }
-

app/views/plantings/_progress.html.haml

@@ -1,8 +1,8 @@
 - if planting.crop.perennial
-  %p Perennial
+  = render "plantings/progress_bar", status: "perennial", progress: nil
 - elsif !planting.planted?
   - if show_explanation
-    %p Progress: 0% - not planted yet
+    %p= t('.progress_0_not_planted_yet')
   = render "plantings/progress_bar", status: "not planted", progress: 0
 - elsif planting.finished?
   = render "plantings/progress_bar", status: 'finished', progress: 100

app/views/plantings/_thumbnail.html.haml

@@ -1,10 +1,13 @@
-.thumbnail
-  .planting-thumbnail
-    - if planting
-      = link_to image_tag(planting_image_path(planting),
-                          alt: planting.crop.name, class: 'img'),
-                          planting
-      .plantinginfo
+.planting
+  .planting-badges
+    = render 'plantings/badges', planting: planting
+  .hover-wrapper
+    .thumbnail
+      .planting-thumbnail{ class: planting_classes(planting) }
+        = link_to image_tag(planting_image_path(planting),
+          alt: planting.crop.name, class: 'img'), planting_path(planting)
+        = render 'plantings/progress', planting: planting, show_explanation: false
         .planting-name
-          = render 'plantings/progress', planting: planting, show_explanation: false
           = link_to planting.crop.name, planting
+        .text
+          .planting-actions= render 'plantings/actions', planting: planting

app/views/plantings/index.html.haml

@@ -3,16 +3,16 @@
 = render 'nav', owner: @owner, show_all: @show_all
 
 - if @owner
-  = link_to "View #{@owner}'s profile >>", member_path(@owner)
+  = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
 
 .pagination
   = page_entries_info @plantings
   = will_paginate @plantings
 
-.row
+.card-row
   - unless @plantings.empty?
     - @plantings.each.with_index do |planting|
-      .col-xs-12.col-lg-6
+      .card
         = render partial: "plantings/card", locals: { planting: planting }
 
 .pagination
@@ -20,12 +20,7 @@
   = will_paginate @plantings
 
   %ul.list-inline
-    %li The data on this page is available in the following formats:
-    - if @owner
-      %li= link_to "CSV", plantings_by_owner_path(@owner, format: 'csv')
-      %li= link_to "JSON", plantings_by_owner_path(@owner, format: 'json')
-      %li= link_to "RSS", plantings_by_owner_path(@owner, format: 'rss')
-    - else
-      %li= link_to "CSV", plantings_path(format: 'csv')
-      %li= link_to "JSON", plantings_path(format: 'json')
-      %li= link_to "RSS", plantings_path(format: 'rss')
+    %li= t('.the_data_on_this_page_is_available_in_the_following_formats')
+    - ['csv', 'json', 'rss'].each do |format|
+      %li= link_to format.upcase,
+          (@owner ? plantings_by_owner_path(@owner, format: format) : plantings_path(format: format))

app/views/posts/show.html.haml

@@ -36,8 +36,12 @@
         = link_to 'Edit Post', edit_post_path(@post), class: 'btn btn-default btn-xs'
       - if can? :destroy, @post
         = link_to 'Delete Post', @post, method: :delete,
-                  data: { confirm: 'Are you sure?' },
-                  class: 'btn btn-default btn-xs'
+                      data: { confirm: 'Are you sure?' },
+                      class: 'btn btn-default btn-xs'
+
+  - if @post.comments.count > 10 && can?(:create, Comment)
+    .post-actions
+      = link_to 'Comment', new_comment_path(post_id: @post.id), class: 'btn btn-primary'
 
   = render partial: "comments", locals: { post: @post }
 

app/views/seeds/index.html.haml

@@ -24,7 +24,7 @@
   = page_entries_info @seeds
   = will_paginate @seeds
 
-.seeds-row
+.card-row
   - unless @seeds.empty?
     - @seeds.each do |seed|
       .seedcard

app/views/shared/buttons/_finish_planting.html.haml

@@ -1,4 +1,4 @@
-- unless planting.finished
+- if can?(:edit, planting) && !planting.finished
   = link_to planting_path(planting, planting: { finished: 1 }),
             method: :put, class: 'btn btn-default btn-xs append-date' do
     %span.glyphicon.glyphicon-ok{ title: "Finished" }

config/locales/en.yml

@@ -52,6 +52,11 @@ en:
       location_helper: If you have a location set in your profile, it will be used when you create a new garden.
     location: "%{owner}'s %{garden}"
     updated: Garden was successfully updated.
+    overview:
+      gardensphoto: gardens/photo
+      plantingsthumbnail: plantings/thumbnail
+      no_plantings: no plantings
+      gardensactions: gardens/actions
   harvests:
     created: Harvest was successfully created.
     index:
@@ -188,7 +193,18 @@ en:
         crop_plantings: Everyone's %{crop} plantings
         default: Everyone's plantings
         owner_plantings: "%{owner} plantings"
+      view_owners_profile: View %{owner}'s profile >>
+      the_data_on_this_page_is_available_in_the_following_formats: 'The data on this page is available in the following formats:'
     string: "%{crop} planting in %{garden} by %{owner}"
+    badges:
+      late_finishing: late finishing
+      super_late: super late
+      sharedbuttonsfinish_planting: shared/buttons/finish_planting
+      days_until_finished: days until finished
+      harvesting_now: harvesting now
+      days_until_harvest: days until harvest
+    progress:
+      progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
   posts:
     index:
       title:

db/migrate/20171105011017_set_prediction_data.rb

@@ -1,7 +1,7 @@
 class SetPredictionData < ActiveRecord::Migration
   def up
     say "Updating all plantings time to first harvest"
-    Planting.all.each(&:update_harvest_days)
+    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

lib/tasks/search.rake

@@ -0,0 +1,11 @@
+namespace :search do
+  desc "Create elastic search index"
+  task create: :environment do
+    puts Crop.__elasticsearch__.create_index! force: true
+  end
+
+  desc 'Refresh elastic search index'
+  task refresh: :environment do
+    puts Crop.__elasticsearch__.refresh_index!
+  end
+end

script/install_elasticsearch.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
 
 if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
+  [[ -z "$VERSION" ]] && VERSION="6.2.3"
   set -euv
   sudo dpkg -r elasticsearch
-  curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb
-  sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb
+  wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb
+  wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb.sha512
+  shasum -a 512 -c elasticsearch-${VERSION}.deb.sha512
+  sudo dpkg -i --force-confnew elasticsearch-${VERSION}.deb
+
   sudo service elasticsearch start
   sleep 10
   curl -v localhost:9200

spec/controllers/charts/gardens_controller_spec.rb

@@ -5,18 +5,23 @@ describe Charts::GardensController do
   let(:valid_params) { { name: 'My second Garden' } }
 
   let(:garden) { FactoryBot.create :garden }
+
   context "when not signed in" do
     describe 'GET timeline' do
       before { get :timeline, garden_id: garden.to_param }
+
       it { expect(response).to be_success }
     end
   end
+
   context "when signed in" do
     before(:each) { sign_in member }
 
     let!(:member) { FactoryBot.create(:member) }
+
     describe 'GET timeline' do
       before { get :timeline, garden_id: garden.to_param }
+
       it { expect(response).to be_success }
     end
   end

spec/controllers/comments_controller_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe CommentsController do
   subject { response }
+
   let(:member) { FactoryBot.create(:member) }
 
   before(:each) do
@@ -20,6 +21,7 @@ describe CommentsController do
 
     describe "returns an RSS feed" do
       before { get :index, format: "rss" }
+
       it { is_expected.to be_success }
       it { is_expected.to render_template("comments/index") }
       it { expect(response.content_type).to eq("application/rss+xml") }
@@ -81,11 +83,13 @@ describe CommentsController do
         expect(response).to redirect_to(comment.post)
       end
     end
+
     describe "not my comment" do
       let(:comment) { FactoryBot.create :comment }
 
       it { expect(response).not_to be_success }
     end
+
     describe "attempting to change post_id" do
       let(:post) { FactoryBot.create :post, subject: 'our post' }
       let(:other_post) { FactoryBot.create :post, subject: 'the other post' }

spec/controllers/crops_controller_spec.rb

@@ -16,6 +16,7 @@ describe CropsController do
   describe "GET crop wrangler homepage" do
     describe 'fetches the crop wrangler homepage' do
       before { get :wrangle }
+
       it { is_expected.to be_success }
       it { is_expected.to render_template("crops/wrangle") }
       it { expect(assigns[:crop_wranglers]).to eq(Role.crop_wranglers) }
@@ -25,6 +26,7 @@ describe CropsController do
   describe "GET crop hierarchy " do
     describe 'fetches the crop hierarchy page' do
       before { get :hierarchy }
+
       it { is_expected.to be_success }
       it { is_expected.to render_template("crops/hierarchy") }
     end
@@ -33,6 +35,7 @@ describe CropsController do
   describe "GET crop search" do
     describe 'fetches the crop search page' do
       before { get :search }
+
       it { is_expected.to be_success }
       it { is_expected.to render_template("crops/search") }
     end
@@ -41,6 +44,7 @@ describe CropsController do
   describe "GET RSS feed" do
     describe "returns an RSS feed" do
       before { get :index, format: "rss" }
+
       it { is_expected.to be_success }
       it { is_expected.to render_template("crops/index") }
       it { expect(response.content_type).to eq("application/rss+xml") }

spec/controllers/gardens_controller_spec.rb

@@ -5,15 +5,20 @@ RSpec.describe GardensController, type: :controller do
   let(:valid_params) { { name: 'My second Garden' } }
 
   let(:garden) { FactoryBot.create :garden }
+
   context "when not signed in" do
     describe 'GET new' do
       before { get :new, id: garden.to_param }
+
       it { expect(response).to redirect_to(new_member_session_path) }
     end
+
     describe 'PUT create' do
       before { put :create, garden: valid_params }
+
       it { expect(response).to redirect_to(new_member_session_path) }
     end
+
     describe 'changing existing records' do
       before do
         allow(Garden).to receive(:find).and_return(:garden)
@@ -23,20 +28,27 @@ RSpec.describe GardensController, type: :controller do
         expect(garden).not_to receive(:update!)
         expect(garden).not_to receive(:destroy)
       end
+
       describe 'GET edit' do
         before { get :edit, id: garden.to_param }
+
         it { expect(response).to redirect_to(new_member_session_path) }
       end
+
       describe 'POST update' do
         before { post :update, id: garden.to_param, garden: valid_params }
+
         it { expect(response).to redirect_to(new_member_session_path) }
       end
+
       describe 'DELETE' do
         before { delete :destroy, id: garden.to_param, params: { garden: valid_params } }
+
         it { expect(response).to redirect_to(new_member_session_path) }
       end
     end
   end
+
   context "when signed in" do
     before(:each) { sign_in member }
 
@@ -56,14 +68,19 @@ RSpec.describe GardensController, type: :controller do
 
       describe 'GET edit' do
         before { get :edit, id: not_my_garden.to_param }
+
         it { expect(response).to redirect_to(root_path) }
       end
+
       describe 'POST update' do
         before { post :update, id: not_my_garden.to_param, garden: valid_params }
+
         it { expect(response).to redirect_to(root_path) }
       end
+
       describe 'DELETE' do
         before { delete :destroy, id: not_my_garden.to_param, params: { garden: valid_params } }
+
         it { expect(response).to redirect_to(root_path) }
       end
     end

spec/controllers/harvests_controller_spec.rb

@@ -22,23 +22,27 @@ describe HarvestsController do
 
     describe "assigns all harvests as @harvests" do
       before { get :index, {} }
+
       it { assigns(:harvests).should =~ [harvest1, harvest2] }
     end
 
     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
 
     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
 
     describe "generates a csv" do
       before { get :index, format: "csv" }
+
       it { expect(response.status).to eq 200 }
     end
   end
@@ -48,6 +52,7 @@ describe HarvestsController do
 
     describe "assigns the requested harvest as @harvest" do
       before { get :show, id: harvest.to_param }
+
       it { expect(assigns(:harvest)).to eq(harvest) }
     end
   end
@@ -69,6 +74,7 @@ describe HarvestsController do
 
     describe "assigns the requested harvest as @harvest" do
       before { get :edit, id: harvest.to_param }
+
       it { expect(assigns(:harvest)).to eq(harvest) }
     end
   end
@@ -96,6 +102,7 @@ describe HarvestsController 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
@@ -124,6 +131,7 @@ describe HarvestsController 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
@@ -179,6 +187,7 @@ describe HarvestsController 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

spec/controllers/likes_controller_spec.rb

@@ -9,8 +9,10 @@ describe LikesController do
   before { sign_in member }
 
   describe "POST create" do
-    it { expect(response.content_type).to eq "application/json" }
     before { post :create, post_id: blogpost.id, format: :json }
+
+    it { expect(response.content_type).to eq "application/json" }
+
     it { expect(Like.last.likeable_id).to eq(blogpost.id) }
     it { expect(Like.last.likeable_type).to eq('Post') }
     it { JSON.parse(response.body)["description"] == "1 like" }
@@ -26,6 +28,7 @@ describe LikesController do
 
   describe "DELETE destroy" do
     before { delete :destroy, id: like.id, format: :json }
+
     it { expect(response.content_type).to eq "application/json" }
 
     describe "un-liking something i liked before" do

spec/controllers/photos_controller_spec.rb

@@ -39,6 +39,7 @@ describe PhotosController do
 
     describe "planting photos" do
       before(:each) { get :new, type: "planting", id: planting.id }
+
       it { assigns(:flickr_auth).should be_an_instance_of(Authentication) }
       it { assigns(:item).should eq planting }
       it { expect(flash[:alert]).not_to be_present }
@@ -47,12 +48,14 @@ describe PhotosController do
 
     describe "harvest photos" do
       before { get :new, type: "harvest", id: harvest.id }
+
       it { assigns(:item).should eq harvest }
       it { expect(flash[:alert]).not_to be_present }
     end
 
     describe "garden photos" do
       before { get :new, type: "garden", id: garden.id }
+
       it { assigns(:item).should eq garden }
       it { expect(flash[:alert]).not_to be_present }
     end
@@ -76,6 +79,7 @@ describe PhotosController do
 
     describe "with valid params" do
       before { controller.stub(:current_member) { member } }
+
       it "attaches the photo to a planting" do
         post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
         expect(flash[:alert]).not_to be_present
@@ -87,6 +91,7 @@ describe PhotosController do
           post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
           post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
         end
+
         it { expect(flash[:alert]).not_to be_present }
         it { expect(Photo.last.plantings.size).to eq 1 }
       end
@@ -108,7 +113,7 @@ describe PhotosController do
         comment = FactoryBot.create(:comment)
         expect do
           post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id
-        end.to raise_error
+        end.to raise_error('Photos not supported')
       end
     end
 
@@ -127,6 +132,7 @@ describe PhotosController do
 
     describe "with matching owners" do
       before { controller.stub(:current_member) { member } }
+
       it "creates the planting/photo link" do
         planting = FactoryBot.create(:planting, garden: garden, owner: member)
         photo = FactoryBot.create(:photo, owner: member)

spec/controllers/plantings_controller_spec.rb

@@ -20,17 +20,20 @@ describe PlantingsController do
 
     describe "assigns all plantings as @plantings" do
       before { get :index, {} }
+
       it { expect(assigns(:plantings)).to match [planting1, planting2] }
     end
 
     describe "picks up owner from params and shows owner's plantings only" do
       before { get :index, owner: member1.slug }
+
       it { expect(assigns(:owner)).to eq member1 }
       it { expect(assigns(:plantings)).to eq [planting1] }
     end
 
     describe "picks up crop from params and shows the plantings for the crop only" do
       before { get :index, crop: maize.name }
+
       it { expect(assigns(:crop)).to eq maize }
       it { expect(assigns(:plantings)).to eq [planting2] }
     end
@@ -41,11 +44,13 @@ describe PlantingsController do
       let(:crop) { FactoryBot.create(:crop) }
 
       before { get :new, crop_id: crop.id }
+
       it { expect(assigns(:crop)).to eq(crop) }
     end
 
     describe "doesn't die if no crop specified" do
       before { get :new, {} }
+
       it { expect(assigns(:crop)).to be_a_new(Crop) }
     end
 
@@ -53,6 +58,7 @@ describe PlantingsController do
       let(:garden) { FactoryBot.create(:garden, owner: member) }
 
       before { get :new, garden_id: garden.id }
+
       it { expect(assigns(:garden)).to eq(garden) }
     end
 
@@ -61,6 +67,7 @@ describe PlantingsController do
       let(:garden) { FactoryBot.create(:garden, owner: another_member) }
 
       before { get :new, garden_id: garden.id }
+
       it { expect(assigns(:garden)).not_to eq(garden) }
     end
 
@@ -69,6 +76,7 @@ describe PlantingsController do
       let!(:garden) { FactoryBot.create(:garden, owner: member) }
 
       before { get :new, crop_id: crop.id }
+
       it { expect(assigns(:crop)).not_to eq(crop) }
     end
 
@@ -77,22 +85,27 @@ describe PlantingsController do
       let!(:garden) { FactoryBot.create(:garden, owner: member) }
 
       before { get :new, crop_id: crop.id }
+
       it { expect(assigns(:crop)).not_to eq(crop) }
     end
 
     describe "doesn't die if no garden specified" do
       before { get :new, {} }
+
       it { expect(assigns(:garden)).to be_a_new(Garden) }
     end
 
     describe "sets the date of the planting to today" do
       before { get :new, {} }
+
       it { expect(assigns(:planting).planted_at).to eq Time.zone.today }
     end
 
     context 'with parent seed' do
       let(:seed) { FactoryBot.create :seed, owner: member }
+
       before { get :new, seed_id: seed.to_param }
+
       it { expect(assigns(:seed)).to eq(seed) }
     end
   end
@@ -100,6 +113,7 @@ describe PlantingsController do
   describe 'POST :create' do
     describe "sets the owner automatically" do
       before { post :create, planting: valid_attributes }
+
       it { expect(assigns(:planting).owner).to eq subject.current_member }
     end
   end

spec/controllers/seeds_controller_spec.rb

@@ -5,6 +5,7 @@ describe SeedsController do
 
   describe "GET index" do
     before { get :index, owner: owner.slug }
+
     it "picks up owner from params" do
       assigns(:owner).should eq(owner)
     end
@@ -21,7 +22,9 @@ describe SeedsController do
 
     context 'with parent planting' do
       let(:planting) { FactoryBot.create :planting, owner: owner }
+
       before { get :new, planting_id: planting.to_param }
+
       it { expect(assigns(:planting)).to eq(planting) }
     end
   end

spec/factories/alternate_names.rb

@@ -2,13 +2,13 @@
 
 FactoryBot.define do
   factory :alternate_name do
-    name "alternate name"
+    name { "alternate name" }
     crop
     creator
 
     factory :alternate_eggplant do
       association :crop, factory: :eggplant
-      name "aubergine"
+      name { "aubergine" }
     end
   end
 end

spec/factories/authentications.rb

@@ -3,14 +3,14 @@
 FactoryBot.define do
   factory :authentication do
     member
-    provider 'twitter'
-    uid 'foo'
-    secret 'bar'
-    name 'baz'
+    provider { 'twitter' }
+    uid { 'foo' }
+    secret { 'bar' }
+    name { 'baz' }
 
     factory :flickr_authentication do
-      provider 'flickr'
-      uid 'blah@blah'
+      provider { 'flickr' }
+      uid { 'blah@blah' }
     end
   end
 end

spec/factories/crop.rb

@@ -1,83 +1,83 @@
 FactoryBot.define do
   factory :crop do
-    name "magic bean"
-    en_wikipedia_url "http://en.wikipedia.org/wiki/Magic_bean"
-    approval_status "approved"
+    name { "magic bean" }
+    en_wikipedia_url { "http://en.wikipedia.org/wiki/Magic_bean" }
+    approval_status { "approved" }
     creator
 
     factory :annual_crop, parent: :crop do
-      perennial false
+      perennial { false }
     end
     factory :perennial_crop, parent: :crop do
-      perennial true
+      perennial { true }
     end
 
     factory :tomato do
-      name "tomato"
-      en_wikipedia_url "http://en.wikipedia.org/wiki/Tomato"
+      name { "tomato" }
+      en_wikipedia_url { "http://en.wikipedia.org/wiki/Tomato" }
     end
 
     factory :maize do
-      name "maize"
-      en_wikipedia_url "http://en.wikipedia.org/wiki/Maize"
+      name { "maize" }
+      en_wikipedia_url { "http://en.wikipedia.org/wiki/Maize" }
     end
 
     factory :chard do
-      name "chard"
+      name { "chard" }
     end
 
     factory :walnut do
-      name "walnut"
+      name { "walnut" }
     end
 
     factory :apple do
-      name "apple"
+      name { "apple" }
     end
 
     factory :pear do
-      name "pear"
+      name { "pear" }
     end
 
     # for testing varieties
     factory :roma do
-      name "roma tomato"
+      name { "roma tomato" }
     end
 
     factory :popcorn do
-      name "popcorn"
+      name { "popcorn" }
     end
 
     factory :eggplant do
-      name "eggplant"
+      name { "eggplant" }
     end
 
     # This should have a name that is alphabetically earlier than :uppercase
     # crop to ensure that the ordering tests work.
     factory :lowercasecrop do
-      name "ffrench bean"
+      name { "ffrench bean" }
     end
 
     factory :uppercasecrop do
-      name "Swiss chard"
+      name { "Swiss chard" }
     end
 
     factory :autoloaded_crop do
-      creator "cropbot"
+      creator { "cropbot" }
     end
 
     # for testing crop request
     factory :crop_request do
-      name "Ultra berry"
-      en_wikipedia_url ""
-      approval_status "pending"
+      name { "Ultra berry" }
+      en_wikipedia_url { "" }
+      approval_status { "pending" }
       association :requester, factory: :member
-      request_notes "Please approve this even though it's fake."
+      request_notes { "Please approve this even though it's fake." }
     end
 
     factory :rejected_crop do
-      name "Fail bean"
-      approval_status "rejected"
-      reason_for_rejection "Totally fake"
+      name { "Fail bean" }
+      approval_status { "rejected" }
+      reason_for_rejection { "Totally fake" }
     end
   end
 end

spec/factories/forums.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :forum do
-    name "Permaculture"
-    description "*Everything* about permaculture!"
+    name { "Permaculture" }
+    description { "*Everything* about permaculture!" }
     owner
   end
 end

spec/factories/garden.rb

@@ -1,24 +1,24 @@
 FactoryBot.define do
   factory :garden do
-    name 'Springfield Community Garden'
-    description "This is a **totally** cool garden"
+    name { Faker::Vehicle.vin }
+    description { "This is a **totally** cool garden" }
     owner
-    active true
-    area 23
-    area_unit "acre"
-    location "Greenwich, UK"
+    active { true }
+    area { 23 }
+    area_unit { "acre" }
+    location { "Greenwich, UK" }
 
     factory :inactive_garden do
-      active false
+      active { false }
     end
 
     # the following are used for testing alphabetical ordering
     factory :garden_a do
-      name 'A garden starting with A'
+      name { 'A garden starting with A' }
     end
 
     factory :garden_z do
-      name 'Zzzz this garden makes me sleepy'
+      name { 'Zzzz this garden makes me sleepy' }
     end
   end
 end

spec/factories/harvests.rb

@@ -3,15 +3,15 @@
 FactoryBot.define do
   factory :harvest do
     crop { planting.present? ? planting.crop : FactoryBot.create(:crop) }
-    plant_part
-    planting nil
+    plant_part { FactoryBot.create :plant_part }
+    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"
+    quantity { "3" }
+    unit { "individual" }
+    weight_quantity { 6 }
+    weight_unit { "kg" }
+    description { "A lovely harvest" }
 
     factory :harvest_with_planting do
       planting
@@ -19,10 +19,10 @@ FactoryBot.define do
   end
 
   trait :long_description do
-    description "This is a very long description that is so very long that it will need to be cut off"
+    description { "This is a very long description that is so very long that it will need to be cut off" }
   end
 
   trait :no_description do
-    description ""
+    description { "" }
   end
 end

spec/factories/member.rb

@@ -4,59 +4,59 @@ FactoryBot.define do
 
   factory :member, aliases: %i(author owner sender recipient creator) do
     login_name { generate(:login_name) }
-    password 'password1'
+    password { 'password1' }
     email { generate(:email) }
-    tos_agreement true
+    tos_agreement { true }
     confirmed_at { Time.now }
-    show_email false
-    bio 'I love seeds'
+    show_email { false }
+    bio { 'I love seeds' }
 
     # cropbot is needed for certain tests, eg. Crop.create_from_csv
     factory :cropbot do
-      login_name 'cropbot'
+      login_name { 'cropbot' }
     end
 
     factory :no_tos_member do
-      tos_agreement false
+      tos_agreement { false }
     end
 
     factory :newsletter_recipient_member do
-      newsletter true
+      newsletter { true }
     end
 
     factory :no_bio_member do
-      bio nil
+      bio { nil }
     end
 
     factory :unconfirmed_member do
-      confirmed_at nil
+      confirmed_at { nil }
     end
 
     # this member has very loose privacy settings
     factory :public_member do
-      login_name 'NothingToHide'
-      show_email true
+      login_name { 'NothingToHide' }
+      show_email { true }
     end
 
     factory :london_member do
       sequence(:login_name) { |n| "JohnH#{n}" } # for the astronomer who figured out longitude
-      location 'Greenwich, UK'
+      location { 'Greenwich, UK' }
       # including lat/long explicitly because geocoder doesn't work with FG
-      latitude 51.483
-      longitude 0.004
+      latitude { 51.483 }
+      longitude { 0.004 }
     end
 
     factory :edinburgh_member do
-      location 'Edinburgh'
-      latitude 55.953252
+      location { 'Edinburgh' }
+      latitude { 55.953252 }
       longitude { -3.188267 }
     end
 
     factory :south_pole_member do
       sequence(:login_name) { |n| "ScottRF#{n}" }
-      location 'Amundsen-Scott Base, Antarctica'
+      location { 'Amundsen-Scott Base, Antarctica' }
       latitude { -90 }
-      longitude 0
+      longitude { 0 }
     end
 
     factory :admin_member do
@@ -69,39 +69,39 @@ FactoryBot.define do
     end
 
     factory :invalid_member_shortname do
-      login_name 'a'
+      login_name { 'a' }
     end
 
     factory :invalid_member_longname do
-      login_name 'MarmadukeBlundellHollinsheadBlundellTolemachePlantagenetWhistlebinkie3rdDukeofMarmoset'
+      login_name { 'MarmadukeBlundellHollinsheadBlundellTolemachePlantagenetWhistlebinkie3rdDukeofMarmoset' }
     end
 
     factory :invalid_member_spaces do
-      login_name "a b"
+      login_name { "a b" }
     end
 
     factory :invalid_member_badchars do
-      login_name 'aa%$'
+      login_name { 'aa%$' }
     end
 
     factory :invalid_member_badname do
-      login_name 'admin'
+      login_name { 'admin' }
     end
 
     factory :valid_member_alphanumeric do
-      login_name 'abc123'
+      login_name { 'abc123' }
     end
 
     factory :valid_member_uppercase do
-      login_name 'ABC123'
+      login_name { 'ABC123' }
     end
 
     factory :valid_member_underscore do
-      login_name 'abc_123'
+      login_name { 'abc_123' }
     end
 
     factory :no_email_notifications_member do
-      send_notification_email false
+      send_notification_email { false }
     end
   end
 end

spec/factories/notifications.rb

@@ -4,9 +4,10 @@ FactoryBot.define do
   factory :notification, aliases: [:message] do
     sender
     recipient
-    subject "MyString"
-    body "MyText"
-    read false
+    subject { "MyString" }
+
+    body { "MyText" }
+    read { false }
     post
 
     factory :no_email_notification do

spec/factories/photos.rb

@@ -3,17 +3,17 @@
 FactoryBot.define do
   factory :photo do
     owner
-    flickr_photo_id 1
+    flickr_photo_id { 1 }
     title { Faker::HarryPotter.quote }
-    license_name "CC-BY"
-    license_url "http://example.com/license.html"
+    license_name { "CC-BY" }
+    license_url { "http://example.com/license.html" }
     thumbnail_url { "http://example.com/#{Faker::File.file_name}.jpg" }
     fullsize_url { "http://example.com/#{Faker::File.file_name}.jpg" }
     link_url { Faker::Internet.url }
 
     factory :unlicensed_photo do
-      license_name "All rights reserved"
-      license_url ""
+      license_name { "All rights reserved" }
+      license_url { "" }
     end
   end
 end

spec/factories/plant_parts.rb

@@ -2,6 +2,6 @@
 
 FactoryBot.define do
   factory :plant_part do
-    name "pollen"
+    name { "#{Faker::Book.title}_#{rand(100..999)}" }
   end
 end

spec/factories/planting.rb

@@ -4,35 +4,37 @@ FactoryBot.define do
     garden { FactoryBot.create :garden, owner: owner }
     crop
     planted_at { Time.zone.local(2014, 7, 30) }
-    quantity 33
-    description "This is a *really* good plant."
+    quantity { 33 }
+    description { "This is a *really* good plant." }
+    finished { false }
+    finished_at { nil }
 
     factory :seed_planting do
-      planted_from 'seed'
+      planted_from { 'seed' }
     end
 
     factory :seedling_planting do
-      planted_from 'seedling'
+      planted_from { 'seedling' }
     end
 
     factory :cutting_planting do
-      planted_from 'cutting'
+      planted_from { 'cutting' }
     end
 
     factory :sunny_planting do
-      sunniness 'sun'
+      sunniness { 'sun' }
     end
 
     factory :semi_shady_planting do
-      sunniness 'semi-shade'
+      sunniness { 'semi-shade' }
     end
 
     factory :shady_planting do
-      sunniness 'shade'
+      sunniness { 'shade' }
     end
 
     factory :finished_planting do
-      finished true
+      finished { true }
       planted_at { Time.zone.local(2014, 7, 30) }
       finished_at { Time.zone.local(2014, 8, 30) }
     end

spec/factories/post.rb

@@ -1,18 +1,19 @@
 FactoryBot.define do
   factory :post do
-    subject "A Post"
-    body "This is some text."
+    subject { "A Post" }
+
+    body { "This is some text." }
     author
     created_at { Time.now }
 
     # Markdown is allowed in posts
     factory :markdown_post do
-      body "This is some **strong** text."
+      body { "This is some **strong** text." }
     end
 
     # HTML isn't allowed in posts
     factory :html_post do
-      body '<a href="http://evil.com">EVIL</a>'
+      body { '<a href="http://evil.com">EVIL</a>' }
     end
 
     factory :forum_post do

spec/factories/roles.rb

@@ -2,17 +2,17 @@
 
 FactoryBot.define do
   factory :role do
-    name "Moderator"
-    description "These people moderate the forums"
+    name { "Moderator" }
+    description { "These people moderate the forums" }
     initialize_with { Role.find_or_create_by(name: name) }
 
     factory :admin do
-      name "admin"
+      name { "admin" }
     end
 
     factory :crop_wrangler do
-      name "Crop Wrangler"
-      description "they wrangle crops"
+      name { "Crop Wrangler" }
+      description { "they wrangle crops" }
     end
   end
 end

spec/factories/scientific_name.rb

@@ -1,17 +1,17 @@
 FactoryBot.define do
   factory :scientific_name do
     association :crop, factory: :crop
-    name "Beanus Magicus"
+    name { "Beanus Magicus" }
     creator
 
     factory :zea_mays do
       association :crop, factory: :maize
-      name "Zea mays"
+      name { "Zea mays" }
     end
 
     factory :solanum_lycopersicum do
       association :crop, factory: :tomato
-      name "Solanum lycopersicum"
+      name { "Solanum lycopersicum" }
     end
   end
 end

spec/factories/seeds.rb

@@ -4,30 +4,30 @@ FactoryBot.define do
   factory :seed do
     owner
     crop
-    description "MyText"
-    quantity 1
-    plant_before "2013-07-15"
-    tradable_to 'nowhere'
-    organic 'unknown'
-    gmo 'unknown'
-    heirloom 'unknown'
-    days_until_maturity_min nil
-    days_until_maturity_max nil
-    finished_at nil
+    description { "MyText" }
+    quantity { 1 }
+    plant_before { "2013-07-15" }
+    tradable_to { 'nowhere' }
+    organic { 'unknown' }
+    gmo { 'unknown' }
+    heirloom { 'unknown' }
+    days_until_maturity_min { nil }
+    days_until_maturity_max { nil }
+    finished_at { nil }
 
     factory :finished_seed do
-      finished true
+      finished { true }
       finished_at { Date.new }
     end
 
     factory :tradable_seed do
-      tradable_to "locally"
-      finished false
-      finished_at nil
+      tradable_to { "locally" }
+      finished { false }
+      finished_at { nil }
     end
 
     factory :untradable_seed do
-      tradable_to "nowhere"
+      tradable_to { "nowhere" }
     end
   end
 end

spec/features/crops/crop_detail_page_spec.rb

@@ -10,6 +10,7 @@ feature "crop detail page", js: true do
     visit crop_path(crop)
     page
   end
+
   let(:crop) { create :crop }
 
   context "varieties" do
@@ -190,6 +191,7 @@ feature "crop detail page", js: true do
                                     planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop))
         planting.crop.update_medians
       end
+
       it "predicts harvest" do
         is_expected.to have_text("First harvest expected 20 days after planting")
       end
@@ -254,18 +256,21 @@ feature "crop detail page", js: true do
 
   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 }
 

spec/features/crops/crop_photos_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 feature "crop detail page", js: true do
   subject { page }
+
   let(:member) { create :member }
 
   let(:crop) { create :crop, plantings: [planting], harvests: [harvest] }
@@ -34,10 +35,12 @@ feature "crop detail page", js: true do
       it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.thumbnail_url}')]") }
       it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.thumbnail_url}')]") }
     end
+
     describe "show harvest photos" do
       it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.thumbnail_url}')]") }
       it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.thumbnail_url}')]") }
     end
+
     describe "link to more photos" do
       it { is_expected.to have_link "more photos" }
     end
@@ -47,10 +50,12 @@ feature "crop detail page", js: true do
     background { login_as(create(:member)) }
     include_examples "shows photos"
   end
+
   context "when signed in as photos owner" do
     background { login_as(member) }
     include_examples "shows photos"
   end
+
   context "when not signed in " do
     include_examples "shows photos"
   end

spec/features/gardens/actions_spec.rb

@@ -3,9 +3,11 @@ require 'custom_matchers'
 
 feature "Gardens" do
   context 'logged in' do
+    subject { page }
+
     let(:member) { FactoryBot.create :member }
     background { login_as member }
-    subject { page }
+
     let(:garden) { member.gardens.first }
 
     describe '#index' do
@@ -21,6 +23,7 @@ feature "Gardens" do
 
       context 'my gardens' do
         before { visit gardens_path(owner: member) }
+
         include_examples "has buttons bar at top"
         it "has actions on garden" do
           within '.garden-actions' do
@@ -32,12 +35,16 @@ feature "Gardens" do
           end
         end
       end
+
       context 'all gardens' do
         before { visit gardens_path }
+
         include_examples "has buttons bar at top"
       end
+
       context "other member's garden" do
         before { visit gardens_path(owner: FactoryBot.create(:member)) }
+
         include_examples "has buttons bar at top"
         it 'does not show actions on other member garden' do
           is_expected.not_to have_link 'Plant something'

spec/features/gardens/gardens_index_spec.rb

@@ -3,14 +3,14 @@ require 'custom_matchers'
 
 feature "Gardens#index", :js do
   context "Logged in as member" do
-    let(:member) { FactoryBot.create :member }
+    let(:member) { FactoryBot.create :member, login_name: 'shadow' }
 
     background { login_as member }
 
     context "with 10 gardens" do
       before do
         FactoryBot.create_list :garden, 10, owner: member
-        visit gardens_path(member: member)
+        visit gardens_path(owner: member.login_name)
       end
 
       it "displays each of the gardens" do
@@ -59,6 +59,7 @@ feature "Gardens#index", :js do
       before do
         visit gardens_path(member: member)
       end
+
       it "shows planting in garden" do
         expect(page).to have_link(planting.crop.name, href: planting_path(planting))
       end
@@ -67,4 +68,74 @@ feature "Gardens#index", :js do
       end
     end
   end
+
+  describe 'badges' do
+    let(:garden) { member.gardens.first }
+    let(:member) { FactoryBot.create :member, login_name: 'robbieburns' }
+    let(:crop) { FactoryBot.create :crop }
+
+    before(:each) do
+      # time to harvest = 50 day
+      # time to finished = 90 days
+      FactoryBot.create(:harvest,
+        harvested_at: 50.days.ago,
+        crop: crop,
+        planting: FactoryBot.create(:planting,
+          crop: crop,
+          planted_at: 100.days.ago,
+          finished_at: 10.days.ago))
+      crop.plantings.each(&:update_harvest_days!)
+      crop.update_lifespan_medians
+      crop.update_harvest_medians
+
+      garden.update! name: 'super awesome garden'
+      assert planting
+      visit gardens_path(owner: member.login_name)
+    end
+
+    describe 'harvest still growing' do
+      let!(:planting) do
+        FactoryBot.create :planting,
+          crop: crop,
+          owner: member,
+          garden: garden,
+          planted_at: Time.zone.today
+      end
+
+      it { expect(page).to have_link href: planting_path(planting) }
+      it { expect(page).to have_link href: garden_path(planting.garden) }
+      it { expect(page).to have_text '50 days until harvest' }
+      it { expect(page).to have_text '90 days until finished' }
+      it { expect(page).not_to have_text 'harvesting now' }
+    end
+
+    describe 'harvesting now' do
+      let!(:planting) do
+        FactoryBot.create :planting,
+          crop: crop,
+          owner: member, garden: garden,
+          planted_at: 51.days.ago
+      end
+
+      it { expect(crop.median_days_to_first_harvest).to eq 50 }
+      it { expect(crop.median_lifespan).to eq 90 }
+
+      it { expect(page).to have_text 'harvesting now' }
+      it { expect(page).to have_text '39 days until finished' }
+      it { expect(page).not_to have_text 'days until harvest' }
+    end
+
+    describe 'super late' do
+      let!(:planting) do
+        FactoryBot.create :planting,
+          crop: crop, owner: member,
+          garden: garden, planted_at: 260.days.ago
+      end
+
+      it { expect(page).to have_text 'super late' }
+      it { expect(page).not_to have_text 'harvesting now' }
+      it { expect(page).not_to have_text 'days until harvest' }
+      it { expect(page).not_to have_text 'days until finished' }
+    end
+  end
 end

spec/features/harvests/browse_harvests_spec.rb

@@ -1,13 +1,16 @@
 require 'rails_helper'
 
 feature "browse harvests" do
+  subject { page }
+
   let!(:member) { create :member }
   let!(:harvest) { create :harvest, owner: member }
 
   background { login_as member }
-  subject { page }
+
   feature 'blank optional fields' do
     let!(:harvest) { create :harvest, :no_description }
+
     before { visit harvests_path }
 
     scenario 'read more' do

spec/features/harvests/harvesting_a_crop_spec.rb

@@ -130,7 +130,7 @@ feature "Harvesting a crop", :js, :elasticsearch do
     end
 
     scenario "linking to a planting" do
-      expect(page).to have_content planting.to_s
+      expect(page).to have_content existing_planting.to_s
       choose("harvest_planting_id_#{existing_planting.id}")
       click_button "save"
       expect(page).to have_link(href: planting_path(existing_planting))

spec/features/home/home_spec.rb

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 feature "home page" do
+  subject { page }
+
   let(:member) { FactoryBot.create :member }
   # let(:seed_photo) { FactoryBot.create :photo }
   let(:photo) { FactoryBot.create :photo }
@@ -13,6 +15,7 @@ feature "home page" do
   let!(:tradable_seed) { FactoryBot.create :tradable_seed, finished: false }
   let!(:finished_seed) { FactoryBot.create :tradable_seed, finished: true }
   let!(:untradable_seed) { FactoryBot.create :untradable_seed }
+
   background do
     # Add photos, so they can appear on home page
     planting.photos << photo
@@ -20,7 +23,6 @@ feature "home page" do
     harvest.photos << photo
   end
 
-  subject { page }
   before { visit root_path }
 
   shared_examples 'shows seeds' do
@@ -55,12 +57,14 @@ feature "home page" do
       it { is_expected.to have_text 'Some of our crops' }
       it { is_expected.to have_link href: crop_path(crop) }
     end
+
     describe 'shows recently added crops' do
       it { is_expected.to have_text 'Recently Added' }
       it 'link to newest crops' do
         is_expected.to have_link crop.name, href: crop_path(crop)
       end
     end
+
     it 'includes a link to all crops' do
       is_expected.to have_link 'View all crops'
     end

spec/features/member_profile_spec.rb

@@ -9,7 +9,6 @@ feature "member profile", js: true do
       expect(page).to have_css("h1", text: member.login_name)
       expect(page).to have_content member.bio
       expect(page).to have_content "Member since: #{member.created_at.to_s(:date)}"
-      expect(page).to have_content "#{member.login_name}'s gardens"
       expect(page).to have_link "More about this garden...", href: garden_path(member.gardens.first)
     end
 

spec/features/notifications_spec.rb

@@ -31,7 +31,7 @@ feature "Notifications", :js do
 
   describe 'pagination' do
     before do
-      34.times { FactoryBot.create :notification, recipient: recipient }
+      FactoryBot.create_list :notification, 34, recipient: recipient
       login_as recipient
       visit notifications_path
     end

spec/features/rss/plantings_spec.rb

@@ -9,6 +9,6 @@ feature 'Plantings RSS feed' do
   scenario 'The index title is what we expect' do
     visit plantings_path(format: 'rss')
     expect(page).to have_content "Recent plantings from "\
-      "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
+      "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
   end
 end

spec/features/rss/posts_spec.rb

@@ -9,6 +9,6 @@ feature 'Posts RSS feed' do
   scenario 'The index title is what we expect' do
     visit posts_path(format: 'rss')
     expect(page).to have_content "Recent posts from "\
-      "#{@author ? @author : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
+      "#{@author || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
   end
 end

spec/features/rss/seeds_spec.rb

@@ -9,6 +9,6 @@ feature 'Seeds RSS feed' do
   scenario 'The index title is what we expect' do
     visit seeds_path(format: 'rss')
     expect(page).to have_content "Recent seeds from "\
-      "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
+      "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
   end
 end

spec/features/seeds/seed_photos.rb

@@ -7,6 +7,7 @@ feature "Seeds", :js do
     visit seed_path(seed)
     page
   end
+
   let(:member) { FactoryBot.create :member }
   let!(:seed) { FactoryBot.create :seed, owner: member }
 
@@ -17,13 +18,16 @@ feature "Seeds", :js do
   # end
   context 'has one photo' do
     before { seed.photos = [photo] }
+
     let!(:photo) { FactoryBot.create :photo, title: 'hello photo' }
 
     it { is_expected.to have_xpath("//img[contains(@src,'#{photo.thumbnail_url}')]") }
     it { is_expected.to have_xpath("//a[contains(@href,'#{photo_path(photo)}')]") }
   end
+
   context 'has 50 photos' do
     before { seed.photos = photos }
+
     let!(:photos) { FactoryBot.create_list :photo, 50 }
 
     it "shows newest photo" do

spec/helpers/application_helper_spec.rb

@@ -1,11 +1,6 @@
 require 'rails_helper'
 
 describe ApplicationHelper do
-  it "formats prices" do
-    price_in_dollars(999).should eq '9.99'
-    price_with_currency(999).should eq format('9.99 %s', Growstuff::Application.config.currency)
-  end
-
   it "parses dates" do
     parse_date(nil).should eq nil
     parse_date('').should eq nil
@@ -25,6 +20,7 @@ describe ApplicationHelper do
       before :each do
         @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
       end
+
       it 'should render a gravatar uri' do
         expect(avatar_uri(@member)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
       end
@@ -38,6 +34,7 @@ describe ApplicationHelper do
       before :each do
         @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
       end
+
       it 'should render a the specified uri' do
         expect(avatar_uri(@member)).to eq 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg'
       end
@@ -92,6 +89,7 @@ describe ApplicationHelper do
           expect(build_alert_classes(:info)).not_to include ' alert-danger'
         end
       end
+
       context 'warning' do
         it 'works when :warning' do
           expect(build_alert_classes(:warning)).to include 'alert-warning'
@@ -106,6 +104,7 @@ describe ApplicationHelper do
           expect(build_alert_classes(:info)).not_to include ' alert-warning'
         end
       end
+
       context 'success' do
         it 'works when :notice' do
           expect(build_alert_classes(:notice)).to include 'alert-success'
@@ -120,6 +119,7 @@ describe ApplicationHelper do
           expect(build_alert_classes(:info)).not_to include ' alert-success'
         end
       end
+
       context 'info' do
         it 'works when :info' do
           expect(build_alert_classes(:info)).to include 'alert-info'

spec/helpers/photos_helper_spec.rb

@@ -19,6 +19,7 @@ describe PhotosHelper do
 
     describe "with a planting" do
       before { planting.photos << planting_photo }
+
       it "uses planting photos" do
         is_expected.to eq planting_photo.thumbnail_url
       end
@@ -26,6 +27,7 @@ describe PhotosHelper do
 
     describe "with a harvest photos" do
       before { harvest.photos << harvest_photo }
+
       it "uses harvest photos" do
         is_expected.to eq harvest_photo.thumbnail_url
       end
@@ -33,6 +35,7 @@ describe PhotosHelper do
 
     describe "uses seed photo" do
       before { seed.photos << seed_photo }
+
       it "uses seed photos" do
         is_expected.to eq seed_photo.thumbnail_url
       end
@@ -41,38 +44,46 @@ describe PhotosHelper do
 
   describe "gardens" do
     subject { garden_image_path(garden) }
+
     it { is_expected.to eq 'placeholder_150.png' }
 
     describe "uses garden's own photo" do
       before { garden.photos << garden_photo }
+
       it { is_expected.to eq garden_photo.thumbnail_url }
     end
   end
 
   describe 'plantings' do
     subject { planting_image_path(planting) }
+
     it { is_expected.to eq 'placeholder_150.png' }
     describe "uses planting's own photo" do
       before { planting.photos << planting_photo }
+
       it { is_expected.to eq planting_photo.thumbnail_url }
     end
   end
 
   describe 'harvests' do
     subject { harvest_image_path(harvest) }
+
     it { is_expected.to eq 'placeholder_150.png' }
     describe "uses harvest's own photo" do
       before { harvest.photos << harvest_photo }
+
       it { is_expected.to eq harvest_photo.thumbnail_url }
     end
   end
 
   describe 'seeds' do
     subject { seed_image_path(seed) }
+
     it { is_expected.to eq 'placeholder_150.png' }
 
     describe "uses seed's own photo" do
       before { seed.photos << seed_photo }
+
       it { is_expected.to eq seed_photo.thumbnail_url }
     end
   end

spec/models/crop_spec.rb

@@ -142,6 +142,7 @@ describe Crop do
     before :each do
       @crop = FactoryBot.create(:tomato)
     end
+
     context 'with a planting photo' do
       before :each do
         @planting = FactoryBot.create(:planting, crop: @crop)
@@ -277,6 +278,7 @@ describe Crop do
 
   context 'interesting' do
     subject { Crop.interesting }
+
     let(:photo) { FactoryBot.create :photo }
     # first, a couple of candidate crops
     let(:crop1) { FactoryBot.create(:crop) }
@@ -307,6 +309,7 @@ describe Crop do
         # ... and photos
         crop1_planting.photos = FactoryBot.create_list(:photo, 3)
       end
+
       it { is_expected.to include crop1 }
       it { is_expected.not_to include crop2 }
       it { expect(subject.size).to eq 1 }
@@ -321,6 +324,7 @@ describe Crop do
         # but only crop1 has photos
         crop1_planting.photos = FactoryBot.create_list(:photo, 3)
       end
+
       it { is_expected.to include crop1 }
       it { is_expected.not_to include crop2 }
       it { expect(subject.size).to eq 1 }

spec/models/garden_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe Garden do
   let(:owner) { FactoryBot.create(:member) }
-  let(:garden) { FactoryBot.create(:garden, owner: owner) }
+  let(:garden) { FactoryBot.create(:garden, owner: owner, name: 'Springfield Community Garden') }
 
   it "should have a slug" do
     garden.slug.should match(/member\d+-springfield-community-garden/)

spec/models/member_spec.rb

@@ -274,9 +274,7 @@ describe 'member' do
         @result = Member.interesting
 
         # Some members have multiple plantings, but should only appear once
-        3.times do
-          FactoryBot.create(:planting, owner: @members[2])
-        end
+        FactoryBot.create_list(:planting, 3, owner: @members[2])
       end
 
       it 'finds interesting members without duplicates in the correct order' do
@@ -343,6 +341,7 @@ describe 'member' do
 
     context 'queries a scope' do
       before { member.destroy }
+
       it { expect(Member.all).not_to include(member) }
       it { expect(Member.confirmed).not_to include(member) }
       it { expect(Member.located).not_to include(member) }
@@ -352,6 +351,7 @@ describe 'member' do
       it { expect(Member.interesting).not_to include(member) }
       it { expect(Member.has_plantings).not_to include(member) }
     end
+
     it "unsubscribes from mailing list" do
       expect(member).to receive(:newsletter_unsubscribe).and_return(true)
       member.destroy

spec/models/planting_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Planting do
   let(:crop) { FactoryBot.create(:tomato) }
   let(:garden_owner) { FactoryBot.create(:member) }
-  let(:garden) { FactoryBot.create(:garden, owner: garden_owner) }
+  let(:garden) { FactoryBot.create(:garden, owner: garden_owner, name: 'Springfield Community Garden') }
   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
@@ -19,6 +19,7 @@ describe Planting do
         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 }
 
@@ -27,6 +28,7 @@ describe Planting do
         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 }
 
@@ -35,6 +37,7 @@ describe Planting do
         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 }
 
@@ -60,9 +63,26 @@ describe Planting do
       describe 'planting 30 days ago, not finished' do
         let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago }
 
-        # 30 / 50
+        # 30 / 50 = 60%
         it { expect(planting.percentage_grown).to eq 60.0 }
+        # planted 30 days ago
         it { expect(planting.days_since_planted).to eq 30 }
+        # means 20 days to go
+        it { expect(planting.finish_predicted_at).to eq Time.zone.today + 20.days }
+      end
+
+      describe 'child crop uses parent data' do
+        let(:child_crop) { FactoryBot.create :crop, parent: crop, name: 'child' }
+        let(:child_planting) { FactoryBot.create :planting, crop: child_crop, planted_at: 30.days.ago }
+
+        # not data for this crop
+        it { expect(child_crop.median_lifespan).to eq nil }
+        # 30 / 50 = 60%
+        it { expect(child_planting.percentage_grown).to eq 60.0 }
+        # planted 30 days ago
+        it { expect(child_planting.days_since_planted).to eq 30 }
+        # means 20 days to go
+        it { expect(child_planting.finish_predicted_at).to eq Time.zone.today + 20.days }
       end
 
       describe 'planting not planted yet' do
@@ -74,7 +94,7 @@ describe Planting do
       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 }
+        it { expect(planting.percentage_grown).to eq 100 }
       end
 
       describe 'planted 30 days ago, finished 10 days ago' do
@@ -96,9 +116,13 @@ describe Planting do
       it { expect(planting.days_to_last_harvest).to eq(nil) }
       it { expect(planting.expected_lifespan).to eq(nil) }
     end
+
     context 'lots of data' do
+      let(:crop) { FactoryBot.create :crop }
+      # this is a method so it creates a new one each time
+
       def one_hundred_day_old_planting
-        FactoryBot.create(:planting, crop: planting.crop, planted_at: 100.days.ago)
+        FactoryBot.create(:planting, crop: crop, planted_at: 100.days.ago)
       end
       before do
         # 50 days to harvest
@@ -110,22 +134,47 @@ describe Planting do
         # 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.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) }
+
+      it { expect(crop.median_days_to_first_harvest).to eq(20) }
+      describe 'sets median time to harvest' do
+        let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: Time.zone.today }
+
+        it { expect(planting.first_harvest_predicted_at).to eq(Time.zone.today + 20.days) }
+      end
+
+      describe 'harvest still growing' do
+        let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: Time.zone.today }
+
+        it { expect(planting.before_harvest_time?).to eq true }
+        it { expect(planting.harvest_time?).to eq false }
+      end
+
+      describe 'harvesting ready now' do
+        let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: 21.days.ago }
+
+        it { expect(planting.first_harvest_predicted_at).to eq(1.day.ago.to_date) }
+        it { expect(planting.before_harvest_time?).to eq false }
+        it { expect(planting.harvest_time?).to eq true }
+      end
     end
+
     describe 'planting has no harvests' do
+      let(:planting) { FactoryBot.create :planting }
+
       before do
-        planting.update_harvest_days
+        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 }
 
@@ -134,23 +183,26 @@ describe Planting do
           planting: planting,
           crop: planting.crop,
           harvested_at: 10.days.ago)
-        planting.update_harvest_days
+        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.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) }
@@ -429,6 +481,7 @@ describe Planting do
   context 'ancestry' do
     let(:parent_seed) { FactoryBot.create :seed }
     let(:planting) { FactoryBot.create :planting, parent_seed: parent_seed }
+
     it "planting has a parent seed" do
       expect(planting.parent_seed).to eq(parent_seed)
     end
@@ -437,6 +490,7 @@ describe Planting do
     end
     describe 'grandchildren' do
       let(:grandchild_seed) { FactoryBot.create :seed, parent_planting: planting }
+
       it { expect(grandchild_seed.parent_planting).to eq planting }
       it { expect(grandchild_seed.parent_planting.parent_seed).to eq parent_seed }
     end

spec/models/role_spec.rb

@@ -6,6 +6,7 @@ describe Role do
     role.members << member
     role
   end
+
   let(:member) { FactoryBot.create(:member) }
 
   it 'has members' do

spec/models/seed_spec.rb

@@ -153,6 +153,7 @@ describe Seed do
     let(:seed) { FactoryBot.create :seed }
 
     before { seed.photos << FactoryBot.create(:photo) }
+
     it 'is found in has_photos scope' do
       Seed.has_photos.should include(seed)
     end
@@ -161,6 +162,7 @@ describe Seed do
   context 'ancestry' do
     let(:parent_planting) { FactoryBot.create :planting }
     let(:seed) { FactoryBot.create :seed, parent_planting: parent_planting }
+
     it "seed has a parent planting" do
       expect(seed.parent_planting).to eq(parent_planting)
     end
@@ -172,6 +174,7 @@ describe Seed do
   context "finished" do
     describe 'has finished fields' do
       let(:seed) { FactoryBot.create(:finished_seed) }
+
       it { expect(seed.finished).to eq true }
       it { expect(seed.finished_at).to be_an_instance_of Date }
     end

spec/requests/api/v1/crop_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Plantings', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:crop) { FactoryBot.create :crop }
   let(:crop_encoded_as_json_api) do
@@ -57,11 +58,13 @@ RSpec.describe 'Plantings', type: :request do
 
   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) }
@@ -72,16 +75,19 @@ RSpec.describe 'Plantings', type: :request do
 
   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

spec/requests/api/v1/gardens_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Gardens', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:garden) { FactoryBot.create :garden }
   let(:garden_encoded_as_json_api) do

spec/requests/api/v1/harvest_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Harvests', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:harvest) { FactoryBot.create :harvest }
   let(:harvest_encoded_as_json_api) do
@@ -58,11 +59,13 @@ RSpec.describe 'Harvests', type: :request do
 
   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) }
@@ -73,16 +76,19 @@ RSpec.describe 'Harvests', type: :request do
 
   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

spec/requests/api/v1/member_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Members', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:member) { FactoryBot.create :member }
   let(:member_encoded_as_json_api) do
@@ -58,11 +59,13 @@ RSpec.describe 'Members', type: :request do
 
   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) }
@@ -73,16 +76,19 @@ RSpec.describe 'Members', type: :request do
 
   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

spec/requests/api/v1/photos_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Photos', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:photo) { FactoryBot.create :photo }
   let(:photo_encoded_as_json_api) do
@@ -56,11 +57,13 @@ RSpec.describe 'Photos', type: :request do
 
   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) }
@@ -70,16 +73,19 @@ RSpec.describe 'Photos', type: :request do
 
   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

spec/requests/api/v1/plantings_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Plantings', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:planting) { FactoryBot.create :planting }
   let(:planting_encoded_as_json_api) do

spec/requests/api/v1/seeds_request_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe 'Photos', type: :request do
   subject { JSON.parse response.body }
+
   let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
   let!(:seed) { FactoryBot.create :seed }
   let(:seed_encoded_as_json_api) do
@@ -45,11 +46,13 @@ RSpec.describe 'Photos', type: :request do
 
   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) }
@@ -58,16 +61,19 @@ RSpec.describe 'Photos', type: :request do
 
   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

spec/views/crops/_planting_advice.html.haml_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe "crops/_planting_advice" do
   subject { rendered }
+
   let(:planting) { FactoryBot.create(:planting) }
 
   shared_examples "render planting_advice" do
@@ -18,6 +19,7 @@ describe "crops/_planting_advice" do
 
     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)" }
@@ -28,6 +30,7 @@ describe "crops/_planting_advice" 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)" }
@@ -44,6 +47,7 @@ describe "crops/_planting_advice" do
 
     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)" }
@@ -54,6 +58,7 @@ describe "crops/_planting_advice" 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)" }

spec/views/devise/registrations/edit_spec.rb

@@ -64,11 +64,13 @@ describe 'devise/registrations/edit.html.haml', type: "view" do
           assert_select "a", "Connect to Twitter"
         end
       end
+
       context 'connected to twitter' do
         before(:each) do
           @twitter_auth = FactoryBot.create(:authentication, member: @member)
           render
         end
+
         it 'has a link to twitter profile' do
           assert_select "a", href: "http://twitter.com/#{@twitter_auth.name}"
         end
@@ -84,11 +86,13 @@ describe 'devise/registrations/edit.html.haml', type: "view" do
           assert_select "a", "Connect to Flickr"
         end
       end
+
       context 'connected to flickr' do
         before(:each) do
           @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
           render
         end
+
         it 'has a link to flickr photostream' do
           assert_select "a", href: "http://flickr.com/photos/#{@flickr_auth.uid}"
         end

spec/views/harvests/index.rss.haml_spec.rb

@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+describe 'harvests/index.rss.haml' do
+  before(:each) do
+    controller.stub(:current_user) { nil }
+    @member = FactoryBot.create(:member)
+    @tomato = FactoryBot.create(:tomato)
+    @maize  = FactoryBot.create(:maize)
+    @pp = FactoryBot.create(:plant_part)
+    page = 1
+    per_page = 2
+    total_entries = 2
+    harvests = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
+      pager.replace([
+                      FactoryBot.create(:harvest,
+                        crop: @tomato,
+                        owner: @member),
+                      FactoryBot.create(:harvest,
+                        crop: @maize,
+                        plant_part: @pp,
+                        owner: @member,
+                        quantity: 2)
+                    ])
+    end
+    assign(:harvests, harvests)
+    render
+  end
+
+  it 'shows RSS feed title' do
+    rendered.should have_content "Recent harvests from all members"
+  end
+
+  it "displays crop's name in title" do
+    assign(:crop, @tomato)
+    render
+    expect(rendered).to have_content @tomato.name
+  end
+
+  it 'shows formatted content of harvest posts' do
+    expect(rendered).to have_content "<p>Quantity: "
+  end
+end

spec/views/harvests/show.html.haml_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe "harvests/show" do
   subject { render }
+
   let!(:harvest) { FactoryBot.create(:harvest) }
 
   before do

spec/views/members/show.rss.haml_spec.rb

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe 'members/show.rss.haml', type: "view" do
+  subject { rendered }
+
   before(:each) do
     @member = assign(:member, FactoryBot.create(:member))
     @post1 = FactoryBot.create(:post, id: 1, author: @member)
@@ -9,8 +11,6 @@ describe 'members/show.rss.haml', type: "view" do
     render
   end
 
-  subject { rendered }
-
   it 'shows RSS feed title' do
     is_expected.to match(/member\d+'s recent posts/)
   end

spec/views/photos/show.html.haml_spec.rb

@@ -49,6 +49,7 @@ describe "photos/show" do
       controller.stub(:current_user) { member }
       render
     end
+
     include_examples "photo data renders"
 
     it "has a delete button" do
@@ -61,6 +62,7 @@ describe "photos/show" do
       controller.stub(:current_user) { FactoryBot.create :member }
       render
     end
+
     include_examples "photo data renders"
     include_examples "No links to change data"
   end
@@ -70,6 +72,7 @@ describe "photos/show" do
       controller.stub(:current_user) { nil }
       render
     end
+
     include_examples "photo data renders"
     include_examples "No links to change data"
   end
@@ -84,6 +87,7 @@ describe "photos/show" do
       @photo.gardens << garden
       render
     end
+
     it "links to the CC license" do
       assert_select "a", href: @photo.license_url,
                          text: @photo.license_name