Add id and type back to photos#new

Bundle Update on 2017-11-21
Move planting's add photo button to _actions.haml
2026-09-12 14:16:17 -04:00 · 2017-11-24 19:02:54 +13:00 · 2017-11-24 19:02:54 +13:00 · 2017-11-24 19:02:54 +13:00 · 2017-11-24 19:02:54 +13:00 · 2017-11-24 19:02:54 +13:00
337 changed files with 5877 additions and 4353 deletions
@@ -0,0 +1,10 @@
+---
+fail_on_violations: true
+ruby:
+  config_file: .rubocop.yml
+haml:
+  config_file: .haml-lint.yml
+scss:
+  config_file: .scss-lint.yml
+eslint:
+  config_file: .eslintrc
@@ -31,6 +31,7 @@ PreCommit:
    enabled: true
    on_fail: warn
    command: ['npm', 'run', 'coffeelint']
+    required_executable: 'npm'
  HardTabs:
    enabled: true
  AuthorEmail:
@@ -42,10 +43,9 @@ PreCommit:
    exclude:
      - '**/bootstrap.min.css'
    command: ['npm', 'run', 'csslint']
+    required_executable: 'npm'
  HamlLint:
    enabled: true
-    requires_files: true
-    on_warn: fail
    command: ['bundle', 'exec', 'haml-lint', 'app/views']
  JsonSyntax:
    enabled: true
@@ -62,6 +62,7 @@ PreCommit:
      - 'spec/javascripts/support/vendor/**'
      - '**/bootstrap*'
    command: ['npm', 'run', 'jshint']
+    required_executable: 'npm'
  ScssLint:
    enabled: true
  RailsSchemaUpToDate:
@@ -71,11 +72,6 @@ PreCommit:
  YamlLint:
    enabled: true

-PostCommit:
-  GitGuilt:
-    enabled: true
-    command: ['npm', 'run', 'git-guilt']
-
 PostCheckout:
  ALL:
    quiet: false
@@ -19,6 +19,13 @@ Style/FileName:
 Style/StringLiterals:
  Enabled: false

+# Stop hound and codeclimate fighting
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: ()
+    '%i': ()
+    '%w': ()
+
 Style/MultilineMethodCallIndentation:
  EnforcedStyle: indented

@@ -30,9 +37,8 @@ Style/AlignParameters:
 Metrics/LineLength:
  Max: 120

-
-# See https://github.com/bbatsov/rubocop/issues/3629
-Rails/HttpPositionalArguments:
+# turn these back on in Rails 5
+Rails/HttpPositionalArguments: # See https://github.com/bbatsov/rubocop/issues/3629
  Enabled: false

 Style/Documentation:
@@ -58,9 +64,9 @@ Metrics/BlockLength:
 Metrics/MethodLength:
  Max: 34
 Metrics/AbcSize:
-  Max: 32
+  Max: 31
 Metrics/ClassLength:
-  Max: 207
+  Max: 179
 Metrics/CyclomaticComplexity:
  Max: 11
 Metrics/PerceivedComplexity:
@@ -1,36 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-offense-counts`
-# on 2017-03-01 11:18:11 +1300 using RuboCop version 0.47.1.
+# on 2017-11-05 20:41:45 +1300 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.

-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'spec/controllers/admin/orders_controller_spec.rb'
-    - 'spec/controllers/orders_controller_spec.rb'
-    - 'spec/features/cms_spec.rb'
-    - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
-    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
-    - 'spec/models/comment_spec.rb'
-    - 'spec/models/planting_spec.rb'
-    - 'spec/views/members/show.rss.haml_spec.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
-
 Lint/HandleExceptions:
  Exclude:
    - 'lib/tasks/testing.rake'

-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'app/controllers/crops_controller.rb'
-    - 'app/controllers/sessions_controller.rb'
-    - 'config/unicorn.rb'
-    - 'lib/haml/filters/growstuff_markdown.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
@@ -41,12 +20,6 @@ Lint/UnusedMethodArgument:
    - 'app/validators/approved_validator.rb'
    - 'spec/views/plantings/show.html.haml_spec.rb'

-Lint/Void:
-  Exclude:
-    - 'spec/models/crop_spec.rb'
-    - 'spec/models/garden_spec.rb'
-    - 'spec/models/post_spec.rb'
-
 # Cop supports --auto-correct.
 Performance/StringReplacement:
  Exclude:
@@ -63,12 +36,9 @@ Rails/OutputSafety:
    - 'app/helpers/gardens_helper.rb'

 # Configuration parameters: Blacklist.
-# Blacklist: decrement!, decrement_counter, increment!, increment_counter
-# toggle!, touch, update_all, update_attribute, update_column, update_columns,
-# update_counters
+# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
  Exclude:
-    - 'app/controllers/plantings_controller.rb'
    - 'db/seeds.rb'

 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -79,7 +49,6 @@ Rails/TimeZone:
    - 'spec/factories/member.rb'
    - 'spec/factories/post.rb'
    - 'spec/models/post_spec.rb'
-    - 'spec/views/plantings/index.html.haml_spec.rb'

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -109,24 +78,20 @@ Style/BarePercentLiterals:
 # IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
  Exclude:
-    - 'app/controllers/members_controller.rb'
    - 'spec/controllers/order_items_controller_spec.rb'
    - 'spec/features/notifications_spec.rb'
    - 'spec/models/ability_spec.rb'
    - 'spec/models/comment_spec.rb'
    - 'spec/models/follow_spec.rb'
    - 'spec/models/member_spec.rb'
-    - 'spec/models/planting_spec.rb'
    - 'spec/models/post_spec.rb'
    - 'spec/views/crops/edit.html.haml_spec.rb'

 # Cop supports --auto-correct.
 Style/BlockEndNewline:
  Exclude:
-    - 'app/controllers/members_controller.rb'
    - 'spec/models/ability_spec.rb'
    - 'spec/models/member_spec.rb'
-    - 'spec/models/planting_spec.rb'

 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
@@ -135,12 +100,6 @@ Style/ClassAndModuleChildren:
    - 'app/controllers/admin/orders_controller.rb'
    - 'lib/actions/oauth_signup_action.rb'
    - 'lib/haml/filters/escaped_markdown.rb'
-    - 'lib/haml/filters/growstuff_markdown.rb'
-
-# Cop supports --auto-correct.
-Style/ClassMethods:
-  Exclude:
-    - 'app/models/planting.rb'

 # Cop supports --auto-correct.
 Style/ColonMethodCall:
@@ -148,33 +107,12 @@ Style/ColonMethodCall:
    - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'

-# Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
-Style/CommentAnnotation:
-  Exclude:
-    - 'app/controllers/crops_controller.rb'
-
 # Cop supports --auto-correct.
 Style/EachForSimpleLoop:
  Exclude:
    - 'spec/models/crop_spec.rb'
    - 'spec/views/home/_crops.html.haml_spec.rb'

-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, expanded
-Style/EmptyMethod:
-  Exclude:
-    - 'app/controllers/accounts_controller.rb'
-    - 'app/controllers/photos_controller.rb'
-    - 'app/controllers/plant_parts_controller.rb'
-    - 'app/controllers/posts_controller.rb'
-    - 'app/controllers/products_controller.rb'
-    - 'app/controllers/roles_controller.rb'
-    - 'app/controllers/scientific_names_controller.rb'
-    - 'app/controllers/seeds_controller.rb'
-
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
@@ -191,9 +129,7 @@ Style/IdenticalConditionalBranches:
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
  Exclude:
-    - 'app/controllers/shop_controller.rb'
    - 'app/helpers/crops_helper.rb'
-    - 'app/models/planting.rb'
    - 'config/initializers/geocoder.rb'
    - 'lib/tasks/growstuff.rake'

@@ -210,20 +146,13 @@ Style/MultilineIfModifier:
  Exclude:
    - 'spec/rails_helper.rb'

-# Cop supports --auto-correct.
-Style/MultilineIfThen:
-  Exclude:
-    - 'script/check_contributors_md'
-
 Style/MultilineTernaryOperator:
  Exclude:
-    - 'app/controllers/notifications_controller.rb'
    - 'app/controllers/order_items_controller.rb'

 # Cop supports --auto-correct.
 Style/MutableConstant:
  Exclude:
-    - 'app/controllers/members_controller.rb'
    - 'app/models/planting.rb'

 # Cop supports --auto-correct.
@@ -231,10 +160,6 @@ Style/NegatedIf:
  Exclude:
    - 'app/helpers/crops_helper.rb'

-Style/NestedTernaryOperator:
-  Exclude:
-    - 'app/controllers/plantings_controller.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 # SupportedStyles: skip_modifier_ifs, always
@@ -256,7 +181,6 @@ Style/NumericPredicate:
    - 'app/helpers/harvests_helper.rb'
    - 'app/helpers/plantings_helper.rb'
    - 'lib/tasks/growstuff.rake'
-    - 'script/check_contributors_md'

 # Cop supports --auto-correct.
 Style/ParallelAssignment:
@@ -268,15 +192,9 @@ Style/ParallelAssignment:
 Style/PercentLiteralDelimiters:
  Exclude:
    - 'app/helpers/auto_suggest_helper.rb'
-    - 'script/check_contributors_md'
    - 'spec/features/signin_spec.rb'
    - 'spec/features/signout_spec.rb'

-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'lib/haml/filters/growstuff_markdown.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
@@ -287,7 +205,6 @@ Style/RegexpLiteral:
    - 'spec/views/devise/registrations/edit_spec.rb'
    - 'spec/views/members/index.html.haml_spec.rb'
    - 'spec/views/posts/index.html.haml_spec.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'

 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
@@ -300,17 +217,11 @@ Style/SpecialGlobalVars:
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
  Exclude:
-    - 'app/controllers/crops_controller.rb'
    - 'lib/tasks/growstuff.rake'

-# Cop supports --auto-correct.
-Style/UnlessElse:
-  Exclude:
-    - 'app/controllers/omniauth_callbacks_controller.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
  EnforcedStyle: percent
-  MinSize: 5
+  MinSize: 4
@@ -1 +1 @@
-2.3.4
+2.4.1
@@ -1,4 +1,4 @@
-sudo: false
+sudo: required
 language: ruby
 cache:
  bundler: true
@@ -14,18 +14,26 @@ env:
    - GROWSTUFF_SITE_NAME="Growstuff (travis)"
    - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
-rvm:
-  - 2.3.4
 before_install:
  - ./script/install_phantomjs;
  - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
+  # Force Travis to use Elastic Search 2.4.0
+  - >
+    if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
+      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;
+      sudo service elasticsearch start;
+      sleep 10;
+      curl localhost:9200;
+    fi
 before_script:
-  - bundle exec rake db:create db:migrate db:test:prepare
  - set -e
  - >
    if [ "${STATIC_CHECKS}" = "true" ]; then
      ./script/install_linters;
    else
+      RAILS_ENV=test bundle exec rake db:create db:migrate;
      bundle exec rake assets:precompile;
    fi
  - set +e
@@ -40,9 +48,6 @@ script:
      bundle exec rake jasmine:ci;
    fi;
  - set +e
-
-services:
-  - elasticsearch
 before_deploy:
  - bundle exec script/heroku_maintenance.rb on
 deploy:
@@ -80,6 +80,8 @@ submit the change with your pull request.
 - Megan Talbot / [meganft](https://github.com/meganft)
 - Arun Kumar / [arun1595](https://github.com/arun1595)
 - Harry Brodsky / [hbrodsk1](https://github.com/hbrodsk1)
+- Jeff Kingswood / [ancyentmariner](https://github.com/ancyentmariner)
+- Logan Gingerich / [logangingerich](https://github.com/logangingerich)

 ## Bots

@@ -1,28 +1,34 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'

-ruby '2.3.4'
+ruby '2.4.1'

-gem 'rails', '~> 4.2.7'
+gem 'rails', '~> 4.2.8'

 gem 'bundler', '>=1.1.5'

-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails'
 gem 'haml'
-gem 'sass-rails', '~> 5.0.4'
+gem 'sass-rails'
+
+# API data
+gem 'jsonapi-resources'

 # CSS framework
-gem 'bootstrap-sass', '~> 3.3.6'
+gem 'bootstrap-sass'
 gem 'font-awesome-sass'

-gem 'uglifier', '~> 2.7.2' # JavaScript compressor
+gem 'uglifier' # JavaScript compressor
+
+# planting and harvest predictions
+gem 'active_median'

 gem 'flickraw'
 gem 'jquery-rails'
-gem 'jquery-ui-rails', '~> 5.0.2'
+gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location
 gem 'js-routes' # provides access to Rails routes in Javascript

-gem 'cancancan', '~> 1.9'          # for checking member privileges
+gem 'cancancan'                    # for checking member privileges
 gem 'csv_shaper'                   # CSV export
 gem 'figaro'                       # for handling config via ENV variables
 gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
@@ -32,10 +38,10 @@ gem 'pg'
 gem 'ruby-units'                   # for unit conversion
 gem 'unicorn'                      # http server

-gem 'comfortable_mexican_sofa', '~> 1.12.0' # content management system
+gem 'comfortable_mexican_sofa'     # content management system

 gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari
-gem 'kaminari', '~> 0.17.0'        # pagination
+gem 'kaminari'                     # pagination

 gem 'activemerchant'
 gem 'active_utils'
@@ -45,13 +51,13 @@ gem 'sidekiq'
 gem 'bluecloth'

 # Pagination
-gem 'will_paginate', '~> 3.0'
+gem 'will_paginate'

 # user signup/login/etc
-gem 'devise', '>= 4.0.0'
+gem 'devise'

 # nicely formatted URLs
-gem 'friendly_id', '~> 5.0.4'
+gem 'friendly_id'

 # gravatars
 gem 'gravatar-ultimate'
@@ -66,7 +72,7 @@ gem 'bootstrap-datepicker-rails'
 gem 'omniauth', '~> 1.3'
 gem 'omniauth-facebook'
 gem 'omniauth-flickr', '>= 0.0.15'
-gem 'omniauth-twitter', '~> 1.2'
+gem 'omniauth-twitter'

 # For charting data
 gem 'd3-rails', '~> 3.5' # 4.* produces Error: <spyOn> : could not find an object to spy upon for linear() - see https://travis-ci.org/Growstuff/growstuff/jobs/204461482
@@ -85,8 +91,13 @@ gem "hashie", ">= 3.5.3"

 gem 'rake', '>= 10.0.0'

-# # CMS
-# gem 'comfortable_mexican_sofa', '~> 1.12.0'
+# locale based flash notices for controllers
+gem "responders"
+
+# allows soft delete. Used for members.
+gem 'acts_as_paranoid', '~> 0.5.0'
+
+gem 'xmlrpc' # fixes rake error - can be removed if not needed later

 group :production, :staging do
  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
@@ -101,7 +112,7 @@ group :development do
  # A debugger and irb alternative. Pry doesn't play nice
  # with unicorn, so start a Webrick server when debugging
  # with Pry
-  gem 'better_errors'
+  gem 'better_errors', '~> 2.2.0'
  gem 'binding_of_caller'
  gem 'guard'
  gem 'guard-rspec'
@@ -118,8 +129,8 @@ group :development, :test do
  gem 'capybara-email'                  # integration tests for email
  gem 'capybara-screenshot'             # for test debugging
  gem 'coveralls', require: false       # coverage analysis
-  gem 'database_cleaner', '~> 1.5.0'
-  gem 'factory_girl_rails'              # for creating test data
+  gem 'database_cleaner'
+  gem 'factory_bot_rails'               # for creating test data
  gem 'haml-i18n-extractor'
  gem 'haml-rails'                      # HTML templating language
  gem 'haml_lint'                       # Checks haml files for goodness
@@ -136,8 +147,9 @@ end

 group :test do
  gem 'codeclimate-test-reporter', require: false
+  gem 'timecop'
 end

 group :travis do
-  gem 'heroku-api'
+  gem 'platform-api'
 end
@@ -1,71 +1,76 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
      rack (~> 1.6)
      rack-test (~> 0.6.2)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_link_to (1.0.4)
+    active_link_to (1.0.5)
      actionpack
      addressable
+    active_median (0.1.4)
+      activerecord
    active_merchant-paypal-bogus-gateway (0.1.0)
      activemerchant
-    active_utils (3.3.3)
+    active_utils (3.3.9)
      activesupport (>= 3.2, < 5.2.0)
      i18n
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
      globalid (>= 0.3.0)
-    activemerchant (1.64.0)
-      activesupport (>= 3.2.14, < 5.1)
+    activemerchant (1.75.0)
+      activesupport (>= 3.2.14, < 6.x)
      builder (>= 2.1.2, < 4.0.0)
      i18n (>= 0.6.9)
      nokogiri (~> 1.4)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
      arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.10)
      i18n (~> 0.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    acts_as_paranoid (0.5.0)
+      activerecord (>= 4.0, < 5.1)
+      activesupport (>= 4.0, < 5.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
    arel (6.0.4)
    ast (2.3.0)
-    autoprefixer-rails (6.7.7.2)
+    autoprefixer-rails (7.1.6)
      execjs
    bcrypt (3.1.11)
-    better_errors (2.1.1)
+    better_errors (2.2.0)
      coderay (>= 1.0.0)
      erubis (>= 2.6.6)
      rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.7.3)
      debug_inspector (>= 0.0.1)
    bluecloth (2.2.0)
    bonsai-elasticsearch-rails (0.2.0)
      elasticsearch-model (~> 0)
      elasticsearch-rails (~> 0)
-    bootstrap-datepicker-rails (1.6.4.1)
+    bootstrap-datepicker-rails (1.7.1.1)
      railties (>= 3.0)
    bootstrap-kaminari-views (0.0.5)
      kaminari (>= 0.13)
@@ -73,16 +78,16 @@ GEM
    bootstrap-sass (3.3.7)
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
-    bootstrap_form (2.6.0)
+    bootstrap_form (2.7.0)
    builder (3.2.3)
-    bullet (5.5.1)
+    bullet (5.6.1)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.10.0)
-    byebug (9.0.6)
-    cancancan (1.16.0)
-    capybara (2.13.0)
+    byebug (9.1.0)
+    cancancan (2.1.1)
+    capybara (2.16.1)
      addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
      nokogiri (>= 1.3.3)
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
@@ -90,12 +95,12 @@ GEM
    capybara-email (2.5.0)
      capybara (~> 2.4)
      mail
-    capybara-screenshot (1.0.14)
+    capybara-screenshot (1.0.18)
      capybara (>= 1.0, < 3)
      launchy
-    childprocess (0.6.3)
+    childprocess (0.8.0)
      ffi (~> 1.0, >= 1.0.11)
-    climate_control (0.1.0)
+    climate_control (0.2.0)
    cliver (0.3.2)
    cocaine (0.5.8)
      climate_control (>= 0.0.3, < 1.0)
@@ -103,10 +108,10 @@ GEM
      simplecov (<= 0.13)
    codemirror-rails (5.16.0)
      railties (>= 3.0, < 6.0)
-    coderay (1.1.1)
-    coffee-rails (4.1.1)
+    coderay (1.1.2)
+    coffee-rails (4.2.2)
      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
@@ -134,17 +139,18 @@ GEM
      term-ansicolor (~> 1.3)
      thor (~> 0.19.1)
      tins (~> 1.6)
+    crass (1.0.3)
    csv_shaper (1.3.0)
      activesupport (>= 3.0.0)
    d3-rails (3.5.17)
      railties (>= 3.1)
    dalli (2.7.6)
-    database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
-    devise (4.2.1)
+    database_cleaner (1.6.2)
+    debug_inspector (0.0.3)
+    devise (4.3.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
      responders
      warden (~> 1.2.3)
    diff-lcs (1.3)
@@ -167,14 +173,14 @@ GEM
      faraday
      multi_json
    erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.59.0)
    execjs (2.7.0)
-    factory_girl (4.8.0)
+    factory_bot (4.8.2)
      activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
      railties (>= 3.0.0)
-    faraday (0.11.0)
+    faraday (0.12.2)
      multipart-post (>= 1.2, < 3)
    ffi (1.9.18)
    figaro (1.1.1)
@@ -183,13 +189,13 @@ GEM
    font-awesome-sass (4.7.0)
      sass (>= 3.2)
    formatador (0.2.5)
-    friendly_id (5.0.5)
+    friendly_id (5.2.3)
      activerecord (>= 4.0.0)
-    geocoder (1.4.3)
+    geocoder (1.4.4)
    gibbon (1.2.1)
      httparty
      multi_json (>= 1.9.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
      activesupport (>= 4.2.0)
    gravatar-ultimate (2.0.0)
      activesupport (>= 2.3.14)
@@ -208,7 +214,8 @@ GEM
      guard (~> 2.1)
      guard-compat (~> 1.1)
      rspec (>= 2.99.0, < 4.0)
-    haml (4.0.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
      tilt
    haml-i18n-extractor (0.5.9)
      activesupport
@@ -216,31 +223,34 @@ GEM
      highline
      tilt
      trollop (= 1.16.2)
-    haml-rails (0.9.0)
+    haml-rails (1.0.0)
      actionpack (>= 4.0.1)
      activesupport (>= 4.0.1)
-      haml (>= 4.0.6, < 5.0)
+      haml (>= 4.0.6, < 6.0)
      html2haml (>= 1.0.1)
      railties (>= 4.0.1)
-    haml_lint (0.24.0)
+    haml_lint (0.25.1)
      haml (>= 4.0, < 5.1)
      rainbow
      rake (>= 10, < 13)
      rubocop (>= 0.47.0)
      sysexits (~> 1.1)
-    hashie (3.5.5)
-    heroku-api (0.4.2)
-      excon (~> 0.45)
-      multi_json (~> 1.8)
+    hashie (3.5.6)
+    heroics (0.0.24)
+      erubis (~> 2.0)
+      excon
+      moneta
+      multi_json (>= 1.9.2)
    highline (1.7.8)
-    html2haml (2.1.0)
+    html2haml (2.2.0)
      erubis (~> 2.7.0)
-      haml (~> 4.0)
+      haml (>= 4.0, < 6)
      nokogiri (>= 1.6.0)
      ruby_parser (~> 3.5)
-    httparty (0.14.0)
+    httparty (0.15.6)
      multi_xml (>= 0.5.2)
-    i18n (0.8.1)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
    i18n-tasks (0.9.12)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
@@ -251,28 +261,41 @@ GEM
      parser (>= 2.2.3.0)
      term-ansicolor (>= 1.3.2)
      terminal-table (>= 1.5.1)
-    jasmine (2.5.2)
-      jasmine-core (>= 2.5.1, < 3.0.0)
+    jasmine (2.8.0)
+      jasmine-core (>= 2.8.0, < 3.0.0)
      phantomjs
      rack (>= 1.2.1)
      rake
-    jasmine-core (2.5.2)
+    jasmine-core (2.8.0)
    jquery-rails (4.3.1)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (5.0.5)
      railties (>= 3.2.16)
-    js-routes (1.3.3)
+    js-routes (1.4.1)
      railties (>= 3.2)
      sprockets-rails
-    json (2.0.4)
+    json (2.1.0)
+    jsonapi-resources (0.9.0)
+      activerecord (>= 4.1)
+      concurrent-ruby
+      railties (>= 4.1)
    jwt (1.5.6)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
    kgio (2.11.0)
-    kramdown (1.13.2)
+    kramdown (1.15.0)
    launchy (2.4.3)
      addressable (~> 2.3)
    leaflet-markercluster-rails (0.7.0)
@@ -284,37 +307,40 @@ GEM
      rb-fsevent (~> 0.9, >= 0.9.4)
      rb-inotify (~> 0.9, >= 0.9.7)
      ruby_dep (~> 1.2)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
-    lumberjack (1.0.11)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
+    lumberjack (1.0.12)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
    memcachier (0.0.2)
-    method_source (0.8.2)
+    method_source (0.9.0)
    mime-types (3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
    mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    moneta (0.8.1)
    multi_json (1.11.3)
    multi_xml (0.6.0)
    multipart-post (2.0.0)
    nenv (0.3.0)
-    newrelic_rpm (4.1.0.333)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    newrelic_rpm (4.6.0.338)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
    notiffany (0.1.1)
      nenv (~> 0.1)
      shellany (~> 0.0)
-    oauth (0.5.1)
-    oauth2 (1.3.1)
-      faraday (>= 0.8, < 0.12)
+    oauth (0.5.3)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
      jwt (~> 1.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
-    omniauth (1.6.1)
+    omniauth (1.7.1)
      hashie (>= 3.4.6, < 3.6.0)
      rack (>= 1.6.2, < 3)
    omniauth-facebook (4.0.0)
@@ -338,39 +364,41 @@ GEM
      cocaine (~> 0.5.5)
      mime-types
      mimemagic (~> 0.3.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    pg (0.20.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    pg (0.21.0)
    phantomjs (2.1.1.0)
+    platform-api (2.1.0)
+      heroics (~> 0.0.23)
+      moneta (~> 0.8.1)
    plupload-rails (1.2.1)
      rails (>= 3.1)
-    poltergeist (1.14.0)
+    poltergeist (1.16.0)
      capybara (~> 2.1)
      cliver (~> 0.3.1)
      websocket-driver (>= 0.2.0)
    powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
    quiet_assets (1.1.0)
      railties (>= 3.1, < 5.0)
-    rack (1.6.5)
-    rack-protection (1.5.3)
+    rack (1.6.8)
+    rack-protection (2.0.0)
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
+      railties (= 4.2.10)
      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
@@ -388,108 +416,112 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.1.0)
-    raindrops (0.18.0)
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    redis (3.3.3)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
+    raindrops (0.19.0)
+    rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    redis (4.0.1)
+    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)
      activemodel (>= 3.0)
      activesupport (>= 3.0)
      rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.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.0)
    rubocop (0.47.1)
      parser (>= 2.3.3.1, < 3.0)
      powerpack (~> 0.1)
      rainbow (>= 1.99.1, < 3.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    ruby-units (2.1.0)
+    ruby-progressbar (1.9.0)
+    ruby-units (2.2.0)
    ruby_dep (1.5.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
    rubyzip (1.2.1)
-    sass (3.4.23)
-    sass-rails (5.0.6)
+    sass (3.5.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
      railties (>= 4.0.0, < 6)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
-    selenium-webdriver (3.3.0)
+    selenium-webdriver (3.7.0)
      childprocess (~> 0.5)
      rubyzip (~> 1.0)
-      websocket (~> 1.0)
-    sexp_processor (4.9.0)
+    sexp_processor (4.10.0)
    shellany (0.0.1)
-    sidekiq (4.2.10)
+    sidekiq (5.0.5)
      concurrent-ruby (~> 1.0)
      connection_pool (~> 2.2, >= 2.2.0)
      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
+      redis (>= 3.3.4, < 5)
    simplecov (0.12.0)
      docile (~> 1.1.0)
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
    sparkpost_rails (1.4.0)
      rails (>= 4.0, < 5.1)
    sprockets (3.7.1)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
    sysexits (1.2.0)
+    temple (0.8.0)
    term-ansicolor (1.6.0)
      tins (~> 1.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
    thor (0.19.4)
    thread (0.2.2)
    thread_safe (0.3.6)
-    tilt (2.0.7)
-    tins (1.13.2)
+    tilt (2.0.8)
+    timecop (0.9.1)
+    tins (1.15.1)
    trollop (1.16.2)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
      thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unicode-display_width (1.1.3)
-    unicorn (5.3.0)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.3.0)
+    unicorn (5.3.1)
      kgio (~> 2.6)
      raindrops (~> 0.7)
    uniform_notifier (1.10.0)
@@ -499,52 +531,54 @@ GEM
      nokogiri (>= 1.2.0)
      rack (>= 1.0)
      rack-test (>= 0.5.3)
-    websocket (1.2.4)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    will_paginate (3.1.5)
-    xpath (2.0.0)
+    websocket-extensions (0.1.3)
+    will_paginate (3.1.6)
+    xmlrpc (0.3.0)
+    xpath (2.1.0)
      nokogiri (~> 1.3)

 PLATFORMS
  ruby

 DEPENDENCIES
+  active_median
  active_merchant-paypal-bogus-gateway
  active_utils
  activemerchant
-  better_errors
+  acts_as_paranoid (~> 0.5.0)
+  better_errors (~> 2.2.0)
  binding_of_caller
  bluecloth
  bonsai-elasticsearch-rails
  bootstrap-datepicker-rails
  bootstrap-kaminari-views
-  bootstrap-sass (~> 3.3.6)
+  bootstrap-sass
  bullet
  bundler (>= 1.1.5)
  byebug
-  cancancan (~> 1.9)
+  cancancan
  capybara
  capybara-email
  capybara-screenshot
  codeclimate-test-reporter
-  coffee-rails (~> 4.1.0)
-  comfortable_mexican_sofa (~> 1.12.0)
+  coffee-rails
+  comfortable_mexican_sofa
  coveralls
  csv_shaper
  d3-rails (~> 3.5)
  dalli
-  database_cleaner (~> 1.5.0)
-  devise (>= 4.0.0)
+  database_cleaner
+  devise
  elasticsearch-api (~> 2.0.0)
  elasticsearch-model
  elasticsearch-rails
-  factory_girl_rails
+  factory_bot_rails
  figaro
  flickraw
  font-awesome-sass
-  friendly_id (~> 5.0.4)
+  friendly_id
  geocoder
  gibbon (~> 1.2.0)
  gravatar-ultimate
@@ -555,13 +589,13 @@ DEPENDENCIES
  haml-rails
  haml_lint
  hashie (>= 3.5.3)
-  heroku-api
  i18n-tasks
  jasmine
  jquery-rails
  jquery-ui-rails (~> 5.0.2)
  js-routes
-  kaminari (~> 0.17.0)
+  jsonapi-resources
+  kaminari
  leaflet-markercluster-rails
  leaflet-rails (~> 0.7.7)
  letter_opener
@@ -570,30 +604,35 @@ DEPENDENCIES
  omniauth (~> 1.3)
  omniauth-facebook
  omniauth-flickr (>= 0.0.15)
-  omniauth-twitter (~> 1.2)
+  omniauth-twitter
  pg
+  platform-api
  poltergeist
  pry
  quiet_assets
-  rails (~> 4.2.7)
+  rails (~> 4.2.8)
  rails_12factor
  rainbow (< 2.2.0)
  rake (>= 10.0.0)
+  responders
  rspec-activemodel-mocks
  rspec-rails
  rubocop (<= 0.47.1)
  ruby-units
-  sass-rails (~> 5.0.4)
+  sass-rails
  selenium-webdriver
  sidekiq
  sparkpost_rails
-  uglifier (~> 2.7.2)
+  timecop
+  uglifier
  unicorn
  webrat
-  will_paginate (~> 3.0)
+  will_paginate
+  xmlrpc
+

 RUBY VERSION
-   ruby 2.3.4p301
+   ruby 2.4.1p111

 BUNDLED WITH
-   1.14.6
+   1.15.4
@@ -57,5 +57,7 @@ Feel free to comment on any of the issues on [Github](https://github.com/Growstu

 For more information about this project, contact [info@growstuff.org](mailto:info@growstuff.org).

+Security Issues: If you find an authorization bypass or data breach, please contact our maintainers directly at [maintainers@growstuff.org](mailto:maintainers@growstuff.org).
+
 You can also contact us on [Twitter](http://twitter.com/growstufforg/) or
 [Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494) or [Github](https://github.com/Growstuff/growstuff/issues)..
@@ -108,8 +108,6 @@ p.stats

 .planting
  dl.planting-attributes
-    font-size: 85%
-
    dt
      text-align: left
    dd
@@ -118,14 +116,13 @@ p.stats
@media (min-width: $screen-md-min)
  .planting-thumbnail
    dl.planting-attributes
-      font-size: 85%
      width: 100%

      dt
        text-align: left
-        width: 80px
+        width: 120px
      dd
-        padding-left: 80px
+        padding-left: 120px
        margin-left: auto

  .navbar .navbar-form
@@ -336,3 +333,15 @@ $state-success-bg: lighten($green, 50%)

 ul.plantings
  list-style-type: none
+
+ul.thumbnail-buttons
+  list-style-type: none
+  text-align: right
+
+
+.hover-wrapper .text
+  position: absolute
+  visibility: hidden
+
+.hover-wrapper:hover .text
+  visibility: visible
@@ -15,8 +15,7 @@ class AccountsController < ApplicationController
  end

  # GET /accounts/1/edit
-  def edit
-  end
+  def edit; end

  # PUT /accounts/1
  def update
@@ -1,16 +1,12 @@
 class AdminController < ApplicationController
+  respond_to :html
  def index
    authorize! :manage, :all
-    respond_to do |format|
-      format.html # index.html.haml
-    end
  end

  def newsletter
    authorize! :manage, :all
    @members = Member.confirmed.wants_newsletter.all
-    respond_to do |format|
-      format.html # index.html.haml
-    end
+    respond_with @members
  end
 end
@@ -2,6 +2,7 @@ class AlternateNamesController < ApplicationController
  before_action :authenticate_member!, except: [:index, :show]
  load_and_authorize_resource
  respond_to :html, :json
+  responders :flash

  # GET /alternate_names
  # GET /alternate_names.json
@@ -0,0 +1,7 @@
+module Api
+  module V1
+    class BaseController < JSONAPI::ResourceController
+      abstract
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class CropsController < BaseController
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class GardensController < BaseController
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class HarvestsController < BaseController
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class MembersController < BaseController
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class PhotosController < BaseController
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class PlantingsController < BaseController
+    end
+  end
+end
@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class SeedsController < BaseController
+    end
+  end
+end
@@ -3,56 +3,42 @@ class CommentsController < ApplicationController
  load_and_authorize_resource
  respond_to :html, :json
  respond_to :rss, only: :index
+  responders :flash

-  # GET /comments
-  # GET /comments.json
-  # GET /comments.rss
  def index
    @comments = Comment.paginate(page: params[:page])
    respond_with(@comments)
  end

-  # GET /comments/new
-  # GET /comments/new.json
  def new
    @comment = Comment.new
    @post = Post.find_by(id: params[:post_id])

    if @post
      @comments = @post.comments
-      respond_with(@comment)
+      respond_with(@comments)
    else
      redirect_to(request.referer || root_url,
        alert: "Can't post a comment on a non-existent post")
    end
  end

-  # GET /comments/1/edit
  def edit
    @comments = @comment.post.comments
  end

-  # POST /comments
-  # POST /comments.json
  def create
    @comment = Comment.new(comment_params)
    @comment.author = current_member
-    flash[:notice] = "Comment was successfully created." if @comment.save
-    respond_with(@comment.post)
+    @comment.save
+    respond_with @comment, location: @comment.post
  end

-  # PUT /comments/1
-  # PUT /comments/1.json
  def update
-    # only body can be updated
-    if @comment.update(body: comment_params['body'])
-      flash[:notice] = 'Comment was successfully updated.'
-    end
-    respond_with(@comment.post)
+    @comment.update(body: comment_params['body'])
+    respond_with @comment, location: @comment.post
  end

-  # DELETE /comments/1
-  # DELETE /comments/1.json
  def destroy
    @post = @comment.post
    @comment.destroy
@@ -4,40 +4,22 @@ class CropsController < ApplicationController
  before_action :authenticate_member!, except: [:index, :hierarchy, :search, :show]
  load_and_authorize_resource
  skip_authorize_resource only: [:hierarchy, :search]
+  respond_to :html, :json, :rss, :csv
+  responders :flash

-  # GET /crops
-  # GET /crops.json
  def index
    @sort = params[:sort]
-    @crops = if @sort == 'alpha'
-               Crop.includes(:scientific_names, plantings: :photos)
-             else
-               popular_crops
-             end
-    @paginated_crops = @crops.approved.paginate(page: params[:page])
-
-    @has_requested_pending = Crop.pending_approval.where(requester: current_member).count if current_member
-
-    respond_to do |format|
-      format.html
-      format.json { render json: @crops }
-      format.rss do
-        @crops = Crop.recent.includes(:scientific_names, :creator)
-        render rss: @crops
-      end
-      format.csv do
-        @filename = "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
-        @crops = Crop.includes(:scientific_names, :plantings, :seeds, :creator)
-        render csv: @crops
-      end
-    end
+    @crops = crops
+    @num_requested_crops = requested_crops.size if current_member
+    @filename = filename
+    respond_with @crops
  end

  def requested
-    @requested = Crop.pending_approval.where(requester: current_member).paginate(page: params[:page])
+    @requested = requested_crops.paginate(page: params[:page])
+    respond_with @requested
  end

-  # GET /crops/wrangle
  def wrangle
    @approval_status = params[:approval_status]
    @crops = case @approval_status
@@ -47,176 +29,124 @@ class CropsController < ApplicationController
               Crop.rejected
             else
               Crop.recent
-             end
-
-    @crops = @crops.paginate(page: params[:page])
+             end.paginate(page: params[:page])

    @crop_wranglers = Role.crop_wranglers
-    respond_to do |format|
-      format.html
-    end
+    respond_with @crops
  end

-  # GET /crops/hierarchy
  def hierarchy
    @crops = Crop.toplevel
-    respond_to do |format|
-      format.html
-    end
+    respond_with @crops
  end

-  # GET /crops/search
  def search
    @term = params[:term]
    @matches = Crop.search(@term)
    @paginated_matches = @matches.paginate(page: params[:page])

-    respond_to do |format|
-      format.html
-      format.json { render json: @matches }
-    end
+    respond_with @matches
  end

-  # GET /crops/1
-  # GET /crops/1.json
  def show
    @crop = Crop.includes(:scientific_names, plantings: :photos).find(params[:id])
    @posts = @crop.posts.paginate(page: params[:page])

    respond_to do |format|
      format.html # show.html.haml
-      format.json do
-        # TODO RABL or similar one day to avoid presentation logic here
-        owner_structure = {
-          owner: {
-            only: [:id, :login_name, :location, :latitude, :longitude]
-          }
-        }
-        render json: @crop.to_json(include: {
-                                     plantings: {
-                                       include: owner_structure
-                                     }
-                                   })
-      end
+      format.json { render json: @crop.to_json(crop_json_fields) }
    end
  end

-  # GET /crops/new
-  # GET /crops/new.json
  def new
    @crop = Crop.new
    @crop.alternate_names.build
    @crop.scientific_names.build

-    respond_to do |format|
-      format.html # new.html.haml
-      format.json { render json: @crop }
-    end
+    respond_with @crop
  end

-  # GET /crops/1/edit
  def edit
    @crop.alternate_names.build if @crop.alternate_names.blank?
    @crop.scientific_names.build if @crop.scientific_names.blank?
  end

-  # POST /crops
-  # POST /crops.json
  def create
    @crop = Crop.new(crop_params)

    if current_member.role? :crop_wrangler
      @crop.creator = current_member
-      success_msg = "Crop was successfully created."
    else
      @crop.requester = current_member
      @crop.approval_status = "pending"
-      success_msg = "Crop was successfully requested."
    end

-    respond_to do |format|
-      if @crop.save
-        params[:alt_name].each do |index, value|
-          create_name('alternate', value)
-        end
-        params[:sci_name].each do |index, value|
-          create_name('scientific', value)
-        end
-        unless current_member.role? :crop_wrangler
-          Role.crop_wranglers.each do |w|
-            Notifier.new_crop_request(w, @crop).deliver_now!
-          end
-        end
+    notify_wranglers if Crop.transaction { @crop.save && save_crop_names }

-        format.html { redirect_to @crop, notice: success_msg }
-        format.json { render json: @crop, status: :created, location: @crop }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @crop.errors, status: :unprocessable_entity }
-      end
-    end
+    respond_with @crop
  end

-  # PUT /crops/1
-  # PUT /crops/1.json
  def update
    previous_status = @crop.approval_status

    @crop.creator = current_member if previous_status == "pending"

-    respond_to do |format|
-      if @crop.update(crop_params)
-        recreate_names('alt_name', 'alternate')
-        recreate_names('sci_name', 'scientific')
+    if @crop.update(crop_params)
+      recreate_names('alt_name', 'alternate')
+      recreate_names('sci_name', 'scientific')

-        if previous_status == "pending"
-          requester = @crop.requester
-          new_status = @crop.approval_status
-          Notifier.crop_request_approved(requester, @crop).deliver_now! if new_status == "approved"
-          Notifier.crop_request_rejected(requester, @crop).deliver_now! if new_status == "rejected"
-        end
-        format.html { redirect_to @crop, notice: 'Crop was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @crop.errors, status: :unprocessable_entity }
-      end
+      notifier.deliver_now! if previous_status == "pending"
    end
+
+    respond_with @crop
  end

-  # DELETE /crops/1
-  # DELETE /crops/1.json
  def destroy
    @crop.destroy
-
-    respond_to do |format|
-      format.html { redirect_to crops_url }
-      format.json { head :no_content }
-    end
+    respond_with @crop
  end

  private

-  def popular_crops
-    Crop.popular.includes(:scientific_names, plantings: :photos)
+  def notifier
+    case @crop.approval_status
+    when "approved"
+      Notifier.crop_request_approved(@crop.requester, @crop)
+    when "rejected"
+      Notifier.crop_request_rejected(@crop.requester, @crop)
+    end
+  end
+
+  def save_crop_names
+    params[:alt_name]&.values&.each do |value|
+      create_name!('alternate', value) unless value.empty?
+    end
+    params[:sci_name]&.values&.each do |value|
+      create_name!('scientific', value) unless value.empty?
+    end
+  end
+
+  def notify_wranglers
+    return if current_member.role? :crop_wrangler
+    Role.crop_wranglers.each do |w|
+      Notifier.new_crop_request(w, @crop).deliver_now!
+    end
  end

  def recreate_names(param_name, name_type)
    return unless params[param_name].present?
    destroy_names(name_type)
-    params[param_name].each do |index, value|
-      create_name(name_type, value)
+    params[param_name].each do |_i, value|
+      create_name!(name_type, value) unless value.empty?
    end
  end

  def destroy_names(name_type)
-    @crop.send("#{name_type}_names").each do |alt_name|
-      alt_name.destroy
-    end
+    @crop.send("#{name_type}_names").each(&:destroy)
  end

-  def create_name(name_type, value)
-    @crop.send("#{name_type}_names").create(name: value, creator_id: current_member.id)
+  def create_name!(name_type, value)
+    @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id)
  end

  def crop_params
@@ -224,11 +154,41 @@ class CropsController < ApplicationController
      :name,
      :parent_id,
      :creator_id,
+      :perennial,
      :approval_status,
      :request_notes,
      :reason_for_rejection,
-      :rejection_notes, scientific_names_attributes: [:scientific_name,
-                                                      :_destroy,
-                                                      :id])
+      :rejection_notes,
+      scientific_names_attributes: [:scientific_name,
+                                    :_destroy,
+                                    :id])
+  end
+
+  def filename
+    "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
+  end
+
+  def crop_json_fields
+    {
+      include: {
+        plantings: {
+          include: {
+            owner: { only: [:id, :login_name, :location, :latitude, :longitude] }
+          }
+        },
+        scientific_names: { only: [:name] },
+        alternate_names: { only: [:name] }
+      }
+    }
+  end
+
+  def crops
+    q = Crop.approved.includes(:scientific_names, plantings: :photos)
+    q = q.popular unless @sort == 'alpha'
+    q.includes(:photos).paginate(page: params[:page])
+  end
+
+  def requested_crops
+    current_member.requested_crops.pending_approval
  end
 end
@@ -10,13 +10,18 @@ class GardensController < ApplicationController
    @owner = Member.find_by(slug: params[:owner])
    @show_all = params[:all] == '1'
    @gardens = gardens
-
    respond_with(@gardens)
  end

  # GET /gardens/1
  # GET /gardens/1.json
  def show
+    @current_plantings = @garden.plantings.current
+      .includes(:crop, :owner)
+      .order(planted_at: :desc)
+    @finished_plantings = @garden.plantings.finished
+      .includes(:crop)
+      .order(finished_at: :desc)
    respond_with(@garden)
  end

@@ -63,6 +68,6 @@ class GardensController < ApplicationController
  def gardens
    g = @owner ? @owner.gardens : Garden.all
    g = g.active unless @show_all
-    g.includes(:owner).order(:updated_at).paginate(page: params[:page])
+    g.joins(:owner).order(:updated_at).paginate(page: params[:page])
  end
 end
@@ -1,60 +1,49 @@
 class HarvestsController < ApplicationController
-  before_action :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: %i(index show)
+  after_action :update_crop_medians, only: %i(create update destroy)
  load_and_authorize_resource
  respond_to :html, :json
  respond_to :csv, only: :index
+  responders :flash

-  # GET /harvests
-  # GET /harvests.json
  def index
-    @owner = Member.find_by(slug: params[:owner])
-    @crop = Crop.find_by(slug: params[:crop])
-    @planting = Planting.find_by(slug: params['planting_id'])
+    @owner = Member.find_by(slug: params[:owner]) if params[:owner]
+    @crop = Crop.find_by(slug: params[:crop]) if params[:crop]
+    @planting = Planting.find_by(slug: params[:planting_id]) if params[:planting_id]

    @harvests = harvests
    @filename = csv_filename
    respond_with(@harvests)
  end

-  # GET /harvests/1
-  # GET /harvests/1.json
  def show
    @matching_plantings = matching_plantings if @harvest.owner == current_member
    respond_with(@harvest)
  end

-  # GET /harvests/new
-  # GET /harvests/new.json
  def new
    @harvest = Harvest.new(harvested_at: Time.zone.today)
    @planting = Planting.find_by(slug: params[:planting_id]) if params[:planting_id]
-    # using find_by_id here because it returns nil, unlike find
    @crop = Crop.find_by(id: params[:crop_id])
    respond_with(@harvest)
  end

-  # GET /harvests/1/edit
  def edit
    @planting = @harvest.planting if @harvest.planting_id
  end

-  # POST /harvests
-  # POST /harvests.json
  def create
    @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
-    flash[:notice] = I18n.t('harvests.created') if @harvest.save
+    @harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
+    @harvest.save
    respond_with(@harvest)
  end

-  # PUT /harvests/1
-  # PUT /harvests/1.json
  def update
-    flash[:notice] = I18n.t('harvests.updated') if @harvest.update(harvest_params)
+    @harvest.update(harvest_params)
    respond_with(@harvest)
  end

-  # DELETE /harvests/1
-  # DELETE /harvests/1.json
  def destroy
    @harvest.destroy
    respond_with(@harvest)
@@ -81,11 +70,11 @@ class HarvestsController < ApplicationController
      @owner.harvests
    elsif @crop
      @crop.harvests
-    elsif @planting_id
+    elsif @planting
      @planting.harvests
    else
-      Harvest
-    end.includes(:owner, :crop).paginate(page: params[:page])
+      Harvest.all
+    end.order(harvested_at: :desc).joins(:owner, :crop).paginate(page: params[:page])
  end

  def csv_filename
@@ -96,4 +85,13 @@ class HarvestsController < ApplicationController
                end
    "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(:number)}.csv"
  end
+
+  def update_crop_medians
+    # We only update medians to predict plantings
+    # if this harvest is not linked to a planting, then do nothing
+    return if @harvest.planting.nil?
+
+    @harvest.planting.update_harvest_days
+    @harvest.crop.update_harvest_medians
+  end
 end
@@ -1,14 +1,11 @@
 class HomeController < ApplicationController
  skip_authorize_resource
+  respond_to :html

  def index
    # we were previously generating a lot of instance variables like
    # @members_count and @interesting_crops in here, but now we call
    # the relevant class methods directly in the view, so that fragment
    # caching will be effective.
-
-    respond_to do |format|
-      format.html # index.html.haml
-    end
  end
 end
@@ -1,26 +1,15 @@
 class MembersController < ApplicationController
  load_and_authorize_resource except: [:finish_signup, :unsubscribe, :view_follows, :view_followers, :show]
  skip_authorize_resource only: [:nearby, :unsubscribe, :finish_signup]
-
-  after_action :expire_cache_fragments, only: :create
+  respond_to :html, :json, :rss
+  after_action :expire_homepage, only: :create

  def index
    @sort = params[:sort]
-    @members = if @sort == 'recently_joined'
-                 Member.confirmed.recently_joined.paginate(page: params[:page])
-               else
-                 Member.confirmed.paginate(page: params[:page])
-               end
-
+    @members = members
    respond_to do |format|
      format.html # index.html.haml
-      format.json {
-        render json: @members.to_json(only: [
-                                        :id, :login_name,
-                                        :slug, :bio, :created_at,
-                                        :location, :latitude, :longitude
-                                      ])
-      }
+      format.json { render json: @members.to_json(only: member_json_fields) }
    end
  end

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

    respond_to do |format|
      format.html # show.html.haml
-      format.json {
-        render json: @member.to_json(only: [
-                                       :id, :login_name, :bio,
-                                       :created_at, :slug, :location,
-                                       :latitude, :longitude
-                                     ])
-      }
-      format.rss {
+      format.json { render json: @member.to_json(only: member_json_fields) }
+      format.rss do
        render(
          layout: false,
          locals: { member: @member }
-        )}
+        )
+      end
    end
  end

@@ -66,7 +51,7 @@ class MembersController < ApplicationController
  EMAIL_TYPE_STRING = {
    send_notification_email: "direct message notifications",
    send_planting_reminder: "planting reminders"
-  }
+  }.freeze

  def unsubscribe
    verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
@@ -98,11 +83,21 @@ class MembersController < ApplicationController

  private

-  def expire_cache_fragments
-    expire_fragment("homepage_stats")
-  end
-
  def member_params
    params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter)
  end
+
+  def member_json_fields
+    [
+      :id, :login_name,
+      :slug, :bio, :created_at,
+      :location, :latitude, :longitude
+    ]
+  end
+
+  def members
+    q = Member.confirmed
+    q = q.recently_joined if @sort == 'recently_joined'
+    q.paginate(page: params[:page])
+  end
 end
@@ -31,9 +31,11 @@ class NotificationsController < ApplicationController
    @sender_notification.read = true
    @sender_notification.save
    @recipient = @sender_notification.sender
-    @subject   = @sender_notification.subject =~ /^Re: / ?
-      @sender_notification.subject :
-      "Re: " + @sender_notification.subject
+    @subject   = if @sender_notification.subject.start_with? 'Re: '
+                   @sender_notification.subject
+                 else
+                   "Re: #{@sender_notification.subject}"
+                 end
  end

  # DELETE /notifications/1
@@ -29,15 +29,15 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
    member = action.find_or_create_from_authorization(auth)
    @authentication = action.establish_authentication(auth, member)

-    unless action.member_created?
-      sign_in_and_redirect member, event: :authentication # this will throw if @user is not activated
-      set_flash_message(:notice, :success, kind: auth['provider']) if is_navigational_format?
-    else
+    if action.member_created?
      raise "Invalid provider" unless ['facebook', 'twitter', 'flickr'].index(auth['provider'].to_s)

      session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
      sign_in member
      redirect_to finish_signup_url(member)
+    else
+      sign_in_and_redirect member, event: :authentication # this will throw if @user is not activated
+      set_flash_message(:notice, :success, kind: auth['provider']) if is_navigational_format?
    end
  end

@@ -0,0 +1,13 @@
+class PhotoAssociationsController < ApplicationController
+  before_action :authenticate_member!
+  respond_to :json, :html
+
+  def destroy
+    @photo = Photo.find_by!(id: params[:photo_id], owner: current_member)
+    collection = Growstuff::Constants::PhotoModels.get_relation(@photo, params[:type])
+    item_class = Growstuff::Constants::PhotoModels.get_item(params[:type])
+    @item = item_class.find_by!(id: params[:id], owner_id: current_member.id)
+    collection.delete(@item)
+    respond_with(@photo)
+  end
+end
@@ -3,57 +3,63 @@ class PhotosController < ApplicationController
  after_action :expire_homepage, only: [:create, :delete]
  load_and_authorize_resource
  respond_to :html, :json
+  responders :flash

-  # GET /photos
-  # GET /photos.json
  def index
-    @photos = Photo.paginate(page: params[:page])
+    if params[:crop_id]
+      @crop = Crop.find params[:crop_id]
+      @photos = @crop.photos
+    else
+      @photos = Photo.all
+    end
+    @photos = @photos.includes(:owner).order(:created_at).paginate(page: params[:page])
    respond_with(@photos)
  end

-  # GET /photos/new
-  # GET /photos/new.json
  def new
-    @type = params[:type]
-    @id = params[:id]
-
    @photo = Photo.new
+    @item = item_to_link_to
+    @type = item_type
+    @id = item_id
    retrieve_from_flickr
-    respond_with(@photo)
+    respond_with @photo
  end

-  # GET /photos/1/edit
  def edit
+    respond_with @photo
  end

-  # POST /photos
-  # POST /photos.json
  def create
-    find_or_create_photo_from_flickr_photo
-    add_photo_to_collection
-    flash[:notice] = 'Photo was successfully added.' if @photo.present? && @photo.save
-    respond_with(@photo)
+    ActiveRecord::Base.transaction do
+      @photo = find_or_create_photo_from_flickr_photo
+      @item = item_to_link_to
+      raise "Could not find this #{type} owned by you" unless @item
+      collection << @item unless collection.include?(@item)
+      @photo.save! if @photo.present?
+    end
+    respond_with @photo
  end

-  # PUT /photos/1
-  # PUT /photos/1.json
  def update
-    flash[:notice] = 'Photo was successfully updated.' if @photo.update(photo_params)
-    respond_with(@photo)
+    @photo.update(photo_params)
+    respond_with @photo
  end

-  # DELETE /photos/1
-  # DELETE /photos/1.json
  def destroy
    @photo.destroy
-    flash[:alert] = "Photo successfully deleted."
-    respond_with(@photo)
+    respond_with @photo
  end

  private

-  def item_id?
-    params.key? :id
+  #
+  # Params
+  def item_id
+    params[:id]
+  end
+
+  def item_type
+    params[:type]
  end

  def flickr_photo_id_param
@@ -65,26 +71,32 @@ class PhotosController < ApplicationController
      :license_url, :thumbnail_url, :fullsize_url, :link_url)
  end

-  def find_or_create_photo_from_flickr_photo
-    @photo = Photo.find_by(flickr_photo_id: flickr_photo_id_param)
-    @photo = Photo.new(photo_params) unless @photo
-    @photo.owner_id = current_member.id
-    @photo.set_flickr_metadata
-    @photo
+  # Item with photos attached
+  #
+  def item_to_link_to
+    raise "No item id provided" if item_id.nil?
+    raise "No item type provided" if item_type.nil?
+    raise "Missing or invalid type provided" unless photos_supported_on_type?(item_type)
+    item_class = Growstuff::Constants::PhotoModels.get_item(item_type)
+    item_class.find_by!(id: params[:id], owner_id: current_member.id)
  end

-  def add_photo_to_collection
-    raise "Missing or invalid type provided" unless Growstuff::Constants::PhotoModels.types.include?(params[:type])
-    raise "No item id provided" unless item_id?
-    collection = Growstuff::Constants::PhotoModels.get_relation(@photo, params[:type])
+  def collection
+    Growstuff::Constants::PhotoModels.get_relation(@photo, item_type)
+  end

-    item_class = Growstuff::Constants::PhotoModels.get_item(params[:type])
-    item = item_class.find_by!(id: params[:id], owner_id: current_member.id)
-    raise "Could not find this item owned by you" unless item
+  def photos_supported_on_type?(_type)
+    Growstuff::Constants::PhotoModels.types.include?(item_type)
+  end

-    collection << item unless collection.include?(item)
-  rescue => e
-    flash[:alert] = e.message
+  #
+  # Flickr retrieval
+  def find_or_create_photo_from_flickr_photo
+    photo = Photo.find_by(flickr_photo_id: flickr_photo_id_param)
+    photo ||= Photo.new(photo_params)
+    photo.owner_id = current_member.id
+    photo.set_flickr_metadata
+    photo
  end

  def retrieve_from_flickr
@@ -1,5 +1,6 @@
 class PlacesController < ApplicationController
  skip_authorize_resource
+  respond_to :html, :json

  def index
    respond_to do |format|
@@ -30,17 +31,9 @@ class PlacesController < ApplicationController

  def search
    if params[:new_place].empty?
-      respond_to do |format|
-        format.html do
-          redirect_to places_path, alert: 'Please enter a valid location'
-        end
-      end
+      redirect_to places_path, alert: 'Please enter a valid location'
    else
-      respond_to do |format|
-        format.html do
-          redirect_to place_path(params[:new_place])
-        end
-      end
+      redirect_to place_path(params[:new_place])
    end
  end
 end
@@ -1,70 +1,37 @@
 class PlantPartsController < ApplicationController
  load_and_authorize_resource
  respond_to :html, :json
+  responders :flash

-  # GET /plant_parts
-  # GET /plant_parts.json
  def index
    @plant_parts = PlantPart.all
    respond_with(@plant_parts)
  end

-  # GET /plant_parts/1
-  # GET /plant_parts/1.json
  def show
    respond_with(@plant_part)
  end

-  # GET /plant_parts/new
-  # GET /plant_parts/new.json
  def new
    @plant_part = PlantPart.new
    respond_with(@plant_part)
  end

-  # GET /plant_parts/1/edit
-  def edit
-  end
+  def edit; end

-  # POST /plant_parts
-  # POST /plant_parts.json
  def create
-    @plant_part = PlantPart.new(plant_part_params)
-
-    respond_to do |format|
-      if @plant_part.save
-        format.html { redirect_to @plant_part, notice: 'Plant part was successfully created.' }
-        format.json { render json: @plant_part, status: :created, location: @plant_part }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @plant_part.errors, status: :unprocessable_entity }
-      end
-    end
+    @plant_part = PlantPart.create(plant_part_params)
+    respond_with(@plant_part)
  end

-  # PUT /plant_parts/1
-  # PUT /plant_parts/1.json
  def update
-    respond_to do |format|
-      if @plant_part.update(plant_part_params)
-        format.html { redirect_to @plant_part, notice: 'Plant part was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @plant_part.errors, status: :unprocessable_entity }
-      end
-    end
+    @plant_part.update(plant_part_params)
+    respond_with(@plant_part)
  end

-  # DELETE /plant_parts/1
-  # DELETE /plant_parts/1.json
  def destroy
    @plant_part.destroy
-
-    respond_to do |format|
-      format.html { redirect_to plant_parts_url }
-      format.json { head :no_content }
-    end
+    respond_with(@plant_part)
  end

  private
@@ -1,126 +1,89 @@
 class PlantingsController < ApplicationController
-  before_action :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: %i(index show)
+  after_action :expire_homepage, only: %i(create update destroy)
+  after_action :update_crop_medians, only: %i(create update destroy)
+  after_action :update_planting_medians, only: :update
  load_and_authorize_resource

-  # GET /plantings
-  # GET /plantings.json
+  respond_to :html, :json
+  respond_to :csv, :rss, only: [:index]
+  responders :flash
+
  def index
    @owner = Member.find_by(slug: params[:owner]) if params[:owner]
    @crop = Crop.find_by(slug: params[:crop]) if params[:crop]
    @show_all = params[:all] == '1'
+
    @plantings = plantings

-    respond_to do |format|
-      format.html { @plantings = @plantings.paginate(page: params[:page]) }
-      format.json { render json: @plantings }
-      format.rss { render layout: false } # index.rss.builder
-      format.csv do
-        specifics = (@owner ? "#{@owner.login_name}-" : @crop ? "#{@crop.name}-" : nil)
-        @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
-        render csv: @plantings
-      end
-    end
+    specifics = if @owner
+                  "#{@owner.login_name}-"
+                elsif @crop
+                  "#{@crop.name}-"
+                end
+
+    @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
+
+    respond_with(@plantings)
  end

-  # GET /plantings/1
-  # GET /plantings/1.json
  def show
-    @planting = Planting.includes(:owner, :crop, :garden, :photos).friendly.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @planting }
-    end
+    @planting = Planting.includes(:owner, :crop, :garden, :photos)
+      .friendly
+      .find(params[:id])
+    respond_with @planting
  end

-  # GET /plantings/new
-  # GET /plantings/new.json
  def new
-    @planting = Planting.new('planted_at' => Time.zone.today)
+    @planting = Planting.new(planted_at: Time.zone.today)

    # using find_by_id here because it returns nil, unlike find
    @crop     = Crop.approved.find_by(id: params[:crop_id]) || Crop.new
    @garden   = Garden.find_by(owner: current_member, id: params[:garden_id]) || Garden.new

-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @planting }
-    end
+    respond_with @planting
  end

-  # GET /plantings/1/edit
  def edit
    # the following are needed to display the form but aren't used
    @crop     = Crop.new
    @garden   = Garden.new
  end

-  # POST /plantings
-  # POST /plantings.json
  def create
-    params[:planted_at] = parse_date(params[:planted_at])
    @planting = Planting.new(planting_params)
    @planting.owner = current_member
-
-    respond_to do |format|
-      if @planting.save
-        @planting.update_attribute(:days_before_maturity,
-          update_days_before_maturity(@planting, planting_params[:crop_id]))
-        format.html { redirect_to @planting, notice: 'Planting was successfully created.' }
-        format.json { render json: @planting, status: :created, location: @planting }
-        expire_fragment("homepage_stats")
-      else
-        format.html { render action: "new" }
-        format.json { render json: @planting.errors, status: :unprocessable_entity }
-      end
-    end
+    @planting.save!
+    respond_with @planting
  end

-  # PUT /plantings/1
-  # PUT /plantings/1.json
  def update
-    params[:planted_at] = parse_date(params[:planted_at])
-
-    respond_to do |format|
-      if @planting.update(planting_params)
-        @planting.update_attribute(:days_before_maturity,
-          update_days_before_maturity(@planting, planting_params[:crop_id]))
-        format.html { redirect_to @planting, notice: 'Planting was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @planting.errors, status: :unprocessable_entity }
-      end
-    end
+    @planting.update(planting_params)
+    respond_with @planting
  end

-  # DELETE /plantings/1
-  # DELETE /plantings/1.json
  def destroy
-    @garden = @planting.garden
    @planting.destroy
-    expire_fragment("homepage_stats")
-
-    respond_to do |format|
-      format.html { redirect_to @garden }
-      format.json { head :no_content }
-    end
+    respond_with @planting, location: @planting.garden
  end

  private

-  def planting_params
-    params.require(:planting).permit(:crop_id, :description, :garden_id, :planted_at,
-      :quantity, :sunniness, :planted_from, :owner_id, :finished,
-      :finished_at)
+  def update_crop_medians
+    @planting.crop.update_lifespan_medians
  end

-  def update_days_before_maturity(planting, crop_id)
-    if planting.finished_at.nil?
-      planting.calculate_days_before_maturity(planting, crop_id)
-    else
-      (planting.finished_at - planting.planted_at).to_i
-    end
+  def update_planting_medians
+    @planting.update_harvest_days
+  end
+
+  def planting_params
+    params[:planted_at] = parse_date(params[:planted_at]) if params[:planted_at]
+    params.require(:planting).permit(
+      :crop_id, :description, :garden_id, :planted_at,
+      :quantity, :sunniness, :planted_from, :finished,
+      :finished_at
+    )
  end

  def plantings
@@ -132,6 +95,9 @@ class PlantingsController < ApplicationController
          Planting
        end
    p = p.current unless @show_all
-    p.includes(:owner, :crop, :garden).order(:created_at).paginate(page: params[:page])
+    p.joins(:owner, :crop, :garden)
+      .includes(:crop, :owner, :garden)
+      .order(:created_at)
+      .paginate(page: params[:page])
  end
 end
@@ -30,8 +30,7 @@ class PostsController < ApplicationController
  end

  # GET /posts/1/edit
-  def edit
-  end
+  def edit; end

  # POST /posts
  # POST /posts.json
@@ -1,67 +1,40 @@
 class ProductsController < ApplicationController
  before_action :authenticate_member!
  load_and_authorize_resource
+  respond_to :html
+  responders :flash

-  # GET /products
  def index
    @products = Product.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-    end
+    respond_with @products
  end

-  # GET /products/1
  def show
-    respond_to do |format|
-      format.html # show.html.erb
-    end
+    respond_with @product
  end

-  # GET /products/new
  def new
    @product = Product.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-    end
+    respond_with @product
  end

-  # GET /products/1/edit
  def edit
+    respond_with @product
  end

-  # POST /products
  def create
-    @product = Product.new(product_params)
-
-    respond_to do |format|
-      if @product.save
-        format.html { redirect_to @product, notice: 'Product was successfully created.' }
-      else
-        format.html { render action: "new" }
-      end
-    end
+    @product = Product.create(product_params)
+    respond_with @product
  end

-  # PUT /products/1
  def update
-    respond_to do |format|
-      if @product.update(product_params)
-        format.html { redirect_to @product, notice: 'Product was successfully updated.' }
-      else
-        format.html { render action: "edit" }
-      end
-    end
+    @product.update(product_params)
+    respond_with @product
  end

-  # DELETE /products/1
  def destroy
    @product.destroy
-
-    respond_to do |format|
-      format.html { redirect_to products_url }
-    end
+    respond_with @product
  end

  private
@@ -35,6 +35,14 @@ class RegistrationsController < Devise::RegistrationsController
      render "edit"
    end
  end
+
+  def destroy
+    if @member.destroy_with_password(params.require(:member)[:current_password])
+      redirect_to root_path
+    else
+      render "edit"
+    end
+  end
 end

 # check if we need the current password to update fields
@@ -1,67 +1,40 @@
 class RolesController < ApplicationController
  before_action :authenticate_member!
  load_and_authorize_resource
+  respond_to :html
+  responders :flash

-  # GET /roles
  def index
    @roles = Role.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-    end
+    respond_with @roles
  end

-  # GET /roles/1
  def show
-    respond_to do |format|
-      format.html # show.html.erb
-    end
+    respond_with @role
  end

-  # GET /roles/new
  def new
    @role = Role.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-    end
+    respond_with @role
  end

-  # GET /roles/1/edit
  def edit
+    respond_with @role
  end

-  # POST /roles
  def create
-    @role = Role.new(role_params)
-
-    respond_to do |format|
-      if @role.save
-        format.html { redirect_to @role, notice: 'Role was successfully created.' }
-      else
-        format.html { render action: "new" }
-      end
-    end
+    @role = Role.create(role_params)
+    respond_with @role
  end

-  # PUT /roles/1
  def update
-    respond_to do |format|
-      if @role.update(role_params)
-        format.html { redirect_to @role, notice: 'Role was successfully updated.' }
-      else
-        format.html { render action: "edit" }
-      end
-    end
+    @role.update(role_params)
+    respond_with @role
  end

-  # DELETE /roles/1
  def destroy
    @role.destroy
-
-    respond_to do |format|
-      format.html { redirect_to roles_url }
-    end
+    respond_with @role
  end

  private
@@ -2,6 +2,7 @@ class ScientificNamesController < ApplicationController
  before_action :authenticate_member!, except: [:index, :show]
  load_and_authorize_resource
  respond_to :html, :json
+  responders :flash

  # GET /scientific_names
  # GET /scientific_names.json
@@ -25,8 +26,7 @@ class ScientificNamesController < ApplicationController
  end

  # GET /scientific_names/1/edit
-  def edit
-  end
+  def edit; end

  # POST /scientific_names
  # POST /scientific_names.json
@@ -34,14 +34,14 @@ class ScientificNamesController < ApplicationController
    @scientific_name = ScientificName.new(scientific_name_params)
    @scientific_name.creator = current_member

-    flash[:notice] = 'Scientific name was successfully created.' if @scientific_name.save
+    @scientific_name.save
    respond_with(@scientific_name.crop)
  end

  # PUT /scientific_names/1
  # PUT /scientific_names/1.json
  def update
-    flash[:notice] = 'Scientific name was successfully updated.' if @scientific_name.update(scientific_name_params)
+    @scientific_name.update(scientific_name_params)
    respond_with(@scientific_name.crop)
  end

@@ -33,8 +33,7 @@ class SeedsController < ApplicationController
  end

  # GET /seeds/1/edit
-  def edit
-  end
+  def edit; end

  # POST /seeds
  # POST /seeds.json
@@ -2,7 +2,7 @@ class SessionsController < Devise::SessionsController
  respond_to :json

  def create
-    super do |resource|
+    super do |_resource|
      if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
        flash[:alert] = "There are crops waiting to be wrangled."
      end
@@ -1,4 +1,5 @@
 class ShopController < ApplicationController
+  respond_to :html
  def index
    @products = Product.all
    @order_item = OrderItem.new
@@ -11,15 +12,8 @@ class ShopController < ApplicationController

    @order = nil
    @most_recent_item = nil
-    if current_member
-      @order = current_member.current_order
-      if @order
-        @most_recent_item = @order.order_items.first
-      end
-    end
-
-    respond_to do |format|
-      format.html # index.html.haml
-    end
+    return unless current_member
+    @order = current_member.current_order
+    @most_recent_item = @order.order_items.first if @order
  end
 end
@@ -55,6 +55,7 @@ module ApplicationHelper
  # Falls back to Gravatar
  #
  def avatar_uri(member, size = 150)
+    return unless member
    if member.preferred_avatar_uri.present?
      # Some avatars support different sizes
      # http://graph.facebook.com/12345678/picture?width=150&height=150
@@ -1,18 +1,6 @@
 module PlantingsHelper
-  def display_days_before_maturity(planting)
-    # First try to calc from finished/finished_at
-    if planting.finished? || planting.finished_at.present?
-      planting.days_until_finished.to_s
-    # then try to calc from planted at + maturity
-    elsif planting.planted_at.present? && planting.days_before_maturity.present?
-      planting.days_until_mature.to_s
-    else
-      "unknown"
-    end
-  end
-
  def display_finished(planting)
-    if !planting.finished_at.nil?
+    if planting.finished_at.present?
      planting.finished_at
    elsif planting.finished
      "Yes (no date specified)"
@@ -6,6 +6,7 @@ module PhotoCapable
    has_and_belongs_to_many :photos # rubocop:disable Rails/HasAndBelongsToMany

    before_destroy :remove_from_list
+    scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
  end

  def remove_from_list
@@ -2,46 +2,48 @@ class Crop < ActiveRecord::Base
  extend FriendlyId
  friendly_id :name, use: [:slugged, :finders]

-  has_many :scientific_names, after_add: :update_index, after_remove: :update_index
-  accepts_nested_attributes_for :scientific_names,
-    allow_destroy: true,
-    reject_if: :all_blank
+  ##
+  ## Triggers
+  before_destroy { |crop| crop.posts.clear }

+  ##
+  ## Relationships
+  has_many :scientific_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
+  accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
  has_many :alternate_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
  has_many :plantings
  has_many :photos, through: :plantings
  has_many :seeds
  has_many :harvests
-  has_many :plant_parts, -> { uniq }, through: :harvests
+  has_many :plant_parts, -> { uniq.reorder("plant_parts.name") }, through: :harvests
  belongs_to :creator, class_name: 'Member'
  belongs_to :requester, class_name: 'Member'
-
  belongs_to :parent, class_name: 'Crop'
  has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
  has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
-  before_destroy { |crop| crop.posts.clear }

+  ##
+  ## Scopes
  default_scope { order("lower(crops.name) asc") }
-  scope :recent, lambda {
-    approved.reorder("created_at desc")
-  }
-  scope :toplevel, lambda {
-    approved.where(parent_id: nil)
-  }
-  scope :popular, lambda {
-    approved.reorder("plantings_count desc, lower(name) asc")
-  }
-  scope :randomized, lambda {
-    # ok on sqlite and psql, but not on mysql
-    approved.reorder('random()')
-  }
+  scope :recent, -> { approved.reorder("created_at desc") }
+  scope :toplevel, -> { approved.where(parent_id: nil) }
+  scope :popular, -> { approved.reorder("plantings_count desc, lower(name) asc") }
+  # ok on sqlite and psql, but not on mysql
+  scope :randomized, -> { approved.reorder('random()') }
  scope :pending_approval, -> { where(approval_status: "pending") }
  scope :approved, -> { where(approval_status: "approved") }
  scope :rejected, -> { where(approval_status: "rejected") }
-
-  scope :interesting, -> { approved.has_photos }
+  scope :interesting, -> { approved.has_photos.randomized }
  scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }

+  ##
+  ## Validations
+  # Reasons are only necessary when rejecting
+  validates :reason_for_rejection, presence: true, if: :rejected?
+  ## This validation addresses a race condition
+  validate :approval_status_cannot_be_changed_again
+  validate :must_be_rejected_if_rejected_reasons_present
+  validate :must_have_meaningful_reason_for_rejection
  ## Wikipedia urls are only necessary when approving a crop
  validates :en_wikipedia_url,
    format: {
@@ -50,16 +52,6 @@ class Crop < ActiveRecord::Base
    },
    if: :approved?

-  ## Reasons are only necessary when rejecting
-  validates :reason_for_rejection, presence: true, if: :rejected?
-
-  ## This validation addresses a race condition
-  validate :approval_status_cannot_be_changed_again
-
-  validate :must_be_rejected_if_rejected_reasons_present
-
-  validate :must_have_meaningful_reason_for_rejection
-
  ####################################
  # Elastic search configuration
  if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
@@ -106,14 +98,8 @@ class Crop < ActiveRecord::Base
    end
  end

-  def as_indexed_json(_options = {})
-    as_json(
-      only: [:id, :name, :approval_status],
-      include: {
-        scientific_names: { only: :name },
-        alternate_names: { only: :name }
-      }
-    )
+  def harvest_photos
+    Photo.joins(:harvests).where("harvests.crop_id": id)
  end

  # update the Elasticsearch index (only if we're using it in this
@@ -121,7 +107,6 @@ class Crop < ActiveRecord::Base
  def update_index(_name_obj)
    __elasticsearch__.index_document if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
  end
-
  # End Elasticsearch section

  def to_s
@@ -132,7 +117,6 @@ class Crop < ActiveRecord::Base
    scientific_names.first.name unless scientific_names.empty?
  end

-  # crop.default_photo
  # currently returns the first available photo, but exists so that
  # later we can choose a default photo based on different criteria,
  # eg. popularity
@@ -144,7 +128,6 @@ class Crop < ActiveRecord::Base
    harvest_with_photo.photos.first if harvest_with_photo
  end

-  # crop.sunniness
  # returns hash indicating whether this crop is grown in
  # sun/semi-shade/shade
  # key: sunniness (eg. 'sun')
@@ -153,7 +136,6 @@ class Crop < ActiveRecord::Base
    count_uses_of_property 'sunniness'
  end

-  # crop.planted_from
  # returns a hash of propagation methods (seed, seedling, etc),
  # key: propagation method (eg. 'seed')
  # value: count of how many times it's been used by plantings
@@ -161,7 +143,6 @@ class Crop < ActiveRecord::Base
    count_uses_of_property 'planted_from'
  end

-  # crop.popular_plant_parts
  # returns a hash of most harvested plant parts (fruit, seed, etc)
  # key: plant part (eg. 'fruit')
  # value: count of how many times it's been used by harvests
@@ -173,6 +154,10 @@ class Crop < ActiveRecord::Base
      .count("harvests.id")
  end

+  def annual?
+    !perennial
+  end
+
  def interesting?
    min_plantings = 3 # needs this many plantings to be interesting
    min_photos    = 3 # needs this many photos to be interesting
@@ -206,45 +191,24 @@ class Crop < ActiveRecord::Base
    reason_for_rejection
  end

-  # Crop.search(string)
+  def update_medians
+    plantings.each(&:update_harvest_days)
+    update_lifespan_medians
+    update_harvest_medians
+  end
+
+  def update_lifespan_medians
+    # Median lifespan of plantings
+    update(median_lifespan: Planting.where(crop: self).median(:lifespan))
+  end
+
+  def update_harvest_medians
+    update(median_days_to_first_harvest: Planting.where(crop: self).median(:days_to_first_harvest))
+    update(median_days_to_last_harvest: Planting.where(crop: self).median(:days_to_last_harvest))
+  end
+
  def self.search(query)
-    if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
-      search_str = query.nil? ? "" : query.downcase
-      response = __elasticsearch__.search( # Finds documents which match any field, but uses the _score from
-        # the best field insead of adding up _score from each field.
-        query: {
-          multi_match: {
-            query: search_str.to_s,
-            analyzer: "standard",
-            fields: ["name",
-                     "scientific_names.scientific_name",
-                     "alternate_names.name"]
-          }
-        },
-        filter: {
-          term: { approval_status: "approved" }
-        },
-        size: 50
-      )
-      response.records.to_a
-    else
-      # if we don't have elasticsearch, just do a basic SQL query.
-      # also, make sure it's an actual array not an activerecord
-      # collection, so it matches what we get from elasticsearch and we can
-      # manipulate it in the same ways (eg. deleting elements without deleting
-      # the whole record from the db)
-      matches = Crop.approved.where("name ILIKE ?", "%#{query}%").to_a
-
-      # we want to make sure that exact matches come first, even if not
-      # using elasticsearch (eg. in development)
-      exact_match = Crop.approved.find_by(name: query)
-      if exact_match
-        matches.delete(exact_match)
-        matches.unshift(exact_match)
-      end
-
-      matches
-    end
+    CropSearchService.search(query)
  end

  def self.case_insensitive_name(name)
@@ -1,7 +1,7 @@
 class Forum < ActiveRecord::Base
  extend FriendlyId
  validates :name, presence: true
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: %i(slugged finders)

  has_many :posts
  belongs_to :owner, class_name: "Member"
@@ -2,10 +2,10 @@ class Garden < ActiveRecord::Base
  extend FriendlyId
  include Geocodable
  include PhotoCapable
-  friendly_id :garden_slug, use: [:slugged, :finders]
+  friendly_id :garden_slug, use: %i(slugged finders)

  belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
-  has_many :plantings, -> { order(created_at: :desc) }, dependent: :destroy
+  has_many :plantings, dependent: :destroy
  has_many :crops, through: :plantings

  # set up geocoding
@@ -14,7 +14,7 @@ class Garden < ActiveRecord::Base
  after_validation :empty_unwanted_geocodes
  after_save :mark_inactive_garden_plantings_as_finished

-  default_scope { order("lower(name) asc") }
+  default_scope { joins(:owner).order("lower(name) asc") }
  scope :active, -> { where(active: true) }
  scope :inactive, -> { where(active: false) }

@@ -23,7 +23,7 @@ class Garden < ActiveRecord::Base

  validates :name,
    format: {
-      with: /\A\w+[\w ]+\z/
+      with: /\A\w+[\w ()]+\z/
    },
    length: { maximum: 255 }

@@ -41,7 +41,7 @@ class Garden < ActiveRecord::Base
    "acres" => "acre"
  }.freeze
  validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
-                                     message: "%{value} is not a valid area unit" },
+                                     message: "%<value>s is not a valid area unit" },
                        allow_nil: true,
                        allow_blank: true

@@ -62,7 +62,7 @@ class Garden < ActiveRecord::Base
    unique_plantings = []
    seen_crops = []

-    plantings.each do |p|
+    plantings.includes(:garden, :crop, :owner, :harvests).each do |p|
      unless seen_crops.include?(p.crop)
        unique_plantings.push(p)
        seen_crops.push(p.crop)
@@ -1,29 +1,11 @@
 class Harvest < ActiveRecord::Base
-  extend FriendlyId
  include ActionView::Helpers::NumberHelper
+  extend FriendlyId
  include PhotoCapable
-  friendly_id :harvest_slug, use: [:slugged, :finders]

-  belongs_to :crop
-  belongs_to :owner, class_name: 'Member', counter_cache: true
-  belongs_to :plant_part
-  belongs_to :planting
-
-  default_scope { order('created_at DESC') }
-
-  validates :crop, approved: true
-
-  validates :crop, presence: { message: "must be present and exist in our database" }
-
-  validates :plant_part, presence: { message: "must be present and exist in our database" }
-
-  validates :quantity,
-    numericality: {
-      only_integer: false,
-      greater_than_or_equal_to: 0
-    },
-    allow_nil: true
+  friendly_id :harvest_slug, use: %i(slugged finders)

+  # Constants
  UNITS_VALUES = {
    "individual" => "individual",
    "bunches" => "bunch",
@@ -36,29 +18,54 @@ class Harvest < ActiveRecord::Base
    "baskets" => "basket",
    "bushels" => "bushel"
  }.freeze
-  validates :unit, inclusion: { in: UNITS_VALUES.values,
-                                message: "%{value} is not a valid unit" },
-                   allow_nil: true,
-                   allow_blank: true
-
-  validates :weight_quantity,
-    numericality: { only_integer: false },
-    allow_nil: true

  WEIGHT_UNITS_VALUES = {
    "kg" => "kg",
    "lb" => "lb",
    "oz" => "oz"
  }.freeze
-  validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
-                                       message: "%{value} is not a valid unit" },
-                          allow_nil: true,
-                          allow_blank: true

+  ##
+  ## Triggers
  after_validation :cleanup_quantities
-
  before_save :set_si_weight

+  ##
+  ## Relationships
+  belongs_to :crop
+  belongs_to :owner, class_name: 'Member', counter_cache: true
+  belongs_to :plant_part
+  belongs_to :planting
+
+  ##
+  ## Scopes
+  default_scope { joins(:owner) }
+
+  ##
+  ## Validations
+  validates :crop, approved: true
+  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :plant_part, presence: { message: "must be present and exist in our database" }
+  validates :harvested_at, presence: true
+  validates :quantity, allow_nil: true, numericality: {
+    only_integer: false, greater_than_or_equal_to: 0
+  }
+  validates :unit, allow_nil: true, allow_blank: true, inclusion: {
+    in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+  }
+  validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
+  validates :weight_unit, allow_nil: true, allow_blank: true, inclusion: {
+    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+  }
+  validate :crop_must_match_planting
+  validate :owner_must_match_planting
+  validate :harvest_must_be_after_planting
+
+  def time_from_planting_to_harvest
+    return if planting.blank?
+    harvested_at - planting.planted_at
+  end
+
  # we're storing the harvest weight in kilograms in the db too
  # to make data manipulation easier
  def set_si_weight
@@ -119,4 +126,20 @@ class Harvest < ActiveRecord::Base
  def default_photo
    photos.first || crop.default_photo
  end
+
+  def crop_must_match_planting
+    return if planting.blank? # only check if we are linked to a planting
+    errors.add(:planting, "must be the same crop") unless crop == planting.crop
+  end
+
+  def owner_must_match_planting
+    return if planting.blank? # only check if we are linked to a planting
+    errors.add(:owner, "of harvest must be the same as planting") unless owner == planting.owner
+  end
+
+  def harvest_must_be_after_planting
+    # only check if we are linked to a planting
+    return unless harvested_at.present? && planting.present? && planting.planted_at.present?
+    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
+  end
 end
@@ -1,13 +1,14 @@
 class Member < ActiveRecord::Base
+  acts_as_paranoid # implements soft deletion
+  before_destroy :newsletter_unsubscribe
  include Geocodable
  extend FriendlyId

-  friendly_id :login_name, use: [:slugged, :finders]
+  friendly_id :login_name, use: %i(slugged finders)

  has_many :posts, foreign_key: 'author_id'
  has_many :comments, foreign_key: 'author_id'
  has_many :forums, foreign_key: 'owner_id'
-
  has_many :gardens, foreign_key: 'owner_id'
  has_many :plantings, foreign_key: 'owner_id'

@@ -27,21 +28,17 @@ class Member < ActiveRecord::Base

  has_many :photos

+  has_many :requested_crops, class_name: Crop, foreign_key: 'requester_id'
  has_many :likes, dependent: :destroy

  default_scope { order("lower(login_name) asc") }
-  scope :confirmed, -> { where('confirmed_at IS NOT NULL') }
-  scope :located, -> { where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL") }
-  scope :recently_signed_in, -> { reorder('updated_at DESC') }
-  scope :recently_joined, -> { reorder("confirmed_at desc") }
-  scope :wants_newsletter, -> { where(newsletter: true) }

-  scope :interesting, lambda {
-    confirmed
-      .located
-      .recently_signed_in
-      .has_plantings
-  }
+  scope :confirmed, -> { where.not(confirmed_at: nil) }
+  scope :located, -> { where.not(location: '').where.not(latitude: nil).where.not(longitude: nil) }
+  scope :recently_signed_in, -> { reorder(updated_at: :desc) }
+  scope :recently_joined, -> { reorder(confirmed_at: :desc) }
+  scope :wants_newsletter, -> { where(newsletter: true) }
+  scope :interesting, -> { confirmed.located.recently_signed_in.has_plantings }

  scope :has_plantings, -> { joins(:plantings).group("members.id") }

@@ -94,7 +91,7 @@ class Member < ActiveRecord::Base

  # and an account record (for paid accounts etc)
  # we use find_or_create to avoid accidentally creating a second one,
-  # which can happen sometimes especially with FactoryGirl associations
+  # which can happen sometimes especially with FactoryBot associations
  after_create { |member| Account.find_or_create_by(member_id: member.id) }

  after_save :update_newsletter_subscription
@@ -1,5 +1,5 @@
 class Order < ActiveRecord::Base
-  belongs_to :member
+  belongs_to :member, with_deleted: true

  has_many :order_items, dependent: :destroy

@@ -64,7 +64,7 @@ class Order < ActiveRecord::Base
    if args[:for]
      case args[:by]
      when "member"
-        member = Member.find_by(login_name: args[:for])
+        member = Member.with_deleted.find_by(login_name: args[:for])
        return member.orders if member
      when "order_id"
        order = Order.find_by(id: args[:for])
@@ -8,7 +8,11 @@ class Photo < ActiveRecord::Base

  before_destroy { all_associations.clear }

-  default_scope { order("created_at desc") }
+  default_scope { joins(:owner).order(created_at: :desc) }
+
+  def associations?
+    plantings.any? || harvests.any? || gardens.any? || seeds.any?
+  end

  def all_associations
    associations = []
@@ -30,7 +34,7 @@ class Photo < ActiveRecord::Base
    licenses = flickr.photos.licenses.getInfo
    license = licenses.find { |l| l.id == info.license }
    {
-      title: info.title || "Untitled",
+      title: calculate_title(info),
      license_name: license.name,
      license_url: license.url,
      thumbnail_url: FlickRaw.url_q(info),
@@ -39,6 +43,16 @@ class Photo < ActiveRecord::Base
    }
  end

+  def calculate_title(info)
+    if id && title # already has a title saved
+      title
+    elsif info.title # use title from flickr
+      info.title
+    else
+      'untitled'
+    end
+  end
+
  def set_flickr_metadata
    update_attributes(flickr_metadata)
  end
@@ -1,6 +1,6 @@
 class PlantPart < ActiveRecord::Base
  extend FriendlyId
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: %i(slugged finders)

  has_many :harvests
  has_many :crops, -> { uniq }, through: :harvests
@@ -1,74 +1,57 @@
 class Planting < ActiveRecord::Base
  extend FriendlyId
  include PhotoCapable
-  friendly_id :planting_slug, use: [:slugged, :finders]
+  friendly_id :planting_slug, use: %i(slugged finders)
+
+  # Constants
+  SUNNINESS_VALUES = %w(sun semi-shade shade)
+  PLANTED_FROM_VALUES = [
+    'seed', 'seedling', 'cutting', 'root division', 'runner',
+    'bulb', 'root/tuber', 'bare root plant', 'advanced plant',
+    'graft', 'layering'
+  ]
+
+  ##
+  ## Triggers
+  before_save :calculate_lifespan

  belongs_to :garden
  belongs_to :owner, class_name: 'Member', counter_cache: true
  belongs_to :crop, counter_cache: true
-  has_many :harvests, -> { order(harvested_at: :desc) }, dependent: :destroy
+  has_many :harvests, dependent: :destroy

-  default_scope { order("plantings.created_at desc") }
+  ##
+  ## Scopes
+  default_scope { joins(:owner).order(created_at: :desc) }
  scope :finished, -> { where(finished: true) }
  scope :current, -> { where(finished: false) }
-
  scope :interesting, -> { has_photos.one_per_owner }
  scope :one_per_owner, lambda {
    joins("JOIN members m ON (m.id=plantings.owner_id)
-          LEFT OUTER JOIN plantings p2
-          ON (m.id=p2.owner_id AND plantings.id < p2.id)").where("p2 IS NULL")
+           LEFT OUTER JOIN plantings p2
+           ON (m.id=p2.owner_id AND plantings.id < p2.id)").where("p2 IS NULL")
  }
-  scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }

-  delegate :name,
-    :en_wikipedia_url,
-    :default_scientific_name,
-    :plantings_count,
-    to: :crop,
-    prefix: true
-
-  validates :crop, approved: true
-
-  validates :crop, presence: { message: "must be present and exist in our database" }
-
-  validates :quantity,
-    numericality: {
-      only_integer: true,
-      greater_than_or_equal_to: 0
-    },
-    allow_nil: true
-
-  SUNNINESS_VALUES = %w(sun semi-shade shade)
-  validates :sunniness, inclusion: { in: SUNNINESS_VALUES,
-                                     message: "%{value} is not a valid sunniness value" },
-                        allow_nil: true,
-                        allow_blank: true
-
-  PLANTED_FROM_VALUES = [
-    'seed',
-    'seedling',
-    'cutting',
-    'root division',
-    'runner',
-    'bulb',
-    'root/tuber',
-    'bare root plant',
-    'advanced plant',
-    'graft',
-    'layering'
-  ]
-  validates :planted_from, inclusion: { in: PLANTED_FROM_VALUES,
-                                        message: "%{value} is not a valid planting method" },
-                           allow_nil: true,
-                           allow_blank: true
+  ##
+  ## Delegations
+  delegate :name, :en_wikipedia_url, :default_scientific_name, :plantings_count,
+    to: :crop, prefix: true

+  ##
+  ## Validations
+  validates :garden, presence: true
+  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
  validate :finished_must_be_after_planted
-
-  # check that any finished_at date occurs after planted_at
-  def finished_must_be_after_planted
-    return unless planted_at && finished_at # only check if we have both
-    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
-  end
+  validate :owner_must_match_garden_owner
+  validates :quantity, allow_nil: true, numericality: {
+    only_integer: true, greater_than_or_equal_to: 0
+  }
+  validates :sunniness, allow_nil: true, allow_blank: true, inclusion: {
+    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
+  }
+  validates :planted_from, allow_nil: true, allow_blank: true, inclusion: {
+    in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
+  }

  def planting_slug
    [
@@ -92,49 +75,68 @@ class Planting < ActiveRecord::Base
    photos.first
  end

-  def calculate_days_before_maturity(planting, crop)
-    p_crop = Planting.where(crop_id: crop).where.not(id: planting)
-    differences = p_crop.collect do |p|
-      if p.finished && !p.finished_at.nil?
-        (p.finished_at - p.planted_at).to_i
-      end
+  def planted?
+    planted_at.present? && planted_at <= Date.current
+  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

-    if differences.compact.empty?
-      nil
-    else
-      differences.compact.sum / differences.compact.size
+  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 planted?(current_date = Date.current)
-    planted_at.present? && current_date.to_date >= planted_at
+  def first_harvest_date
+    harvests_with_dates.minimum(:harvested_at)
  end

-  def days_until_finished
-    return 0 if finished?
-    days = (finished_at - Date.current).to_i
-    days.positive? ? days : 0
+  def last_harvest_date
+    harvests_with_dates.maximum(:harvested_at)
  end

-  def days_until_mature
-    days = ((planted_at + days_before_maturity) - Date.current).to_i
-    days.positive? ? days : 0
+  private
+
+  def harvests_with_dates
+    harvests.where.not(harvested_at: nil)
  end

-  def percentage_grown(current_date = Date.current)
-    return nil unless days_before_maturity && planted?(current_date)
+  # check that any finished_at date occurs after planted_at
+  def finished_must_be_after_planted
+    return unless planted_at && finished_at # only check if we have both
+    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
+  end

-    days = (current_date.to_date - planted_at.to_date).to_i
-
-    return 0 if current_date < planted_at
-    return 100 if days > days_before_maturity
-    percent = (days / days_before_maturity * 100).to_i
-
-    if percent >= 100
-      percent = 100
-    end
-
-    percent
+  def owner_must_match_garden_owner
+    errors.add(:owner, "must be the same as garden") unless owner == garden.owner
  end
 end
@@ -1,7 +1,7 @@
 class Post < ActiveRecord::Base
  extend FriendlyId
  include Likeable
-  friendly_id :author_date_subject, use: [:slugged, :finders]
+  friendly_id :author_date_subject, use: %i(slugged finders)
  belongs_to :author, class_name: 'Member'
  belongs_to :forum
  has_many :comments, dependent: :destroy
@@ -36,7 +36,7 @@ class Post < ActiveRecord::Base
    end
  end

-  default_scope { order("created_at desc") }
+  default_scope { joins(:author).order(created_at: :desc) }

  validates :subject,
    presence: true,
@@ -8,6 +8,7 @@ class Product < ActiveRecord::Base
      greater_than_or_equal_to: 0
    },
    allow_nil: true
+  validates :min_price, presence: true

  def to_s
    name
@@ -1,11 +1,11 @@
 class Role < ActiveRecord::Base
  extend FriendlyId
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: %i(slugged finders)

  has_and_belongs_to_many :members # rubocop:disable Rails/HasAndBelongsToMany

  class << self
-    [:crop_wranglers, :admins].each do |method|
+    %i(crop_wranglers admins).each do |method|
      define_method method do
        slug = method.to_s.singularize.dasherize
        Role.where(slug: slug).try(:first).try(:members)
@@ -6,9 +6,11 @@ class Seed < ActiveRecord::Base
  belongs_to :crop
  belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true

-  default_scope { order("created_at desc") }
+  default_scope { joins(:owner).order(created_at: :desc) }

  validates :crop, approved: true
+  delegate :name, to: :crop
+  delegate :default_photo, to: :crop

  validates :crop, presence: { message: "must be present and exist in our database" }
  validates :quantity,
@@ -30,8 +32,9 @@ class Seed < ActiveRecord::Base
    },
    allow_nil: true

-  scope :tradable, -> { where("tradable_to != 'nowhere'") }
-
+  scope :tradable, -> { where.not(tradable_to: 'nowhere') }
+  scope :interesting, -> { tradable.has_location }
+  scope :has_location, -> { joins(:owner).where.not("members.location": nil) }
  TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
  validates :tradable_to, inclusion: { in: TRADABLE_TO_VALUES,
                                       message: "You may only trade seed nowhere, "\
@@ -77,27 +80,6 @@ class Seed < ActiveRecord::Base
    end
  end

-  def interesting?
-    # assuming we're passed something that's already known to be tradable
-    # eg. from Seed.tradable scope
-    return false if owner.location.blank? # don't want unspecified locations
-    true
-  end
-
-  # Seed.interesting
-  # returns a list of interesting seeds, for use on the homepage etc
-  def self.interesting
-    howmany = 12 # max number to find
-    interesting_seeds = []
-
-    Seed.tradable.each do |s|
-      break if interesting_seeds.size == howmany
-      interesting_seeds.push(s) if s.interesting?
-    end
-
-    interesting_seeds
-  end
-
  def seed_slug
    "#{owner.login_name}-#{crop}".downcase.tr(' ', '-')
  end
@@ -0,0 +1,8 @@
+module Api
+  module V1
+    class BaseResource < JSONAPI::Resource
+      immutable
+      abstract
+    end
+  end
+end
@@ -0,0 +1,22 @@
+module Api
+  module V1
+    class CropResource < BaseResource
+      immutable
+
+      filter :approval_status, default: 'approved'
+
+      has_many :plantings
+      has_many :photos
+      has_many :harvests
+      has_one :parent
+
+      attribute :name
+      attribute :en_wikipedia_url
+
+      attribute :perennial
+      attribute :median_lifespan
+      attribute :median_days_to_first_harvest
+      attribute :median_days_to_last_harvest
+    end
+  end
+end
@@ -0,0 +1,13 @@
+module Api
+  module V1
+    class GardenResource < BaseResource
+      immutable
+
+      has_one :owner, class_name: 'Member'
+      has_many :plantings
+      has_many :photos
+
+      attribute :name
+    end
+  end
+end
@@ -0,0 +1,19 @@
+module Api
+  module V1
+    class HarvestResource < BaseResource
+      immutable
+
+      has_one :crop
+      has_one :planting
+      has_one :owner, class_name: 'Member'
+      has_many :photos
+
+      attribute :harvested_at
+      attribute :description
+      attribute :unit
+      attribute :weight_quantity
+      attribute :weight_unit
+      attribute :si_weight
+    end
+  end
+end
@@ -0,0 +1,15 @@
+module Api
+  module V1
+    class MemberResource < BaseResource
+      immutable
+
+      has_many :gardens
+      has_many :plantings
+      has_many :harvests
+      has_many :seeds
+      has_many :photos
+
+      attribute :login_name
+    end
+  end
+end
@@ -0,0 +1,18 @@
+module Api
+  module V1
+    class PhotoResource < BaseResource
+      immutable
+
+      has_one :owner, class_name: 'Member'
+      has_many :plantings
+      has_many :gardens
+      has_many :harvests
+
+      attribute :thumbnail_url
+      attribute :fullsize_url
+      attribute :license_name
+      attribute :link_url
+      attribute :title
+    end
+  end
+end
@@ -0,0 +1,28 @@
+module Api
+  module V1
+    class PlantingResource < BaseResource
+      immutable
+
+      has_one :garden
+      has_one :crop
+      has_one :owner, class_name: 'Member'
+      has_many :photos
+      has_many :harvests
+
+      attribute :planted_at
+      attribute :finished_at
+      attribute :finished
+      attribute :quantity
+      attribute :description
+      attribute :sunniness
+      attribute :planted_from
+
+      # Predictions
+      attribute :expected_lifespan
+      attribute :finish_predicted_at
+      attribute :percentage_grown
+      attribute :first_harvest_date
+      attribute :last_harvest_date
+    end
+  end
+end
@@ -0,0 +1,20 @@
+module Api
+  module V1
+    class SeedResource < BaseResource
+      immutable
+
+      has_one :owner, class_name: 'Member'
+      has_one :crop
+
+      attribute :description
+      attribute :quantity
+      attribute :plant_before
+      attribute :tradable_to
+      attribute :days_until_maturity_min
+      attribute :days_until_maturity_max
+      attribute :organic
+      attribute :gmo
+      attribute :heirloom
+    end
+  end
+end
@@ -0,0 +1,42 @@
+class CropSearchService
+  # Crop.search(string)
+  def self.search(query)
+    if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
+      search_str = query.nil? ? "" : query.downcase
+      response = Crop.__elasticsearch__.search( # Finds documents which match any field, but uses the _score from
+        # the best field insead of adding up _score from each field.
+        query: {
+          multi_match: {
+            query: search_str.to_s,
+            analyzer: "standard",
+            fields: ["name",
+                     "scientific_names.scientific_name",
+                     "alternate_names.name"]
+          }
+        },
+        filter: {
+          term: { approval_status: "approved" }
+        },
+        size: 50
+      )
+      response.records.to_a
+    else
+      # if we don't have elasticsearch, just do a basic SQL query.
+      # also, make sure it's an actual array not an activerecord
+      # collection, so it matches what we get from elasticsearch and we can
+      # manipulate it in the same ways (eg. deleting elements without deleting
+      # the whole record from the db)
+      matches = Crop.approved.where("name ILIKE ?", "%#{query}%").to_a
+
+      # we want to make sure that exact matches come first, even if not
+      # using elasticsearch (eg. in development)
+      exact_match = Crop.approved.find_by(name: query)
+      if exact_match
+        matches.delete(exact_match)
+        matches.unshift(exact_match)
+      end
+
+      matches
+    end
+  end
+end
@@ -5,6 +5,7 @@
 %ul#admin_links
  %li= link_to "Account types", account_types_path
  %li= link_to "Alternate names", alternate_names_path
+  %li= link_to "Scientific names", scientific_names_path
  %li= link_to "Products", products_path
  %li= link_to "Roles", roles_path
  %li= link_to "Forums", forums_path
@@ -18,7 +18,9 @@

    - @orders.each do |order|
      %tr
-        %td= link_to order.member.login_name, order.member
+        %td
+          = link_to order.member.login_name, order.member
+          = "(deleted)" if order.member.deleted_at
        %td= order.id
        %td
          - if order.completed_at
@@ -6,7 +6,10 @@
      .col-md-11
        .comment-meta
          Posted by
-          = link_to comment.author.login_name, member_path(comment.author)
+          - if comment.author
+            = link_to comment.author.login_name, member_path(comment.author)
+          - else
+            Member Deleted
          on
          = comment.created_at
          - if comment.updated_at > comment.created_at
@@ -29,6 +29,16 @@
          Wranglers: please ensure this is singular, and capitalize
          proper nouns only.

+  .form-group
+    = f.label :perennial, 'Lifespan', class: 'control-label col-md-2'
+    .col-md-8
+      = f.radio_button(:perennial, false)
+      = f.label(:perennial_false, "Annual")
+      %span.help-block Living and reproducing in a single year or less
+      = f.radio_button(:perennial, true)
+      = f.label(:perennial_true, "Perennial")
+      %span.help-block Living more than two years
+
  .form-group
    = f.label :en_wikipedia_url, 'Wikipedia URL', class: 'control-label col-md-2'
    .col-md-8
@@ -12,11 +12,23 @@
      %p
        %b Scientific name:
        = crop.default_scientific_name
-      %p
-        %b
-          Planted
-          = pluralize(crop.plantings.size, "time")
-        by #{ENV['GROWSTUFF_SITE_NAME']} members
+
+      - if crop.annual? && crop.median_lifespan.present?
+        %p
+          Median Lifespan
+          %b= crop.median_lifespan
+          days
+      - unless crop.median_days_to_first_harvest.nil?
+        %p
+          First harvest expected
+          %b= crop.median_days_to_first_harvest
+          days after planting
+
+      - if crop.annual? && crop.median_days_to_last_harvest.present?
+        %p
+          Last harvest expected
+          %b= crop.median_days_to_last_harvest
+          days after planting

      - if can? :create, Planting
        = link_to 'Plant this', new_planting_path(params: { crop_id: crop.id }), class: 'btn btn-primary'
@@ -1,5 +1,15 @@
+- unless crop.harvest_photos.empty?
+  %h3 Photos of #{crop.name} harvests
+  .row
+    - crop.harvest_photos.first(6).each do |p|
+      .col-xs-6.col-md-2
+        = render "photos/thumbnail", photo: p
+
+- unless crop.photos.empty?
+  %h3 Photos of #{crop.name} plants
+  .row
+    - crop.photos.first(6).each do |p|
+      .col-xs-6.col-md-2
+        = render "photos/thumbnail", photo: p
 .row
-  - unless crop.photos.empty?
-    - crop.photos.first(3).each do |p|
-      .col-md-4
-        = render partial: "photos/thumbnail", locals: { photo: p }
+  = link_to "more photos", crop_photos_path(crop_id: crop.id)
@@ -0,0 +1,29 @@
+- unless crop.perennial.nil?
+  %p
+    #{crop.name} is
+    - if crop.perennial == true
+      = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
+        a perennial crop
+      (living more than two years)
+    - elsif crop.perennial == false
+      = link_to 'https://en.wikipedia.org/wiki/Annual_vs._perennial_plant_evolution' do
+        an annual crop
+      (living and reproducing in a single year or less)
+
+- if crop.annual? && crop.median_lifespan.present?
+  %p
+    Median lifespan of #{crop.name} plants is
+    %strong= crop.median_lifespan
+    days
+
+- if crop.median_days_to_first_harvest.present?
+  %p
+    First harvest expected
+    %strong= crop.median_days_to_first_harvest
+    days after planting
+
+- if crop.annual? && crop.median_days_to_last_harvest.present?
+  %p
+    Last harvest expected
+    %strong= crop.median_days_to_last_harvest
+    days after planting
@@ -4,8 +4,8 @@
 - if can? :wrangle, Crop
  = link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-primary'

- if @has_requested_pending
-  = link_to(I18n.t('crops.requested.link', number_crops: @has_requested_pending), requested_crops_path)
+- if @num_requested_crops && @num_requested_crops.positive?
+  = link_to(I18n.t('crops.requested.link', number_crops: @num_requested_crops), requested_crops_path)

 %p
  #{ENV['GROWSTUFF_SITE_NAME']} tracks who's growing what, where.
@@ -23,10 +23,10 @@
  = submit_tag "Show", class: 'btn btn-primary'

 .pagination
-  = will_paginate @paginated_crops
+  = will_paginate @crops

 .row
-  - @paginated_crops.each do |crop|
+  - @crops.each do |crop|
    .col-md-2.six-across
      = render partial: "thumbnail", locals: { crop: crop }

@@ -35,7 +35,7 @@
    = link_to 'New Crop', new_crop_path, class: 'btn btn-primary'

 .pagination
-  = will_paginate @paginated_crops
+  = will_paginate @crops


 %ul.list-inline
@@ -7,5 +7,5 @@
      %item
        %title= crop.name
        %pubdate= crop.created_at.to_s(:rfc822)
-        %link= post_url(crop)
-        %guid= post_url(crop)
+        %link= crop_url(crop)
+        %guid= crop_url(crop)
@@ -20,19 +20,17 @@

    - if can? :create, Seed
      = link_to 'Add seeds to stash', new_seed_path(params: { crop_id: @crop.id }), class: 'btn btn-default'
-  - if member_signed_in?
-    = display_seed_availability(@current_member, @crop)
-    = link_to "View your seeds", seeds_by_owner_path(owner: current_member.slug)

 .row
  .col-md-9
-    - unless current_member
-      Learn how to grow #{@crop.name.pluralize} from growers around the world.
-      #{ENV['GROWSTUFF_SITE_NAME']} has tips and advice from real-life growers,
-      including when to plant #{@crop.name.pluralize}, how to harvest
-      #{@crop.name.pluralize}, and more.
+    - if member_signed_in?
+      = display_seed_availability(@current_member, @crop)
+      = link_to "View your seeds", seeds_by_owner_path(owner: current_member.slug)

-    = render partial: 'photos', locals: { crop: @crop }
+    %h2 Predictions
+    = render 'predictions', crop: @crop
+
+    %p= render 'crops/photos', crop: @crop

    %h2
      - if !@crop.plantings.empty?
@@ -86,18 +84,18 @@

    %h4 How to grow #{@crop.name.pluralize}

-    = render partial: 'grown_for', locals: { crop: @crop }
-    = render partial: 'planting_advice', locals: { crop: @crop }
+    = render 'grown_for', crop: @crop
+    = render 'planting_advice', crop: @crop

-    = render partial: 'scientific_names', locals: { crop: @crop }
-    = render partial: 'alternate_names', locals: { crop: @crop }
+    = render 'scientific_names', crop: @crop
+    = render 'alternate_names', crop: @crop

    %h4 #{@crop.name.capitalize} varieties
-    = render partial: 'varieties', locals: { crop: @crop }
+    = render 'varieties', crop: @crop

-    = render partial: 'plantings', locals: { crop: @crop }
-    = render partial: 'harvests', locals: { crop: @crop }
-    = render partial: 'find_seeds', locals: { crop: @crop }
+    = render 'plantings', crop: @crop
+    = render 'harvests', crop: @crop
+    = render 'find_seeds', crop: @crop


    %h4 Learn more about #{@crop.name.pluralize}
@@ -0,0 +1,12 @@
+= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :delete, class: 'form-horizontal' }) do |f|
+  %br/
+  = devise_error_messages!
+
+  .form-group
+    = f.label :current_password, "Password required to delete", class: 'control-label col-md-2'
+    .col-md-4
+      = f.password_field :current_password, class: 'form-control', id: 'current_pw_for_delete'
+
+  .form-group
+    .form-actions.col-md-offset-2.col-md-8
+      = f.submit "Delete", class: 'btn btn-primary'
@@ -13,6 +13,9 @@
  %li
    %a{ href: '#password', role: 'tab', 'data-toggle': 'tab' }
      Password
+  %li
+    %a{ href: '#delete', role: 'tab', 'data-toggle': 'tab' }
+      Delete Account

 .tab-content
  .tab-pane.active#profile
@@ -23,3 +26,5 @@
    = render partial: 'edit_apps'
  .tab-pane#password
    = render partial: 'edit_password'
+  .tab-pane#delete
+    = render partial: 'delete'
@@ -0,0 +1,28 @@
+- if can?(:edit, garden) || can?(:delete, garden)
+  - if can? :edit, garden
+    - if garden.active
+      = link_to new_planting_path(garden_id: garden.id), class: 'btn btn-primary' do
+        %span.glyphicon.glyphicon-grain{ title: "Plant" }
+        Plant something
+      = link_to "Mark as inactive", garden_path(garden, garden: { active: 0 }),
+        method: :put, class: 'btn btn-default',
+        data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
+    - else
+      = link_to "Mark as active", garden_path(garden, garden: { active: 1 }),
+                method: :put,
+                class: 'btn btn-default'
+    = link_to edit_garden_path(garden), class: 'btn btn-default', id: 'edit_garden_link' do
+      %span.glyphicon.glyphicon-pencil{ title: "Edit garden" }
+      Edit
+  - if can?(:destroy, garden)
+    = link_to garden,
+              method: :delete,
+              data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
+              class: 'btn btn-default', id: 'delete_garden_link' do
+      %span.glyphicon.glyphicon-trash{ title: "Delete" }
+      Delete
+  - if can?(:edit, garden) && can?(:create, Photo)
+    = link_to new_photo_path(type: "garden", id: garden.id),
+              class: 'btn btn-primary' do
+      %span.glyphicon.glyphicon-camera{ title: "Add Photo" }
+      Add Photo
@@ -0,0 +1,25 @@
+
+.panel.panel-success
+  .panel-heading
+    %h3.panel-title
+      = link_to garden.name, garden_path(garden)
+
+  .panel-body
+    .row
+      .col-md-2.col-xs-12.garden-info
+        .row
+          .col-md-12.col-xs-6
+            = render 'gardens/photo', garden: garden
+          .col-md-12.col-xs-6
+            = render 'gardens/actions', garden: garden
+      .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 }
+          - else
+            no plantings
+  -# .panel-footer
@@ -0,0 +1,3 @@
+= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
+                    alt: garden.name, class: 'img-responsive'),
+          garden_path(garden)
@@ -6,15 +6,13 @@
  = page_entries_info @gardens
  = will_paginate @gardens

-.row
-  - if @gardens.empty?
-    %p There are no gardens to display.
-  - else
-    - @gardens.each do |garden|
-      .col-md-6
-        = render partial: 'gardens/thumbnail', locals: { garden: garden }
+
+- if @gardens.empty?
+  %p There are no gardens to display.
+- else
+  - @gardens.each do |garden|
+    = render 'overview', garden: garden

 .pagination
  = page_entries_info @gardens
  = will_paginate @gardens
-
@@ -11,24 +11,7 @@
  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 .row
  .col-md-9
-    - if can?(:edit, @garden) || can?(:delete, @garden)
-      %p.btn-group
-        - if can? :edit, @garden
-          - if @garden.active
-            = link_to "Plant something", new_planting_path(garden_id: @garden.id), class: 'btn btn-primary'
-            = link_to "Mark as inactive", garden_path(@garden, garden: { active: 0 }),
-              method: :put, class: 'btn btn-default',
-              data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
-          - else
-            = link_to "Mark as active", garden_path(@garden, garden: { active: 1 }),
-                      method: :put,
-                      class: 'btn btn-default'
-          = link_to 'Edit garden', edit_garden_path(@garden), class: 'btn btn-default'
-        - if can?(:destroy, @garden)
-          = link_to 'Delete garden', @garden,
-                    method: :delete,
-                    data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
-                    class: 'btn btn-default'
+    %p.btn-group= render 'gardens/actions', garden: @garden

    - unless @garden.active
      .alert.alert-warning
@@ -49,35 +32,23 @@
              Why not
              = link_to 'tell us more.', edit_garden_path(@garden)

-    - if !@garden.photos.empty? || (can?(:edit, @garden) && can?(:create, Photo))
-      .row-fluid
-        %h3 Photos
-        %p= localize_plural(@garden.photos, Photo)
-        .row-fluid
-          %ul.thumbnails
-            - @garden.photos.each do |p|
-              .col-md-2.six-across
-                = render partial: 'photos/thumbnail', locals: { photo: p }
-        .row-fluid
-          - if can?(:create, Photo) && can?(:edit, @garden)
-            %p
-              = link_to "Add photo", new_photo_path(type: "garden", id: @garden.id), class: 'btn btn-primary'
-
-    .row-fluid
-      %h3 What's planted here?
-      - if @garden.plantings.current.empty?
-        %p Nothing is currently planted here.
+    %h3 What's planted here?
+    .row
+      - if @current_plantings.size.positive?
+        - @current_plantings.each do |planting|
+          .col-xs-12.col-md-6
+            = render partial: "plantings/card", locals: { planting: planting }
+      - else
+        .col-md-12
+          %p Nothing is currently planted here.
+    %h3 Previously planted in this garden
+    .row
+      - if @finished_plantings.size.positive?
+        - @finished_plantings.each do |planting|
+          .col-xs-6.col-md-2
+            = render partial: "plantings/thumbnail", locals: { planting: planting }
      - else
-        - @garden.plantings.current.each.with_index do |planting_current, _|
-          = render partial: "plantings/thumbnail", locals: { planting: planting_current }
-
-    .row-fluid
-      %h3 Previously planted in this garden
-      - if @garden.plantings.finished.empty?
        %p Nothing has been planted here.
-      - else
-        - @garden.plantings.finished.each.with_index do |planting_finished|
-          = render partial: "plantings/thumbnail", locals: { planting: planting_finished }
  .col-md-3
    %h4 About this garden
    %p
@@ -107,9 +78,24 @@
        - @garden.owner.gardens.inactive.each do |othergarden|
          %li
            - if @garden == othergarden
-              = @garden
+              = @garden.name
            - else
              = link_to othergarden, garden_path(othergarden)

    - if @garden.owner == current_member
-      = link_to 'Add New Garden', new_garden_path, class: 'btn btn-default btn-xs'
+      %p
+        = link_to new_garden_path, class: 'btn btn-default btn-xs' do
+          Add New Garden
+
+    - if can?(:edit, @garden) && can?(:create, Photo)
+      %p
+        = link_to new_photo_path(type: "garden", id: @garden.id),
+        class: 'btn btn-primary' do
+          %span.glyphicon.glyphicon-camera{ title: "Add photo" }
+          Add photo
+    - if @garden.photos.size.positive?
+      %h3= localize_plural(@garden.photos, Photo)
+      .row
+        - @garden.photos.includes(:owner).each do |photo|
+          .col-xs-6
+            = render partial: 'photos/thumbnail', locals: { photo: photo }
@@ -10,7 +10,7 @@
      .col-md-4
        = link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
                            alt: harvest.crop.name, class: 'img'),
-                  harvest.crop
+                  harvest
      .col-md-8
        %dl.dl-horizontal
          %dt Crop :
@@ -1,28 +1,21 @@
- seeds = Seed.interesting.first(6)
- if seeds.present?
+- cache cache_key_for(Seed, 'interesting'), expires_in: 1.day do
  %h2= t('.title')
-  - cache cache_key_for(Seed) do
-    %table.table.table-striped
-      %tr
-        %th= t('.owner')
-        %th= t('.crop')
-        %th.hidden-xs.hidden-sm= t('.description')
-        %th= t('.trade_to')
-        %th= t('.from')
-        %th
-
-      - seeds.each do |seed|
-        %tr
-          %td= link_to seed.owner.login_name, seed.owner
-          %td= link_to seed.crop.name, seed.crop
-          %td.hidden-xs.hidden-sm= truncate(seed.description, length: 40, separator: ' ')
-          %td= seed.tradable? ? seed.tradable_to : ''
-          %td
-            - if seed.tradable? && seed.owner.location.blank?
-              = t('.unspecified')
-            - elsif seed.tradable?
-              = truncate(seed.owner.location, length: 25, separator: ', ')
-          %td= link_to t('.details'), seed, class: 'btn btn-default btn-xs'
-
-  %p.text-right
-    = link_to "#{t('.view_all')} »", seeds_path
+  .row
+    .col-md-8
+      - Seed.includes(:owner, crop: :photos).interesting.first(6).each do |seed|
+        .col-md-3
+          .thumbnail
+            - cache cache_key_for(Crop, seed.id) do
+              = link_to image_tag((seed.default_photo ? seed.default_photo.thumbnail_url : 'placeholder_150.png'),
+                                  alt: seed.crop.name, class: 'img'),
+                                  seed
+              .seedinfo
+                = link_to seed.crop.name, seed
+                .trade-to
+                  %p= seed.owner.location
+                  %p
+                    Will trade to:
+                    %br/
+                    #{seed.tradable_to}
+%p.text-right
+  = link_to "#{t('.view_all')} »", seeds_path
@@ -1,4 +1,5 @@
-= link_to image_tag(avatar_uri(member, 150),
-          alt: '',
-          class: 'img img-responsive avatar'),
-  member_path(member)
+- if member
+  = link_to image_tag(avatar_uri(member, 150),
+            alt: '',
+            class: 'img img-responsive avatar'),
+    member_path(member)
@@ -36,7 +36,7 @@
              %p= localize_plural(g.photos, Photo)
              .row
                %ul.thumbnails
-                  - g.photos.each do |p|
+                  - g.photos.includes(:owner).each do |p|
                    .col-md-2.six-across
                      = render partial: 'photos/thumbnail', locals: { photo: p }
              .row
@@ -49,7 +49,7 @@
            - unless g.featured_plantings.empty?
              - g.featured_plantings.each.with_index do |planting|
                .col-xs-12.col-lg-6
-                  = render partial: "plantings/thumbnail", locals: { planting: planting }
+                  = render partial: "plantings/card", locals: { planting: planting }

          %p
            = link_to "More about this garden...", url_for(g)
@@ -15,10 +15,13 @@
      - if can? :read, n
        %tr
          %td
-            - if n.read
-              = link_to n.sender, member_path(n.sender)
+            - if n.sender.present?
+              - if n.read
+                = link_to n.sender, member_path(n.sender)
+              - else
+                %strong= link_to n.sender, member_path(n.sender)
            - else
-              %strong= link_to n.sender, member_path(n.sender)
+              *deleted member*
          %td
            - if n.read
              = link_to n.subject, notification_path(n)
@@ -0,0 +1,4 @@
+- if can? :edit, photo
+  = link_to photo_associations_path(photo_id: photo.id, type: type, id: thing.id),
+    method: 'delete', class: 'btn btn-default btn-xs' do
+    %span.glyphicon.glyphicon-remove{ title: "Remove link" }
@@ -0,0 +1,21 @@
+%h4 This photo depicts:
+%ul
+  - @photo.plantings.each do |planting|
+    %li
+      = link_to t('photos.show.planting', planting: planting.to_s, owner: planting.owner.to_s), planting_path(planting)
+      = render partial: "photo_association_delete", locals: { photo: @photo, type: 'planting', thing: planting }
+
+  - @photo.harvests.each do |harvest|
+    %li
+      = link_to t('photos.show.harvest', crop: harvest.crop.name, owner: harvest.owner.to_s), harvest_path(harvest)
+      = render partial: "photo_association_delete", locals: { photo: @photo, type: 'harvest', thing: harvest }
+
+  - @photo.gardens.each do |garden|
+    %li
+      = link_to t('photos.show.garden', garden: garden.to_s, owner: garden.owner.to_s), garden_path(garden)
+      = render partial: "photo_association_delete", locals: { photo: @photo, type: 'garden', thing: garden }
+
+  - @photo.seeds.each do |seed|
+    %li
+      = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
+      = render partial: "photo_association_delete", locals: { photo: @photo, type: 'seed', thing: seed }
@@ -1,2 +1,5 @@
 - content_for :title, "Edit Photo"
-
+= form_for(@photo) do |f|
+  = f.label :title
+  = f.text_field :title, placeholder: "title"
+  = f.submit
@@ -1,11 +1,15 @@
 - content_for :title, "Photos"

+- if @crop
+  %h2= @crop.name
+
 %p Most recent photos added to #{ENV['GROWSTUFF_SITE_NAME']}.

 .pagination
  = page_entries_info @photos
  = will_paginate @photos

+
 .row
  - @photos.each do |p|
    .col-md-2.six-across
@@ -19,5 +23,3 @@
 .pagination
  = page_entries_info @photos
  = will_paginate @photos
-
-
@@ -1,5 +1,9 @@
 - content_for :title, "New Photo"

+%h3
+  Choose photo for
+  = @item
+
 - if @flickr_auth
  %p
    Connected to Flickr as
@@ -36,5 +40,5 @@
 - else
  .alert
    You must
-    = link_to "connect your account to Flickr", '/auth/flickr'
+    = link_to "connect your account to Flickr", '/members/auth/flickr'
    to add photos.
@@ -8,7 +8,19 @@
  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])

 .row
-  .col-md-6
+  .col-md-8
+    %p= image_tag(@photo.fullsize_url, alt: @photo.title, class: 'img img-responsive')
+
+  .col-md-4
+    %p
+      - if can? :destroy, @photo
+        = link_to @photo, method: :delete,
+          data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
+          %span.glyphicon.glyphicon-trash{ title: "Delete" }
+
+      - if can? :edit, @photo
+        = link_to edit_photo_path(@photo), class: 'btn btn-default btn-xs' do
+          %span.glyphicon.glyphicon-pencil{ title: "Edit" }
    %p
      %strong Posted by:
      = link_to @photo.owner, @photo.owner
@@ -19,30 +31,7 @@
      - else
        = succeed "." do
          = @photo.license_name
-    %p
-      = link_to "View on Flickr", @photo.link_url
-
-    - if can? :destroy, @photo
-      %p= link_to 'Delete Photo',
-          @photo,
-          method: :delete,
-          data: { confirm: 'Are you sure?' },
-          class: 'btn btn-default btn-xs'
-
-  .col-md-6
-    - unless @photo.plantings.empty? && @photo.harvests.empty? && @photo.gardens.empty? && @photo.seeds.empty?
-      %p This photo depicts:
-      %ul
-        - @photo.plantings.each do |p|
-          %li= link_to t('.planting', planting: p.to_s, owner: p.owner.to_s), planting_path(p)
-        - @photo.harvests.each do |h|
-          %li= link_to t('.harvest', crop: h.crop.name, owner: h.owner.to_s), harvest_path(h)
-        - @photo.gardens.each do |g|
-          %li= link_to t('.garden', garden: g.to_s, owner: g.owner.to_s), garden_path(g)
-        - @photo.seeds.each do |s|
-          %li= link_to t('.seed', seed: s.to_s, owner: s.owner.to_s), seed_path(s)
-
-.row
-  .col-md-12
-    %p= image_tag(@photo.fullsize_url, alt: @photo.title, class: 'img')

+    %p= link_to "View on Flickr", @photo.link_url
+    - if @photo.associations?
+      = render "photo_associations", locals: { photo: @photo }
@@ -44,11 +44,9 @@
    .row
      - plantings.first(10).each.with_index do |planting, index|
        .col-xs-12.col-lg-6
-          = render partial: "plantings/thumbnail", locals: { planting: planting, index: index }
-    .row
-      = link_to "View all plantings >>", plantings_path
+          = render partial: "plantings/card", locals: { planting: planting, index: index }
+    = link_to "View all plantings >>", plantings_path
  - else
-    .row
-      %p No nearby plantings found
+    %p No nearby plantings found
 - else
  %p No results found
@@ -0,0 +1,27 @@
+- if can?(:edit, planting) || can?(:destroy, planting)
+  - if can? :edit, planting
+    = link_to edit_planting_path(planting), class: 'btn btn-default btn-xs' do
+      %span.glyphicon.glyphicon-pencil{ title: "Edit" }
+      Edit
+  - if can? :destroy, planting
+    = link_to planting, method: :delete,
+              data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
+      %span.glyphicon.glyphicon-trash{ title: "Delete" }
+      Delete
+
+    - unless 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" }
+        Mark as finished
+
+  - if can?(:create, Harvest)
+    = link_to new_planting_harvest_path(planting), class: 'btn btn-default btn-xs' do
+      %span.glyphicon.glyphicon-leaf{ title: "Harvest" }
+      Harvest
+
+  - if can?(:edit, planting) && can?(:create, Photo)
+    = link_to new_photo_path(id: planting.id, type: 'planting'), class: 'btn btn-default btn-xs' do
+      %span.glyphicon.glyphicon-camera{ title: "Add photo" }
+      Add photo
@@ -0,0 +1,58 @@
+.panel.panel-success.planting-thumbnail
+  .panel-heading
+    %h3.panel-title
+      = link_to planting.crop.name, planting_path(planting)
+      - if can? :edit, planting
+        %a.pull-right{ href: edit_planting_path(planting), role: "button", id: "edit_garden_glyphicon" }
+          %span.glyphicon.glyphicon-pencil{ title: "Edit" }
+  .panel-body
+    .row
+      .col-xs-12.col-md-5
+        = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
+                  alt: planting.crop_id, class: 'img img-responsive'),
+                  planting
+      .col-xs-12.col-md-7
+        %dl.dl-horizontal.planting-attributes
+          %dt Owner:
+          %dd= link_to planting.owner.login_name, planting.owner
+          %dt Garden:
+          %dd= link_to planting.garden&.name, planting.garden
+          %dt Planted on:
+          %dd= planting.planted_at
+          - if planting.quantity
+            %dt Quantity:
+            %dd= display_planting_quantity(planting)
+          - if planting.finished?
+            %dt Finished on:
+            %dd= display_finished(planting)
+          %dt Sun/shade?:
+          %dd
+            - sunniness = planting.sunniness.blank? ? "not specified" : planting.sunniness
+            = image_tag("sunniness_#{sunniness}.png", size: "25x25", alt: sunniness, title: sunniness)
+            = " (#{sunniness})"
+          %dt Planted from:
+          %dd= display_planted_from(planting)
+
+          %dt Finish expected:
+          %dd= planting.finish_predicted_at if planting.finish_predicted_at.present?
+
+    %p= render 'plantings/progress', planting: planting, show_explanation: true
+
+    = link_to 'Details', planting_path(planting),
+      class: 'btn btn-default btn-xs'
+
+    - if can?(:edit, planting) && can?(:create, Harvest)
+      = link_to 'Harvest', new_planting_harvest_path(planting),
+        class: 'btn btn-default btn-xs'
+
+    - if can?(:edit, planting) && !planting.finished
+      = link_to "Mark as finished",
+                    planting_path(planting, planting: { finished: 1 }),
+                    method: :put,
+                    class: 'btn btn-default btn-xs append-date'
+
+    - if can? :destroy, planting
+      = link_to planting, method: :delete,
+                  data: { confirm: 'Are you sure?' },
+                  class: 'btn btn-default btn-xs' do
+        %span.glyphicon.glyphicon-trash{ title: "Delete" }
@@ -1,7 +1,7 @@
- if planting.harvests
+- unless planting.harvests.empty?
  Harvests:
  %ul
-    - planting.harvests.each do |harvest|
+    - planting.harvests.includes(:crop).each do |harvest|
      %li
        = harvest.harvested_at ? harvest.harvested_at : "undated"
        = link_to harvest, harvest_path(harvest)
@@ -1 +1 @@
 .3.4
 .4.1