Merge pull request #1423 from Growstuff/dev

Release 31

.hound.yml

@@ -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

.overcommit.yml

@@ -31,6 +31,7 @@ PreCommit:
     enabled: true
     on_fail: warn
     command: ['npm', 'run', 'coffeelint']
+    required_executable: 'npm'
   HardTabs:
     enabled: true
   AuthorEmail:
@@ -42,6 +43,7 @@ PreCommit:
     exclude:
       - '**/bootstrap.min.css'
     command: ['npm', 'run', 'csslint']
+    required_executable: 'npm'
   HamlLint:
     enabled: true
     command: ['bundle', 'exec', 'haml-lint', 'app/views']
@@ -60,6 +62,7 @@ PreCommit:
       - 'spec/javascripts/support/vendor/**'
       - '**/bootstrap*'
     command: ['npm', 'run', 'jshint']
+    required_executable: 'npm'
   ScssLint:
     enabled: true
   RailsSchemaUpToDate:
@@ -69,11 +72,6 @@ PreCommit:
   YamlLint:
     enabled: true
 
-PostCommit:
-  GitGuilt:
-    enabled: true
-    command: ['npm', 'run', 'git-guilt']
-
 PostCheckout:
   ALL:
     quiet: false

.rubocop.yml

@@ -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
 

.rubocop_todo.yml

@@ -1,22 +1,11 @@
 # 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-05-28 10:57:55 +1200 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:
@@ -26,10 +15,8 @@ Lint/HandleExceptions:
 # 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.
@@ -41,12 +28,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,9 +44,7 @@ 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:
     - 'db/seeds.rb'
@@ -114,7 +93,6 @@ Style/BlockDelimiters:
     - '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'
 
@@ -123,7 +101,6 @@ Style/BlockEndNewline:
   Exclude:
     - 'spec/models/ability_spec.rb'
     - 'spec/models/member_spec.rb'
-    - 'spec/models/planting_spec.rb'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
@@ -132,12 +109,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:
@@ -145,13 +116,6 @@ 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:
@@ -163,14 +127,7 @@ Style/EachForSimpleLoop:
 # 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
@@ -188,7 +145,6 @@ 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'
@@ -207,11 +163,6 @@ 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'
@@ -248,7 +199,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:
@@ -260,15 +210,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
@@ -292,14 +236,8 @@ 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

.ruby-version

@@ -1 +1 @@
-2.3.4
+2.4.1

.travis.yml

@@ -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
+      bundle exec rake db:create db:migrate db:test:prepare;
       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:

CONTRIBUTORS.md

@@ -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
 

Gemfile

@@ -1,28 +1,28 @@
 # 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 'haml', '~> 4.0.7'
-gem 'sass-rails', '~> 5.0.4'
+gem 'coffee-rails'
+gem 'haml'
+gem 'sass-rails'
 
 # 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
 
 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 +32,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 +45,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 +66,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
@@ -88,6 +88,11 @@ gem 'rake', '>= 10.0.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
   gem 'dalli'
@@ -101,7 +106,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 +123,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 +141,9 @@ end
 
 group :test do
   gem 'codeclimate-test-reporter', require: false
+  gem 'timecop'
 end
 
 group :travis do
-  gem 'heroku-api'
+  gem 'platform-api'
 end

Gemfile.lock

@@ -1,71 +1,74 @@
 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_merchant-paypal-bogus-gateway (0.1.0)
       activemerchant
-    active_utils (3.3.4)
+    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.66.0)
+    activemerchant (1.74.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 (7.0.1)
+    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)
@@ -75,14 +78,14 @@ GEM
       sass (>= 3.3.4)
     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.14.0)
+    byebug (9.1.0)
+    cancancan (2.0.0)
+    capybara (2.15.4)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
@@ -90,10 +93,10 @@ GEM
     capybara-email (2.5.0)
       capybara (~> 2.4)
       mail
-    capybara-screenshot (1.0.14)
+    capybara-screenshot (1.0.17)
       capybara (>= 1.0, < 3)
       launchy
-    childprocess (0.7.0)
+    childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.2.0)
     cliver (0.3.2)
@@ -103,10 +106,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 +137,18 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6)
+    crass (1.0.2)
     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)
+    database_cleaner (1.6.2)
     debug_inspector (0.0.3)
-    devise (4.2.1)
+    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 +171,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 +187,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 +212,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
@@ -228,19 +233,22 @@ GEM
       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.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.15.2)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.8.1)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.12)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
@@ -251,28 +259,37 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    jasmine (2.6.0)
-      jasmine-core (>= 2.6.0, < 3.0.0)
+    jasmine (2.8.0)
+      jasmine-core (>= 2.8.0, < 3.0.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.6.1)
+    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.1.0)
     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 +301,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.12)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     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.2)
+    mini_mime (0.1.4)
+    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.2)
-      mini_portile2 (~> 2.1.0)
+    newrelic_rpm (4.5.0.337)
+    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)
@@ -340,37 +360,39 @@ GEM
       mimemagic (~> 0.3.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.20.0)
+    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.15.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.2)
       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.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.6)
+    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,109 +410,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)
+    raindrops (0.19.0)
+    rake (12.2.1)
+    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.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
+    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.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.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.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.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 (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.6)
       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.4.0)
+    selenium-webdriver (3.6.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 (5.0.0)
+    sidekiq (5.0.5)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
+      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.0)
     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)
@@ -500,12 +525,12 @@ 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)
+    will_paginate (3.1.6)
+    xmlrpc (0.3.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -515,54 +540,54 @@ DEPENDENCIES
   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
   guard
   guard-rspec
-  haml (~> 4.0.7)
+  haml
   haml-i18n-extractor
   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)
+  kaminari
   leaflet-markercluster-rails
   leaflet-rails (~> 0.7.7)
   letter_opener
@@ -571,12 +596,13 @@ 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)
@@ -585,18 +611,19 @@ DEPENDENCIES
   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

README.md

@@ -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)..

app/assets/stylesheets/overrides.sass

@@ -337,3 +337,11 @@ ul.plantings
 ul.thumbnail-buttons
   list-style-type: none
   text-align: right
+
+
+.hover-wrapper .text
+  position: absolute
+  visibility: hidden
+
+.hover-wrapper:hover .text
+  visibility: visible

app/controllers/accounts_controller.rb

@@ -15,8 +15,7 @@ class AccountsController < ApplicationController
   end
 
   # GET /accounts/1/edit
-  def edit
-  end
+  def edit; end
 
   # PUT /accounts/1
   def update

app/controllers/admin_controller.rb

@@ -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

app/controllers/alternate_names_controller.rb

@@ -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

app/controllers/comments_controller.rb

@@ -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

app/controllers/crops_controller.rb

@@ -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)
     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
@@ -227,8 +157,37 @@ class CropsController < ApplicationController
       :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

app/controllers/gardens_controller.rb

@@ -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

app/controllers/harvests_controller.rb

@@ -3,58 +3,45 @@ class HarvestsController < ApplicationController
   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.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 +68,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])
+    end.joins(:owner, :crop).paginate(page: params[:page])
   end
 
   def csv_filename

app/controllers/home_controller.rb

@@ -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

app/controllers/members_controller.rb

@@ -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 do
-        render json: @members.to_json(only: [
-                                        :id, :login_name,
-                                        :slug, :bio, :created_at,
-                                        :location, :latitude, :longitude
-                                      ])
-      end
+      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,13 +28,7 @@ class MembersController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.haml
-      format.json do
-        render json: @member.to_json(only: [
-                                       :id, :login_name, :bio,
-                                       :created_at, :slug, :location,
-                                       :latitude, :longitude
-                                     ])
-      end
+      format.json { render json: @member.to_json(only: member_json_fields) }
       format.rss do
         render(
           layout: false,
@@ -99,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

app/controllers/notifications_controller.rb

@@ -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

app/controllers/omniauth_callbacks_controller.rb

@@ -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
 

app/controllers/photos_controller.rb

@@ -3,51 +3,47 @@ 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
     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)
+    @photo.save if @photo.present?
+    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

app/controllers/places_controller.rb

@@ -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

app/controllers/plant_parts_controller.rb

@@ -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

app/controllers/plantings_controller.rb

@@ -12,7 +12,7 @@ class PlantingsController < ApplicationController
     @crop = Crop.find_by(slug: params[:crop]) if params[:crop]
     @show_all = params[:all] == '1'
 
-    @plantings = plantings.paginate(page: params[:page])
+    @plantings = plantings
 
     specifics = if @owner
                   "#{@owner.login_name}-"
@@ -29,7 +29,7 @@ class PlantingsController < ApplicationController
     @planting = Planting.includes(:owner, :crop, :garden, :photos)
       .friendly
       .find(params[:id])
-    respond_with(@planting)
+    respond_with @planting
   end
 
   def new
@@ -39,7 +39,7 @@ class PlantingsController < ApplicationController
     @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_with(@planting)
+    respond_with @planting
   end
 
   def edit
@@ -53,18 +53,18 @@ class PlantingsController < ApplicationController
     @planting.owner = current_member
     @planting.calc_and_set_days_before_maturity
     @planting.save
-    respond_with(@planting)
+    respond_with @planting
   end
 
   def update
     @planting.calc_and_set_days_before_maturity
     @planting.update(planting_params)
-    respond_with(@planting)
+    respond_with @planting
   end
 
   def destroy
     @planting.destroy
-    respond_with(@planting.garden)
+    respond_with @planting, location: @planting.garden
   end
 
   private
@@ -87,6 +87,6 @@ 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).order(:created_at).paginate(page: params[:page])
   end
 end

app/controllers/posts_controller.rb

@@ -30,8 +30,7 @@ class PostsController < ApplicationController
   end
 
   # GET /posts/1/edit
-  def edit
-  end
+  def edit; end
 
   # POST /posts
   # POST /posts.json

app/controllers/products_controller.rb

@@ -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

app/controllers/registrations_controller.rb

@@ -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

app/controllers/roles_controller.rb

@@ -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

app/controllers/scientific_names_controller.rb

@@ -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
 

app/controllers/seeds_controller.rb

@@ -33,8 +33,7 @@ class SeedsController < ApplicationController
   end
 
   # GET /seeds/1/edit
-  def edit
-  end
+  def edit; end
 
   # POST /seeds
   # POST /seeds.json

app/controllers/shop_controller.rb

@@ -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

app/helpers/application_helper.rb

@@ -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

app/models/concerns/photo_capable.rb

@@ -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

app/models/crop.rb

@@ -12,7 +12,7 @@ class Crop < ActiveRecord::Base
   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'
 
@@ -39,7 +39,7 @@ class Crop < ActiveRecord::Base
   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 }) }
 
   ## Wikipedia urls are only necessary when approving a crop
@@ -106,6 +106,10 @@ class Crop < ActiveRecord::Base
     end
   end
 
+  def harvest_photos
+    Photo.joins(:harvests).where("harvests.crop_id": id)
+  end
+
   def as_indexed_json(_options = {})
     as_json(
       only: [:id, :name, :approval_status],

app/models/garden.rb

@@ -5,7 +5,7 @@ class Garden < ActiveRecord::Base
   friendly_id :garden_slug, use: [: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 }
 

app/models/harvest.rb

@@ -9,8 +9,7 @@ class Harvest < ActiveRecord::Base
   belongs_to :plant_part
   belongs_to :planting
 
-  default_scope { order('created_at DESC') }
-
+  default_scope { joins(:owner).order(created_at: :desc) }
   validates :crop, approved: true
 
   validates :crop, presence: { message: "must be present and exist in our database" }

app/models/member.rb

@@ -1,4 +1,6 @@
 class Member < ActiveRecord::Base
+  acts_as_paranoid # implements soft deletion
+  before_destroy :newsletter_unsubscribe
   include Geocodable
   extend FriendlyId
 
@@ -7,7 +9,6 @@ class Member < ActiveRecord::Base
   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

app/models/order.rb

@@ -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])

app/models/photo.rb

@@ -8,7 +8,7 @@ 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?

app/models/planting.rb

@@ -6,19 +6,18 @@ class Planting < ActiveRecord::Base
   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") }
+  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,
@@ -64,6 +63,11 @@ class Planting < ActiveRecord::Base
 
   validate :finished_must_be_after_planted
 
+  delegate :days_until_finished, to: :predict
+  delegate :days_until_mature, to: :predict
+  delegate :percentage_grown, to: :predict
+  delegate :start_to_finish_diff, to: :predict
+
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both
@@ -92,59 +96,17 @@ class Planting < ActiveRecord::Base
     photos.first
   end
 
-  def planted?(current_date = Date.current)
-    planted_at.present? && current_date.to_date >= planted_at
-  end
-
-  def days_until_finished
-    return 0 if finished?
-    days = (finished_at - Date.current).to_i
-    days.positive? ? days : 0
-  end
-
-  def days_until_mature
-    days = ((planted_at + days_before_maturity) - Date.current).to_i
-    days.positive? ? days : 0
-  end
-
-  def percentage_grown(current_date = Date.current)
-    return nil unless days_before_maturity && planted?(current_date)
-
-    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
-  end
-
-  def start_to_finish_diff
-    (finished_at - planted_at).to_i
-  end
-
-  def self.mean_days_until_maturity(plantings)
-    ## Given a set of finished plantings, calculate the average/mean time from start to finish
-    differences = plantings.collect(&:start_to_finish_diff)
-    differences.compact.sum / differences.compact.size unless differences.compact.empty?
+  def planted?
+    planted_at.present? && planted_at <= Date.current
   end
 
   def calc_and_set_days_before_maturity
-    # calculate the number of days, from planted_at, until maturity
-    if planted_at && finished_at
-      self.days_before_maturity = start_to_finish_diff
-    else
-      self.days_before_maturity = Planting.mean_days_until_maturity other_finished_plantings_same_crop
-    end
+    self.days_before_maturity = predict.predict_days_before_maturity
   end
 
   private
 
-  def other_finished_plantings_same_crop
-    Planting.where(crop_id: crop).where.not(id: id).where.not(finished_at: nil)
+  def predict
+    PlantingPredictions.new(self)
   end
 end

app/models/post.rb

@@ -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,

app/models/product.rb

@@ -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

app/models/seed.rb

@@ -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

app/services/planting_predictions.rb

@@ -0,0 +1,58 @@
+class PlantingPredictions
+  def initialize(planting)
+    @planting = planting
+  end
+
+  def days_until_finished
+    return 0 if @planting.finished?
+    days = (@planting.finished_at - Date.current).to_i
+    days.positive? ? days : 0
+  end
+
+  def days_until_mature
+    days = ((@planting.planted_at + @planting.days_before_maturity) - Date.current).to_i
+    days.positive? ? days : 0
+  end
+
+  def percentage_grown
+    return nil unless @planting.days_before_maturity && @planting.planted?
+
+    days = (Date.current - @planting.planted_at.to_date).to_f
+
+    return 0 if Date.current < @planting.planted_at
+    return 100 if days > @planting.days_before_maturity
+    percent = (days / @planting.days_before_maturity * 100).to_i
+
+    percent = 100 if percent >= 100
+
+    percent
+  end
+
+  def start_to_finish_diff
+    (@planting.finished_at - @planting.planted_at).to_i if @planting.finished_at && @planting.planted_at
+  end
+
+  def predict_days_before_maturity
+    # calculate the number of days, from planted_at, until maturity
+    if @planting.planted_at && @planting.finished_at
+      start_to_finish_diff
+    elsif @planting.crop_id
+      plantings = other_finished_plantings_same_crop
+      PlantingPredictions.mean_days_until_maturity(plantings)
+    end
+  end
+
+  def self.mean_days_until_maturity(plantings)
+    ## Given a set of finished plantings, calculate the average/mean time from start to finish
+    differences = plantings.collect(&:start_to_finish_diff)
+    differences.compact.sum / differences.compact.size unless differences.compact.empty?
+  end
+
+  private
+
+  def other_finished_plantings_same_crop
+    Planting.where(crop_id: @planting.crop_id)
+      .where.not(id: @planting.id)
+      .where.not(finished_at: nil)
+  end
+end

app/views/admin/index.html.haml

@@ -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

app/views/admin/orders/search.html.haml

@@ -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

app/views/comments/_single.html.haml

@@ -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

app/views/crops/_photos.html.haml

@@ -1,5 +1,15 @@
+%h2 Photos of #{crop.name} harvests
+.row
+  - unless crop.harvest_photos.empty?
+    - crop.harvest_photos.includes(:owner).first(3).each do |p|
+      .col-md-4
+        = render "photos/thumbnail", photo: p
+
+%h2 Photos of #{crop.name} plants
 .row
   - unless crop.photos.empty?
-    - crop.photos.first(3).each do |p|
+    - crop.photos.includes(:owner).first(3).each do |p|
       .col-md-4
-        = render partial: "photos/thumbnail", locals: { photo: p }
+        = render "photos/thumbnail", photo: p
+.row
+  = link_to "more photos", crop_photos_path(crop_id: crop.id)

app/views/crops/index.html.haml

@@ -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

app/views/crops/index.rss.haml

@@ -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)

app/views/devise/registrations/_delete.html.haml

@@ -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'

app/views/devise/registrations/edit.html.haml

@@ -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'

app/views/gardens/_actions.html.haml

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

app/views/gardens/_overview.html.haml

@@ -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

app/views/gardens/_photo.html.haml

@@ -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)

app/views/gardens/index.html.haml

@@ -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
-

app/views/gardens/show.html.haml

@@ -11,28 +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 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" }
-        - 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" }
+    %p.btn-group= render 'gardens/actions', garden: @garden
 
     - unless @garden.active
       .alert.alert-warning
@@ -55,21 +34,21 @@
 
     %h3 What's planted here?
     .row
-      - if @garden.plantings.size.positive?
-        - @garden.plantings.current.includes(:crop, :owner, :garden).each do |planting|
+      - if @current_plantings.size.positive?
+        - @current_plantings.each do |planting|
           .col-xs-12.col-md-6
-            = render partial: "plantings/thumbnail", locals: { planting: planting }
+            = render partial: "plantings/card", locals: { planting: planting }
       - else
         .col-md-12
           %p Nothing is currently planted here.
     %h3 Previously planted in this garden
-    - if @garden.plantings.finished.size.positive?
-      .row
-        - @garden.plantings.finished.includes(:crop, :owner, :garden).each do |planting|
-          .col-xs-12.col-md-6
+    .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
-      %p Nothing has been planted here.
+      - else
+        %p Nothing has been planted here.
   .col-md-3
     %h4 About this garden
     %p
@@ -119,4 +98,4 @@
       .row
         - @garden.photos.includes(:owner).each do |photo|
           .col-xs-6
-            = render partial: 'photos/thumbnail', locals: { photo: photo }
+            = render partial: 'photos/thumbnail', locals: { photo: photo }

app/views/harvests/_thumbnail.html.haml

@@ -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 :

app/views/home/_seeds.html.haml

@@ -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

app/views/members/_avatar.html.haml

@@ -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)

app/views/members/_gardens.html.haml

@@ -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)

app/views/notifications/index.html.haml

@@ -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)

app/views/photos/index.html.haml

@@ -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
-
-

app/views/places/show.html.haml

@@ -44,7 +44,7 @@
     .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 }
+          = render partial: "plantings/card", locals: { planting: planting, index: index }
     = link_to "View all plantings >>", plantings_path
   - else
     %p No nearby plantings found

app/views/plantings/_actions.html.haml

@@ -0,0 +1,16 @@
+- 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 garden" }
+      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 "Mark as finished", planting_path(planting, planting: { finished: 1 }),
+                method: :put, class: 'btn btn-default btn-xs append-date'
+  - if can? :create, Harvest
+    = link_to 'Harvest', new_planting_harvest_path(planting), class: 'btn btn-default btn-xs'

app/views/plantings/_card.html.haml

@@ -0,0 +1,60 @@
+.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 Mature in:
+          %dd
+            = display_days_before_maturity(planting)
+            days
+
+    %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" }

app/views/plantings/_planting_progress.html.haml

@@ -1,10 +0,0 @@
-- if !planting.planted?
-  Progress: 0% - not planted yet
-- elsif planting.finished?
-  Progress: 100%
-  = render partial: "plantings/progress_bar", locals: { status: "success", progress: "100%" }
-- elsif planting.days_before_maturity.nil?
-  Progress: Not calculated, days before maturity unknown
-- else
-  Progress: #{planting.percentage_grown}%
-  = render partial: "plantings/progress_bar", locals: { status: "success", progress: "#{planting.percentage_grown}%" }

app/views/plantings/_progress.html.haml

@@ -0,0 +1,19 @@
+- if !planting.planted?
+  - if show_explanation == true
+    Progress: 0% - not planted yet
+  = render "plantings/progress_bar", status: "not planted", progress: 0
+
+- elsif planting.finished?
+  - if show_explanation == true
+    Progress: 100%
+  = render "plantings/progress_bar", status: 'finished', progress: 100
+
+- elsif planting.days_before_maturity.nil?
+  - if show_explanation == true
+    Progress: Not calculated, days before maturity unknown
+  = render "plantings/progress_bar", status: "unknown", progress: nil
+
+- else
+  - if show_explanation == true
+    Progress: #{planting.percentage_grown}%
+  = render "plantings/progress_bar", status: 'growing', progress: planting.percentage_grown

app/views/plantings/_progress_bar.html.haml

@@ -1,3 +1,11 @@
 .progress
-  %div{ class: "progress-bar progress-bar-#{status}", role: "progressbar", style: "width: #{progress}" }
-
+  - if progress.nil?
+    = status
+  - else
+    -# haml-lint:disable InlineStyles
+    %div{ class: "progress-bar progress-bar-#{status}", role: "progressbar", style: "width: #{progress}%" }
+      - if progress >= 30
+        #{progress}%
+    - if progress < 30
+      #{progress}%
+    -# haml-lint:enable InlineStyles

app/views/plantings/_thumbnail.html.haml

@@ -1,62 +1,10 @@
-.panel.panel-success.planting-thumbnail
-  .panel-heading
-    %h3.panel-title= link_to planting.crop.name, planting_path(planting)
-  .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 Mature in:
-          %dd
-            = display_days_before_maturity(planting)
-            days
-
-    %p= render partial: 'plantings/planting_progress', locals: { planting: planting }
-
-    = link_to 'Details', planting_path(planting),
-      class: 'btn btn-default btn-xs'
-
-    - if can? :edit, planting
-      = link_to edit_planting_path(planting),
-        class: 'btn btn-default btn-xs' do
-        %span.glyphicon.glyphicon-pencil{ title: "Edit" }
-
-    - 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" }
-
+.thumbnail
+  .planting-thumbnail
+    - if planting
+      = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
+                          alt: planting.crop.name, class: 'img'),
+                          planting
+      .plantinginfo
+        .planting-name
+          = render 'plantings/progress', planting: planting, show_explanation: false
+          = link_to planting.crop.name, planting

app/views/plantings/index.html.haml

@@ -13,7 +13,7 @@
   - unless @plantings.empty?
     - @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 }
 
 .pagination
   = page_entries_info @plantings

app/views/plantings/show.html.haml

@@ -48,22 +48,10 @@
       %dt Finished:
       %dd= display_finished(@planting)
 
-    %p= render 'plantings/planting_harvest', planting: @planting
-    %p= render 'planting_progress', planting: @planting
+    %p= render 'plantings/harvests', planting: @planting
+    %p= render 'plantings/progress', planting: @planting, show_explanation: true
 
-    - if can?(:edit, @planting) || can?(:destroy, @planting)
-      %p
-        - if can? :edit, @planting
-          = link_to 'Edit', edit_planting_path(@planting), class: 'btn btn-default btn-xs'
-          - unless @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? :create, Harvest
-          = link_to 'Harvest', new_planting_harvest_path(@planting), class: 'btn btn-default btn-xs'
-        - if can? :destroy, @planting
-          = link_to 'Delete', @planting, method: :delete,
-                    data: { confirm: 'Are you sure?' },
-                    class: 'btn btn-default btn-xs'
+    = render 'plantings/actions', planting: @planting
 
   .col-md-6
     = render partial: "crops/index_card", locals: { crop: @planting.crop }

app/views/posts/_single.html.haml

@@ -10,7 +10,10 @@
         .post-meta
           %p
             Posted by
-            = link_to post.author.login_name, member_path(post.author)
+            - if post.author
+              = link_to post.author.login_name, member_path(post.author)
+            - else
+              Member Deleted
             - if post.forum
               in
               = link_to post.forum, post.forum

app/views/posts/show.html.haml

@@ -7,7 +7,7 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-- unless current_member
+- if @post.author && !current_member
   .alert.alert-info
     = link_to @post.author.login_name, member_path(@post.author)
     is using

config/environments/development.rb

@@ -44,7 +44,7 @@ Growstuff::Application.configure do
   # config.action_view.raise_on_missing_translations = true
 
   # Growstuff config
-  config.action_mailer.default_url_options = { host: 'localhost:8080' }
+  config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
   config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.smtp_settings = {
@@ -55,7 +55,7 @@ Growstuff::Application.configure do
     authentication: :login
   }
 
-  config.host = 'localhost:8080'
+  config.host = 'localhost:3000'
   config.analytics_code = ''
 
   # this config variable cannot be put in application.yml as it is needed

config/factory_bot.rb

@@ -0,0 +1,9 @@
+ActionDispatch::Callbacks.after do
+  # Reload the factories
+  return unless Rails.env.development? || Rails.env.test?
+
+  if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
+    FactoryBot.factories.clear
+    FactoryBot.find_definitions
+  end
+end

config/factory_girl.rb

@@ -1,9 +0,0 @@
-ActionDispatch::Callbacks.after do
-  # Reload the factories
-  return unless Rails.env.development? || Rails.env.test?
-
-  unless FactoryGirl.factories.blank? # first init will load factories, this should only run on subsequent reloads
-    FactoryGirl.factories.clear
-    FactoryGirl.find_definitions
-  end
-end

config/routes.rb

@@ -48,7 +48,9 @@ Growstuff::Application.routes.draw do
   get 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
   get 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
   get 'crops/search' => 'crops#search', :as => 'crops_search'
-  resources :crops
+  resources :crops do
+    get 'photos' => 'photos#index'
+  end
 
   resources :comments
   resources :roles

db/migrate/20170413221549_counter_caches.rb

@@ -4,7 +4,7 @@ class CounterCaches < ActiveRecord::Migration
     add_column :members, :harvests_count, :integer
     add_column :members, :seeds_count, :integer
 
-    Member.find_each do |member|
+    Member.unscoped.find_each do |member|
       Member.reset_counters(member.id, :gardens)
       Member.reset_counters(member.id, :harvests)
       Member.reset_counters(member.id, :seeds)

db/migrate/20170520060252_add_deleted_to_members.rb

@@ -0,0 +1,6 @@
+class AddDeletedToMembers < ActiveRecord::Migration
+  def change
+    add_column :members, :deleted_at, :datetime
+    add_index :members, :deleted_at
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170413221549) do
+ActiveRecord::Schema.define(version: 20170520060252) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -326,9 +326,11 @@ ActiveRecord::Schema.define(version: 20170413221549) do
     t.integer  "gardens_count"
     t.integer  "harvests_count"
     t.integer  "seeds_count"
+    t.datetime "deleted_at"
   end
 
   add_index "members", ["confirmation_token"], name: "index_members_on_confirmation_token", unique: true, using: :btree
+  add_index "members", ["deleted_at"], name: "index_members_on_deleted_at", using: :btree
   add_index "members", ["email"], name: "index_members_on_email", unique: true, using: :btree
   add_index "members", ["reset_password_token"], name: "index_members_on_reset_password_token", unique: true, using: :btree
   add_index "members", ["slug"], name: "index_members_on_slug", unique: true, using: :btree

lib/haml/filters/growstuff_markdown.rb

@@ -1,56 +1,70 @@
 require 'bluecloth'
 
-module Haml::Filters
+module Haml::Filters # rubocop:disable Style/ClassAndModuleChildren
   module GrowstuffMarkdown
+    include Haml::Filters::Base
+
+    def render(text)
+      @expanded = text
+      expand_crops!
+      expand_members!
+      BlueCloth.new(@expanded).to_html
+    end
+
+    private
+
     CROP_REGEX = /(?<!\\)\[([^\[\]]+?)\]\(crop\)/
     MEMBER_REGEX = /(?<!\\)\[([^\[\]]+?)\]\(member\)/
     MEMBER_AT_REGEX = /(?<!\\)(\@\w+)/
     MEMBER_ESCAPE_AT_REGEX = /(?<!\\)\\(?=\@\w+)/
-    include Haml::Filters::Base
+    HOST = Growstuff::Application.config.host
 
-    def render(text)
+    def expand_crops!
       # turn [tomato](crop) into [tomato](http://growstuff.org/crops/tomato)
-      expanded = text.gsub(CROP_REGEX) do |m|
-        crop_str = $1
+      @expanded = @expanded.gsub(CROP_REGEX) do
+        crop_str = Regexp.last_match(1)
         # find crop case-insensitively
         crop = Crop.where('lower(name) = ?', crop_str.downcase).first
-        if crop
-          url = Rails.application.routes.url_helpers.crop_url(crop, host: Growstuff::Application.config.host)
-          "[#{crop_str}](#{url})"
-        else
-          crop_str
-        end
+        crop_link crop, crop_str
       end
+    end
 
+    def expand_members!
       # turn [jane](member) into [jane](http://growstuff.org/members/jane)
-      expanded = expanded.gsub(MEMBER_REGEX) do |m|
-        member_str = $1
-        # find member case-insensitively
-        member = Member.case_insensitive_login_name(member_str).first
-        if member
-          url = Rails.application.routes.url_helpers.member_url(member, only_path: true)
-          "[#{member_str}](#{url})"
-        else
-          member_str
-        end
-      end
-
       # turn @jane into [@jane](http://growstuff.org/members/jane)
-      expanded = expanded.gsub(MEMBER_AT_REGEX) do |m|
-        member_str = $1
-        # find member case-insensitively
-        member = Member.case_insensitive_login_name(member_str[1..-1]).first
-        if member
-          url = Rails.application.routes.url_helpers.member_url(member, only_path: true)
-          "[#{member_str}](#{url})"
-        else
-          member_str
+      [MEMBER_REGEX, MEMBER_AT_REGEX].each do |re|
+        @expanded = @expanded.gsub(re) do
+          member_str = Regexp.last_match(1)
+          member = find_member(member_str)
+          member_link(member, member_str)
         end
       end
 
-      expanded = expanded.gsub(MEMBER_ESCAPE_AT_REGEX, "")
+      @expanded = @expanded.gsub(MEMBER_ESCAPE_AT_REGEX, '')
+    end
 
-      BlueCloth.new(expanded).to_html
+    def member_link(member, link_text)
+      if member
+        url = Rails.application.routes.url_helpers.member_url(member, only_path: true)
+        "[#{link_text}](#{url})"
+      else
+        link_text
+      end
+    end
+
+    def crop_link(crop, link_text)
+      if crop
+        url = Rails.application.routes.url_helpers.crop_url(crop, host: HOST)
+        "[#{link_text}](#{url})"
+      else
+        link_text
+      end
+    end
+
+    def find_member(login_name)
+      # Remove @ if present
+      login_name = login_name[1..-1] if login_name.start_with?('@')
+      Member.case_insensitive_login_name(login_name).first
     end
   end
 

package.json

@@ -8,7 +8,6 @@
     "coffeelint": "^1.16.0",
     "csslint": "^1.0.5",
     "eslint": "^3.17.1",
-    "git-guilt": "^0.1.1",
     "jshint": "^2.9.4"
   },
   "repository": {

script/heroku_maintenance.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'heroku-api'
+require 'platform-api'
 require 'yaml'
 
-heroku = Heroku::API.new(api_key: ENV['HEROKU_API_KEY'])
+heroku = PlatformAPI.connect(ENV['HEROKU_API_KEY'])
 branch = ENV['TRAVIS_BRANCH']
 travis_config = YAML.load_file('.travis.yml')
 if travis_config['deploy']['app'].key? branch
@@ -14,12 +14,12 @@ end
 
 case ARGV[0]
 when "on"
-  maintenance_state = 1
+  maintenance_state = true
 when "off"
-  maintenance_state = 0
+  maintenance_state = false
 else
   abort "usage: #{$0} (on|off)"
 end
 
 puts "Turning #{maintenance_state} maintenance mode on app #{app}"
-heroku.post_app_maintenance(app, maintenance_state)
+heroku.app.update app, maintenance: maintenance_state

spec/controllers/accounts_controller_spec.rb

@@ -24,7 +24,7 @@ describe AccountsController do
     # member; creating them manually will just cause errors as only one is
     # allowed. This method has been left here in case it's useful in
     # future.
-    member = FactoryGirl.create(:member)
+    member = FactoryBot.create(:member)
     member.account
   end
 end

spec/controllers/admin/orders_controller_spec.rb

@@ -17,14 +17,14 @@ describe Admin::OrdersController do
 
   describe "GET search" do
     it "assigns @orders" do
-      order = FactoryGirl.create(:order)
+      order = FactoryBot.create(:order)
       get :search, search_by: 'order_id', search_text: order.id
       assigns(:orders).should eq([order])
     end
 
     it "sets an error message if nothing found" do
       get :search, search_by: 'order_id', search_text: 'foo'
-      flash[:alert].should match /Couldn't find order with/
+      flash[:alert].should have_text "Couldn't find order with"
     end
   end
 end

spec/controllers/admin_controller_spec.rb

@@ -23,7 +23,7 @@ describe AdminController do
     end
 
     it 'assigns @members' do
-      m = FactoryGirl.create(:newsletter_recipient_member)
+      m = FactoryBot.create(:newsletter_recipient_member)
       get :newsletter
       assigns(:members).should eq [m]
     end

spec/controllers/authentications_controller_spec.rb

@@ -14,10 +14,10 @@ require 'rails_helper'
 
 describe AuthenticationsController do
   before(:each) do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
     controller.stub(:current_member) { @member }
-    @auth = FactoryGirl.create(:authentication, member: @member)
+    @auth = FactoryBot.create(:authentication, member: @member)
     request.env['omniauth.auth'] = {
       'provider' => 'foo',
       'uid' => 'bar',

spec/controllers/comments_controller_spec.rb

@@ -14,13 +14,13 @@ require 'rails_helper'
 
 describe CommentsController do
   before(:each) do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
     controller.stub(:current_member) { @member }
   end
 
   def valid_attributes
-    @post = FactoryGirl.create(:post)
+    @post = FactoryBot.create(:post)
     { post_id: @post.id, body: "some text" }
   end
 
@@ -34,7 +34,7 @@ describe CommentsController do
   end
 
   describe "GET new" do
-    let(:post) { FactoryGirl.create(:post) }
+    let(:post) { FactoryBot.create(:post) }
 
     describe "with valid params" do
       before { get :new, post_id: post.id }
@@ -43,7 +43,7 @@ describe CommentsController do
         assigns(:post).should eq(post)
       end
 
-      let(:old_comment) { FactoryGirl.create(:comment, post: post) }
+      let(:old_comment) { FactoryBot.create(:comment, post: post) }
       it "assigns the old comments as @comments" do
         assigns(:comments).should eq [old_comment]
       end
@@ -56,19 +56,19 @@ describe CommentsController do
   end
 
   describe "GET edit" do
-    let(:post) { FactoryGirl.create(:post) }
+    let(:post) { FactoryBot.create(:post) }
     before { get :edit, id: comment.to_param }
 
     describe "my comment" do
-      let!(:comment) { FactoryGirl.create :comment, author: @member, post: post }
-      let!(:old_comment) { FactoryGirl.create(:comment, post: post, created_at: Time.zone.yesterday) }
+      let!(:comment) { FactoryBot.create :comment, author: @member, post: post }
+      let!(:old_comment) { FactoryBot.create(:comment, post: post, created_at: Time.zone.yesterday) }
       it "assigns previous comments as @comments" do
         assigns(:comments).should eq([comment, old_comment])
       end
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryGirl.create :comment, post: post }
+      let(:comment) { FactoryBot.create :comment, post: post }
       it { expect(response).not_to be_success }
     end
   end
@@ -77,20 +77,20 @@ describe CommentsController do
     before { put :update, id: comment.to_param, comment: valid_attributes }
 
     describe "my comment" do
-      let(:comment) { FactoryGirl.create :comment, author: @member }
+      let(:comment) { FactoryBot.create :comment, author: @member }
       it "redirects to the comment's post" do
         expect(response).to redirect_to(comment.post)
       end
     end
     describe "not my comment" do
-      let(:comment) { FactoryGirl.create :comment }
+      let(:comment) { FactoryBot.create :comment }
       it { expect(response).not_to be_success }
     end
     describe "attempting to change post_id" do
-      let(:post) { FactoryGirl.create :post, subject: 'our post' }
-      let(:other_post) { FactoryGirl.create :post, subject: 'the other post' }
+      let(:post) { FactoryBot.create :post, subject: 'our post' }
+      let(:other_post) { FactoryBot.create :post, subject: 'the other post' }
       let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } }
-      let(:comment) { FactoryGirl.create :comment, author: @member, post: post }
+      let(:comment) { FactoryBot.create :comment, author: @member, post: post }
       it "does not change post_id" do
         comment.reload
         expect(comment.post_id).to eq(post.id)
@@ -102,14 +102,14 @@ describe CommentsController do
     before { delete :destroy, id: comment.to_param }
 
     describe "my comment" do
-      let(:comment) { FactoryGirl.create :comment, author: @member }
+      let(:comment) { FactoryBot.create :comment, author: @member }
       it "redirects to the post the comment was on" do
         expect(response).to redirect_to(comment.post)
       end
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryGirl.create :comment }
+      let(:comment) { FactoryBot.create :comment }
       it { expect(response).not_to be_success }
     end
   end

spec/controllers/gardens_controller_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe GardensController, type: :controller do
   context "when signed in" do
     before(:each) { sign_in member }
 
-    let!(:member) { FactoryGirl.create(:member) }
+    let!(:member) { FactoryBot.create(:member) }
 
     describe "for another member's garden" do
       let(:not_my_garden) { double('garden') }

spec/controllers/harvests_controller_spec.rb

@@ -18,19 +18,19 @@ describe HarvestsController do
   def valid_attributes
     {
       owner_id: subject.current_member.id,
-      crop_id: FactoryGirl.create(:crop).id,
-      plant_part_id: FactoryGirl.create(:plant_part).id
+      crop_id: FactoryBot.create(:crop).id,
+      plant_part_id: FactoryBot.create(:plant_part).id
     }
   end
 
   describe "GET index" do
     before do
-      @member1 = FactoryGirl.create(:member)
-      @member2 = FactoryGirl.create(:member)
-      @tomato = FactoryGirl.create(:tomato)
-      @maize = FactoryGirl.create(:maize)
-      @harvest1 = FactoryGirl.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
-      @harvest2 = FactoryGirl.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
+      @member1 = FactoryBot.create(:member)
+      @member2 = FactoryBot.create(:member)
+      @tomato = FactoryBot.create(:tomato)
+      @maize = FactoryBot.create(:maize)
+      @harvest1 = FactoryBot.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
+      @harvest2 = FactoryBot.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
     end
 
     it "assigns all harvests as @harvests" do
@@ -104,7 +104,7 @@ describe HarvestsController do
       end
 
       it "links to planting" do
-        planting = FactoryGirl.create(:planting, owner_id: member.id)
+        planting = FactoryBot.create(:planting, owner_id: member.id)
         post :create, harvest: valid_attributes.merge(planting_id: planting.id)
         expect(Harvest.last.planting.id).to eq(planting.id)
       end
@@ -126,8 +126,8 @@ describe HarvestsController do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { FactoryGirl.create(:planting) }
-      let(:harvest) { FactoryGirl.create(:harvest) }
+      let(:not_my_planting) { FactoryBot.create(:planting) }
+      let(:harvest) { FactoryBot.create(:harvest) }
       it "does not save planting_id" do
         allow(Harvest).to receive(:new).and_return(harvest)
         post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id)
@@ -178,8 +178,8 @@ describe HarvestsController do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { FactoryGirl.create(:planting) }
-      let(:harvest) { FactoryGirl.create(:harvest) }
+      let(:not_my_planting) { FactoryBot.create(:planting) }
+      let(:harvest) { FactoryBot.create(:harvest) }
       it "does not save planting_id" do
         put :update, id: harvest.to_param,
                      harvest: valid_attributes.merge(planting_id: not_my_planting.id)

spec/controllers/likes_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'rails_helper'
 
 describe LikesController do
-  let(:like) { FactoryGirl.create :like, member: member }
-  let(:member) { FactoryGirl.create(:member) }
-  let(:blogpost) { FactoryGirl.create(:post) }
-  let(:mypost) { FactoryGirl.create(:post, author: member) }
+  let(:like) { FactoryBot.create :like, member: member }
+  let(:member) { FactoryBot.create(:member) }
+  let(:blogpost) { FactoryBot.create(:post) }
+  let(:mypost) { FactoryBot.create(:post, author: member) }
 
   before { sign_in member }
 
@@ -20,7 +20,7 @@ describe LikesController do
     end
 
     describe "Liking your own post" do
-      let(:blogpost) { FactoryGirl.create(:post, author: member) }
+      let(:blogpost) { FactoryBot.create(:post, author: member) }
     end
   end
 
@@ -34,7 +34,7 @@ describe LikesController do
     end
 
     describe "Deleting someone else's like" do
-      let(:like) { FactoryGirl.create :like }
+      let(:like) { FactoryBot.create :like }
       it { expect(response.code).to eq('403') }
       it { JSON.parse(response.body)["error"] == "Unable to like" }
     end

spec/controllers/member_controller_spec.rb

@@ -14,10 +14,10 @@ require 'rails_helper'
 
 describe MembersController do
   before :each do
-    @member = FactoryGirl.create(:member)
-    @posts = [FactoryGirl.create(:post, author: @member)]
-    @twitter_auth = FactoryGirl.create(:authentication, member: @member)
-    @flickr_auth = FactoryGirl.create(:flickr_authentication, member: @member)
+    @member = FactoryBot.create(:member)
+    @posts = [FactoryBot.create(:post, author: @member)]
+    @twitter_auth = FactoryBot.create(:authentication, member: @member)
+    @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
   end
 
   describe "GET index" do
@@ -60,7 +60,7 @@ describe MembersController do
     end
 
     it "doesn't show unconfirmed members" do
-      @member2 = FactoryGirl.create(:unconfirmed_member)
+      @member2 = FactoryBot.create(:unconfirmed_member)
       lambda { get :show, id: @member2.id }.should raise_error(ActiveRecord::RecordNotFound)
     end
   end

spec/controllers/notifications_controller_spec.rb

@@ -18,7 +18,7 @@ describe NotificationsController do
   def valid_attributes
     {
       "recipient_id" => subject.current_member.id,
-      "sender_id" => FactoryGirl.create(:member).id,
+      "sender_id" => FactoryBot.create(:member).id,
       "subject" => 'test'
     }
   end
@@ -31,7 +31,7 @@ describe NotificationsController do
   def valid_attributes_for_sender
     {
       "sender_id" => subject.current_member.id,
-      "recipient_id" => FactoryGirl.create(:member).id,
+      "recipient_id" => FactoryBot.create(:member).id,
       "subject" => 'test'
     }
   end
@@ -42,7 +42,7 @@ describe NotificationsController do
 
   describe "GET index" do
     it "assigns all notifications as @notifications" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :index, {}
       assigns(:notifications).should eq([notification])
     end
@@ -50,13 +50,13 @@ describe NotificationsController do
 
   describe "GET show" do
     it "assigns the requested notification as @notification" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :show, id: notification.to_param
       assigns(:notification).should eq(notification)
     end
 
     it "assigns the reply link for a post comment" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
 
       get :show, id: notification.to_param
       assigns(:reply_link).should_not be_nil
@@ -66,7 +66,7 @@ describe NotificationsController do
     end
 
     it "marks notifications as read" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :show, id: notification.to_param
       # we need to fetch it from the db again, can't test against the old one
       n = Notification.find(notification.id)
@@ -76,7 +76,7 @@ describe NotificationsController do
 
   describe "GET reply" do
     it "marks notifications as read" do
-      notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
+      notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
       get :reply, id: notification.to_param
       # we need to fetch it from the db again, can't test against the old one
       n = Notification.find(notification.id)
@@ -86,7 +86,7 @@ describe NotificationsController do
 
   describe "GET new" do
     it "assigns a recipient" do
-      @recipient = FactoryGirl.create(:member)
+      @recipient = FactoryBot.create(:member)
       get :new, recipient_id: @recipient.id
       assigns(:recipient).should be_an_instance_of(Member)
     end
@@ -95,7 +95,7 @@ describe NotificationsController do
   describe "POST create" do
     describe "with valid params" do
       it "redirects to the recipient's profile" do
-        @recipient = FactoryGirl.create(:member)
+        @recipient = FactoryBot.create(:member)
         post :create, notification: { recipient_id: @recipient.id, subject: 'foo' }
         response.should redirect_to(notifications_path)
       end

spec/controllers/order_items_controller_spec.rb

@@ -16,11 +16,11 @@ describe OrderItemsController do
   login_member(:admin_member)
 
   before(:each) do
-    @member = FactoryGirl.create(:member)
+    @member = FactoryBot.create(:member)
     sign_in @member
-    @product = FactoryGirl.create(:product)
-    @order = FactoryGirl.create(:order, member: @member)
-    @order_item = FactoryGirl.create(:order_item,
+    @product = FactoryBot.create(:product)
+    @order = FactoryBot.create(:order, member: @member)
+    @order_item = FactoryBot.create(:order_item,
       order: @order,
       product: @product,
       price: @product.min_price)
@@ -28,7 +28,7 @@ describe OrderItemsController do
 
   describe "POST create" do
     it "redirects to order" do
-      @order = FactoryGirl.create(:order, member: @member)
+      @order = FactoryBot.create(:order, member: @member)
       post :create, order_item: {
         order_id: @order.id,
         product_id: @product.id,
@@ -38,9 +38,9 @@ describe OrderItemsController do
     end
 
     it 'creates an order for you' do
-      @member = FactoryGirl.create(:member)
+      @member = FactoryBot.create(:member)
       sign_in @member
-      @product = FactoryGirl.create(:product)
+      @product = FactoryBot.create(:product)
       expect {
         post :create, order_item: {
           product_id: @product.id,
@@ -52,8 +52,8 @@ describe OrderItemsController do
 
     describe "with non-int price" do
       it "converts 3.33 to 333 cents" do
-        @order = FactoryGirl.create(:order, member: @member)
-        @product = FactoryGirl.create(:product, min_price: 1)
+        @order = FactoryBot.create(:order, member: @member)
+        @product = FactoryBot.create(:product, min_price: 1)
         expect {
           post :create, order_item: {
             order_id: @order.id,

spec/controllers/orders_controller_spec.rb

@@ -25,7 +25,7 @@ describe OrdersController do
 
   describe "GET checkout" do
     it 'sets the referral_code' do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       get :checkout, id: order.to_param, referral_code: 'FOOBAR'
@@ -34,18 +34,18 @@ describe OrdersController do
     end
 
     it "redirects to Paypal" do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       get :checkout, id: order.to_param
       response.status.should eq 302
-      response.redirect_url.should match /paypal\.com/
+      response.redirect_url.should match(/paypal\.com/)
     end
   end
 
   describe "GET complete" do
     it "assigns the requested order as @order" do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       get :complete, id: order.to_param
@@ -55,7 +55,7 @@ describe OrdersController do
 
   describe "DELETE destroy" do
     it "redirects to the shop" do
-      member = FactoryGirl.create(:member)
+      member = FactoryBot.create(:member)
       sign_in member
       order = Order.create!(member_id: member.id)
       delete :destroy, id: order.id