Merge pull request #1191 from Growstuff/dev

Release 19

.codeclimate.yml

@@ -19,6 +19,9 @@ engines:
       languages:
       - ruby
       - javascript
+    exclude_fingerprints:
+      - 16dbcb58d6caa7ccfe241417831ecfa6
+      - 7d7dca4f27f50e3084f203280073cc74
   fixme:
     enabled: true
     exclude_fingerprints:  # rubocop_todo filename
@@ -38,3 +41,4 @@ exclude_paths:
 - db/
 - spec/
 - public/
+- app/assets/stylesheets/bootstrap-accessibility.css

.haml-lint.yml

@@ -0,0 +1,4 @@
+linters:
+  LineLength:
+    max: 120
+

.rubocop.yml

@@ -8,6 +8,9 @@ AllCops:
     - 'db/schema.rb'
     - 'vendor/**/*'
 
+Rails:
+  Enabled: true
+
 Style/FileName:
   Exclude:
     - 'Gemfile'
@@ -34,7 +37,7 @@ Metrics/MethodLength:
 # Remove the following once the code style matches
 # Offense count: 59
 Metrics/AbcSize:
-  Max: 115
+  Max: 32
 
 # Offense count: 5
 # Configuration parameters: CountComments.
@@ -44,7 +47,7 @@ Metrics/BlockLength:
 # Offense count: 6
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 275
+  Max: 269
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
@@ -55,7 +58,7 @@ Metrics/LineLength:
 
 # Offense count: 8
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 9
 
 # See https://github.com/bbatsov/rubocop/issues/3629
 Rails/HttpPositionalArguments:
@@ -66,3 +69,10 @@ Style/Documentation:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+# Configuration parameters: Include.
+# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
+Rails/Output:
+  Exclude:
+    - 'config/unicorn.rb'
+    - 'db/seeds.rb'

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.3

.travis.yml

@@ -11,12 +11,12 @@ env:
   global:
     secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 rvm:
-  - 2.3.1
+  - 2.3.3
 before_install:
   - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
   - >
     if [ $(phantomjs --version) != '2.1.1' ]; then
-    PHANTOM_URL=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2;
+    PHANTOM_URL=https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2;
     rm -rf $PWD/travis_phantomjs;
     mkdir -p $PWD/travis_phantomjs;
     wget $PHANTOM_URL -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2;
@@ -28,6 +28,7 @@ before_script:
   - bundle exec rake assets:precompile
 script:
   - bundle exec rubocop --display-cop-names --rails
+  - bundle exec haml-lint app/views/account_types app/views/admin app/views/alternate_names app/views/account_types app/views/comments app/views/crops app/views/forums app/views/gardens app/views/harvests app/views/notifier app/views/orders app/views/photos
   - script/gemfile_check
   - bundle exec script/check_contributors_md
   - bundle exec rake db:migrate --trace

CONTRIBUTING.md

@@ -3,7 +3,7 @@ Thanks for contributing to Growstuff!
 When you create a pull request, please include the following:
 
 * Mention the issue it solves (eg. #123)
-* Your code should follow our [Coding style guide](http://wiki.growstuff.org/index.php/Coding_style_guide)
+* Your code should follow our [Coding style guide](https://github.com/Growstuff/growstuff/wiki/Development-process-overview#coding-practices)
 * Make sure you have automated tests for your work, where possible.
 * Add your name (and that of your pair partner, if any) to [CONTRIBUTORS.md](CONTRIBUTORS.md).
 

CONTRIBUTORS.md

@@ -54,6 +54,8 @@ submit the change with your pull request.
 - Rocky Jaiswal / [rocky-jaiswal](https://github.com/rocky-jaiswal)
 - Robert Landreaux / [robertlandreaux](https://github.com/robertlandreaux)
 - Savant Krishna / [sksavant](https://github.com/sksavant)
+- Marlena Compton / [marlena](https://github/marlena)
+- Ryan Dy / [rdy](https://github/rdy)
 - Jake Yesbeck / [yez](https://github.com/yez)
 - Mauricio Gonzalez / [mauricio-gonzalez](https://github.com/mauricio-gonzalez)
 - Andrey Bazhutkin / [andrba](https://github.com/andrba)
@@ -72,3 +74,5 @@ submit the change with your pull request.
 - Charley Lewittes / [ctlewitt](https://github.com/ctlewitt)
 - Kristine Nicole Polvoriza / [polveenomials](https://github.com/polveenomials)
 - Brenda Wallace / [br3nda](https://github.com/br3nda)
+- Jim Stallings / [jestallin](https://github.com/jestallin)
+- Alyssa Ransbury / [alran](https://github.com/alran)

Gemfile

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-ruby '2.3.1'
+ruby '2.3.3'
 
-gem 'rails', '~> 4.2.1'
+gem 'rails', '~> 4.2.7'
 
 gem 'bundler', '>=1.1.5'
 
-gem 'sass-rails',   '~> 5.0.4'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'haml'
+gem 'sass-rails', '~> 5.0.4'
 
 # CSS framework
 gem 'bootstrap-sass', '~> 3.3.6'
@@ -17,28 +17,28 @@ gem 'font-awesome-sass'
 
 gem 'uglifier', '~> 2.7.2' # JavaScript compressor
 
+gem 'flickraw'
 gem 'jquery-rails'
 gem 'jquery-ui-rails', '~> 5.0.2'
 gem 'js-routes' # provides access to Rails routes in Javascript
-gem 'flickraw'
 
-gem 'leaflet-rails'
-gem 'leaflet-markercluster-rails'
-gem 'unicorn'                      # http server
-gem 'pg'
-gem 'figaro'                       # for handling config via ENV variables
 gem 'cancancan', '~> 1.9'          # for checking member privileges
-gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 gem 'csv_shaper'                   # CSV export
+gem 'figaro'                       # for handling config via ENV variables
+gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
+gem 'leaflet-markercluster-rails'
+gem 'leaflet-rails'
+gem 'pg'
 gem 'ruby-units'                   # for unit conversion
+gem 'unicorn'                      # http server
 
 gem 'comfortable_mexican_sofa', '~> 1.12.0' # content management system
 
-gem 'kaminari'                     # pagination
 gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari
+gem 'kaminari'                     # pagination
 
-gem 'activemerchant'
 gem 'active_utils'
+gem 'activemerchant'
 gem 'sidekiq'
 
 # Markdown formatting for updates etc
@@ -64,24 +64,35 @@ gem 'bootstrap-datepicker-rails'
 
 # For connecting to other services (eg Twitter)
 gem 'omniauth'
-gem 'omniauth-twitter'
-gem 'omniauth-flickr', '>= 0.0.15'
 gem 'omniauth-facebook'
+gem 'omniauth-flickr', '>= 0.0.15'
+gem 'omniauth-twitter'
+
+# For charting data
+gem 'd3-rails'
 
 # client for Elasticsearch. Elasticsearch is a flexible
 # and powerful, distributed, real-time search and analytics engine.
 # An example of the use in the project is fuzzy crop search.
+
+# Project does not use semver, so we want to be in sync with the version of
+# elasticsearch we use
+# See https://github.com/elastic/elasticsearch-ruby#compatibility
+gem "elasticsearch-api", "~> 2.0.0"
 gem "elasticsearch-model"
 gem "elasticsearch-rails"
 
 gem 'rake', '>= 10.0.0'
 
+# # CMS
+# gem 'comfortable_mexican_sofa', '~> 1.12.0'
+
 group :production, :staging do
-  gem 'newrelic_rpm'
+  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
   gem 'memcachier'
+  gem 'newrelic_rpm'
   gem 'rails_12factor' # supresses heroku plugin injection
-  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'sparkpost_rails'
 end
 
@@ -89,32 +100,36 @@ 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 'pry'
   gem 'better_errors'
   gem 'binding_of_caller'
-  gem 'letter_opener'
-  gem 'quiet_assets'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'letter_opener'
+  gem 'pry'
+  gem 'quiet_assets'
 end
 
 group :development, :test do
-  gem 'haml-rails'                      # HTML templating language
-  gem 'rspec-rails'                     # unit testing framework
-  gem 'rspec-activemodel-mocks'
+  gem "active_merchant-paypal-bogus-gateway"
   gem 'byebug'                          # debugging
-  gem 'database_cleaner', '~> 1.5.0'
-  gem 'webrat'                          # provides HTML matchers for view tests
-  gem 'factory_girl_rails'              # for creating test data
-  gem 'coveralls', require: false       # coverage analysis
   gem 'capybara'                        # integration tests
   gem 'capybara-email'                  # integration tests for email
   gem 'capybara-screenshot'             # for test debugging
-  gem 'poltergeist'                     # for headless JS testing
+  gem 'coveralls', require: false       # coverage analysis
+  gem 'database_cleaner', '~> 1.5.0'
+  gem 'factory_girl_rails'              # for creating test data
+  gem 'haml-i18n-extractor'
+  gem 'haml_lint'                       # Checks haml files for goodness
+  gem 'haml-rails'                      # HTML templating language
   gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
-  gem 'selenium-webdriver'
-  gem "active_merchant-paypal-bogus-gateway"
+  gem 'jasmine'                         # javascript unit testing
+  gem 'poltergeist'                     # for headless JS testing
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-rails'                     # unit testing framework
   gem 'rubocop', require: false
+  gem 'rainbow', '< 2.2.0' # See https://github.com/sickill/rainbow/issues/44
+  gem 'selenium-webdriver'
+  gem 'webrat'                          # provides HTML matchers for view tests
 end
 
 group :test do

Gemfile.lock

@@ -50,9 +50,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (6.0.3)
+    arel (6.0.4)
     ast (2.3.0)
-    autoprefixer-rails (6.4.0.2)
+    autoprefixer-rails (6.6.1)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -71,8 +71,8 @@ GEM
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bootstrap_form (2.5.2)
-    builder (3.2.2)
+    bootstrap_form (2.5.3)
+    builder (3.2.3)
     byebug (9.0.6)
     cancancan (1.15.0)
     capybara (2.10.1)
@@ -90,13 +90,12 @@ GEM
       launchy
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
+    codeclimate-test-reporter (1.0.3)
+      simplecov
     codemirror-rails (5.16.0)
       railties (>= 3.0, < 6.0)
     coderay (1.1.1)
@@ -106,8 +105,8 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    comfortable_mexican_sofa (1.12.9)
+    coffee-script-source (1.12.2)
+    comfortable_mexican_sofa (1.12.10)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -119,19 +118,21 @@ GEM
       kramdown (>= 1.0.0)
       paperclip (>= 4.0.0)
       plupload-rails (>= 1.2.1)
-      rails (>= 4.0.0, < 5)
+      rails (>= 4.0.0, < 5.1)
       rails-i18n (>= 4.0.0)
       sass-rails (>= 4.0.3)
-    concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
-    coveralls (0.8.16)
+    concurrent-ruby (1.0.4)
+    connection_pool (2.2.1)
+    coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
-      term-ansicolor (~> 1.3.0)
+      term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
+      tins (~> 1.6)
     csv_shaper (1.3.0)
       activesupport (>= 3.0.0)
+    d3-rails (3.4.13)
+      railties (>= 3.1)
     dalli (2.7.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -141,7 +142,7 @@ GEM
       railties (>= 4.1.0, < 5.1)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     easy_translate (0.5.0)
       json
@@ -163,14 +164,14 @@ GEM
     erubis (2.7.0)
     excon (0.54.0)
     execjs (2.7.0)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.17)
     figaro (1.1.1)
       thor (~> 0.14)
     flickraw (0.9.9)
@@ -179,7 +180,7 @@ GEM
     formatador (0.2.5)
     friendly_id (5.0.5)
       activerecord (>= 4.0.0)
-    geocoder (1.3.7)
+    geocoder (1.4.1)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
@@ -204,13 +205,24 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     haml (4.0.7)
       tilt
+    haml-i18n-extractor (0.5.9)
+      activesupport
+      haml
+      highline
+      tilt
+      trollop (= 1.16.2)
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (3.4.4)
+    haml_lint (0.20.0)
+      haml (~> 4.0)
+      rake (>= 10, < 13)
+      rubocop (>= 0.47.0)
+      sysexits (~> 1.1)
+    hashie (3.4.6)
     heroku-api (0.4.2)
       excon (~> 0.45)
       multi_json (~> 1.8)
@@ -223,7 +235,7 @@ GEM
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    i18n-tasks (0.9.6)
+    i18n-tasks (0.9.9)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       easy_translate (>= 0.5.0)
@@ -233,7 +245,13 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    jquery-rails (4.2.1)
+    jasmine (2.5.1)
+      jasmine-core (>= 2.5.1, < 3.0.0)
+      phantomjs
+      rack (>= 1.2.1)
+      rake
+    jasmine-core (2.5.2)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -242,13 +260,13 @@ GEM
     js-routes (1.3.0)
       railties (>= 3.2)
       sprockets-rails
-    json (1.8.3)
+    json (1.8.6)
     jwt (1.5.6)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    kramdown (1.13.1)
+    kramdown (1.13.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     leaflet-markercluster-rails (0.7.0)
@@ -262,7 +280,7 @@ GEM
       ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.10)
+    lumberjack (1.0.11)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     memcachier (0.0.2)
@@ -272,9 +290,9 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     multi_json (1.11.3)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
     newrelic_rpm (3.17.1.326)
@@ -290,10 +308,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.3.1)
+    omniauth (1.3.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
-    omniauth-facebook (3.0.0)
+    omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-flickr (0.0.19)
       multi_json (~> 1.11.0)
@@ -314,9 +332,10 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parser (2.3.2.0)
+    parser (2.3.3.1)
       ast (~> 2.2)
     pg (0.19.0)
+    phantomjs (2.1.1.0)
     plupload-rails (1.2.1)
       rails (>= 3.1)
     poltergeist (1.11.0)
@@ -328,7 +347,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.5)
@@ -349,9 +368,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -370,7 +389,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     raindrops (0.17.0)
-    rake (11.3.0)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -402,26 +421,26 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.45.0)
-      parser (>= 2.3.1.1, < 3.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.0.1)
-    ruby_dep (1.4.0)
-    ruby_parser (3.8.3)
+    ruby_dep (1.5.0)
+    ruby_parser (3.8.4)
       sexp_processor (~> 4.1)
     rubyzip (1.2.0)
-    sass (3.4.22)
+    sass (3.4.23)
     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 (2.53.4)
+    selenium-webdriver (3.0.5)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
@@ -444,28 +463,30 @@ GEM
     slop (3.6.0)
     sparkpost_rails (1.4.0)
       rails (>= 4.0, < 5.1)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    term-ansicolor (1.3.2)
+    sysexits (1.2.0)
+    term-ansicolor (1.4.0)
       tins (~> 1.0)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
-    thor (0.19.3)
+    thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.5)
     tilt (2.0.5)
     tins (1.13.0)
+    trollop (1.16.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.3)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -479,7 +500,7 @@ GEM
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.1.0)
+    will_paginate (3.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -508,9 +529,11 @@ DEPENDENCIES
   comfortable_mexican_sofa (~> 1.12.0)
   coveralls
   csv_shaper
+  d3-rails
   dalli
   database_cleaner (~> 1.5.0)
   devise (>= 4.0.0)
+  elasticsearch-api (~> 2.0.0)
   elasticsearch-model
   elasticsearch-rails
   factory_girl_rails
@@ -524,9 +547,12 @@ DEPENDENCIES
   guard
   guard-rspec
   haml
+  haml-i18n-extractor
   haml-rails
+  haml_lint
   heroku-api
   i18n-tasks
+  jasmine
   jquery-rails
   jquery-ui-rails (~> 5.0.2)
   js-routes
@@ -544,8 +570,9 @@ DEPENDENCIES
   poltergeist
   pry
   quiet_assets
-  rails (~> 4.2.1)
+  rails (~> 4.2.7)
   rails_12factor
+  rainbow (< 2.2.0)
   rake (>= 10.0.0)
   rspec-activemodel-mocks
   rspec-rails
@@ -561,7 +588,7 @@ DEPENDENCIES
   will_paginate (~> 3.0)
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.3.3p222
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

app/assets/javascripts/crops.js.erb

@@ -1,3 +1,5 @@
+//= require graphs/horizontal_bar_graph
+
 if (document.getElementById("cropmap") !== null) {
   mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
   mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
@@ -49,6 +51,41 @@ function showCropMap(cropmap) {
   cropmap.addLayer(markers);
 }
 
+function plantingStats(crop) {
+  var sunniness_counts = { 'empty': 0, 'sun': 0, 'semi-shade': 0, 'shade': 0 };
+  $.each(crop.plantings, function(i, planting) {
+    if (planting.sunniness) {
+      sunniness_counts[planting.sunniness]++;
+    } else {
+      sunniness_counts['Empty']++;
+    }
+  });
+  return [
+    {name: 'Empty', value: sunniness_counts['empty']},
+    {name: 'Sun', value: sunniness_counts['sun']},
+    {name: 'Semi-shade', value: sunniness_counts['semi-shade']},
+    {name: 'Shade', value: sunniness_counts['shade']}
+  ];
+}
+
+if ($("#sunchart")[0] !== null) {
+  var HorizontalBarGraph = growstuff.HorizontalBarGraph;
+  $.getJSON(location.pathname + '.json', function (crop) {
+    data = {
+      bars: plantingStats(crop),
+      bar_color: 'steelblue',
+      width: {size: 300, scale: 'linear'},
+      height: {size: 100, scale: 'ordinal'},
+      //left is used to shift the bars over so that there is
+      //room for the labels
+      margin: {top: 0, right: 0, bottom: 0, left: 100}
+    };
+
+    var graph = new HorizontalBarGraph(data);
+    graph.render(d3.select($('#sunchart')[0]));
+  });
+}
+
 $('.btn.toggle.crop-hierarchy').click(function () {
   $('.toggle.crop-hierarchy').toggleClass('hide');
 });

app/assets/javascripts/graphs/bar_group.js

@@ -0,0 +1,50 @@
+//= require graphs/width_scale
+//= require graphs/height_scale
+
+(function(){
+  'use strict';
+
+  /*
+  This represents bars for a bar graph.
+  Currently these are used for HorizontalBarGraph.
+   */
+
+  var growstuff = (window.growstuff = window.growstuff || {});
+  var WidthScale = growstuff.WidthScale;
+  var HeightScale = growstuff.HeightScale;
+
+function BarGroup(data) {
+  this._data = data;
+}
+
+BarGroup.prototype.render = function(root){
+
+  var data = this._data;
+  var bars = this._data.bars;
+  var widthScale = new WidthScale(data).render();
+  var heightScale = new HeightScale(data).render();
+
+  return root.append('g')
+    .attr("class", "bar")
+    .selectAll("rect")
+    .data(bars.map(function(bar) { return bar.value; }))
+    .enter()
+    .append("rect")
+    .attr("y", function(d, i){
+      return heightScale(i);
+
+    })
+    .attr("height", heightScale.rangeBand())
+    .attr("fill", data.bar_color)
+    .attr("width", function(d){
+      return widthScale(d);
+    })
+    .append("title")
+    .text(function(d){
+      return 'This value is ' + d + '.';
+    });
+};
+
+growstuff.BarGroup = BarGroup;
+
+}());

app/assets/javascripts/graphs/bar_label_group.js

@@ -0,0 +1,40 @@
+(function() {
+  'use strict';
+
+/*
+This file draws the labels to the left of each bar.
+ */
+
+  var growstuff = (window.growstuff = window.growstuff || {});
+
+  function BarLabelGroup(data) {
+    this._data = data;
+  }
+
+  BarLabelGroup.prototype.render = function(d3){
+    var bars = this._data.bars;
+    //vvcopy pasta from spike vv  -- this is a good candidate for refactor
+    var barHeight = 40;
+
+    return d3.append('g')
+      .attr("class", "bar-label")
+      .selectAll("text")
+      .data(bars.map(function(bar){ return bar.name;}))
+      .enter()
+      .append("text")
+      .attr('x', -80)
+      .attr('y', function(d, i){
+        //shrink the margin between each label to give them an even spread with
+        //bars
+        var barLabelSpread = 2/3;
+        //move them downward to line up with bars
+        var barLabelTopEdge = 17;
+        return i * barHeight * (barLabelSpread) + barLabelTopEdge;
+      })
+      .text(function(d){return d});
+
+  };
+
+  growstuff.BarLabelGroup = BarLabelGroup;
+
+}())

app/assets/javascripts/graphs/height_scale.js

@@ -0,0 +1,29 @@
+//=require d3
+
+/*
+Height Scale is used to map the number of bars to the display size of
+the svg
+ */
+
+(function(){
+  'use strict';
+
+  var growstuff = (window.growstuff = window.growstuff || {});
+
+  function HeightScale(data){
+    this._data = data;
+  }
+
+  HeightScale.prototype.render = function(){
+    var data = this._data;
+    var scaleType = data.height.scale;
+    var axisSize = data.height.size;
+
+    return d3.scale[scaleType]()
+        .domain(d3.range(data.bars.length))
+        .rangeRoundBands([0, data.height.size], 0.05, 0);
+  };
+
+  growstuff.HeightScale = HeightScale;
+
+}());

app/assets/javascripts/graphs/horizontal_bar_graph.js

@@ -0,0 +1,51 @@
+//= require d3
+//= require graphs/bar_group
+//= require graphs/bar_label_group
+
+/*
+Horizontal Bar Graph represents sum total of the graph including all of the parts:
+Bars
+Bar Labels
+
+The main dimensions of the graph are rendered here.
+ */
+
+(function() {
+  'use strict';
+
+  var growstuff = (window.growstuff = window.growstuff || {});
+  var BarGroup = growstuff.BarGroup;
+  var BarLabelGroup = growstuff.BarLabelGroup;
+
+  function HorizontalBarGraph(data) {
+    this._data = data;
+    this._d3 = d3;
+  }
+
+  HorizontalBarGraph.prototype.render = function(root) {
+    var bars = this._data.bars;
+    var width = this._data.width;
+    var height = this._data.height;
+
+    var barLabelGroup = new BarLabelGroup(this._data);
+    var margin = this._data.margin;
+
+    var barGroup = new BarGroup(this._data);
+
+    var svg = root
+      .append("svg")
+        .attr("width", width.size + margin.left + margin.right)
+        .attr("height", height.size + margin.top + margin.bottom)
+      .append("g")
+        .attr("class","bar-graph")
+        .attr("transform","translate(" + margin.left + "," + margin.top + ")");
+
+
+    barGroup.render(svg);
+    barLabelGroup.render(svg);
+
+    return svg;
+  };
+
+  growstuff.HorizontalBarGraph = HorizontalBarGraph;
+}());

app/assets/javascripts/graphs/width_scale.js

@@ -0,0 +1,33 @@
+//=require d3
+
+/*
+Width scale is used to map the value for the length of each bar
+to the display size of the svg
+ */
+
+(function(){
+  'use strict';
+
+  var growstuff = (window.growstuff = window.growstuff || {});
+
+  function WidthScale (data){
+    this._data = data;
+  }
+
+  WidthScale.prototype.render = function() {
+    var data = this._data;
+    var scaleType = data.width.scale;
+    var axisSize = data.width.size;
+
+    return d3.scale[scaleType]()
+        .domain([0, this.getMaxValue()])
+        .range([0, axisSize]);
+  };
+
+  WidthScale.prototype.getMaxValue = function(){
+    return d3.max(this._data.bars.map(function(bar) { return bar.value; }));
+  }
+
+  growstuff.WidthScale = WidthScale;
+
+}());

app/assets/javascripts/posts.js

@@ -0,0 +1,18 @@
+$(document).ready(function () {
+  $('.post-like').show();
+
+  $('.post-like').on('ajax:success', function(event, data) {
+    var like_control = $('#post-' + data.id + ' .post-like');
+
+    $('#post-' + data.id + ' .like-count').text(data.description);
+    if (data.liked_by_member) {
+      like_control.data("method", "delete");
+      like_control.attr("href", data.url);
+      like_control.text("Unlike");
+    } else {
+      like_control.data("method", "post");
+      like_control.attr("href", '/likes.json?post_id=' + data.id);      
+      like_control.text("Like");
+    }
+  });
+});

app/assets/stylesheets/application.sass

@@ -5,3 +5,4 @@
 @import 'leaflet.markercluster.default'
 @import 'custom_bootstrap/custom_bootstrap'
 @import 'overrides'
+@import 'graphs'

app/assets/stylesheets/custom_bootstrap/variables.sass

@@ -11,12 +11,13 @@ $brown: #413f3b
 $green:  #5f8e43
 $blue:   #2f4365
 $red:    #8e4d43
-$orange: #b2685c
+$orange: #ffa500
 $yellow: #b2935c
 
 $body-bg: $beige
 $text-color: $brown
 $link-color: $green
+$graph-hover: $orange
 
 $brand-primary: $green
 

app/assets/stylesheets/graphs.sass

@@ -0,0 +1,2 @@
+.bar rect:hover
+  fill: $graph-hover

app/assets/stylesheets/overrides.sass

@@ -319,9 +319,6 @@ $state-success-bg: lighten($green, 50%)
     text-overflow: ellipsis
     overflow: hidden
 
-#gardens_panel_body
-  height: 20em
-
 .form-group.required .control-label:before
   content: "* "
   color: red

app/constants/photo_models.rb

@@ -0,0 +1,38 @@
+module Growstuff
+  module Constants
+    class PhotoModels
+      PLANTING = { type: 'planting', class: 'Planting', relation: 'plantings' }.freeze
+      HARVEST = { type: 'harvest', class: 'Harvest', relation: 'harvests' }.freeze
+      GARDEN = { type: 'garden', class: 'Garden', relation: 'gardens' }.freeze
+      SEED = { type: 'seed', class: 'Seed', relation: 'seeds' }.freeze
+
+      ALL = [PLANTING, HARVEST, GARDEN, SEED].freeze
+
+      def self.types
+        ALL.map do |model|
+          model[:type]
+        end
+      end
+
+      def self.relations
+        ALL.map do |model|
+          model[:relation]
+        end
+      end
+
+      def self.get_relation(object, type)
+        relation = ALL.select do |model|
+          model[:type] == type
+        end[0][:relation]
+        object.send(relation)
+      end
+
+      def self.get_item(type)
+        class_name = ALL.select do |model|
+          model[:type] == type
+        end[0][:class]
+        class_name.constantize
+      end
+    end
+  end
+end

app/controllers/account_types_controller.rb

@@ -1,5 +1,5 @@
 class AccountTypesController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /account_types
@@ -13,8 +13,6 @@ class AccountTypesController < ApplicationController
 
   # GET /account_types/1
   def show
-    @account_type = AccountType.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
     end
@@ -31,7 +29,6 @@ class AccountTypesController < ApplicationController
 
   # GET /account_types/1/edit
   def edit
-    @account_type = AccountType.find(params[:id])
   end
 
   # POST /account_types
@@ -40,7 +37,7 @@ class AccountTypesController < ApplicationController
 
     respond_to do |format|
       if @account_type.save
-        format.html { redirect_to @account_type, notice: 'Account type was successfully created.' }
+        format.html { redirect_to @account_type, notice: I18n.t('account_types.created') }
       else
         format.html { render action: "new" }
       end
@@ -49,11 +46,9 @@ class AccountTypesController < ApplicationController
 
   # PUT /account_types/1
   def update
-    @account_type = AccountType.find(params[:id])
-
     respond_to do |format|
       if @account_type.update(account_type_params)
-        format.html { redirect_to @account_type, notice: 'Account type was successfully updated.' }
+        format.html { redirect_to @account_type, notice: I18n.t('account_types.updated') }
       else
         format.html { render action: "edit" }
       end
@@ -62,11 +57,10 @@ class AccountTypesController < ApplicationController
 
   # DELETE /account_types/1
   def destroy
-    @account_type = AccountType.find(params[:id])
     @account_type.destroy
 
     respond_to do |format|
-      format.html { redirect_to account_types_url, notice: 'Account type was successfully deleted.' }
+      format.html { redirect_to account_types_url, notice: I18n.t('account_types.deleted') }
     end
   end
 

app/controllers/accounts_controller.rb

@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /accounts
@@ -13,8 +13,6 @@ class AccountsController < ApplicationController
 
   # GET /accounts/1
   def show
-    @account = Account.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
     end
@@ -22,16 +20,13 @@ class AccountsController < ApplicationController
 
   # GET /accounts/1/edit
   def edit
-    @account = Account.find(params[:id])
   end
 
   # PUT /accounts/1
   def update
-    @account = Account.find(params[:id])
-
     respond_to do |format|
       if @account.update(params[:account])
-        format.html { redirect_to @account, notice: 'Account detail was successfully updated.' }
+        format.html { redirect_to @account, notice: I18n.t('account.update') }
       else
         format.html { render action: "edit" }
       end

app/controllers/admin/orders_controller.rb

@@ -8,7 +8,7 @@ class Admin::OrdersController < ApplicationController
 
   def search
     authorize! :manage, :all
-    @orders = Order.search({ by: params[:search_by], for: params[:search_text] })
+    @orders = Order.search(by: params[:search_by], for: params[:search_text])
 
     if @orders.empty?
       flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"

app/controllers/alternate_names_controller.rb

@@ -1,5 +1,5 @@
 class AlternateNamesController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /alternate_names
@@ -17,7 +17,7 @@ class AlternateNamesController < ApplicationController
   # GET /alternate_names/new.json
   def new
     @alternate_name = AlternateName.new
-    @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
+    @crop = Crop.find_or_initialize_by(id: params[:crop_id])
 
     respond_to do |format|
       format.html # new.html.haml
@@ -27,7 +27,6 @@ class AlternateNamesController < ApplicationController
 
   # GET /alternate_names/1/edit
   def edit
-    @alternate_name = AlternateName.find(params[:id])
   end
 
   # POST /alternate_names
@@ -50,8 +49,6 @@ class AlternateNamesController < ApplicationController
   # PUT /alternate_names/1
   # PUT /alternate_names/1.json
   def update
-    @alternate_name = AlternateName.find(params[:id])
-
     respond_to do |format|
       if @alternate_name.update(alternate_name_params)
         format.html { redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.' }
@@ -66,7 +63,6 @@ class AlternateNamesController < ApplicationController
   # DELETE /alternate_names/1
   # DELETE /alternate_names/1.json
   def destroy
-    @alternate_name = AlternateName.find(params[:id])
     @crop = @alternate_name.crop
     @alternate_name.destroy
 

app/controllers/application_controller.rb

@@ -3,17 +3,16 @@ class ApplicationController < ActionController::Base
 
   include ApplicationHelper
 
-  after_filter :store_location
-  before_filter :set_locale
+  after_action :store_location
+  before_action :set_locale
 
   def store_location
-    if (request.path != "/members/sign_in" &&
-        request.path != "/members/sign_up" &&
-        request.path != "/members/password/new" &&
-        request.path != "/members/password/edit" &&
-        request.path != "/members/confirmation" &&
-        request.path != "/members/sign_out" &&
-        !request.xhr?)
+    unless (request.path.in?(["/members/sign_in",
+                              "/members/sign_up",
+                              "/members/password/new",
+                              "/members/password/edit",
+                              "/members/confirmation",
+                              "/members/sign_out"]) || request.xhr?)
       store_location_for(:member, request.fullpath)
     end
   end
@@ -23,7 +22,7 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(resource_or_scope)
-    request.referrer
+    request.referer
   end
 
   # tweak CanCan defaults because we don't have a "current_user" method

app/controllers/authentications_controller.rb

@@ -1,5 +1,5 @@
 class AuthenticationsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # POST /authentications

app/controllers/comments_controller.rb

@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /comments
@@ -18,7 +18,7 @@ class CommentsController < ApplicationController
   # GET /comments/new.json
   def new
     @comment = Comment.new
-    @post = Post.find_by_id(params[:post_id])
+    @post = Post.find_by(id: params[:post_id])
 
     if @post
       @comments = @post.comments
@@ -34,7 +34,6 @@ class CommentsController < ApplicationController
 
   # GET /comments/1/edit
   def edit
-    @comment = Comment.find(params[:id])
     @comments = @comment.post.comments
   end
 
@@ -58,8 +57,6 @@ class CommentsController < ApplicationController
   # PUT /comments/1
   # PUT /comments/1.json
   def update
-    @comment = Comment.find(params[:id])
-
     # you should never be able to change the author or post when
     # updating
     params[:comment].delete("post_id")
@@ -79,7 +76,6 @@ class CommentsController < ApplicationController
   # DELETE /comments/1
   # DELETE /comments/1.json
   def destroy
-    @comment = Comment.find(params[:id])
     @post = @comment.post
     @comment.destroy
 

app/controllers/crops_controller.rb

@@ -1,7 +1,7 @@
 require 'will_paginate/array'
 
 class CropsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :hierarchy, :search, :show]
+  before_action :authenticate_member!, except: [:index, :hierarchy, :search, :show]
   load_and_authorize_resource
   skip_authorize_resource only: [:hierarchy, :search]
 
@@ -9,15 +9,14 @@ class CropsController < ApplicationController
   # GET /crops.json
   def index
     @sort = params[:sort]
-    if @sort == 'alpha'
-      # alphabetical order
-      @crops = Crop.includes(:scientific_names, { plantings: :photos })
-      @paginated_crops = @crops.approved.paginate(page: params[:page])
-    else
-      # default to sorting by popularity
-      @crops = Crop.popular.includes(:scientific_names, { plantings: :photos })
-      @paginated_crops = @crops.approved.paginate(page: params[:page])
-    end
+    @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
@@ -34,6 +33,10 @@ class CropsController < ApplicationController
     end
   end
 
+  def requested
+    @requested = Crop.pending_approval.where(requester: current_member).paginate(page: params[:page])
+  end
+
   # GET /crops/wrangle
   def wrangle
     @approval_status = params[:approval_status]
@@ -77,7 +80,7 @@ class CropsController < ApplicationController
   # GET /crops/1
   # GET /crops/1.json
   def show
-    @crop = Crop.includes(:scientific_names, { plantings: :photos }).find(params[:id])
+    @crop = Crop.includes(:scientific_names, plantings: :photos).find(params[:id])
     @posts = @crop.posts.paginate(page: params[:page])
 
     respond_to do |format|
@@ -113,7 +116,6 @@ class CropsController < ApplicationController
 
   # GET /crops/1/edit
   def edit
-    @crop = Crop.find(params[:id])
     @crop.alternate_names.build if @crop.alternate_names.blank?
     @crop.scientific_names.build if @crop.scientific_names.blank?
   end
@@ -123,7 +125,7 @@ class CropsController < ApplicationController
   def create
     @crop = Crop.new(crop_params)
 
-    if current_member.has_role? :crop_wrangler
+    if current_member.role? :crop_wrangler
       @crop.creator = current_member
       success_msg = "Crop was successfully created."
     else
@@ -140,9 +142,9 @@ class CropsController < ApplicationController
         params[:sci_name].each do |index, value|
           create_name('scientific', value)
         end
-        unless current_member.has_role? :crop_wrangler
+        unless current_member.role? :crop_wrangler
           Role.crop_wranglers.each do |w|
-            Notifier.new_crop_request(w, @crop).deliver_later!
+            Notifier.new_crop_request(w, @crop).deliver_now!
           end
         end
 
@@ -158,8 +160,6 @@ class CropsController < ApplicationController
   # PUT /crops/1
   # PUT /crops/1.json
   def update
-    @crop = Crop.find(params[:id])
-
     previous_status = @crop.approval_status
 
     @crop.creator = current_member if previous_status == "pending"
@@ -172,8 +172,8 @@ class CropsController < ApplicationController
         if previous_status == "pending"
           requester = @crop.requester
           new_status = @crop.approval_status
-          Notifier.crop_request_approved(requester, @crop).deliver_later! if new_status == "approved"
-          Notifier.crop_request_rejected(requester, @crop).deliver_later! if new_status == "rejected"
+          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 }
@@ -187,7 +187,6 @@ class CropsController < ApplicationController
   # DELETE /crops/1
   # DELETE /crops/1.json
   def destroy
-    @crop = Crop.find(params[:id])
     @crop.destroy
 
     respond_to do |format|
@@ -198,6 +197,10 @@ class CropsController < ApplicationController
 
   private
 
+  def popular_crops
+    Crop.popular.includes(:scientific_names, plantings: :photos)
+  end
+
   def recreate_names(param_name, name_type)
     return unless params[param_name].present?
     destroy_names(name_type)

app/controllers/follows_controller.rb

@@ -1,5 +1,5 @@
 class FollowsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
   skip_load_resource only: :create
 

app/controllers/gardens_controller.rb

@@ -1,15 +1,13 @@
 class GardensController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /gardens
   # GET /gardens.json
   def index
-    @gardens = Garden.paginate(page: params[:page])
-    @owner = Member.find_by_slug(params[:owner])
-    if @owner
-      @gardens = @owner.gardens.paginate(page: params[:page])
-    end
+    @owner = Member.find_by(slug: params[:owner])
+    @show_all = params[:all] == '1'
+    @gardens = gardens
 
     respond_to do |format|
       format.html # index.html.erb
@@ -20,8 +18,6 @@ class GardensController < ApplicationController
   # GET /gardens/1
   # GET /gardens/1.json
   def show
-    @garden = Garden.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @garden }
@@ -41,18 +37,16 @@ class GardensController < ApplicationController
 
   # GET /gardens/1/edit
   def edit
-    @garden = Garden.find(params[:id])
   end
 
   # POST /gardens
   # POST /gardens.json
   def create
-    params[:garden][:owner_id] = current_member.id
-    @garden = Garden.new(garden_params)
+    @garden.owner_id = current_member.id
 
     respond_to do |format|
       if @garden.save
-        format.html { redirect_to @garden, notice: 'Garden was successfully created.' }
+        format.html { redirect_to @garden, notice: I18n.t('gardens.created') }
         format.json { render json: @garden, status: :created, location: @garden }
         expire_fragment("homepage_stats")
       else
@@ -65,11 +59,9 @@ class GardensController < ApplicationController
   # PUT /gardens/1
   # PUT /gardens/1.json
   def update
-    @garden = Garden.find(params[:id])
-
     respond_to do |format|
       if @garden.update(garden_params)
-        format.html { redirect_to @garden, notice: 'Garden was successfully updated.' }
+        format.html { redirect_to @garden, notice: I18n.t('gardens.updated') }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -81,13 +73,12 @@ class GardensController < ApplicationController
   # DELETE /gardens/1
   # DELETE /gardens/1.json
   def destroy
-    @garden = Garden.find(params[:id])
     @garden.destroy
     expire_fragment("homepage_stats")
 
     respond_to do |format|
       format.html do
-        redirect_to gardens_by_owner_path(owner: @garden.owner), notice: 'Garden was successfully deleted.'
+        redirect_to gardens_by_owner_path(owner: @garden.owner), notice: I18n.t('gardens.deleted')
       end
       format.json { head :no_content }
     end
@@ -99,4 +90,12 @@ class GardensController < ApplicationController
     params.require(:garden).permit(:name, :slug, :owner_id, :description, :active,
       :location, :latitude, :longitude, :area, :area_unit)
   end
+
+  def gardens
+    g = @owner ? @owner.gardens : Garden.all
+    g = g.active unless @show_all
+    g = g.includes(:owner).order(:name)
+    g = g.paginate(page: params[:page])
+    g
+  end
 end

app/controllers/harvests_controller.rb

@@ -1,12 +1,12 @@
 class HarvestsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /harvests
   # GET /harvests.json
   def index
-    @owner = Member.find_by_slug(params[:owner])
-    @crop = Crop.find_by_slug(params[:crop])
+    @owner = Member.find_by(slug: params[:owner])
+    @crop = Crop.find_by(slug: params[:crop])
     @harvests = if @owner
                   @owner.harvests.includes(:owner, :crop)
                 elsif @crop
@@ -26,13 +26,18 @@ class HarvestsController < ApplicationController
     end
   end
 
+  def show
+    @planting = @harvest.planting if @harvest.planting_id
+  end
+
   # GET /harvests/new
   # GET /harvests/new.json
   def new
     @harvest = Harvest.new('harvested_at' => Date.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]) || Crop.new
+    @crop = Crop.find_or_initialize_by(id: params[:crop_id])
 
     respond_to do |format|
       format.html # new.html.erb
@@ -42,19 +47,17 @@ class HarvestsController < ApplicationController
 
   # GET /harvests/1/edit
   def edit
-    @harvest = Harvest.find(params[:id])
+    @planting = @harvest.planting if @harvest.planting_id
   end
 
   # POST /harvests
   # POST /harvests.json
   def create
-    params[:harvest][:owner_id] = current_member.id
-    params[:harvested_at] = parse_date(params[:harvested_at])
-    @harvest = Harvest.new(harvest_params)
+    @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
 
     respond_to do |format|
       if @harvest.save
-        format.html { redirect_to @harvest, notice: 'Harvest was successfully created.' }
+        format.html { redirect_to @harvest, notice: I18n.t('harvests.created') }
         format.json { render json: @harvest, status: :created, location: @harvest }
       else
         format.html { render action: "new" }
@@ -66,11 +69,9 @@ class HarvestsController < ApplicationController
   # PUT /harvests/1
   # PUT /harvests/1.json
   def update
-    @harvest = Harvest.find(params[:id])
-
     respond_to do |format|
       if @harvest.update(harvest_params)
-        format.html { redirect_to @harvest, notice: 'Harvest was successfully updated.' }
+        format.html { redirect_to @harvest, notice: I18n.t('harvests.updated') }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -82,7 +83,6 @@ class HarvestsController < ApplicationController
   # DELETE /harvests/1
   # DELETE /harvests/1.json
   def destroy
-    @harvest = Harvest.find(params[:id])
     @harvest.destroy
 
     respond_to do |format|
@@ -94,7 +94,10 @@ class HarvestsController < ApplicationController
   private
 
   def harvest_params
-    params.require(:harvest).permit(:crop_id, :harvested_at, :description, :owner_id,
-      :quantity, :unit, :weight_quantity, :weight_unit, :plant_part_id, :slug, :si_weight)
+    params.require(:harvest)
+      .permit(:planting_id, :crop_id, :harvested_at, :description,
+        :quantity, :unit, :weight_quantity, :weight_unit,
+        :plant_part_id, :slug, :si_weight)
+      .merge(owner_id: current_member.id)
   end
 end

app/controllers/likes_controller.rb

@@ -0,0 +1,71 @@
+class LikesController < ApplicationController
+  before_action :authenticate_member!, except: :index
+
+  respond_to :html, :json
+
+  def create
+    @like = Like.new
+    @like.member = current_member
+    @like.likeable = find_likeable
+
+    respond_to do |format|
+      if @like.save
+        format.html { redirect_to @like.likeable }
+        format.json do
+          render(
+            json: {
+              id: @like.likeable.id,
+              liked_by_member: true,
+              description: ActionController::Base.helpers.pluralize(@like.likeable.likes.count, "like"),
+              url: like_path(@like, format: :json)
+            },
+            status: 201
+          )
+        end
+      else
+        format.html do
+          flash[:error] = 'Unable to like'
+          redirect_to @like.likeable
+        end
+      end
+    end
+  end
+
+  def destroy
+    like = Like.find(params[:id])
+    likeable = like.likeable
+    respond_to do |format|
+      if like.destroy
+        format.html { redirect_to likeable }
+        format.json do
+          render(
+            json: {
+              id: likeable.id,
+              liked_by_member: false,
+              description: ActionController::Base.helpers.pluralize(likeable.likes.count, "like"),
+              url: likes_path(Like.new, "#{likeable.class.name.underscore}_id", likeable.id, format: :json)
+            },
+            status: 200
+          )
+        end
+      else
+        format.html do
+          flash[:error] = 'Unable to unlike'
+          redirect_to likeable
+        end
+      end
+    end
+  end
+
+  private
+
+  def find_likeable
+    params.each do |name, value|
+      return Regexp.last_match[1].classify.constantize.find(value) if name =~ /(.+)_id$/
+    end
+  end
+
+  def like_params
+    params.require(:like).permit(:member, :likeable)
+  end
+end

app/controllers/members_controller.rb

@@ -1,6 +1,5 @@
 class MembersController < ApplicationController
-  load_and_authorize_resource
-
+  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
@@ -17,7 +16,9 @@ class MembersController < ApplicationController
       format.html # index.html.haml
       format.json {
         render json: @members.to_json(only: [
-                                        :id, :login_name, :slug, :bio, :created_at, :location, :latitude, :longitude
+                                        :id, :login_name,
+                                        :slug, :bio, :created_at,
+                                        :location, :latitude, :longitude
                                       ])
       }
     end
@@ -29,6 +30,7 @@ class MembersController < ApplicationController
     @flickr_auth   = @member.auth('flickr')
     @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,7 +40,9 @@ class MembersController < ApplicationController
       format.html # show.html.haml
       format.json {
         render json: @member.to_json(only: [
-                                       :id, :login_name, :bio, :created_at, :slug, :location, :latitude, :longitude
+                                       :id, :login_name, :bio,
+                                       :created_at, :slug, :location,
+                                       :latitude, :longitude
                                      ])
       }
       format.rss { render(
@@ -64,32 +68,30 @@ class MembersController < ApplicationController
   }
 
   def unsubscribe
-    begin
-      verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
-      decrypted_message = verifier.verify(params[:message])
+    verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
+    decrypted_message = verifier.verify(params[:message])
 
-      @member = Member.find(decrypted_message[:member_id])
-      @type = decrypted_message[:type]
-      @member.update(@type => false)
+    @member = Member.find(decrypted_message[:member_id])
+    @type = decrypted_message[:type]
+    @member.update(@type => false)
 
-      flash.now[:notice] = "You have been unsubscribed from #{EMAIL_TYPE_STRING[@type]} emails."
+    flash.now[:notice] = I18n.t('members.unsubscribed', email_type: EMAIL_TYPE_STRING[@type])
 
-    rescue ActiveSupport::MessageVerifier::InvalidSignature
-      flash.now[:alert] = "We're sorry, there was an error updating your settings."
-    end
+  rescue ActiveSupport::MessageVerifier::InvalidSignature
+    flash.now[:alert] = I18n.t('members.unsubscribe.error')
   end
 
   def finish_signup
     @member = current_member
-    if request.patch? && params[:member]
-      if @member.update(member_params)
-        @member.skip_reconfirmation!
-        bypass_sign_in(@member)
-        redirect_to root_path, notice: 'Welcome.'
-      else
-        flash[:alert] = 'Failed to complete signup'
-        @show_errors = true
-      end
+    return unless request.patch? && params[:member]
+
+    if @member.update(member_params)
+      @member.skip_reconfirmation!
+      bypass_sign_in(@member)
+      redirect_to root_path, notice: I18n.t('members.welcome')
+    else
+      flash[:alert] = I18n.t('members.signup.error')
+      @show_errors = true
     end
   end
 

app/controllers/notifications_controller.rb

@@ -1,11 +1,11 @@
 class NotificationsController < ApplicationController
   include NotificationsHelper
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /notifications
   def index
-    @notifications = Notification.where(recipient_id: current_member).page(params[:page])
+    @notifications = Notification.by_recipient(current_member).page(params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
@@ -14,7 +14,6 @@ class NotificationsController < ApplicationController
 
   # GET /notifications/1
   def show
-    @notification = Notification.find(params[:id])
     @notification.read = true
     @notification.save
     @reply_link = reply_link(@notification)
@@ -28,7 +27,7 @@ class NotificationsController < ApplicationController
 
   def new
     @notification = Notification.new
-    @recipient = Member.find_by_id(params[:recipient_id])
+    @recipient = Member.find_by(id: params[:recipient_id])
     @subject   = params[:subject] || ""
 
     respond_to do |format|
@@ -54,7 +53,6 @@ class NotificationsController < ApplicationController
 
   # DELETE /notifications/1
   def destroy
-    @notification = Notification.find(params[:id])
     @notification.destroy
 
     respond_to do |format|
@@ -66,7 +64,7 @@ class NotificationsController < ApplicationController
   def create
     params[:notification][:sender_id] = current_member.id
     @notification = Notification.new(notification_params)
-    @recipient = Member.find_by_id(params[:notification][:recipient_id])
+    @recipient = Member.find_by(id: params[:notification][:recipient_id])
 
     respond_to do |format|
       if @notification.save

app/controllers/omniauth_callbacks_controller.rb

@@ -23,22 +23,21 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     action = Growstuff::OauthSignupAction.new
 
     @authentication = nil
-    if auth
-      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
-        raise "Invalid provider" unless ['facebook', 'twitter', 'flickr'].index(auth['provider'].to_s)
+    return redirect_to request.env['omniauth.origin'] || edit_member_registration_path unless auth
 
-        session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
-        sign_in member
-        redirect_to finish_signup_url(member)
-      end
+    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
-      redirect_to request.env['omniauth.origin'] || edit_member_registration_path
+      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)
     end
   end
 

app/controllers/order_items_controller.rb

@@ -1,5 +1,5 @@
 class OrderItemsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # POST /order_items

app/controllers/orders_controller.rb

@@ -1,10 +1,10 @@
 class OrdersController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /orders
   def index
-    @orders = Order.where(member_id: current_member.id)
+    @orders = Order.by_member(current_member)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -13,8 +13,6 @@ class OrdersController < ApplicationController
 
   # GET /orders/1
   def show
-    @order = Order.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
     end
@@ -31,8 +29,6 @@ class OrdersController < ApplicationController
 
   # checkout with PayPal
   def checkout
-    @order = Order.find(params[:id])
-
     respond_to do |format|
       if @order.update_attributes(referral_code: params[:referral_code])
         response = EXPRESS_GATEWAY.setup_purchase(
@@ -52,8 +48,6 @@ class OrdersController < ApplicationController
   end
 
   def complete
-    @order = Order.find(params[:id])
-
     if (params[:token] && params['PayerID'])
       purchase = EXPRESS_GATEWAY.purchase(
         @order.total,
@@ -80,7 +74,6 @@ class OrdersController < ApplicationController
   end
 
   def cancel
-    @order = Order.find(params[:id])
     respond_to do |format|
       format.html { redirect_to shop_url, notice: 'Order was cancelled.' }
     end
@@ -88,7 +81,6 @@ class OrdersController < ApplicationController
 
   # DELETE /orders/1
   def destroy
-    @order = Order.find(params[:id])
     @order.destroy
 
     respond_to do |format|

app/controllers/photos_controller.rb

@@ -41,7 +41,6 @@ class PhotosController < ApplicationController
 
   # GET /photos/1/edit
   def edit
-    @photo = Photo.find(params[:id])
   end
 
   # POST /photos
@@ -64,8 +63,6 @@ class PhotosController < ApplicationController
   # PUT /photos/1
   # PUT /photos/1.json
   def update
-    @photo = Photo.find(params[:id])
-
     respond_to do |format|
       if @photo.update(photo_params)
         format.html { redirect_to @photo, notice: 'Photo was successfully updated.' }
@@ -80,7 +77,6 @@ class PhotosController < ApplicationController
   # DELETE /photos/1
   # DELETE /photos/1.json
   def destroy
-    @photo = Photo.find(params[:id])
     @photo.destroy
     flash[:alert] = "Photo successfully deleted."
 
@@ -113,36 +109,17 @@ class PhotosController < ApplicationController
     @photo
   end
 
-  def which_collection?
-    case params[:type]
-    when "garden" then @photo.gardens
-    when "harvest" then @photo.harvests
-    when "planting" then @photo.plantings
-    else raise "Invalid type"
-    end
-  end
-
   def add_photo_to_collection
-    collection = which_collection?
+    raise "Missing or invalid type provided" unless Growstuff::Constants::PhotoModels.types.include?(params[:type])
+    raise "No item id provided" unless item_id?
+    collection = Growstuff::Constants::PhotoModels.get_relation(@photo, params[:type])
 
-    unless collection && item_id?
-      flash[:alert] = "Missing or invalid type or id parameter"
-      return
-    end
+    item_class = Growstuff::Constants::PhotoModels.get_item(params[:type])
+    item = item_class.find_by!(id: params[:id], owner_id: current_member.id)
+    raise "Could not find this item owned by you" unless item
 
-    item = find_item_for_photo!
     collection << item unless collection.include?(item)
-  rescue
-    flash[:alert] = "Could not find this item owned by you"
-  end
-
-  def find_item_for_photo!
-    item_class = case params[:type]
-                 when "garden" then Garden
-                 when "harvest" then Harvest
-                 when "planting" then Planting
-                 else raise "Invalid type"
-                 end
-    item_class.find_by!(id: params[:id], owner_id: current_member.id)
+  rescue => e
+    flash[:alert] = e.message
   end
 end

app/controllers/plant_parts_controller.rb

@@ -15,8 +15,6 @@ class PlantPartsController < ApplicationController
   # GET /plant_parts/1
   # GET /plant_parts/1.json
   def show
-    @plant_part = PlantPart.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @plant_part }
@@ -36,7 +34,6 @@ class PlantPartsController < ApplicationController
 
   # GET /plant_parts/1/edit
   def edit
-    @plant_part = PlantPart.find(params[:id])
   end
 
   # POST /plant_parts
@@ -58,8 +55,6 @@ class PlantPartsController < ApplicationController
   # PUT /plant_parts/1
   # PUT /plant_parts/1.json
   def update
-    @plant_part = PlantPart.find(params[:id])
-
     respond_to do |format|
       if @plant_part.update(plant_part_params)
         format.html { redirect_to @plant_part, notice: 'Plant part was successfully updated.' }
@@ -74,7 +69,6 @@ class PlantPartsController < ApplicationController
   # DELETE /plant_parts/1
   # DELETE /plant_parts/1.json
   def destroy
-    @plant_part = PlantPart.find(params[:id])
     @plant_part.destroy
 
     respond_to do |format|

app/controllers/plantings_controller.rb

@@ -1,19 +1,14 @@
 class PlantingsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /plantings
   # GET /plantings.json
   def index
-    @owner = Member.find_by_slug(params[:owner])
-    @crop = Crop.find_by_slug(params[:crop])
-    @plantings = if @owner
-                   @owner.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
-                 elsif @crop
-                   @crop.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
-                 else
-                   Planting.includes(:owner, :crop, :garden).paginate(page: params[:page])
-                 end
+    @owner = Member.find_by(slug: params[:owner]) if params[:owner]
+    @crop = Crop.find_by(slug: params[:crop]) if params[:crop]
+    @show_all = params[:all] == '1'
+    @plantings = plantings
 
     respond_to do |format|
       format.html { @plantings = @plantings.paginate(page: params[:page]) }
@@ -41,11 +36,11 @@ class PlantingsController < ApplicationController
   # GET /plantings/new
   # GET /plantings/new.json
   def new
-    @planting = Planting.new('planted_at' => Date.today)
+    @planting = Planting.new('planted_at' => Time.zone.today)
 
     # using find_by_id here because it returns nil, unlike find
-    @crop     = Crop.find_by_id(params[:crop_id])     || Crop.new
-    @garden   = Garden.find_by_id(params[:garden_id]) || Garden.new
+    @crop     = Crop.find_by(id: params[:crop_id])     || Crop.new
+    @garden   = Garden.find_by(id: params[:garden_id]) || Garden.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -55,8 +50,6 @@ class PlantingsController < ApplicationController
 
   # GET /plantings/1/edit
   def edit
-    @planting = Planting.find(params[:id])
-
     # the following are needed to display the form but aren't used
     @crop     = Crop.new
     @garden   = Garden.new
@@ -86,7 +79,6 @@ class PlantingsController < ApplicationController
   # PUT /plantings/1
   # PUT /plantings/1.json
   def update
-    @planting = Planting.find(params[:id])
     params[:planted_at] = parse_date(params[:planted_at])
 
     respond_to do |format|
@@ -105,7 +97,6 @@ class PlantingsController < ApplicationController
   # DELETE /plantings/1
   # DELETE /plantings/1.json
   def destroy
-    @planting = Planting.find(params[:id])
     @garden = @planting.garden
     @planting.destroy
     expire_fragment("homepage_stats")
@@ -131,4 +122,16 @@ class PlantingsController < ApplicationController
       (planting.finished_at - planting.planted_at).to_i
     end
   end
+
+  def plantings
+    p = if @owner
+          @owner.plantings
+        elsif @crop
+          @crop.plantings
+        else
+          Planting
+        end
+    p = p.current unless @show_all
+    p.includes(:owner, :crop, :garden).order(:created_at).paginate(page: params[:page])
+  end
 end

app/controllers/posts_controller.rb

@@ -1,16 +1,16 @@
 class PostsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /posts
   # GET /posts.json
 
   def index
-    @author = Member.find_by_slug(params[:author])
+    @author = Member.find_by(slug: params[:author])
     @posts = if @author
-               @author.posts.includes(:author, { comments: :author }).paginate(page: params[:page])
+               @author.posts.includes(:author, comments: :author).paginate(page: params[:page])
              else
-               Post.includes(:author, { comments: :author }).paginate(page: params[:page])
+               Post.includes(:author, comments: :author).paginate(page: params[:page])
              end
 
     respond_to do |format|
@@ -23,7 +23,7 @@ class PostsController < ApplicationController
   # GET /posts/1
   # GET /posts/1.json
   def show
-    @post = Post.includes(:author, { comments: :author }).find(params[:id])
+    @post = Post.includes(:author, comments: :author).find(params[:id])
 
     respond_to do |format|
       format.html # show.html.haml
@@ -39,7 +39,7 @@ class PostsController < ApplicationController
   # GET /posts/new.json
   def new
     @post = Post.new
-    @forum = Forum.find_by_id(params[:forum_id])
+    @forum = Forum.find_by(id: params[:forum_id])
 
     respond_to do |format|
       format.html # new.html.haml
@@ -49,7 +49,6 @@ class PostsController < ApplicationController
 
   # GET /posts/1/edit
   def edit
-    @post = Post.find(params[:id])
   end
 
   # POST /posts
@@ -72,8 +71,6 @@ class PostsController < ApplicationController
   # PUT /posts/1
   # PUT /posts/1.json
   def update
-    @post = Post.find(params[:id])
-
     respond_to do |format|
       if @post.update(post_params)
         format.html { redirect_to @post, notice: 'Post was successfully updated.' }
@@ -88,7 +85,6 @@ class PostsController < ApplicationController
   # DELETE /posts/1
   # DELETE /posts/1.json
   def destroy
-    @post = Post.find(params[:id])
     @post.destroy
 
     respond_to do |format|

app/controllers/products_controller.rb

@@ -1,5 +1,5 @@
 class ProductsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /products
@@ -13,8 +13,6 @@ class ProductsController < ApplicationController
 
   # GET /products/1
   def show
-    @product = Product.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
     end
@@ -31,7 +29,6 @@ class ProductsController < ApplicationController
 
   # GET /products/1/edit
   def edit
-    @product = Product.find(params[:id])
   end
 
   # POST /products
@@ -49,8 +46,6 @@ class ProductsController < ApplicationController
 
   # PUT /products/1
   def update
-    @product = Product.find(params[:id])
-
     respond_to do |format|
       if @product.update(product_params)
         format.html { redirect_to @product, notice: 'Product was successfully updated.' }
@@ -62,7 +57,6 @@ class ProductsController < ApplicationController
 
   # DELETE /products/1
   def destroy
-    @product = Product.find(params[:id])
     @product.destroy
 
     respond_to do |format|

app/controllers/roles_controller.rb

@@ -1,5 +1,5 @@
 class RolesController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
 
   # GET /roles
@@ -13,8 +13,6 @@ class RolesController < ApplicationController
 
   # GET /roles/1
   def show
-    @role = Role.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
     end
@@ -31,7 +29,6 @@ class RolesController < ApplicationController
 
   # GET /roles/1/edit
   def edit
-    @role = Role.find(params[:id])
   end
 
   # POST /roles
@@ -49,8 +46,6 @@ class RolesController < ApplicationController
 
   # PUT /roles/1
   def update
-    @role = Role.find(params[:id])
-
     respond_to do |format|
       if @role.update(role_params)
         format.html { redirect_to @role, notice: 'Role was successfully updated.' }
@@ -62,7 +57,6 @@ class RolesController < ApplicationController
 
   # DELETE /roles/1
   def destroy
-    @role = Role.find(params[:id])
     @role.destroy
 
     respond_to do |format|

app/controllers/scientific_names_controller.rb

@@ -1,5 +1,5 @@
 class ScientificNamesController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /scientific_names
@@ -16,8 +16,6 @@ class ScientificNamesController < ApplicationController
   # GET /scientific_names/1
   # GET /scientific_names/1.json
   def show
-    @scientific_name = ScientificName.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.haml
       format.json { render json: @scientific_name }
@@ -28,7 +26,7 @@ class ScientificNamesController < ApplicationController
   # GET /scientific_names/new.json
   def new
     @scientific_name = ScientificName.new
-    @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
+    @crop = Crop.find_or_initialize_by(id: params[:crop_id])
 
     respond_to do |format|
       format.html # new.html.haml
@@ -38,7 +36,6 @@ class ScientificNamesController < ApplicationController
 
   # GET /scientific_names/1/edit
   def edit
-    @scientific_name = ScientificName.find(params[:id])
   end
 
   # POST /scientific_names
@@ -61,8 +58,6 @@ class ScientificNamesController < ApplicationController
   # PUT /scientific_names/1
   # PUT /scientific_names/1.json
   def update
-    @scientific_name = ScientificName.find(params[:id])
-
     respond_to do |format|
       if @scientific_name.update(scientific_name_params)
         format.html { redirect_to @scientific_name.crop, notice: 'Scientific name was successfully updated.' }
@@ -77,7 +72,6 @@ class ScientificNamesController < ApplicationController
   # DELETE /scientific_names/1
   # DELETE /scientific_names/1.json
   def destroy
-    @scientific_name = ScientificName.find(params[:id])
     @crop = @scientific_name.crop
     @scientific_name.destroy
 

app/controllers/seeds_controller.rb

@@ -1,19 +1,13 @@
 class SeedsController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /seeds
   # GET /seeds.json
   def index
-    @owner = Member.find_by_slug(params[:owner])
-    @crop = Crop.find_by_slug(params[:crop])
-    @seeds = if @owner
-               @owner.seeds.includes(:owner, :crop).paginate(page: params[:page])
-             elsif @crop
-               @crop.seeds.includes(:owner, :crop).paginate(page: params[:page])
-             else
-               Seed.includes(:owner, :crop).paginate(page: params[:page])
-             end
+    @owner = Member.find_by(slug: params[:owner])
+    @crop = Crop.find_by(slug: params[:crop])
+    @seeds = seeds(owner: @owner, crop: @crop)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -35,8 +29,6 @@ class SeedsController < ApplicationController
   # GET /seeds/1
   # GET /seeds/1.json
   def show
-    @seed = Seed.find(params[:id])
-
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @seed }
@@ -49,7 +41,7 @@ class SeedsController < ApplicationController
     @seed = Seed.new
 
     # using find_by_id here because it returns nil, unlike find
-    @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
+    @crop = Crop.find_or_initialize_by(id: params[:crop_id])
 
     respond_to do |format|
       format.html # new.html.erb
@@ -59,7 +51,6 @@ class SeedsController < ApplicationController
 
   # GET /seeds/1/edit
   def edit
-    @seed = Seed.find(params[:id])
   end
 
   # POST /seeds
@@ -82,8 +73,6 @@ class SeedsController < ApplicationController
   # PUT /seeds/1
   # PUT /seeds/1.json
   def update
-    @seed = Seed.find(params[:id])
-
     respond_to do |format|
       if @seed.update(seed_params)
         format.html { redirect_to @seed, notice: 'Seed was successfully updated.' }
@@ -98,7 +87,6 @@ class SeedsController < ApplicationController
   # DELETE /seeds/1
   # DELETE /seeds/1.json
   def destroy
-    @seed = Seed.find(params[:id])
     @seed.destroy
 
     respond_to do |format|
@@ -115,4 +103,14 @@ class SeedsController < ApplicationController
       :days_until_maturity_min, :days_until_maturity_max, :organic, :gmo,
       :heirloom, :tradable_to, :slug)
   end
+
+  def seeds(owner: nil, crop: nil)
+    if owner
+      owner.seeds
+    elsif crop
+      crop.seeds
+    else
+      Seed
+    end.includes(:owner, :crop).paginate(page: params[:page])
+  end
 end

app/controllers/sessions_controller.rb

@@ -3,7 +3,7 @@ class SessionsController < Devise::SessionsController
 
   def create
     super do |resource|
-      if Crop.pending_approval.present? && current_member.has_role?(:crop_wrangler)
+      if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
         flash[:alert] = "There are crops waiting to be wrangled."
       end
     end

app/helpers/application_helper.rb

@@ -1,17 +1,16 @@
 module ApplicationHelper
   def price_in_dollars(price)
-    return sprintf('%.2f', price / 100.0)
+    sprintf('%.2f', price / 100.0)
   end
 
   # 999 cents becomes 9.99 AUD -- for products/orders/etc
   def price_with_currency(price)
-    return sprintf('%.2f %s', price / 100.0,
-      Growstuff::Application.config.currency)
+    sprintf('%.2f %s', price / 100.0, Growstuff::Application.config.currency)
   end
 
   def parse_date(str)
     str ||= '' # Date.parse barfs on nil
-    return str == '' ? nil : Date.parse(str)
+    str == '' ? nil : Date.parse(str)
   end
 
   def forex_link(price)
@@ -71,10 +70,8 @@ module ApplicationHelper
       return uri.to_s
     end
 
-    Gravatar.new(member.email).image_url({
-                                           size: size,
-                                           default: :identicon
-                                         })
+    Gravatar.new(member.email).image_url(size: size,
+                                         default: :identicon)
   end
 
   # Returns a string with the quantity and the right pluralization for a
@@ -84,4 +81,29 @@ module ApplicationHelper
     model_name = model.model_name.human(count: size)
     "#{size} #{model_name}"
   end
+
+  def show_inactive_tickbox_path(type, owner, show_all)
+    all = show_all ? '' : 1
+    if owner
+      plantings_by_owner_path(owner: owner.slug, all: all) if type == 'plantings'
+      gardens_by_owner_path(owner: owner.slug, all: all) if type == 'gardens'
+    else
+      plantings_path(all: all) if type == 'plantings'
+      gardens_path(all: all) if type == 'gardens'
+    end
+  end
+
+  def title(type, owner, crop)
+    if owner
+      t(".title.owner_#{type}", owner: owner.login_name)
+    elsif crop
+      t(".title.crop_#{type}", crop: crop.name)
+    else
+      t(".title.default")
+    end
+  end
+
+  def og_description(description)
+    strip_tags(description).split(' ')[0..20].join(' ')
+  end
 end

app/helpers/crops_helper.rb

@@ -18,4 +18,8 @@ module CropsHelper
       "You have an unknown quantity of seeds of this crop."
     end
   end
+
+  def crop_ebay_seeds_url(crop)
+    "http://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{URI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg" # rubocop:disable Metrics/LineLength
+  end
 end

app/helpers/gardens_helper.rb

@@ -9,6 +9,14 @@ module GardensHelper
     end
   end
 
+  def gardens_active_tickbox_path(owner, show_all)
+    show_inactive_tickbox_path('gardens', owner, show_all)
+  end
+
+  def display_garden_name(garden)
+    truncate(garden.name, length: 50, separator: ' ', omission: '... ')
+  end
+
   def display_garden_plantings(plantings)
     if plantings.blank?
       "None"

app/helpers/harvests_helper.rb

@@ -3,44 +3,32 @@ module HarvestsHelper
     human_quantity = display_human_quantity(harvest)
     weight = display_weight(harvest)
 
-    if human_quantity && weight
-      return "#{human_quantity}, weighing #{weight}"
-    elsif human_quantity
-      return human_quantity
-    elsif weight
-      return weight
-    else
-      return 'not specified'
-    end
+    return "#{human_quantity}, weighing #{weight}" if human_quantity && weight
+    return human_quantity if human_quantity
+    return weight if weight
+
+    'not specified'
   end
 
   def display_human_quantity(harvest)
-    if !harvest.quantity.blank? && harvest.quantity > 0
-      if harvest.unit == 'individual' # just the number
-        number_to_human(harvest.quantity, strip_insignificant_zeros: true)
-      elsif !harvest.unit.blank? # pluralize anything else
-        return pluralize(number_to_human(harvest.quantity, strip_insignificant_zeros: true), harvest.unit)
-      else
-        return "#{number_to_human(harvest.quantity, strip_insignificant_zeros: true)} #{harvest.unit}"
-      end
+    return unless harvest.quantity.present? && harvest.quantity > 0
+
+    if harvest.unit == 'individual' # just the number
+      number_to_human(harvest.quantity, strip_insignificant_zeros: true)
+    elsif !harvest.unit.blank? # pluralize anything else
+      pluralize(number_to_human(harvest.quantity, strip_insignificant_zeros: true), harvest.unit)
     else
-      return nil
+      "#{number_to_human(harvest.quantity, strip_insignificant_zeros: true)} #{harvest.unit}"
     end
   end
 
   def display_weight(harvest)
-    if !harvest.weight_quantity.blank? && harvest.weight_quantity > 0
-      return "#{number_to_human(harvest.weight_quantity, strip_insignificant_zeros: true)} #{harvest.weight_unit}"
-    else
-      return nil
-    end
+    return if harvest.weight_quantity.blank? || harvest.weight_quantity <= 0
+    "#{number_to_human(harvest.weight_quantity, strip_insignificant_zeros: true)} #{harvest.weight_unit}"
   end
 
   def display_harvest_description(harvest)
-    if harvest.description.empty?
-      "No description provided."
-    else
-      harvest.description
-    end
+    return "No description provided." if harvest.description.nil?
+    harvest.description
   end
 end

app/helpers/plantings_helper.rb

@@ -1,13 +1,13 @@
 module PlantingsHelper
   def display_days_before_maturity(planting)
-    if planting.finished?
-      0
-    elsif !planting.finished_at.nil?
-      ((p = planting.finished_at - DateTime.now).to_i) <= 0 ? 0 : p.to_i
-    elsif planting.planted_at.nil? || planting.days_before_maturity.nil?
-      "unknown"
+    # First try to calc from finished/finished_at
+    if planting.finished? || planting.finished_at.present?
+      planting.days_until_finished.to_s
+    # then try to calc from planted at + maturity
+    elsif planting.planted_at.present? && planting.days_before_maturity.present?
+      planting.days_until_mature.to_s
     else
-      ((p = (planting.planted_at + planting.days_before_maturity) - DateTime.now).to_i <= 0) ? 0 : p.to_i
+      "unknown"
     end
   end
 
@@ -31,13 +31,17 @@ module PlantingsHelper
 
   def display_planting(planting)
     if planting.quantity.to_i > 0 && planting.planted_from.present?
-      return "#{planting.owner} planted #{pluralize(planting.quantity, planting.planted_from)}."
+      "#{planting.owner} planted #{pluralize(planting.quantity, planting.planted_from)}."
     elsif planting.quantity.to_i > 0
-      return "#{planting.owner} planted #{pluralize(planting.quantity, 'unit')}."
+      "#{planting.owner} planted #{pluralize(planting.quantity, 'unit')}."
     elsif planting.planted_from.present?
-      return "#{planting.owner} planted #{planting.planted_from.pluralize}."
+      "#{planting.owner} planted #{planting.planted_from.pluralize}."
     else
-      return "#{planting.owner}."
+      "#{planting.owner}."
     end
   end
+
+  def plantings_active_tickbox_path(owner, show_all)
+    show_inactive_tickbox_path('plantings', owner, show_all)
+  end
 end

app/mailers/notifier.rb

@@ -8,7 +8,7 @@ class Notifier < ActionMailer::Base
         "not set - have you created config/application.yml?"
     end
 
-    return ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
+    ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
   end
 
   def notify(notification)
@@ -16,7 +16,8 @@ class Notifier < ActionMailer::Base
     @reply_link = reply_link(@notification)
 
     # Encrypting
-    @signed_message = verifier.generate ({ member_id: @notification.recipient.id, type: :send_notification_email })
+    message = { member_id: @notification.recipient.id, type: :send_notification_email }
+    @signed_message = verifier.generate(message)
 
     mail(to: @notification.recipient.email,
          subject: @notification.subject)
@@ -29,12 +30,10 @@ class Notifier < ActionMailer::Base
     @harvests = @member.harvests.first(5)
 
     # Encrypting
-    @signed_message = verifier.generate ({ member_id: @member.id, type: :send_planting_reminder })
+    message = { member_id: @member.id, type: :send_planting_reminder }
+    @signed_message = verifier.generate(message)
 
-    if @member.send_planting_reminder
-      mail(to: @member.email,
-           subject: "What have you planted lately?")
-    end
+    mail(to: @member.email, subject: "What have you planted lately?") if @member.send_planting_reminder
   end
 
   def new_crop_request(member, request)

app/models/ability.rb

@@ -1,7 +1,7 @@
 class Ability
   include CanCan::Ability
 
-  def initialize(member)
+  def initialize(member) # rubocop:disable Metrics/AbcSize
     # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
 
     # everyone can do these things, even non-logged in
@@ -36,110 +36,110 @@ class Ability
       an.crop.approved?
     end
 
-    if member
-      # members can see even rejected or pending crops if they requested it
-      can :read, Crop, requester_id: member.id
+    return unless member
 
-      # managing your own user settings
-      can :update, Member, id: member.id
+    # members can see even rejected or pending crops if they requested it
+    can :read, Crop, requester_id: member.id
+    can :requested, Crop # see list of crops they've requested
 
-      # can read/delete notifications that were sent to them
-      can :read, Notification, recipient_id: member.id
-      can :destroy, Notification, recipient_id: member.id
-      can :reply, Notification, recipient_id: member.id
-      # can send a private message to anyone but themselves
-      # note: sadly, we can't test for this from the view, but it works
-      # for the model/controller
-      can :create, Notification do |n|
-        n.recipient_id != member.id
-      end
-      # note we don't support update for notifications
+    # managing your own user settings
+    can :update, Member, id: member.id
 
-      # only crop wranglers can create/edit/destroy crops
-      if member.has_role? :crop_wrangler
-        can :wrangle, Crop
-        can :manage, Crop
-        can :manage, ScientificName
-        can :manage, AlternateName
-      end
+    # can read/delete notifications that were sent to them
+    can :read, Notification, recipient_id: member.id
+    can :destroy, Notification, recipient_id: member.id
+    can :reply, Notification, recipient_id: member.id
+    # can send a private message to anyone but themselves
+    # note: sadly, we can't test for this from the view, but it works
+    # for the model/controller
+    can :create, Notification do |n|
+      n.recipient_id != member.id
+    end
+    # note we don't support update for notifications
 
-      # any member can create a crop provisionally
-      can :create, Crop
+    # only crop wranglers can create/edit/destroy crops
+    if member.role? :crop_wrangler
+      can :wrangle, Crop
+      can :manage, Crop
+      can :manage, ScientificName
+      can :manage, AlternateName
+    end
 
-      # can create & destroy their own authentications against other sites.
-      can :create, Authentication
-      can :destroy, Authentication, member_id: member.id
+    # any member can create a crop provisionally
+    can :create, Crop
 
-      # anyone can create a post, or comment on a post,
-      # but only the author can edit/destroy it.
-      can :create,  Post
-      can :update,  Post, author_id: member.id
-      can :destroy, Post, author_id: member.id
-      can :create,  Comment
-      can :update,  Comment, author_id: member.id
-      can :destroy, Comment, author_id: member.id
+    # can create & destroy their own authentications against other sites.
+    can :create, Authentication
+    can :destroy, Authentication, member_id: member.id
 
-      # same deal for gardens and plantings
-      can :create,  Garden
-      can :update,  Garden, owner_id: member.id
-      can :destroy, Garden, owner_id: member.id
+    # anyone can create a post, or comment on a post,
+    # but only the author can edit/destroy it.
+    can :create,  Post
+    can :update,  Post, author_id: member.id
+    can :destroy, Post, author_id: member.id
+    can :create,  Comment
+    can :update,  Comment, author_id: member.id
+    can :destroy, Comment, author_id: member.id
 
-      can :create,  Planting
-      can :update,  Planting, garden: { owner_id: member.id }
-      can :destroy, Planting, garden: { owner_id: member.id }
+    # same deal for gardens and plantings
+    can :create,  Garden
+    can :update,  Garden, owner_id: member.id
+    can :destroy, Garden, owner_id: member.id
 
-      can :create,  Harvest
-      can :update,  Harvest, owner_id: member.id
-      can :destroy, Harvest, owner_id: member.id
+    can :create,  Planting
+    can :update,  Planting, garden: { owner_id: member.id }
+    can :destroy, Planting, garden: { owner_id: member.id }
 
-      can :create, Photo
-      can :update, Photo, owner_id: member.id
-      can :destroy, Photo, owner_id: member.id
+    can :create,  Harvest
+    can :update,  Harvest, owner_id: member.id
+    can :destroy, Harvest, owner_id: member.id
+    can :update,  Harvest, owner_id: member.id, planting: { owner_id: member.id }
+    can :destroy, Harvest, owner_id: member.id, planting: { owner_id: member.id }
 
-      can :create, Seed
-      can :update, Seed, owner_id: member.id
-      can :destroy, Seed, owner_id: member.id
+    can :create, Photo
+    can :update, Photo, owner_id: member.id
+    can :destroy, Photo, owner_id: member.id
 
-      # orders/shop/etc
-      can :create,   Order
-      can :read,     Order, member_id: member.id
-      can :complete, Order, member_id: member.id, completed_at: nil
-      can :checkout, Order, member_id: member.id, completed_at: nil
-      can :cancel,   Order, member_id: member.id, completed_at: nil
-      can :destroy,  Order, member_id: member.id, completed_at: nil
+    can :create, Seed
+    can :update, Seed, owner_id: member.id
+    can :destroy, Seed, owner_id: member.id
 
-      can :create, OrderItem
-      # for now, let's not let people mess with individual order items
-      cannot :read,    OrderItem, order: { member_id: member.id }
-      cannot :update,  OrderItem, order: { member_id: member.id, completed_at: nil }
-      cannot :destroy, OrderItem, order: { member_id: member.id, completed_at: nil }
+    # orders/shop/etc
+    can :create,   Order
+    can :read,     Order, member_id: member.id
+    can :complete, Order, member_id: member.id, completed_at: nil
+    can :checkout, Order, member_id: member.id, completed_at: nil
+    can :cancel,   Order, member_id: member.id, completed_at: nil
+    can :destroy,  Order, member_id: member.id, completed_at: nil
 
-      # following/unfollowing permissions
-      can :create, Follow
-      cannot :create, Follow, followed_id: member.id # can't follow yourself
+    can :create, OrderItem
+    # for now, let's not let people mess with individual order items
+    cannot :read,    OrderItem, order: { member_id: member.id }
+    cannot :update,  OrderItem, order: { member_id: member.id, completed_at: nil }
+    cannot :destroy, OrderItem, order: { member_id: member.id, completed_at: nil }
 
-      can :destroy, Follow
-      cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
+    # following/unfollowing permissions
+    can :create, Follow
+    cannot :create, Follow, followed_id: member.id # can't follow yourself
 
-      if member.has_role? :admin
+    can :destroy, Follow
+    cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
-        can :read, :all
-        can :manage, :all
+    return unless member.role? :admin
 
-        # can't change order history, because it's *history*
-        cannot :create, Order
-        cannot :complete, Order
-        cannot :destroy, Order
-        cannot :manage, OrderItem
+    can :read, :all
+    can :manage, :all
 
-        # can't delete plant parts if they have harvests associated with them
-        cannot :destroy, PlantPart
-        can :destroy, PlantPart do |pp|
-          pp.harvests.empty?
-        end
-
-      end
+    # can't change order history, because it's *history*
+    cannot :create, Order
+    cannot :complete, Order
+    cannot :destroy, Order
+    cannot :manage, OrderItem
 
+    # can't delete plant parts if they have harvests associated with them
+    cannot :destroy, PlantPart
+    can :destroy, PlantPart do |pp|
+      pp.harvests.empty?
     end
   end
 end

app/models/account.rb

@@ -9,16 +9,15 @@ class Account < ActiveRecord::Base
   before_create do |account|
     unless account.account_type
       account.account_type = AccountType.find_or_create_by(name:
-        Growstuff::Application.config.default_account_type
-      )
+        Growstuff::Application.config.default_account_type)
     end
   end
 
   def paid_until_string
     if account_type.is_permanent_paid
-      return "forever"
+      "forever"
     elsif account_type.is_paid
-      return paid_until.to_s
+      paid_until.to_s
     end
   end
 end

app/models/comment.rb

@@ -6,16 +6,16 @@ class Comment < ActiveRecord::Base
   scope :post_order, -> { reorder("created_at ASC") } # for display on post page
 
   after_create do
-    recipient = self.post.author.id
-    sender    = self.author.id
+    recipient = post.author.id
+    sender    = author.id
     # don't send notifications to yourself
     if recipient != sender
       Notification.create(
         recipient_id: recipient,
         sender_id: sender,
-        subject: "#{self.author} commented on #{self.post.subject}",
-        body: self.body,
-        post_id: self.post.id
+        subject: "#{author} commented on #{post.subject}",
+        body: body,
+        post_id: post.id
       )
     end
   end

app/models/concerns/likeable.rb

@@ -0,0 +1,8 @@
+module Likeable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :likes, as: :likeable, dependent: :destroy
+    has_many :members, through: :likes
+  end
+end

app/models/concerns/photo_capable.rb

@@ -0,0 +1,17 @@
+require_relative '../../constants/photo_models.rb'
+module PhotoCapable
+  extend ActiveSupport::Concern
+
+  included do
+    has_and_belongs_to_many :photos # rubocop:disable Rails/HasAndBelongsToMany
+
+    before_destroy :remove_from_list
+  end
+
+  def remove_from_list
+    photolist = photos.to_a # save a temp copy of the photo list
+    photos.clear # clear relationship b/w object and photo
+
+    photolist.each(&:destroy_if_unused)
+  end
+end

app/models/crop.rb

@@ -1,4 +1,4 @@
-class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
+class Crop < ActiveRecord::Base
   extend FriendlyId
   friendly_id :name, use: [:slugged, :finders]
 
@@ -18,7 +18,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
 
   belongs_to :parent, class_name: 'Crop'
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
-  has_and_belongs_to_many :posts
+  has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
   before_destroy { |crop| crop.posts.clear }
 
   default_scope { order("lower(name) asc") }
@@ -42,7 +42,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   ## Wikipedia urls are only necessary when approving a crop
   validates :en_wikipedia_url,
     format: {
-      with: /\Ahttps?:\/\/en\.wikipedia\.org\/wiki\/[[:alnum:]%_]+\z/,
+      with: %r{\Ahttps?:\/\/en\.wikipedia\.org\/wiki\/[[:alnum:]%_\.()-]+\z},
       message: 'is not a valid English Wikipedia URL'
     },
     if: :approved?
@@ -73,8 +73,8 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
                    min_gram: 3,
                    max_gram: 10,
                    # token_chars: Elasticsearch will split on characters
-                   # that don’t belong to any of these classes
-                   token_chars: ["letter", "digit"]
+                   # that don't belong to any of these classes
+                   token_chars: %w(letter digit)
                  }
                },
                analyzer: {
@@ -82,7 +82,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
                    tokenizer: "gs_edgeNGram_tokenizer",
                    filter: ["lowercase"]
                  }
-               },
+               }
              } do
       mappings dynamic: 'false' do
         indexes :id, type: 'long'
@@ -103,21 +103,20 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     end
   end
 
-  def as_indexed_json(options = {})
-    self.as_json(
+  def as_indexed_json(_options = {})
+    as_json(
       only: [:id, :name, :approval_status],
       include: {
         scientific_names: { only: :name },
         alternate_names: { only: :name }
-      })
+      }
+    )
   end
 
   # update the Elasticsearch index (only if we're using it in this
   # environment)
-  def update_index(name_obj)
-    if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
-      __elasticsearch__.index_document
-    end
+  def update_index(_name_obj)
+    __elasticsearch__.index_document if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
   end
 
   # End Elasticsearch section
@@ -127,9 +126,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   end
 
   def default_scientific_name
-    if scientific_names.size > 0
-      scientific_names.first.name
-    end
+    scientific_names.first.name unless scientific_names.empty?
   end
 
   # crop.default_photo
@@ -166,13 +163,11 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   # key: plant part (eg. 'fruit')
   # value: count of how many times it's been used by harvests
   def popular_plant_parts
-    popular_plant_parts = Hash.new(0)
-    harvests.each do |h|
-      if h.plant_part
-        popular_plant_parts[h.plant_part] += 1
-      end
-    end
-    return popular_plant_parts
+    PlantPart.joins(:harvests)
+      .where("crop_id = ?", id)
+      .order("count_harvests_id DESC")
+      .group("plant_parts.id", "plant_parts.name")
+      .count("harvests.id")
   end
 
   def interesting?
@@ -180,7 +175,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     min_photos    = 3 # needs this many photos to be interesting
     return false unless photos.size >= min_photos
     return false unless plantings_count >= min_plantings
-    return true
+    true
   end
 
   def pending?
@@ -196,7 +191,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   end
 
   def approval_statuses
-    ['rejected', 'pending', 'approved']
+    %w(rejected pending approved)
   end
 
   def reasons_for_rejection
@@ -205,7 +200,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
 
   # Crop.interesting
   # returns a list of interesting crops, for use on the homepage etc
-  def Crop.interesting
+  def self.interesting
     howmany = 12 # max number to find
     interesting_crops = []
     Crop.includes(:photos).randomized.each do |c|
@@ -213,7 +208,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
       next unless c.interesting?
       interesting_crops.push(c)
     end
-    return interesting_crops
+    interesting_crops
   end
 
   # Crop.create_from_csv(row)
@@ -224,10 +219,10 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   # - parent (name, optional)
   # - scientific name (optional, can be picked up from parent if it has one)
 
-  def Crop.create_from_csv(row)
+  def self.create_from_csv(row)
     name, en_wikipedia_url, parent, scientific_names, alternate_names = row
 
-    cropbot = Member.find_by_login_name('cropbot')
+    cropbot = Member.find_by(login_name: 'cropbot')
     raise "cropbot account not found: run rake db:seed" unless cropbot
 
     crop = Crop.find_or_create_by(name: name)
@@ -237,7 +232,7 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     )
 
     if parent
-      parent = Crop.find_by_name(parent)
+      parent = Crop.find_by(name: parent)
       if parent
         crop.update_attributes(parent_id: parent.id)
       else
@@ -252,66 +247,58 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   def add_scientific_names_from_csv(scientific_names)
     names_to_add = []
     if !scientific_names.blank? # i.e. we actually passed something in, which isn't a given
-      names_to_add = scientific_names.split(%r{,\s*})
-    elsif parent && parent.scientific_names.size > 0 # pick up from parent
-      names_to_add = parent.scientific_names.map { |s| s.name }
+      names_to_add = scientific_names.split(/,\s*/)
+    elsif parent && !parent.scientific_names.empty? # pick up from parent
+      names_to_add = parent.scientific_names.map(&:name)
     else
       logger.warn("Warning: no scientific name (not even on parent crop) for #{self}")
     end
 
-    cropbot = Member.find_by_login_name('cropbot')
+    cropbot = Member.find_by(login_name: 'cropbot')
 
-    if names_to_add.size > 0
-      raise "cropbot account not found: run rake db:seed" unless cropbot
+    return if names_to_add.empty?
+    raise "cropbot account not found: run rake db:seed" unless cropbot
 
-      add_names_to_list(names_to_add, 'scientific')
-    end
+    add_names_to_list(names_to_add, 'scientific')
   end
 
   def add_alternate_names_from_csv(alternate_names)
-    cropbot = Member.find_by_login_name('cropbot')
+    # i.e. we actually passed something in, which isn't a given
+    return if alternate_names.blank?
 
-    names_to_add = []
-
-    if !alternate_names.blank? # i.e. we actually passed something in, which isn't a given
-      raise "cropbot account not found: run rake db:seed" unless cropbot
-
-      names_to_add = alternate_names.split(%r{,\s*})
-      add_names_to_list(names_to_add, 'alternate')
-    end
+    cropbot = Member.find_by!(login_name: 'cropbot')
+    names_to_add = alternate_names.split(/,\s*/)
+    add_names_to_list(names_to_add, 'alternate')
+  rescue
+    raise "cropbot account not found: run rake db:seed" unless cropbot
   end
 
   def rejection_explanation
-    if reason_for_rejection == "other"
-      return rejection_notes
-    else
-      return reason_for_rejection
-    end
+    return rejection_notes if reason_for_rejection == "other"
+    reason_for_rejection
   end
 
   # Crop.search(string)
   def self.search(query)
     if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
       search_str = query.nil? ? "" : query.downcase
-      response = __elasticsearch__.search({
-                                            # Finds documents which match any field, but uses the _score from
-                                            # the best field insead of adding up _score from each field.
-                                            query: {
-                                              multi_match: {
-                                                query: "#{search_str}",
-                                                analyzer: "standard",
-                                                fields: ["name",
-                                                         "scientific_names.scientific_name",
-                                                         "alternate_names.name"]
-                                              }
-                                            },
-                                            filter: {
-                                              term: { approval_status: "approved" }
-                                            },
-                                            size: 50
-                                          }
+      response = __elasticsearch__.search( # Finds documents which match any field, but uses the _score from
+        # the best field insead of adding up _score from each field.
+        query: {
+          multi_match: {
+            query: search_str.to_s,
+            analyzer: "standard",
+            fields: ["name",
+                     "scientific_names.scientific_name",
+                     "alternate_names.name"]
+          }
+        },
+        filter: {
+          term: { approval_status: "approved" }
+        },
+        size: 50
       )
-      return response.records.to_a
+      response.records.to_a
     else
       # if we don't have elasticsearch, just do a basic SQL query.
       # also, make sure it's an actual array not an activerecord
@@ -322,16 +309,20 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
 
       # we want to make sure that exact matches come first, even if not
       # using elasticsearch (eg. in development)
-      exact_match = Crop.approved.find_by_name(query)
+      exact_match = Crop.approved.find_by(name: query)
       if exact_match
         matches.delete(exact_match)
         matches.unshift(exact_match)
       end
 
-      return matches
+      matches
     end
   end
 
+  def self.case_insensitive_name(name)
+    where(["lower(name) = :value", { value: name.downcase }])
+  end
+
   private
 
   def add_names_to_list(names_to_add, list_name)
@@ -345,48 +336,42 @@ class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
   end
 
   def create_crop_in_list(list_name, name)
-    cropbot = Member.find_by_login_name('cropbot')
+    cropbot = Member.find_by(login_name: 'cropbot')
     create_hash = {
-      creator_id: "#{cropbot.id}",
+      creator_id: cropbot.id.to_s,
       name: name
     }
-    self.send("#{list_name}_names").create(create_hash)
+    send("#{list_name}_names").create(create_hash)
   end
 
   def name_already_exists(list_name, name)
-    self.send("#{list_name}_names").exists?(name: name)
+    send("#{list_name}_names").exists?(name: name)
   end
 
   def count_uses_of_property(col_name)
-    data = Hash.new(0)
-    plantings.each do |p|
-      if !p.send("#{col_name}").blank?
-        data[p.send("#{col_name}")] += 1
-      end
-    end
-    data
+    plantings.unscoped
+      .where(crop_id: id)
+      .where.not(col_name => nil)
+      .group(col_name)
+      .count
   end
 
   # Custom validations
 
   def approval_status_cannot_be_changed_again
     previous = previous_changes.include?(:approval_status) ? previous_changes.approval_status : {}
-    if previous.include?(:rejected) || previous.include?(:approved)
-      errors.add(:approval_status, "has already been set to #{approval_status}")
-    end
+    return unless previous.include?(:rejected) || previous.include?(:approved)
+    errors.add(:approval_status, "has already been set to #{approval_status}")
   end
 
   def must_be_rejected_if_rejected_reasons_present
-    unless rejected?
-      if reason_for_rejection.present? || rejection_notes.present?
-        errors.add(:approval_status, "must be rejected if a reason for rejection is present")
-      end
-    end
+    return if rejected?
+    return unless reason_for_rejection.present? || rejection_notes.present?
+    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
   end
 
   def must_have_meaningful_reason_for_rejection
-    if reason_for_rejection == "other" && rejection_notes.blank?
-      errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
-    end
+    return unless reason_for_rejection == "other" && rejection_notes.blank?
+    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
   end
 end

app/models/follow.rb

@@ -5,10 +5,10 @@ class Follow < ActiveRecord::Base
 
   after_create do
     Notification.create(
-      recipient_id: self.followed_id,
-      sender_id: self.follower_id,
-      subject: "#{self.follower.login_name} is now following you",
-      body: "#{self.follower.login_name} just followed you on #{ENV["GROWSTUFF_SITE_NAME"]}. "
+      recipient_id: followed_id,
+      sender_id: follower_id,
+      subject: "#{follower.login_name} is now following you",
+      body: "#{follower.login_name} just followed you on #{ENV['GROWSTUFF_SITE_NAME']}. "
     )
   end
 end

app/models/forum.rb

@@ -6,6 +6,6 @@ class Forum < ActiveRecord::Base
   belongs_to :owner, class_name: "Member"
 
   def to_s
-    return name
+    name
   end
 end

app/models/garden.rb

@@ -1,23 +1,13 @@
 class Garden < ActiveRecord::Base
-  include Geocodable
   extend FriendlyId
+  include Geocodable
+  include PhotoCapable
   friendly_id :garden_slug, use: [:slugged, :finders]
 
   belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id'
   has_many :plantings, -> { order(created_at: :desc) }, dependent: :destroy
   has_many :crops, through: :plantings
 
-  has_and_belongs_to_many :photos
-
-  before_destroy do |garden|
-    photolist = garden.photos.to_a # save a temp copy of the photo list
-    garden.photos.clear # clear relationship b/w garden and photo
-
-    photolist.each do |photo|
-      photo.destroy_if_unused
-    end
-  end
-
   # set up geocoding
   geocoded_by :location
   after_validation :geocode
@@ -40,7 +30,8 @@ class Garden < ActiveRecord::Base
   validates :area,
     numericality: {
       only_integer: false,
-      greater_than_or_equal_to: 0 },
+      greater_than_or_equal_to: 0
+    },
     allow_nil: true
 
   AREA_UNITS_VALUES = {
@@ -48,7 +39,7 @@ class Garden < ActiveRecord::Base
     "square feet" => "square foot",
     "hectares" => "hectare",
     "acres" => "acre"
-  }
+  }.freeze
   validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
                                      message: "%{value} is not a valid area unit" },
                         allow_nil: true,
@@ -57,16 +48,12 @@ class Garden < ActiveRecord::Base
   after_validation :cleanup_area
 
   def cleanup_area
-    if area == 0
-      self.area = nil
-    end
-    if area.blank?
-      self.area_unit = nil
-    end
+    self.area = nil if area && area.zero?
+    self.area_unit = nil if area.blank?
   end
 
   def garden_slug
-    "#{owner.login_name}-#{name}".downcase.gsub(' ', '-')
+    "#{owner.login_name}-#{name}".downcase.tr(' ', '-')
   end
 
   # featured plantings returns the most recent 4 plantings for a garden,
@@ -76,13 +63,13 @@ class Garden < ActiveRecord::Base
     seen_crops = []
 
     plantings.each do |p|
-      if (!seen_crops.include?(p.crop))
+      unless seen_crops.include?(p.crop)
         unique_plantings.push(p)
         seen_crops.push(p.crop)
       end
     end
 
-    return unique_plantings[0..3]
+    unique_plantings[0..3]
   end
 
   def to_s
@@ -92,15 +79,15 @@ class Garden < ActiveRecord::Base
   # When you mark a garden as inactive, all the plantings in it should be
   # marked as finished.  This automates that.
   def mark_inactive_garden_plantings_as_finished
-    if (active == false)
-      plantings.current.each do |p|
-        p.finished = true
-        p.save
-      end
+    return unless active == false
+
+    plantings.current.each do |p|
+      p.finished = true
+      p.save
     end
   end
 
   def default_photo
-    return photos.first
+    photos.first
   end
 end

app/models/harvest.rb

@@ -1,22 +1,13 @@
 class Harvest < ActiveRecord::Base
-  include ActionView::Helpers::NumberHelper
   extend FriendlyId
+  include ActionView::Helpers::NumberHelper
+  include PhotoCapable
   friendly_id :harvest_slug, use: [:slugged, :finders]
 
   belongs_to :crop
   belongs_to :owner, class_name: 'Member'
   belongs_to :plant_part
-
-  has_and_belongs_to_many :photos
-
-  before_destroy do |harvest|
-    photolist = harvest.photos.to_a # save a temp copy of the photo list
-    harvest.photos.clear # clear relationship b/w harvest and photo
-
-    photolist.each do |photo|
-      photo.destroy_if_unused
-    end
-  end
+  belongs_to :planting
 
   default_scope { order('created_at DESC') }
 
@@ -29,7 +20,8 @@ class Harvest < ActiveRecord::Base
   validates :quantity,
     numericality: {
       only_integer: false,
-      greater_than_or_equal_to: 0 },
+      greater_than_or_equal_to: 0
+    },
     allow_nil: true
 
   UNITS_VALUES = {
@@ -43,7 +35,7 @@ class Harvest < ActiveRecord::Base
     "buckets" => "bucket",
     "baskets" => "basket",
     "bushels" => "bushel"
-  }
+  }.freeze
   validates :unit, inclusion: { in: UNITS_VALUES.values,
                                 message: "%{value} is not a valid unit" },
                    allow_nil: true,
@@ -57,7 +49,7 @@ class Harvest < ActiveRecord::Base
     "kg" => "kg",
     "lb" => "lb",
     "oz" => "oz"
-  }
+  }.freeze
   validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
                                        message: "%{value} is not a valid unit" },
                           allow_nil: true,
@@ -70,67 +62,61 @@ class Harvest < ActiveRecord::Base
   # we're storing the harvest weight in kilograms in the db too
   # to make data manipulation easier
   def set_si_weight
-    if self.weight_unit != nil
-      weight_string = "#{self.weight_quantity} #{self.weight_unit}"
-      self.si_weight = Unit.new(weight_string).convert_to("kg").to_s("%0.3f").delete(" kg").to_f
-    end
+    return if weight_unit.nil?
+    weight_string = "#{weight_quantity} #{weight_unit}"
+    self.si_weight = Unit.new(weight_string).convert_to("kg").to_s("%0.3f").delete(" kg").to_f
   end
 
   def cleanup_quantities
-    if quantity == 0
-      self.quantity = nil
-    end
-
-    if quantity.blank?
-      self.unit = nil
-    end
-
-    if weight_quantity == 0
-      self.weight_quantity = nil
-    end
-
-    if weight_quantity.blank?
-      self.weight_unit = nil
-    end
+    self.quantity = nil if quantity && quantity.zero?
+    self.unit = nil if quantity.blank?
+    self.weight_quantity = nil if weight_quantity && weight_quantity.zero?
+    self.weight_unit = nil if weight_quantity.blank?
   end
 
   def harvest_slug
-    "#{owner.login_name}-#{crop}".downcase.gsub(' ', '-')
+    "#{owner.login_name}-#{crop}".downcase.tr(' ', '-')
   end
 
   # stringify as "beet in Skud's backyard" or similar
   def to_s
     # 50 individual apples, weighing 3lb
     # 2 buckets of apricots, weighing 10kg
-    string = ''
-    if self.quantity
-      string += "#{number_to_human(self.quantity.to_s, strip_insignificant_zeros: true)} "
-      string += if self.unit == 'individual'
-                  'individual '
-                elsif self.quantity == 1
-                  "#{self.unit} of "
-                else
-                  "#{self.unit.pluralize} of "
-                end
+    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+  end
+
+  def quantity_to_human
+    return number_to_human(quantity.to_s, strip_insignificant_zeros: true) if quantity
+    ""
+  end
+
+  def unit_to_human
+    return "" unless quantity
+    if unit == 'individual'
+      'individual'
+    elsif quantity == 1
+      "#{unit} of"
+    else
+      "#{unit.pluralize} of"
     end
+  end
 
-    string += if self.unit != 'individual' # buckets of apricot*s*
-                "#{self.crop.name.pluralize}"
-              elsif self.quantity == 1
-                "#{self.crop.name}"
-              else
-                "#{self.crop.name.pluralize}"
-              end
+  def weight_to_human
+    return "" unless weight_quantity
+    "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
+  end
 
-    if self.weight_quantity
-      string += " weighing #{number_to_human(self.weight_quantity, strip_insignificant_zeros: true)}"\
-        " #{self.weight_unit}"
-    end
-
-    return string
+  def crop_name_to_human
+    if unit != 'individual' # buckets of apricot*s*
+      crop.name.pluralize
+    elsif quantity == 1
+      crop.name
+    else
+      crop.name.pluralize
+    end.to_s
   end
 
   def default_photo
-    return photos.first || crop.default_photo
+    photos.first || crop.default_photo
   end
 end

app/models/like.rb

@@ -0,0 +1,6 @@
+class Like < ActiveRecord::Base
+  belongs_to :member
+  belongs_to :likeable, polymorphic: true
+  validates :member, :likeable, presence: true
+  validates :member, uniqueness: { scope: :likeable }
+end

app/models/member.rb

@@ -14,7 +14,7 @@ class Member < ActiveRecord::Base
   has_many :seeds, foreign_key: 'owner_id'
   has_many :harvests, foreign_key: 'owner_id'
 
-  has_and_belongs_to_many :roles
+  has_and_belongs_to_many :roles # rubocop:disable Rails/HasAndBelongsToMany
 
   has_many :notifications, foreign_key: 'recipient_id'
   has_many :sent_notifications, foreign_key: 'sender_id'
@@ -27,6 +27,8 @@ class Member < ActiveRecord::Base
 
   has_many :photos
 
+  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") }
@@ -57,8 +59,8 @@ class Member < ActiveRecord::Base
   attr_accessor :login
 
   # Requires acceptance of the Terms of Service
-  validates_acceptance_of :tos_agreement, allow_nil: true,
-                                          accept: true
+  validates :tos_agreement, acceptance: { allow_nil: true,
+                                          accept: true }
 
   validates :login_name,
     length: {
@@ -91,23 +93,21 @@ class Member < ActiveRecord::Base
   # allow login via either login_name or email address
   def self.find_first_by_auth_conditions(warden_conditions)
     conditions = warden_conditions.dup
-    if login = conditions.delete(:login)
-      where(conditions).where(["lower(login_name) = :value OR lower(email) = :value", { value: login.downcase }]).first
-    else
-      where(conditions).first
-    end
+    login = conditions.delete(:login)
+    return  where(conditions).login_name_or_email(login).first if login
+    find_by(conditions)
   end
 
   def to_s
-    return login_name
+    login_name
   end
 
-  def has_role?(role_sym)
+  def role?(role_sym)
     roles.any? { |r| r.name.gsub(/\s+/, "_").underscore.to_sym == role_sym }
   end
 
   def current_order
-    orders.where(completed_at: nil).first
+    orders.find_by(completed_at: nil)
   end
 
   # when purchasing a product that gives you a paid account, this method
@@ -116,9 +116,7 @@ class Member < ActiveRecord::Base
   # called by order.update_account, which loops through all order items
   # and does this for each one.
   def update_account_after_purchase(product)
-    if product.account_type
-      account.account_type = product.account_type
-    end
+    account.account_type = product.account_type if product.account_type
     if product.paid_months
       start_date = account.paid_until || Time.zone.now
       account.paid_until = start_date + product.paid_months.months
@@ -126,18 +124,18 @@ class Member < ActiveRecord::Base
     account.save
   end
 
-  def is_paid?
+  def paid?
     if account.account_type.is_permanent_paid
-      return true
+      true
     elsif account.account_type.is_paid && account.paid_until >= Time.zone.now
-      return true
+      true
     else
-      return false
+      false
     end
   end
 
   def auth(provider)
-    return authentications.find_by_provider(provider)
+    authentications.find_by(provider: provider)
   end
 
   # Authenticates against Flickr and returns an object we can use for subsequent api calls
@@ -152,14 +150,13 @@ class Member < ActiveRecord::Base
         @flickr.access_secret = flickr_auth.secret
       end
     end
-    return @flickr
+    @flickr
   end
 
   # Fetches a collection of photos from Flickr
   # Returns a [[page of photos], total] pair.
   # Total is needed for pagination.
   def flickr_photos(page_num = 1, set = nil)
-    result = false
     result = if set
                flickr.photosets.getPhotos(
                  photoset_id: set,
@@ -173,20 +170,17 @@ class Member < ActiveRecord::Base
                  per_page: 30
                )
              end
-    if result
-      return [result.photo, result.total]
-    else
-      return [[], 0]
-    end
+    return [result.photo, result.total] if result
+    [[], 0]
   end
 
   # Returns a hash of Flickr photosets' ids and titles
   def flickr_sets
-    sets = Hash.new
+    sets = {}
     flickr.photosets.getList.each do |p|
       sets[p.title] = p.id
     end
-    return sets
+    sets
   end
 
   def interesting?
@@ -194,22 +188,28 @@ class Member < ActiveRecord::Base
     # Member.confirmed.located as those are required for
     # interestingness, as well.
     return true if plantings.present?
-    return false
+    false
   end
 
-  def Member.interesting
+  def self.login_name_or_email(login)
+    where(["lower(login_name) = :value OR lower(email) = :value", { value: login.downcase }])
+  end
+
+  def self.case_insensitive_login_name(login)
+    where(["lower(login_name) = :value", { value: login.downcase }])
+  end
+
+  def self.interesting
     howmany = 12 # max number to find
     interesting_members = []
     Member.confirmed.located.recently_signed_in.each do |m|
       break if interesting_members.size == howmany
-      if m.interesting?
-        interesting_members.push(m)
-      end
+      interesting_members.push(m) if m.interesting?
     end
-    return interesting_members
+    interesting_members
   end
 
-  def Member.nearest_to(place)
+  def self.nearest_to(place)
     nearby_members = []
     if place
       latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
@@ -217,48 +217,40 @@ class Member < ActiveRecord::Base
         nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) }
       end
     end
-    return nearby_members
+    nearby_members
   end
 
   def update_newsletter_subscription
-    if confirmed_at_changed? && newsletter # just signed up
-      newsletter_subscribe
-    elsif confirmed_at # i.e. after member's confirmed their account
-      if newsletter_changed? # edited member settings
-        if newsletter
-          newsletter_subscribe
-        else
-          newsletter_unsubscribe
-        end
-      end
+    return unless confirmed_at_changed? || newsletter_changed?
+
+    if newsletter
+      newsletter_subscribe if confirmed_at_changed? || confirmed_at && newsletter_changed?
+    elsif confirmed_at
+      newsletter_unsubscribe
     end
   end
 
-  def newsletter_subscribe(testing = false)
-    return true if (Rails.env.test? && !testing)
-    gb = Gibbon::API.new
-    res = gb.lists.subscribe({
-                               id: Growstuff::Application.config.newsletter_list_id,
-                               email: { email: email },
-                               merge_vars: { login_name: login_name },
-                               double_optin: false # they already confirmed their email with us
-                             })
+  def newsletter_subscribe(gb = Gibbon::API.new, testing = false)
+    return true if Rails.env.test? && !testing
+    gb.lists.subscribe(
+      id: Growstuff::Application.config.newsletter_list_id,
+      email: { email: email },
+      merge_vars: { login_name: login_name },
+      double_optin: false # they already confirmed their email with us
+    )
   end
 
-  def newsletter_unsubscribe(testing = false)
-    return true if (Rails.env.test? && !testing)
-    gb = Gibbon::API.new
-    res = gb.lists.unsubscribe({
-                                 id: Growstuff::Application.config.newsletter_list_id,
-                                 email: { email: email }
-                               })
+  def newsletter_unsubscribe(gb = Gibbon::API.new, testing = false)
+    return true if Rails.env.test? && !testing
+    gb.lists.unsubscribe(id: Growstuff::Application.config.newsletter_list_id,
+                         email: { email: email })
   end
 
   def already_following?(member)
-    self.follows.exists?(followed_id: member.id)
+    follows.exists?(followed_id: member.id)
   end
 
   def get_follow(member)
-    self.follows.where(followed_id: member.id).first if already_following?(member)
+    follows.find_by(followed_id: member.id) if already_following?(member)
   end
 end

app/models/notification.rb

@@ -7,23 +7,20 @@ class Notification < ActiveRecord::Base
 
   default_scope { order('created_at DESC') }
   scope :unread, -> { where(read: false) }
+  scope :by_recipient, ->(recipient) { where(recipient_id: recipient) }
 
   before_create :replace_blank_subject
   after_create :send_email
 
   def self.unread_count
-    self.unread.size
+    unread.size
   end
 
   def replace_blank_subject
-    if self.subject.nil? or self.subject =~ /^\s*$/
-      self.subject = "(no subject)"
-    end
+    self.subject = "(no subject)" if subject.nil? || subject =~ /^\s*$/
   end
 
   def send_email
-    if self.recipient.send_notification_email
-      Notifier.notify(self).deliver_later
-    end
+    Notifier.notify(self).deliver_now! if recipient.send_notification_email
   end
 end

app/models/order.rb

@@ -12,27 +12,27 @@ class Order < ActiveRecord::Base
 
   before_save :standardize_referral_code
 
+  scope :by_member, ->(member) { where(member: member) }
+
   # total price of an order
   def total
     sum = 0
-    for i in order_items do
+    order_items.each do |i|
       subtotal = i.price * i.quantity
       sum += subtotal
     end
-    return sum
+    sum
   end
 
   # return items in the format ActiveMerchant/PayPal want them
   def activemerchant_items
     items = []
     order_items.each do |i|
-      items.push({
-                   name: i.product.name,
-                   quantity: i.quantity,
-                   amount: i.price
-                 })
+      items.push(name: i.product.name,
+                 quantity: i.quantity,
+                 amount: i.price)
     end
-    return items
+    items
   end
 
   # record the paypal details for reference
@@ -40,7 +40,7 @@ class Order < ActiveRecord::Base
     self.paypal_express_token = token
     details = EXPRESS_GATEWAY.details_for(token)
     self.paypal_express_payer_id = details.payer_id
-    self.save
+    save
   end
 
   # when an order is completed, we update the member's account to mark
@@ -54,42 +54,32 @@ class Order < ActiveRecord::Base
   # removes whitespace and forces to uppercase (we're somewhat liberal
   # in what we accept, but we clean it up anyway.)
   def standardize_referral_code
-    if referral_code
-      self.referral_code = referral_code.upcase.gsub /\s/, ''
-    end
+    self.referral_code = referral_code.upcase.gsub(/\s/, '') if referral_code
   end
 
   # search orders (used by admin/orders)
   # usage: Order.search({ :by => 'member', :for => 'Skud' })
   # can search by: member, order_id, paypal_token, paypal_payer_id,
-  def Order.search(args = {})
+  def self.search(args = {})
     if args[:for]
       case args[:by]
       when "member"
-        member = Member.find_by_login_name(args[:for])
-        if member
-          return member.orders
-        end
+        member = Member.find_by(login_name: args[:for])
+        return member.orders if member
       when "order_id"
-        order = Order.find_by_id(args[:for])
-        if order
-          return [order]
-        end
+        order = Order.find_by(id: args[:for])
+        return [order] if order
       when "paypal_token"
-        order = Order.find_by_paypal_express_token(args[:for])
-        if order
-          return [order]
-        end
+        order = Order.find_by(paypal_express_token: args[:for])
+        return [order] if order
       when "paypal_payer_id"
-        order = Order.find_by_paypal_express_payer_id(args[:for])
-        if order
-          return [order]
-        end
+        order = Order.find_by(paypal_express_payer_id: args[:for])
+        return [order] if order
       when "referral_code"
         # coerce to uppercase
         return Order.where(referral_code: args[:for].upcase)
       end
     end
-    return []
+    []
   end
 end

app/models/order_item.rb

@@ -3,13 +3,10 @@ class OrderItem < ActiveRecord::Base
   belongs_to :product
 
   validate :price_must_be_greater_than_minimum
-
-  validates_uniqueness_of :order_id, message: "may only have one item."
+  validates :order_id, uniqueness: { message: "may only have one item." }
 
   def price_must_be_greater_than_minimum
     @product = Product.find(product_id)
-    if price < @product.min_price
-      errors.add(:price, "must be greater than the product's minimum value")
-    end
+    errors.add(:price, "must be greater than the product's minimum value") if price < @product.min_price
   end
 end

app/models/photo.rb

@@ -1,22 +1,25 @@
+require_relative '../constants/photo_models.rb'
 class Photo < ActiveRecord::Base
   belongs_to :owner, class_name: 'Member'
 
-  has_and_belongs_to_many :plantings
-  has_and_belongs_to_many :harvests
-  has_and_belongs_to_many :gardens
-  before_destroy do |photo|
-    photo.plantings.clear
-    photo.harvests.clear
-    photo.gardens.clear
+  Growstuff::Constants::PhotoModels.relations.each do |relation|
+    has_and_belongs_to_many relation.to_sym # rubocop:disable Rails/HasAndBelongsToMany
   end
 
+  before_destroy { all_associations.clear }
+
   default_scope { order("created_at desc") }
 
-  # remove photos that aren't used by anything
-  def destroy_if_unused
-    unless plantings.size > 0 or harvests.size > 0 or gardens.size > 0
-      self.destroy
+  def all_associations
+    associations = []
+    Growstuff::Constants::PhotoModels.relations.each do |association_name|
+      associations << send(association_name.to_s).to_a
     end
+    associations.flatten!
+  end
+
+  def destroy_if_unused
+    destroy if all_associations.empty?
   end
 
   # This is split into a side-effect free method and a side-effecting method
@@ -24,9 +27,9 @@ class Photo < ActiveRecord::Base
   def flickr_metadata
     flickr = owner.flickr
     info = flickr.photos.getInfo(photo_id: flickr_photo_id)
-    licenses = flickr.photos.licenses.getInfo()
+    licenses = flickr.photos.licenses.getInfo
     license = licenses.find { |l| l.id == info.license }
-    return {
+    {
       title: info.title || "Untitled",
       license_name: license.name,
       license_url: license.url,
@@ -37,6 +40,6 @@ class Photo < ActiveRecord::Base
   end
 
   def set_flickr_metadata
-    self.update_attributes(flickr_metadata)
+    update_attributes(flickr_metadata)
   end
 end

app/models/plant_part.rb

@@ -6,7 +6,7 @@ class PlantPart < ActiveRecord::Base
   has_many :crops, -> { uniq }, through: :harvests
 
   def to_s
-    return name
+    name
   end
 
   # Postgres complains if the ORDER BY clause of a SELECT DISTINCT query is
@@ -18,6 +18,6 @@ class PlantPart < ActiveRecord::Base
   # associated to plant parts will not be sorted in the same order as crops
   # on the rest of the site.
   def crops
-    return super.reorder('name')
+    super.reorder('name')
   end
 end

app/models/planting.rb

@@ -1,21 +1,12 @@
 class Planting < ActiveRecord::Base
   extend FriendlyId
+  include PhotoCapable
   friendly_id :planting_slug, use: [:slugged, :finders]
 
   belongs_to :garden
   belongs_to :owner, class_name: 'Member', counter_cache: true
   belongs_to :crop, counter_cache: true
-
-  has_and_belongs_to_many :photos
-
-  before_destroy do |planting|
-    photolist = planting.photos.to_a # save a temp copy of the photo list
-    planting.photos.clear # clear relationship b/w planting and photo
-
-    photolist.each do |photo|
-      photo.destroy_if_unused
-    end
-  end
+  has_many :harvests, -> { order(harvested_at: :desc) }, dependent: :destroy
 
   default_scope { order("created_at desc") }
   scope :finished, -> { where(finished: true) }
@@ -73,25 +64,33 @@ class Planting < ActiveRecord::Base
   end
 
   def planting_slug
-    "#{owner.login_name}-#{garden}-#{crop}".downcase.gsub(' ', '-')
+    if garden.present? && crop.present?
+      "#{owner.login_name}-#{garden.name}-#{crop.name}"
+    elsif garden.present?
+      "#{owner.login_name}-#{garden.name}-null"
+    elsif crop.present?
+      "#{owner.login_name}-null-#{crop.name}"
+    else
+      "#{owner.login_name}-null-null"
+    end.downcase.gsub(' ', '-')
   end
 
   # location = garden owner + garden name, i.e. "Skud's backyard"
   def location
-    return "#{garden.owner.login_name}'s #{garden}"
+    I18n.t("gardens.location", garden: garden.name, owner: garden.owner.login_name)
   end
 
   # stringify as "beet in Skud's backyard" or similar
   def to_s
-    self.crop_name + " in " + self.location
+    I18n.t('plantings.string', crop: crop.name, garden: garden.name, owner: owner)
   end
 
   def default_photo
-    return photos.first
+    photos.first
   end
 
   def interesting?
-    return photos.present?
+    photos.present?
   end
 
   def calculate_days_before_maturity(planting, crop)
@@ -113,6 +112,17 @@ class Planting < ActiveRecord::Base
     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)
 
@@ -146,6 +156,6 @@ class Planting < ActiveRecord::Base
       interesting_plantings.push(p)
     end
 
-    return interesting_plantings
+    interesting_plantings
   end
 end

app/models/post.rb

@@ -1,10 +1,11 @@
 class Post < ActiveRecord::Base
   extend FriendlyId
+  include Likeable
   friendly_id :author_date_subject, use: [:slugged, :finders]
   belongs_to :author, class_name: 'Member'
   belongs_to :forum
   has_many :comments, dependent: :destroy
-  has_and_belongs_to_many :crops
+  has_and_belongs_to_many :crops # rubocop:disable Rails/HasAndBelongsToMany
   before_destroy { |post| post.crops.clear }
   after_save :update_crops_posts_association
   # also has_many notifications, but kinda meaningless to get at them
@@ -12,27 +13,26 @@ class Post < ActiveRecord::Base
 
   after_create do
     recipients = []
-    sender = self.author.id
-    self.body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_REGEX) do |m|
+    sender = author.id
+    body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_REGEX) do |_m|
       # find member case-insensitively and add to list of recipients
-      member = Member.where('lower(login_name) = ?', $1.downcase).first
+      member = Member.case_insensitive_login_name(Regexp.last_match(1)).first
       recipients << member if member && !recipients.include?(member)
     end
-    self.body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_AT_REGEX) do |m|
+    body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_AT_REGEX) do |_m|
       # find member case-insensitively and add to list of recipients
-      member = Member.where('lower(login_name) = ?', $1[1..-1].downcase).first
+      member = Member.case_insensitive_login_name(Regexp.last_match(1)[1..-1]).first
       recipients << member if member && !recipients.include?(member)
     end
     # don't send notifications to yourself
-    recipients.map { |r| r.id }.each do |recipient|
-      if recipient != sender
-        Notification.create(
-          recipient_id: recipient,
-          sender_id: sender,
-          subject: "#{self.author} mentioned you in their post #{self.subject}",
-          body: self.body,
-        )
-      end
+    recipients.map(&:id).each do |recipient|
+      next unless recipient != sender
+      Notification.create(
+        recipient_id: recipient,
+        sender_id: sender,
+        subject: "#{author} mentioned you in their post #{subject}",
+        body: body
+      )
     end
   end
 
@@ -47,22 +47,22 @@ class Post < ActiveRecord::Base
   def author_date_subject
     # slugs are created before created_at is set
     time = created_at || Time.zone.now
-    "#{author.login_name} #{time.strftime("%Y%m%d")} #{subject}"
+    "#{author.login_name} #{time.strftime('%Y%m%d')} #{subject}"
   end
 
   def comment_count
-    self.comments.size
+    comments.size
   end
 
   # return the timestamp of the most recent activity on this post
   # i.e. the time of the most recent comment, or of the post itself if
   # there are no comments.
   def recent_activity
-    self.comments.present? ? self.comments.reorder('created_at DESC').first.created_at : self.created_at
+    comments.present? ? comments.reorder('created_at DESC').first.created_at : created_at
   end
 
   # return posts sorted by recent activity
-  def Post.recently_active
+  def self.recently_active
     Post.all.sort do |a, b|
       b.recent_activity <=> a.recent_activity
     end
@@ -71,13 +71,13 @@ class Post < ActiveRecord::Base
   private
 
   def update_crops_posts_association
-    self.crops.destroy_all
+    crops.destroy_all
     # look for crops mentioned in the post. eg. [tomato](crop)
-    self.body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |m|
+    body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |_m|
       # find crop case-insensitively
-      crop = Crop.where('lower(name) = ?', $1.downcase).first
+      crop = Crop.case_insensitive_name(Regexp.last_match(1)).first
       # create association
-      self.crops << crop if crop && !self.crops.include?(crop)
+      crops << crop if crop && !crops.include?(crop)
     end
   end
 end

app/models/product.rb

@@ -1,11 +1,12 @@
 class Product < ActiveRecord::Base
-  has_and_belongs_to_many :orders
+  has_and_belongs_to_many :orders # rubocop:disable Rails/HasAndBelongsToMany
   belongs_to :account_type
 
   validates :paid_months,
     numericality: {
       only_integer: true,
-      greater_than_or_equal_to: 0 },
+      greater_than_or_equal_to: 0
+    },
     allow_nil: true
 
   def to_s

app/models/role.rb

@@ -2,7 +2,7 @@ class Role < ActiveRecord::Base
   extend FriendlyId
   friendly_id :name, use: [:slugged, :finders]
 
-  has_and_belongs_to_many :members
+  has_and_belongs_to_many :members # rubocop:disable Rails/HasAndBelongsToMany
 
   class << self
     [:crop_wranglers, :admins].each do |method|

app/models/seed.rb

@@ -1,5 +1,6 @@
 class Seed < ActiveRecord::Base
   extend FriendlyId
+  include PhotoCapable
   friendly_id :seed_slug, use: [:slugged, :finders]
 
   belongs_to :crop
@@ -13,22 +14,25 @@ class Seed < ActiveRecord::Base
   validates :quantity,
     numericality: {
       only_integer: true,
-      greater_than_or_equal_to: 0 },
+      greater_than_or_equal_to: 0
+    },
     allow_nil: true
   validates :days_until_maturity_min,
     numericality: {
       only_integer: true,
-      greater_than_or_equal_to: 0 },
+      greater_than_or_equal_to: 0
+    },
     allow_nil: true
   validates :days_until_maturity_max,
     numericality: {
       only_integer: true,
-      greater_than_or_equal_to: 0 },
+      greater_than_or_equal_to: 0
+    },
     allow_nil: true
 
   scope :tradable, -> { where("tradable_to != 'nowhere'") }
 
-  TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally)
+  TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
   validates :tradable_to, inclusion: { in: TRADABLE_TO_VALUES,
                                        message: "You may only trade seed nowhere, "\
                                                 "locally, nationally, or internationally" },
@@ -39,7 +43,8 @@ class Seed < ActiveRecord::Base
     'certified organic',
     'non-certified organic',
     'conventional/non-organic',
-    'unknown']
+    'unknown'
+  ].freeze
   validates :organic, inclusion: { in: ORGANIC_VALUES,
                                    message: "You must say whether the seeds "\
                                              "are organic or not, or that you don't know" },
@@ -50,24 +55,25 @@ class Seed < ActiveRecord::Base
     'certified GMO-free',
     'non-certified GMO-free',
     'GMO',
-    'unknown']
+    'unknown'
+  ].freeze
   validates :gmo, inclusion: { in: GMO_VALUES,
                                message: "You must say whether the seeds are "\
                                         "genetically modified or not, or that you don't know" },
                   allow_nil: false,
                   allow_blank: false
 
-  HEIRLOOM_VALUES = %w(heirloom hybrid unknown)
+  HEIRLOOM_VALUES = %w(heirloom hybrid unknown).freeze
   validates :heirloom, inclusion: { in: HEIRLOOM_VALUES,
                                     message: "You must say whether the seeds are heirloom, hybrid, or unknown" },
                        allow_nil: false,
                        allow_blank: false
 
   def tradable?
-    if self.tradable_to == 'nowhere'
-      return false
+    if tradable_to == 'nowhere'
+      false
     else
-      return true
+      true
     end
   end
 
@@ -75,26 +81,28 @@ class Seed < ActiveRecord::Base
     # 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
-    return true
+    true
   end
 
   # Seed.interesting
   # returns a list of interesting seeds, for use on the homepage etc
-  def Seed.interesting
+  def self.interesting
     howmany = 12 # max number to find
     interesting_seeds = []
 
     Seed.tradable.each do |s|
       break if interesting_seeds.size == howmany
-      if s.interesting?
-        interesting_seeds.push(s)
-      end
+      interesting_seeds.push(s) if s.interesting?
     end
 
-    return interesting_seeds
+    interesting_seeds
   end
 
   def seed_slug
-    "#{owner.login_name}-#{crop}".downcase.gsub(' ', '-')
+    "#{owner.login_name}-#{crop}".downcase.tr(' ', '-')
+  end
+
+  def to_s
+    I18n.t('seeds.string', crop: crop.name, owner: owner)
   end
 end

app/validators/approved_validator.rb

@@ -1,7 +1,5 @@
 class ApprovedValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless record.crop.try(:approved?)
-      record.errors[attribute] << (options[:message] || 'must be approved')
-    end
+    record.errors[attribute] << (options[:message] || 'must be approved') unless record.crop.try(:approved?)
   end
 end

app/views/account_types/_form.html.haml

@@ -1,7 +1,9 @@
 = form_for @account_type do |f|
   - if @account_type.errors.any?
     #error_explanation
-      %h2= "#{pluralize(@account_type.errors.size, "error")} prohibited this account_type from being saved:"
+      %h2
+        = pluralize(@account_type.errors.size, "error")
+        prohibited this account_type from being saved:
       %ul
         - @account_type.errors.full_messages.each do |msg|
           %li= msg

app/views/account_types/edit.html.haml

@@ -1,4 +1,4 @@
--content_for :title, "Editing account type"
+- content_for :title, "Editing account type"
 
 = render 'form'
 

app/views/account_types/index.html.haml

@@ -16,7 +16,7 @@
       %td= account_type.is_permanent_paid
       %td= link_to 'Show', account_type
       %td= link_to 'Edit', edit_account_type_path(account_type)
-      %td= link_to 'Destroy', account_type, :method => :delete, :data => { :confirm => 'Are you sure?' }
+      %td= link_to 'Destroy', account_type, method: :delete, data: { confirm: 'Are you sure?' }
 
 %br
 

app/views/account_types/show.html.haml

@@ -12,6 +12,6 @@
 
 = link_to 'Edit', edit_account_type_path(@account_type)
 \|
-= link_to 'Delete', @account_type, :method => :delete, :data => { :confirm => 'Are you sure?' }
+= link_to 'Delete', @account_type, method: :delete, data: { confirm: 'Are you sure?' }
 \|
 = link_to 'Back', account_types_path

app/views/accounts/_form.html.haml

@@ -1,7 +1,9 @@
 = form_for @account do |f|
   - if @account.errors.any?
     #error_explanation
-      %h2= "#{pluralize(@account.errors.size, "error")} prohibited this account from being saved:"
+      %h2
+        = pluralize(@account.errors.size, "error")
+        prohibited this account from being saved:
       %ul
         - @account.errors.full_messages.each do |msg|
           %li= msg

app/views/accounts/index.html.haml

@@ -16,7 +16,7 @@
       %td= account.paid_until
       %td= link_to 'Show', account
       %td= link_to 'Edit', edit_account_path(account)
-      %td= link_to 'Destroy', account, :method => :delete, :data => { :confirm => 'Are you sure?' }
+      %td= link_to 'Destroy', account, method: :delete, data: { confirm: 'Are you sure?' }
 
 %br
 

app/views/admin/index.html.haml

@@ -1,4 +1,4 @@
--content_for :title, 'Admin'
+- content_for :title, 'Admin'
 
 %h2 Manage
 
@@ -12,4 +12,4 @@
 
 %h2 Orders
 
-=render "admin/orders/searchform"
+= render "admin/orders/searchform"

app/views/admin/newsletter.html.haml

@@ -1,4 +1,4 @@
--content_for :title, 'Newsletter subscribers'
+- content_for :title, 'Newsletter subscribers'
 
 %p
 - @members.each do |m|

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

@@ -1,5 +1,8 @@
-= form_tag(url_for(:controller => 'admin/orders', :action => 'search'), :method => :get, :class => 'form-inline') do
-  = label_tag :distance, "Search orders:", :class => 'control-label'
+= form_tag(url_for(controller: 'admin/orders', action: 'search'), method: :get, class: 'form-inline') do
+  = label_tag :distance, "Search orders:", class: 'control-label'
   = text_field_tag :search_text
-  = select_tag :search_by, options_for_select({'Member' => 'member', 'Referral code' => 'referral_code', 'Order ID' => 'order_id', 'Paypal Token' => 'paypal_token', 'Paypal Payer ID' => 'paypal_payer_id' })
-  = submit_tag "Search", :class => 'btn btn-primary'
+  = select_tag :search_by,
+    options_for_select('Member': 'member', 'Referral code': 'referral_code',
+                       'Order ID': 'order_id', 'Paypal Token': 'paypal_token',
+                       'Paypal Payer ID': 'paypal_payer_id')
+  = submit_tag "Search", class: 'btn btn-primary'

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

@@ -1,3 +1,3 @@
--content_for :title, 'Admin Orders'
+- content_for :title, 'Admin Orders'
 
-=render "admin/orders/searchform"
+= render "admin/orders/searchform"

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

@@ -1,6 +1,6 @@
--content_for :title, 'Search Orders'
+- content_for :title, 'Search Orders'
 
-=render "admin/orders/searchform"
+= render "admin/orders/searchform"
 
 - unless @orders.empty?
   %h2
@@ -28,7 +28,7 @@
         %td
           = order.referral_code
         %td
-          - if order.order_items.size > 0
+          - unless order.order_items.empty?
             - order.order_items.each do |o|
               = o.quantity
               x
@@ -36,4 +36,4 @@
               @
               = price_with_currency(o.price)
               %br/
-        %td= link_to 'Details', order, :class => 'btn btn-default btn-xs'
+        %td= link_to 'Details', order, class: 'btn btn-default btn-xs'

app/views/alternate_names/_form.html.haml

@@ -1,7 +1,9 @@
-= form_for @alternate_name, :html => {:class => 'form-horizontal', :role => "form"} do |f|
+= form_for @alternate_name, html: { class: 'form-horizontal', role: "form" } do |f|
   - if @alternate_name.errors.any?
     #error_explanation
-      %h2= "#{pluralize(@alternate_name.errors.size, "error")} prohibited this alternate_name from being saved:"
+      %h2
+        = pluralize(@alternate_name.errors.size, "error")
+        prohibited this alternate_name from being saved:
       %ul
         - @alternate_name.errors.full_messages.each do |msg|
           %li= msg
@@ -9,19 +11,22 @@
   %p
     %span.help-block
       For detailed crop wrangling guidelines, please consult the
-      =link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+      = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
       on the Growstuff wiki.
 
   .form-group
-    = f.label :crop_id, :class => 'control-label col-md-2'
+    = f.label :crop_id, class: 'control-label col-md-2'
     .col-md-8
-      = collection_select(:alternate_name, :crop_id, Crop.all, :id, :name, { :selected => @alternate_name.crop_id || @crop.id }, :class => 'form-control')
+      = collection_select(:alternate_name, :crop_id,
+                          Crop.all, :id, :name,
+                          { selected: @alternate_name.crop_id || @crop.id },
+                          class: 'form-control')
 
   .form-group
-    = f.label :name, :class => 'control-label col-md-2'
+    = f.label :name, class: 'control-label col-md-2'
     .col-md-8
-      = f.text_field :name, :class => 'form-control'
+      = f.text_field :name, class: 'form-control'
 
   .form-group
     .form-actions.col-md-offset-2.col-md-8
-      = f.submit 'Save', :class => 'btn btn-primary'
+      = f.submit 'Save', class: 'btn btn-primary'

app/views/alternate_names/index.html.haml

@@ -1,7 +1,7 @@
 - content_for :title, "Listing alternate names"
 
 - if can? :create, AlternateName
-  %p= link_to 'New alternate name', new_alternate_name_path, :class => 'btn btn-primary'
+  %p= link_to 'New alternate name', new_alternate_name_path, class: 'btn btn-primary'
 
 %table
   %tr
@@ -17,7 +17,10 @@
       %td= link_to 'Show', alternate_name
       %td
         - if can? :edit, alternate_name
-          = link_to 'Edit', edit_alternate_name_path(alternate_name), :class => 'btn btn-default btn-xs'
+          = link_to 'Edit', edit_alternate_name_path(alternate_name), class: 'btn btn-default btn-xs'
       %td
         - if can? :destroy, alternate_name
-          = link_to 'Delete', alternate_name, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-default btn-xs'
+          = link_to 'Delete', alternate_name,
+                     method: :delete,
+                     data: { confirm: 'Are you sure?' },
+                     class: 'btn btn-default btn-xs'

app/views/alternate_names/show.html.haml

@@ -7,7 +7,7 @@
 
 %p#notice= notice
 
-= render :partial => 'crops/approval_status_message', :locals => { :crop => @alternate_name.crop }
+= render partial: 'crops/approval_status_message', locals: { crop: @alternate_name.crop }
 
 %p
   %b Alternate name:
@@ -17,6 +17,6 @@
   = link_to @alternate_name.crop, @alternate_name.crop
 
 - if can? :edit, @alternate_name
-  = link_to 'Edit', edit_alternate_name_path(@alternate_name), :class => 'btn btn-default btn-xs'
+  = link_to 'Edit', edit_alternate_name_path(@alternate_name), class: 'btn btn-default btn-xs'
   \|
 = link_to 'Back', alternate_names_path

app/views/comments/_form.html.haml

@@ -1,18 +1,20 @@
-= form_for(@comment, :html => {:class => "form-horizontal", :role => "form"}) do |f|
+= form_for(@comment, html: { class: "form-horizontal", role: "form" }) do |f|
   - if @comment.errors.any?
     #error_explanation
-      %h2= "#{pluralize(@comment.errors.size, "error")} prohibited this comment from being saved:"
+      %h2
+        = pluralize(@comment.errors.size, "error")
+        prohibited this comment from being saved:
       %ul
         - @comment.errors.full_messages.each do |msg|
           %li= msg
 
   .form-group
     = f.label :body, "Your comment:"
-    = f.text_area :body, :rows => 6, :class => 'form-control', :autofocus => 'autofocus'
+    = f.text_area :body, rows: 6, class: 'form-control', autofocus: 'autofocus'
   %span.help-block
-    = render :partial => "shared/markdown_help"
+    = render partial: "shared/markdown_help"
   .actions
-    = f.submit 'Post comment', :class => 'btn btn-primary'
+    = f.submit 'Post comment', class: 'btn btn-primary'
   - if defined?(@post)
     .field
-      = f.hidden_field :post_id, :value => @post.id
+      = f.hidden_field :post_id, value: @post.id

app/views/comments/_single.html.haml

@@ -2,7 +2,7 @@
   .comment
     .row
       .col-md-1
-        = render :partial => "members/avatar", :locals => { :member => comment.author }
+        = render partial: "members/avatar", locals: { member: comment.author }
       .col-md-11
         .comment-meta
           Posted by
@@ -17,11 +17,11 @@
           :growstuff_markdown
             #{ strip_tags comment.body }
 
-        - if can? :edit, comment or can? :destroy, comment
+        - if can?(:edit, comment) || can?(:destroy, comment)
           .comment-actions
             - if can? :edit, comment
-              = link_to 'Edit', edit_comment_path(comment), :class => 'btn btn-default btn-xs'
+              = link_to 'Edit', edit_comment_path(comment), class: 'btn btn-default btn-xs'
             - if can? :destroy, comment
-              = link_to 'Delete', comment, method: :delete, |
-                data: { confirm: 'Are you sure?' }, :class => 'btn btn-default btn-xs'
+              = link_to 'Delete', comment, method: :delete,
+                data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
 

app/views/comments/index.html.haml

@@ -1,6 +1,6 @@
 = content_for :title, "Recent comments"
 
-%div.pagination
+.pagination
   = page_entries_info @comments
   = will_paginate @comments
 
@@ -8,13 +8,13 @@
   %h2
     Comment on
     = link_to comment.post.subject, comment.post
-  = render :partial => "single", :locals => { :comment => comment }
+  = render partial: "single", locals: { comment: comment }
 
-%div.pagination
+.pagination
   = page_entries_info @comments
   = will_paginate @comments
 
 %p
   Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']}
   = succeed "." do
-    = link_to "comments RSS feed", comments_path(:format => 'rss')
+    = link_to "comments RSS feed", comments_path(format: 'rss')

app/views/comments/index.rss.haml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-%rss{:version => 2.0}
+%rss{ version: 2.0 }
   %channel
     %title Recent comments on all posts (#{ENV['GROWSTUFF_SITE_NAME']})
     %link= comments_url
@@ -16,6 +16,6 @@
           :escaped_markdown
             #{ strip_tags comment.body }
 
-        %pubDate= comment.created_at.to_s(:rfc822)
+        %pubdate= comment.created_at.to_s(:rfc822)
         %link= post_url(comment.post)
         %guid= comment_url(comment)

app/views/comments/new.html.haml

@@ -1,7 +1,7 @@
 = content_for :title, "New comment"
 
-= render :partial => "posts/single", :locals => { :post => @post || @comment.post, :subject => true }
+= render partial: "posts/single", locals: { post: @post || @comment.post, subject: true }
 
-= render :partial => "posts/comments", :locals => {:post => @post || @comment.post}
+= render partial: "posts/comments", locals: { post: @post || @comment.post }
 
 = render 'form'

app/views/comments/show.html.haml

@@ -3,15 +3,15 @@
   = tag("meta", property: "og:image", content: avatar_uri(@comment.post.author, 200))
   = tag("meta", property: "og:image:user_generated", content: "true")
   = tag("meta", property: "og:title", content: @comment.post.subject)
-  = tag("meta", property: "og:description", content: strip_tags(@comment.post.body).split(' ')[0..20].join(' '))
+  = tag("meta", property: "og:description", content: og_description(@comment.post.body))
   = tag("meta", property: "og:type", content: "website")
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-= render :partial => "posts/single", :locals => { :post => @comment.post }
+= render partial: "posts/single", locals: { post: @comment.post }
 
 %h2 Showing 1 comment
 
-= render :partial => "single", :locals => { :comment => @comment }
+= render partial: "single", locals: { comment: @comment }
 
-=link_to "View all comments", post_path(@comment.post)
+= link_to "View all comments", post_path(@comment.post)

app/views/crops/_alternate_names.html.haml

@@ -8,9 +8,9 @@
         %li
           = an.name
           - if can? :edit, an
-            = link_to 'Edit', edit_alternate_name_path(an), { :class => 'btn btn-default btn-xs' }
+            = link_to 'Edit', edit_alternate_name_path(an), class: 'btn btn-default btn-xs'
           - if can? :destroy, an
-            = link_to 'Delete', an, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-default btn-xs'
+            = link_to 'Delete', an, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs'
   %p
   - if can? :edit, crop
-    = link_to 'Add', new_alternate_name_path( :crop_id => crop.id ), { :class => 'btn btn-default btn-xs' }
+    = link_to 'Add', new_alternate_name_path(crop_id: crop.id), class: 'btn btn-default btn-xs'

app/views/crops/_find_seeds.html.haml

@@ -1,4 +1,4 @@
-%h4 Find #{ crop.name } seeds
+%h4 Find #{crop.name} seeds
 - if crop.seeds.empty?
   %p
     There are no seeds available to trade on Growstuff right now.
@@ -7,13 +7,16 @@
     - crop.seeds.tradable.each do |seed|
       %li
         = link_to "#{seed.owner} will trade #{seed.tradable_to}.", seed_path(seed)
-        = render :partial => 'members/location', :locals => { :member => seed.owner }
+        = render partial: 'members/location', locals: { member: seed.owner }
   %p
     = link_to "View all #{crop.name} seeds", seeds_by_crop_path(crop)
 %p
-  = link_to "Purchase seeds via Ebay", "http://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{URI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg", target: "_blank", rel: "noopener noreferrer"
+  = link_to "Purchase seeds via Ebay",
+             crop_ebay_seeds_url(crop),
+             target: "_blank",
+             rel: "noopener noreferrer"
 - if crop.approved?
   - if current_member
-    %p= link_to "List #{crop.name} seeds to trade", new_seed_path(:crop_id => crop.id)
+    %p= link_to "List #{crop.name} seeds to trade", new_seed_path(crop_id: crop.id)
   - else
-    = render :partial => 'shared/signin_signup', :locals => { :to => 'list your seeds to trade' }
+    = render partial: 'shared/signin_signup', locals: { to: 'list your seeds to trade' }

app/views/crops/_form.html.haml

@@ -1,7 +1,9 @@
-= form_for @crop, :html => {:class => 'form-horizontal', :role => "form"} do |f|
+= form_for @crop, html: { class: 'form-horizontal', role: "form" } do |f|
   - if @crop.errors.any?
     #error_explanation
-      %h3= "#{pluralize(@crop.errors.size, "error")} prohibited this crop from being saved:"
+      %h3
+        = pluralize(@crop.errors.size, "error")
+        prohibited this crop from being saved:
       %ul
         - @crop.errors.full_messages.each do |msg|
           %li= msg
@@ -11,16 +13,16 @@
     %p
       %span.help-block
         For detailed crop wrangling guidelines, please consult the
-        =link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+        = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
         on the Growstuff wiki.
 
   -# Everyone (wranglers and requesters) sees the basic info section
   %h2 Basic information
 
   .form-group#new_crop
-    = f.label :name, :class => 'control-label col-md-2'
+    = f.label :name, class: 'control-label col-md-2'
     .col-md-8
-      = f.text_field :name, :class => 'form-control'
+      = f.text_field :name, class: 'form-control'
       %span.help-block
         The common name for the crop, in English (required).
         - if can? :wrangle, @crop
@@ -28,87 +30,89 @@
           proper nouns only.
 
   .form-group
-    = f.label :en_wikipedia_url, 'Wikipedia URL', :class => 'control-label col-md-2'
+    = f.label :en_wikipedia_url, 'Wikipedia URL', class: 'control-label col-md-2'
     .col-md-8
-      = f.text_field :en_wikipedia_url, :class => 'form-control', :id => "en_wikipedia_url"
+      = f.text_field :en_wikipedia_url, class: 'form-control', id: "en_wikipedia_url"
       %span.help-block
         Link to the crop's page on the English language Wikipedia (required).
 
   -# Only crop wranglers see the crop hierarchy (for now)
   - if can? :wrangle, @crop
     .form-group
-      = f.label :parent_id, 'Parent crop', :class => 'control-label col-md-2'
+      = f.label :parent_id, 'Parent crop', class: 'control-label col-md-2'
       .col-md-8
-        = collection_select(:crop, :parent_id, Crop.all, :id, :name, {:include_blank => true}, :class => 'form-control')
+        = collection_select(:crop, :parent_id, Crop.all, :id, :name, { include_blank: true }, class: 'form-control')
         %span.help-block Optional. For setting up crop hierarchies for varieties etc.
 
 
   -# Everyone (wranglers and requesters) gets to add scientific names
   %h2
     Scientific names
-    = button_tag "+", :id => "add-sci_name-row", :type => "button"
-    = button_tag "-", :id => "remove-sci_name-row", :type => "button"
+    = button_tag "+", id: "add-sci_name-row", type: "button"
+    = button_tag "-", id: "remove-sci_name-row", type: "button"
 
   .form-group#scientific_names
     - @crop.scientific_names.each.with_index do |sci, index|
-      .template.col-md-12{ :id => "sci_template[#{index+1}]" }
+      .template.col-md-12{ id: "sci_template[#{index + 1}]" }
         .col-md-2
-          = label_tag :scientific_names, "Scientific name #{index+1}:", :class => 'control-label'
+          = label_tag :scientific_names, "Scientific name #{index + 1}:", class: 'control-label'
         .col-md-8
-          = text_field_tag "sci_name[#{index+1}]", sci.name, :id => "sci_name[#{index+1}]", :class => 'form-control'
+          = text_field_tag "sci_name[#{index + 1}]", sci.name, id: "sci_name[#{index + 1}]", class: 'form-control'
           %span.help-block Scientific name of crop.
         .col-md-2
 
   %h2
     Alternate names
-    = button_tag "+", :id => "add-alt_name-row", :type => "button"
-    = button_tag "-", :id => "remove-alt_name-row", :type => "button"
+    = button_tag "+", id: "add-alt_name-row", type: "button"
+    = button_tag "-", id: "remove-alt_name-row", type: "button"
 
   .form-group#alternate_names
     - @crop.alternate_names.each.with_index do |alt, index|
-      .template.col-md-12{ :id => "alt_template[#{index+1}]" }
+      .template.col-md-12{ id: "alt_template[#{index + 1}]" }
         .col-md-2
-          = label_tag :alternate_names, "Alternate name #{index+1}:", :class => 'control-label'
+          = label_tag :alternate_names, "Alternate name #{index + 1}:", class: 'control-label'
         .col-md-8
-          = text_field_tag "alt_name[#{index+1}]", alt.name, :id => "alt_name[#{index+1}]", :class => 'form-control'
+          = text_field_tag "alt_name[#{index + 1}]", alt.name, id: "alt_name[#{index + 1}]", class: 'form-control'
           %span.help-block Alternate name of crop.
         .col-md-2
 
   -# This is used for comments from crop requesters.  We need to show it
   -# to everyone, but we don't include it on new crops from wranglers.
 
-  - if (can? :wrangle, @crop and @crop.requester) or (cannot? :wrangle, @crop and @crop.new_record?)
+  - if (can?(:wrangle, @crop) && @crop.requester) || (cannot?(:wrangle, @crop) && @crop.new_record?)
     %h2 Crop request notes
     .form-group
-      = f.label :request_notes, 'Comments', :class => 'control-label col-md-2'
+      = f.label :request_notes, 'Comments', class: 'control-label col-md-2'
       .col-md-8
-        = f.text_area :request_notes, :rows => 3, :class => 'form-control', :id => 'request_notes'
+        = f.text_area :request_notes, rows: 3, class: 'form-control', id: 'request_notes'
 
   -# A final explanation of what's going to happen next, for crop requesters
   - unless can? :wrangle, @crop
-    %p When you submit this form, your suggestion will be sent to our team of #{link_to 'volunteer crop wranglers', 'http://talk.growstuff.org/c/crop-wrangling'} for review. We'll let you know the outcome as soon as we can.
+    %p
+      When you submit this form, your suggestion will be sent to our team of
+      = link_to 'volunteer crop wranglers', 'http://talk.growstuff.org/c/crop-wrangling'
+      for review. We'll let you know the outcome as soon as we can.
 
   -# Now, for crop wranglers, let's have approval/rejection at the bottom of the page
-  - if can? :wrangle, @crop and @crop.requester
+  - if can?(:wrangle, @crop) && @crop.requester
     %h2 Approve or reject pending crops
     .form-group
-      = f.label :approval_status, 'Approval status', :class=> 'control-label col-md-2'
+      = f.label :approval_status, 'Approval status', class: 'control-label col-md-2'
       .col-md-8
-        = f.select(:approval_status, @crop.approval_statuses, {}, {:class => 'form-control'})
+        = f.select(:approval_status, @crop.approval_statuses, {}, class: 'form-control')
 
     .form-group
-      = f.label :reason_for_rejection, 'Reason for rejection', :class => 'control-label col-md-2'
+      = f.label :reason_for_rejection, 'Reason for rejection', class: 'control-label col-md-2'
       .col-md-8
-        = f.select(:reason_for_rejection, @crop.reasons_for_rejection, {:include_blank => true}, {:class => 'form-control'})
+        = f.select(:reason_for_rejection, @crop.reasons_for_rejection, include_blank: true, class: 'form-control')
 
     .form-group
-      = f.label :rejection_notes, 'Rejection notes', :class => 'control-label col-md-2'
+      = f.label :rejection_notes, 'Rejection notes', class: 'control-label col-md-2'
       .col-md-8
-        = f.text_area :rejection_notes, :rows => 3, :class => 'form-control'
+        = f.text_area :rejection_notes, rows: 3, class: 'form-control'
         %span.help-block
           Please provide additional notes why this crop request was rejected if the above reasons do not apply.
 
-
   .form-group
     .form-actions.col-md-offset-2.col-md-8
-      = f.submit 'Save', :class => 'btn btn-primary'
+      = f.submit 'Save', class: 'btn btn-primary'