Merge pull request #1130 from Growstuff/dev

Release 17

.codeclimate.yml

@@ -38,3 +38,4 @@ exclude_paths:
 - db/
 - spec/
 - public/
+- app/assets/stylesheets/bootstrap-accessibility.css

.rubocop.yml

@@ -8,9 +8,25 @@ AllCops:
     - 'db/schema.rb'
     - 'vendor/**/*'
 
+Rails:
+  Enabled: true
+
+Style/FileName:
+  Exclude:
+    - 'Gemfile'
+    - 'Gemfile.lock'
+
 Style/StringLiterals:
   Enabled: false
 
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
 Metrics/MethodLength:
   Description: 'Avoid methods longer than 30 lines of code.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#short-methods'
@@ -21,7 +37,7 @@ Metrics/MethodLength:
 # Remove the following once the code style matches
 # Offense count: 59
 Metrics/AbcSize:
-  Max: 115
+  Max: 38
 
 # Offense count: 5
 # Configuration parameters: CountComments.
@@ -37,12 +53,26 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 1108
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
-# URISchemes: http, https
 Metrics/LineLength:
-  Max: 223
+  Max: 120
 
 # Offense count: 8
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 10
+
+# See https://github.com/bbatsov/rubocop/issues/3629
+Rails/HttpPositionalArguments:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+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,21 +11,27 @@ 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 rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi
-  - if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi
-  - if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi
+  - >
+    if [ $(phantomjs --version) != '2.1.1' ]; then
+    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;
+    tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs;
+    fi
   - phantomjs --version
 before_script:
-- psql -c 'create database growstuff_test;' -U postgres
+  - bundle exec rake db:create db:migrate db:test:prepare
+  - bundle exec rake assets:precompile
 script:
-- bundle exec rubocop --display-cop-names --rails
-- script/gemfile_check
-- bundle exec script/check_contributors_md
-- bundle exec rake db:migrate --trace
-- bundle exec rspec spec/
+  - bundle exec rubocop --display-cop-names --rails
+  - script/gemfile_check
+  - bundle exec script/check_contributors_md
+  - bundle exec rake db:migrate --trace
+  - bundle exec rspec spec/
 services:
   - elasticsearch
 before_deploy:
@@ -38,6 +44,7 @@ deploy:
     repo: Growstuff/growstuff
   app:
     dev: growstuff-staging
+    master: growstuff-prod
     travis_deploy: tranquil-basin-3130
     travis_containers: tranquil-basin-3130
   run:

.yamllint

@@ -0,0 +1,7 @@
+extends: relaxed
+
+rules:
+  # 80 chars should be enough, but don't fail if a line is longer
+  line-length:
+    max: 150
+    level: warning

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

@@ -72,3 +72,4 @@ 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)

Gemfile

@@ -1,9 +1,9 @@
 # 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'
 
@@ -71,6 +71,11 @@ gem 'omniauth-facebook'
 # 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"
 
@@ -110,14 +115,18 @@ group :development, :test do
   gem 'capybara'                        # integration tests
   gem 'capybara-email'                  # integration tests for email
   gem 'capybara-screenshot'             # for test debugging
-  gem 'poltergeist', '~> 1.6'           # for headless JS testing
+  gem 'poltergeist'                     # for headless JS testing
   gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
   gem 'selenium-webdriver'
-  gem "codeclimate-test-reporter", group: :test, require: nil
+  gem 'haml-i18n-extractor'
   gem "active_merchant-paypal-bogus-gateway"
   gem 'rubocop', require: false
 end
 
+group :test do
+  gem 'codeclimate-test-reporter', require: false
+end
+
 group :travis do
   gem 'heroku-api'
 end

Gemfile.lock

@@ -24,13 +24,13 @@ GEM
       actionpack
     active_merchant-paypal-bogus-gateway (0.1.0)
       activemerchant
-    active_utils (3.2.2)
+    active_utils (3.2.3)
       activesupport (>= 3.2, < 5.1.0)
       i18n
     activejob (4.2.7.1)
       activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemerchant (1.60.0)
+    activemerchant (1.61.0)
       activesupport (>= 3.2.14, < 5.1)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
@@ -48,10 +48,11 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.3)
     ast (2.3.0)
-    autoprefixer-rails (6.4.0.2)
+    autoprefixer-rails (6.5.3.1)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -70,11 +71,11 @@ GEM
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bootstrap_form (2.5.0)
+    bootstrap_form (2.5.2)
     builder (3.2.2)
-    byebug (9.0.5)
+    byebug (9.0.6)
     cancancan (1.15.0)
-    capybara (2.8.0)
+    capybara (2.10.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -84,7 +85,7 @@ GEM
     capybara-email (2.5.0)
       capybara (~> 2.4)
       mail
-    capybara-screenshot (1.0.13)
+    capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
     childprocess (0.5.9)
@@ -94,8 +95,8 @@ GEM
     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)
@@ -105,7 +106,7 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.11.1)
     comfortable_mexican_sofa (1.12.9)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
@@ -123,10 +124,10 @@ GEM
       sass-rails (>= 4.0.3)
     concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
-    coveralls (0.8.15)
+    coveralls (0.8.16)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
-      term-ansicolor (~> 1.3)
+      term-ansicolor (~> 1.3.0)
       thor (~> 0.19.1)
       tins (>= 1.6.0, < 2)
     csv_shaper (1.3.0)
@@ -160,7 +161,7 @@ GEM
       faraday
       multi_json
     erubis (2.7.0)
-    excon (0.51.0)
+    excon (0.54.0)
     execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
@@ -203,13 +204,19 @@ 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)
+    hashie (3.4.6)
     heroku-api (0.4.2)
       excon (~> 0.45)
       multi_json (~> 1.8)
@@ -222,7 +229,7 @@ GEM
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    i18n-tasks (0.9.5)
+    i18n-tasks (0.9.6)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       easy_translate (>= 0.5.0)
@@ -242,12 +249,12 @@ GEM
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
-    jwt (1.5.4)
+    jwt (1.5.6)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    kramdown (1.12.0)
+    kramdown (1.13.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     leaflet-markercluster-rails (0.7.0)
@@ -271,15 +278,14 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    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.16.1.320)
-    nokogiri (1.6.8)
+    newrelic_rpm (3.17.1.326)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -293,7 +299,7 @@ GEM
     omniauth (1.3.1)
       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,13 +320,12 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parser (2.3.1.2)
+    parser (2.3.2.0)
       ast (~> 2.2)
-    pg (0.18.4)
-    pkg-config (1.1.7)
+    pg (0.19.0)
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    poltergeist (1.10.0)
+    poltergeist (1.11.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -329,9 +334,10 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (2.0.4)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
@@ -370,11 +376,11 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     raindrops (0.17.0)
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    redis (3.3.1)
+    redis (3.3.2)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rspec (3.5.0)
@@ -385,7 +391,7 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -393,7 +399,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -411,7 +417,7 @@ GEM
     ruby-progressbar (1.8.1)
     ruby-units (2.0.1)
     ruby_dep (1.4.0)
-    ruby_parser (3.8.2)
+    ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
     rubyzip (1.2.0)
     sass (3.4.22)
@@ -453,12 +459,14 @@ GEM
       sprockets (>= 3.0.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    terminal-table (1.6.0)
-    thor (0.19.1)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
+    thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.5)
     tilt (2.0.5)
-    tins (1.12.0)
+    tins (1.13.0)
+    trollop (1.16.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
@@ -478,7 +486,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)
 
@@ -510,6 +518,7 @@ DEPENDENCIES
   dalli
   database_cleaner (~> 1.5.0)
   devise (>= 4.0.0)
+  elasticsearch-api (~> 2.0.0)
   elasticsearch-model
   elasticsearch-rails
   factory_girl_rails
@@ -523,6 +532,7 @@ DEPENDENCIES
   guard
   guard-rspec
   haml
+  haml-i18n-extractor
   haml-rails
   heroku-api
   i18n-tasks
@@ -540,10 +550,10 @@ DEPENDENCIES
   omniauth-flickr (>= 0.0.15)
   omniauth-twitter
   pg
-  poltergeist (~> 1.6)
+  poltergeist
   pry
   quiet_assets
-  rails (~> 4.2.1)
+  rails (~> 4.2.7)
   rails_12factor
   rake (>= 10.0.0)
   rspec-activemodel-mocks
@@ -560,7 +570,7 @@ DEPENDENCIES
   will_paginate (~> 3.0)
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.3.3p222
 
 BUNDLED WITH
    1.13.6

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
@@ -49,8 +46,6 @@ 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.' }
@@ -62,7 +57,6 @@ class AccountTypesController < ApplicationController
 
   # DELETE /account_types/1
   def destroy
-    @account_type = AccountType.find(params[:id])
     @account_type.destroy
 
     respond_to do |format|

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,13 +20,10 @@ 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.' }
@@ -43,5 +38,4 @@ class AccountsController < ApplicationController
   def account_params
     params.require(:account).permit(:account_type_id, :member_id, :paid_until)
   end
-
 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]}"
@@ -17,6 +17,5 @@ class Admin::OrdersController < ApplicationController
     respond_to do |format|
       format.html # index.html.haml
     end
-
   end
 end

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,8 +3,8 @@ 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" &&
@@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base
         request.path != "/members/confirmation" &&
         request.path != "/members/sign_out" &&
         !request.xhr?)
-        store_location_for(:member, request.fullpath)
+      store_location_for(:member, request.fullpath)
     end
   end
 
@@ -23,7 +23,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
@@ -73,10 +73,9 @@ class ApplicationController < ActionController::Base
         :bio, :location, :latitude, :longitude,
         # email settings
         :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
-        #update password
+        # update password
         :current_password
       )
     end
   end
-
 end

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
@@ -10,15 +10,15 @@ class AuthenticationsController < ApplicationController
       name = Growstuff::OauthSignupAction.new.determine_name(auth)
 
       @authentication = current_member.authentications
-      .create_with(
-        name: name,
-        token: auth['credentials']['token'],
-        secret: auth['credentials']['secret']
-      )
-      .find_or_create_by(
-        provider: auth['provider'],
-        uid: auth['uid'],
-        name: name)
+        .create_with(
+          name: name,
+          token: auth['credentials']['token'],
+          secret: auth['credentials']['secret']
+        )
+        .find_or_create_by(
+          provider: auth['provider'],
+          uid: auth['uid'],
+          name: name)
 
       flash[:notice] = "Authentication successful."
     else

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,12 @@ 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])
 
     respond_to do |format|
       format.html
@@ -37,14 +34,14 @@ class CropsController < ApplicationController
   # GET /crops/wrangle
   def wrangle
     @approval_status = params[:approval_status]
-    case @approval_status
-    when "pending"
-      @crops = Crop.pending_approval
-    when "rejected"
-      @crops = Crop.rejected
-    else
-      @crops = Crop.recent
-    end
+    @crops = case @approval_status
+             when "pending"
+               Crop.pending_approval
+             when "rejected"
+               Crop.rejected
+             else
+               Crop.recent
+             end
 
     @crops = @crops.paginate(page: params[:page])
 
@@ -77,7 +74,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|
@@ -90,10 +87,10 @@ class CropsController < ApplicationController
           }
         }
         render json: @crop.to_json(include: {
-          plantings: {
-            include: owner_structure
-          }
-        })
+                                     plantings: {
+                                       include: owner_structure
+                                     }
+                                   })
       end
     end
   end
@@ -113,16 +110,13 @@ 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
 
   # POST /crops
   # POST /crops.json
   def create
-
     @crop = Crop.new(crop_params)
 
     if current_member.has_role? :crop_wrangler
@@ -137,10 +131,10 @@ class CropsController < ApplicationController
     respond_to do |format|
       if @crop.save
         params[:alt_name].each do |index, value|
-        @crop.alternate_names.create(name: value, creator_id: current_member.id)
+          create_name('alternate', value)
         end
         params[:sci_name].each do |index, value|
-        @crop.scientific_names.create(scientific_name: value, creator_id: current_member.id)
+          create_name('scientific', value)
         end
         unless current_member.has_role? :crop_wrangler
           Role.crop_wranglers.each do |w|
@@ -160,30 +154,14 @@ 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"
 
     respond_to do |format|
       if @crop.update(crop_params)
-        if !params[:alt_name].nil?
-          @crop.alternate_names.each do |alt_name|
-            alt_name.destroy
-          end
-
-          params[:alt_name].each do |index, value|
-            alt_name = @crop.alternate_names.create(name: value, creator_id: current_member.id)
-          end
-
-          @crop.scientific_names.each do |sci_name|
-            sci_name.destroy
-          end
-          params[:sci_name].each do |index, value|
-            sci_name = @crop.scientific_names.create(scientific_name: value, creator_id: current_member.id)
-          end
-        end
+        recreate_names('alt_name', 'alternate')
+        recreate_names('sci_name', 'scientific')
 
         if previous_status == "pending"
           requester = @crop.requester
@@ -203,7 +181,6 @@ class CropsController < ApplicationController
   # DELETE /crops/1
   # DELETE /crops/1.json
   def destroy
-    @crop = Crop.find(params[:id])
     @crop.destroy
 
     respond_to do |format|
@@ -214,7 +191,38 @@ 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)
+    params[param_name].each do |index, value|
+      create_name(name_type, value)
+    end
+  end
+
+  def destroy_names(name_type)
+    @crop.send("#{name_type}_names").each do |alt_name|
+      alt_name.destroy
+    end
+  end
+
+  def create_name(name_type, value)
+    @crop.send("#{name_type}_names").create(name: value, creator_id: current_member.id)
+  end
+
   def crop_params
-    params.require(:crop).permit(:en_wikipedia_url, :name, :parent_id, :creator_id, :approval_status, :request_notes, :reason_for_rejection, :rejection_notes, scientific_names_attributes: [:scientific_name, :_destroy, :id])
+    params.require(:crop).permit(:en_wikipedia_url,
+      :name,
+      :parent_id,
+      :creator_id,
+      :approval_status,
+      :request_notes,
+      :reason_for_rejection,
+      :rejection_notes, scientific_names_attributes: [:scientific_name,
+                                                      :_destroy,
+                                                      :id])
   end
 end

app/controllers/follows_controller.rb

@@ -1,15 +1,14 @@
 class FollowsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
   load_and_authorize_resource
   skip_load_resource only: :create
 
   # POST /follows
   def create
-
     @follow = current_member.follows.build(followed_id: follow_params[:followed_id])
 
     if @follow.save
-      flash[:notice] = "Followed #{ @follow.followed.login_name }"
+      flash[:notice] = "Followed #{@follow.followed.login_name}"
       redirect_to :back
     else
       flash[:error] = "Already following or error while following."
@@ -23,7 +22,7 @@ class FollowsController < ApplicationController
     unfollowed_name = @follow.followed.login_name
     @follow.destroy
 
-    flash[:notice] = "Unfollowed #{ unfollowed_name }"
+    flash[:notice] = "Unfollowed #{unfollowed_name}"
     redirect_to root_path
   end
 

app/controllers/gardens_controller.rb

@@ -1,16 +1,16 @@
 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])
+    @gardens = if @owner
+                 @owner.gardens.paginate(page: params[:page])
+               else
+                 Garden.paginate(page: params[:page])
+               end
 
     respond_to do |format|
       format.html # index.html.erb
@@ -21,8 +21,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 }
@@ -42,7 +40,6 @@ class GardensController < ApplicationController
 
   # GET /gardens/1/edit
   def edit
-    @garden = Garden.find(params[:id])
   end
 
   # POST /gardens
@@ -66,8 +63,6 @@ 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.' }
@@ -82,12 +77,13 @@ 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 { redirect_to gardens_by_owner_path(owner: @garden.owner), notice: 'Garden was successfully deleted.' }
+      format.html do
+        redirect_to gardens_by_owner_path(owner: @garden.owner), notice: 'Garden was successfully deleted.'
+      end
       format.json { head :no_content }
     end
   end
@@ -96,6 +92,6 @@ class GardensController < ApplicationController
 
   def garden_params
     params.require(:garden).permit(:name, :slug, :owner_id, :description, :active,
-    :location, :latitude, :longitude, :area, :area_unit)
+      :location, :latitude, :longitude, :area, :area_unit)
   end
 end

app/controllers/harvests_controller.rb

@@ -1,19 +1,19 @@
 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])
-    if @owner
-      @harvests = @owner.harvests.includes(:owner, :crop)
-    elsif @crop
-      @harvests = @crop.harvests.includes(:owner, :crop)
-    else
-      @harvests = Harvest.includes(:owner, :crop)
-    end
+    @owner = Member.find_by(slug: params[:owner])
+    @crop = Crop.find_by(slug: params[:crop])
+    @harvests = if @owner
+                  @owner.harvests.includes(:owner, :crop)
+                elsif @crop
+                  @crop.harvests.includes(:owner, :crop)
+                else
+                  Harvest.includes(:owner, :crop)
+                end
 
     respond_to do |format|
       format.html { @harvests = @harvests.paginate(page: params[:page]) }
@@ -32,7 +32,7 @@ class HarvestsController < ApplicationController
     @harvest = Harvest.new('harvested_at' => Date.today)
 
     # 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,7 +42,6 @@ class HarvestsController < ApplicationController
 
   # GET /harvests/1/edit
   def edit
-    @harvest = Harvest.find(params[:id])
   end
 
   # POST /harvests
@@ -66,8 +65,6 @@ 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.' }
@@ -82,7 +79,6 @@ class HarvestsController < ApplicationController
   # DELETE /harvests/1
   # DELETE /harvests/1.json
   def destroy
-    @harvest = Harvest.find(params[:id])
     @harvest.destroy
 
     respond_to do |format|
@@ -95,6 +91,6 @@ class HarvestsController < ApplicationController
 
   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)
+      :quantity, :unit, :weight_quantity, :weight_unit, :plant_part_id, :slug, :si_weight)
   end
 end

app/controllers/home_controller.rb

@@ -2,7 +2,6 @@ class HomeController < ApplicationController
   skip_authorize_resource
 
   def index
-
     # we were previously generating a lot of instance variables like
     # @members_count and @interesting_crops in here, but now we call
     # the relevant class methods directly in the view, so that fragment
@@ -12,5 +11,4 @@ class HomeController < ApplicationController
       format.html # index.html.haml
     end
   end
-
 end

app/controllers/members_controller.rb

@@ -1,21 +1,26 @@
 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
 
   def index
     @sort = params[:sort]
-    if @sort == 'recently_joined'
-      @members = Member.confirmed.recently_joined.paginate(page: params[:page])
-    else
-      @members = Member.confirmed.paginate(page: params[:page])
-    end
+    @members = if @sort == 'recently_joined'
+                 Member.confirmed.recently_joined.paginate(page: params[:page])
+               else
+                 Member.confirmed.paginate(page: params[:page])
+               end
 
     respond_to do |format|
       format.html # index.html.haml
-      format.json { render json: @members.to_json(only: [:id, :login_name, :slug, :bio, :created_at, :location, :latitude, :longitude]) }
+      format.json {
+        render json: @members.to_json(only: [
+                                        :id, :login_name,
+                                        :slug, :bio, :created_at,
+                                        :location, :latitude, :longitude
+                                      ])
+      }
     end
   end
 
@@ -32,7 +37,13 @@ class MembersController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.haml
-      format.json { render json: @member.to_json(only: [:id, :login_name, :bio, :created_at, :slug, :location, :latitude, :longitude]) }
+      format.json {
+        render json: @member.to_json(only: [
+                                       :id, :login_name, :bio,
+                                       :created_at, :slug, :location,
+                                       :latitude, :longitude
+                                     ])
+      }
       format.rss { render(
         layout: false,
         locals: { member: @member }
@@ -56,32 +67,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] = "You have been unsubscribed from #{EMAIL_TYPE_STRING[@type]} emails."
 
-    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] = "We're sorry, there was an error updating your settings."
   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: 'Welcome.'
+    else
+      flash[:alert] = 'Failed to complete signup'
+      @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

@@ -10,6 +10,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
     create
   end
+
   def failure
     flash[:alert] = "Authentication failed."
     redirect_to request.env['omniauth.origin'] || "/"
@@ -27,7 +28,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       @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
+        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)

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(
@@ -49,12 +45,9 @@ class OrdersController < ApplicationController
         format.html { render action: "show" }
       end
     end
-
   end
 
   def complete
-    @order = Order.find(params[:id])
-
     if (params[:token] && params['PayerID'])
       purchase = EXPRESS_GATEWAY.purchase(
         @order.total,
@@ -78,11 +71,9 @@ class OrdersController < ApplicationController
     respond_to do |format|
       format.html # new.html.erb
     end
-
   end
 
   def cancel
-    @order = Order.find(params[:id])
     respond_to do |format|
       format.html { redirect_to shop_url, notice: 'Order was cancelled.' }
     end
@@ -90,7 +81,6 @@ class OrdersController < ApplicationController
 
   # DELETE /orders/1
   def destroy
-    @order = Order.find(params[:id])
     @order.destroy
 
     respond_to do |format|

app/controllers/passwords_controller.rb

@@ -1,6 +1,6 @@
 class PasswordsController < Devise::PasswordsController
+  protected
 
-protected
   def after_resetting_password_path_for(resource)
     root_path
   end

app/controllers/photos_controller.rb

@@ -1,5 +1,5 @@
 class PhotosController < ApplicationController
-  before_filter :authenticate_member!, except: [:index, :show]
+  before_action :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /photos
@@ -41,43 +41,17 @@ class PhotosController < ApplicationController
 
   # GET /photos/1/edit
   def edit
-    @photo = Photo.find(params[:id])
   end
 
   # POST /photos
   # POST /photos.json
   def create
-    @photo = Photo.find_by_flickr_photo_id(params[:photo][:flickr_photo_id]) ||
-      Photo.new(photo_params)
-    @photo.owner_id = current_member.id
-    @photo.set_flickr_metadata
-
-
-    collection = case params[:type]
-                   when 'garden'
-                     @photo.gardens
-                   when 'planting'
-                     @photo.plantings
-                   when 'harvest'
-                     @photo.harvests
-                   else
-                     nil
-                 end
-
-    if collection && has_item_id
-      item = params[:type].camelcase.constantize.find_by_id(params[:id])
-      if item && member_owns_item(item)
-        collection << item unless collection.include?(item)
-      else
-        flash[:alert] = "Could not find this item owned by you"
-      end
-    else
-      flash[:alert] = "Missing or invalid type or id parameter"
-    end
+    find_or_create_photo_from_flickr_photo
+    add_photo_to_collection
 
     respond_to do |format|
-      if @photo.save
-        format.html { redirect_to @photo, notice: 'Photo was successfully added.' }
+      if @photo.present? && @photo.save
+        format.html { redirect_to photo_path(@photo), notice: 'Photo was successfully added.' }
         format.json { render json: @photo, status: :created, location: @photo }
       else
         format.html { render action: "new" }
@@ -89,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.' }
@@ -105,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."
 
@@ -117,16 +88,38 @@ class PhotosController < ApplicationController
 
   private
 
-  def has_item_id
+  def item_id?
     params.key? :id
   end
 
-  def member_owns_item(item)
-    item.owner.id == current_member.id
+  def flickr_photo_id_param
+    params[:photo][:flickr_photo_id]
   end
 
   def photo_params
     params.require(:photo).permit(:flickr_photo_id, :owner_id, :title, :license_name,
-    :license_url, :thumbnail_url, :fullsize_url, :link_url)
+      :license_url, :thumbnail_url, :fullsize_url, :link_url)
+  end
+
+  def find_or_create_photo_from_flickr_photo
+    @photo = Photo.find_by(flickr_photo_id: flickr_photo_id_param)
+    @photo = Photo.new(photo_params) unless @photo
+    @photo.owner_id = current_member.id
+    @photo.set_flickr_metadata
+    @photo
+  end
+
+  def add_photo_to_collection
+    raise "Missing or invalid type provided" unless Growstuff::Constants::PhotoModels.types.include?(params[:type])
+    raise "No item id provided" unless item_id?
+    collection = Growstuff::Constants::PhotoModels.get_relation(@photo, params[:type])
+
+    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
+
+    collection << item unless collection.include?(item)
+  rescue => e
+    flash[:alert] = e.message
   end
 end

app/controllers/places_controller.rb

@@ -5,7 +5,11 @@ class PlacesController < ApplicationController
     respond_to do |format|
       format.html
       # json response is whatever we want to map here
-      format.json { render json: Member.located.to_json(only: [:id, :login_name, :slug, :location, :latitude, :longitude]) }
+      format.json do
+        render json: Member.located.to_json(only: [
+                                              :id, :login_name, :slug, :location, :latitude, :longitude
+                                            ])
+      end
     end
   end
 
@@ -16,7 +20,11 @@ class PlacesController < ApplicationController
     @nearby_members = Member.nearest_to(params[:place])
     respond_to do |format|
       format.html # show.html.haml
-      format.json { render json: @nearby_members.to_json(only: [:id, :login_name, :slug, :location, :latitude, :longitude]) }
+      format.json do
+        render json: @nearby_members.to_json(only: [
+                                               :id, :login_name, :slug, :location, :latitude, :longitude
+                                             ])
+      end
     end
   end
 
@@ -35,5 +43,4 @@ class PlacesController < ApplicationController
       end
     end
   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,24 +1,24 @@
 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])
-    if @owner
-      @plantings = @owner.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
-    elsif @crop
-      @plantings = @crop.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
-    else
-      @plantings = Planting.includes(:owner, :crop, :garden).paginate(page: params[:page])
-    end
+    @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
 
     respond_to do |format|
       format.html { @plantings = @plantings.paginate(page: params[:page]) }
       format.json { render json: @plantings }
-      format.rss { render layout: false } #index.rss.builder
+      format.rss { render layout: false } # index.rss.builder
       format.csv do
         specifics = (@owner ? "#{@owner.login_name}-" : @crop ? "#{@crop.name}-" : nil)
         @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
@@ -44,8 +44,8 @@ class PlantingsController < ApplicationController
     @planting = Planting.new('planted_at' => Date.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 +55,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
@@ -71,7 +69,8 @@ class PlantingsController < ApplicationController
 
     respond_to do |format|
       if @planting.save
-        @planting.update_attribute(:days_before_maturity, update_days_before_maturity(@planting, planting_params[:crop_id]))
+        @planting.update_attribute(:days_before_maturity,
+          update_days_before_maturity(@planting, planting_params[:crop_id]))
         format.html { redirect_to @planting, notice: 'Planting was successfully created.' }
         format.json { render json: @planting, status: :created, location: @planting }
         expire_fragment("homepage_stats")
@@ -85,12 +84,12 @@ 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|
       if @planting.update(planting_params)
-        @planting.update_attribute(:days_before_maturity, update_days_before_maturity(@planting, planting_params[:crop_id]))
+        @planting.update_attribute(:days_before_maturity,
+          update_days_before_maturity(@planting, planting_params[:crop_id]))
         format.html { redirect_to @planting, notice: 'Planting was successfully updated.' }
         format.json { head :no_content }
       else
@@ -103,7 +102,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")
@@ -118,8 +116,8 @@ class PlantingsController < ApplicationController
 
   def planting_params
     params.require(:planting).permit(:crop_id, :description, :garden_id, :planted_at,
-    :quantity, :sunniness, :planted_from, :owner_id, :finished,
-    :finished_at)
+      :quantity, :sunniness, :planted_from, :owner_id, :finished,
+      :finished_at)
   end
 
   def update_days_before_maturity(planting, crop_id)

app/controllers/posts_controller.rb

@@ -1,22 +1,22 @@
 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])
-    if @author
-      @posts = @author.posts.includes(:author, { comments: :author }).paginate(page: params[:page])
-    else
-      @posts = Post.includes(:author, { comments: :author }).paginate(page: params[:page])
-    end
+    @author = Member.find_by(slug: params[:author])
+    @posts = if @author
+               @author.posts.includes(:author, { comments: :author }).paginate(page: params[:page])
+             else
+               Post.includes(:author, { comments: :author }).paginate(page: params[:page])
+             end
 
     respond_to do |format|
       format.html # index.html.haml
       format.json { render json: @posts }
-      format.rss { render layout: false } #index.rss.builder
+      format.rss { render layout: false } # index.rss.builder
     end
   end
 
@@ -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|
@@ -74,6 +68,6 @@ class ProductsController < ApplicationController
 
   def product_params
     params.require(:product).permit(:description, :min_price, :recommended_price, :name,
-    :account_type_id, :paid_months)
+      :account_type_id, :paid_months)
   end
 end

app/controllers/registrations_controller.rb

@@ -8,23 +8,22 @@ class RegistrationsController < Devise::RegistrationsController
     render "edit"
   end
 
-# we need this subclassed method so that Devise doesn't force people to
-# change their password every time they want to edit their settings.
-# we also check that they give their current password to change their password.
-# Code copied from
-# https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-edit-their-account-without-providing-a-password
+  # we need this subclassed method so that Devise doesn't force people to
+  # change their password every time they want to edit their settings.
+  # we also check that they give their current password to change their password.
+  # Code copied from
+  # https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-edit-their-account-without-providing-a-password
 
   def update
-
     @member = Member.find(current_member.id)
 
-    successfully_updated = if needs_password?(@member, params)
-      @member.update_with_password(devise_parameter_sanitizer.sanitize(:account_update))
+    if needs_password?(@member, params)
+      successfully_updated = @member.update_with_password(devise_parameter_sanitizer.sanitize(:account_update))
     else
       # remove the virtual current_password attribute
       # update_without_password doesn't know how to ignore it
       params[:member].delete(:current_password)
-      @member.update_without_password(devise_parameter_sanitizer.sanitize(:account_update))
+      successfully_updated = @member.update_without_password(devise_parameter_sanitizer.sanitize(:account_update))
     end
 
     if successfully_updated
@@ -35,12 +34,11 @@ class RegistrationsController < Devise::RegistrationsController
     else
       render "edit"
     end
-
   end
 end
 
 # check if we need the current password to update fields
 def needs_password?(member, params)
   params[:member][:password].present? ||
-  params[:member][:password_confirmation].present?
+    params[:member][:password_confirmation].present?
 end

app/controllers/robots_controller.rb

@@ -1,14 +1,9 @@
 class RobotsController < ApplicationController
-
   DEFAULT_FILENAME = 'config/robots.txt'.freeze
 
   def robots
-    filename = if subdomain && subdomain != 'www'
-      "config/robots.#{ subdomain }.txt"
-    end
-
-    file_to_render = File.exists?(filename.to_s) ? filename : DEFAULT_FILENAME
-
+    filename = "config/robots.#{subdomain}.txt" if subdomain && subdomain != 'www'
+    file_to_render = File.exist?(filename.to_s) ? filename : DEFAULT_FILENAME
     render file: file_to_render, layout: false, content_type: 'text/plain'
   end
 

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
 
@@ -92,6 +86,6 @@ class ScientificNamesController < ApplicationController
   private
 
   def scientific_name_params
-    params.require(:scientific_name).permit(:crop_id, :scientific_name, :creator_id)
+    params.require(:scientific_name).permit(:crop_id, :name, :creator_id)
   end
 end

app/controllers/seeds_controller.rb

@@ -1,24 +1,24 @@
 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])
-    if @owner
-      @seeds = @owner.seeds.includes(:owner, :crop).paginate(page: params[:page])
-    elsif @crop
-      @seeds = @crop.seeds.includes(:owner, :crop).paginate(page: params[:page])
-    else
-      @seeds = Seed.includes(:owner, :crop).paginate(page: params[:page])
-    end
+    @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
 
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @seeds }
-      format.rss { render layout: false } #index.rss.builder
+      format.rss { render layout: false } # index.rss.builder
       format.csv do
         if @owner
           @filename = "Growstuff-#{@owner}-Seeds-#{Time.zone.now.to_s(:number)}.csv"
@@ -35,8 +35,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 +47,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 +57,6 @@ class SeedsController < ApplicationController
 
   # GET /seeds/1/edit
   def edit
-    @seed = Seed.find(params[:id])
   end
 
   # POST /seeds
@@ -82,8 +79,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 +93,6 @@ class SeedsController < ApplicationController
   # DELETE /seeds/1
   # DELETE /seeds/1.json
   def destroy
-    @seed = Seed.find(params[:id])
     @seed.destroy
 
     respond_to do |format|

app/helpers/application_helper.rb

@@ -1,18 +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)
@@ -26,20 +24,20 @@ module ApplicationHelper
   def build_alert_classes(alert_type = :info)
     classes = 'alert alert-dismissable '
     case alert_type.to_sym
-      when :alert, :danger, :error, :validation_errors
-        classes += 'alert-danger'
-      when :warning, :todo
-        classes += 'alert-warning'
-      when :notice, :success
-        classes += 'alert-success'
-      when :info
-        classes += 'alert-info'
+    when :alert, :danger, :error, :validation_errors
+      classes += 'alert-danger'
+    when :warning, :todo
+      classes += 'alert-warning'
+    when :notice, :success
+      classes += 'alert-success'
+    when :info
+      classes += 'alert-info'
     end
     classes
   end
 
   # Produces a cache key for uniquely identifying cached fragments.
-  def cache_key_for(klass, identifier="all")
+  def cache_key_for(klass, identifier = "all")
     count          = klass.count
     max_updated_at = klass.maximum(:updated_at).try(:utc).try(:to_s, :number)
     "#{klass.name.downcase.pluralize}/#{identifier}-#{count}-#{max_updated_at}"
@@ -73,9 +71,9 @@ module ApplicationHelper
     end
 
     Gravatar.new(member.email).image_url({
-      size: size,
-      default: :identicon
-    })
+                                           size: size,
+                                           default: :identicon
+                                         })
   end
 
   # Returns a string with the quantity and the right pluralization for a

app/helpers/auto_suggest_helper.rb

@@ -1,6 +1,5 @@
 module AutoSuggestHelper
-
-  def auto_suggest(resource, source, options={})
+  def auto_suggest(resource, source, options = {})
     if options[:default] && !options[:default].new_record?
       default = options[:default]
       default_id = options[:default].try(:id)
@@ -13,10 +12,14 @@ module AutoSuggestHelper
     source_path = Rails.application.routes.url_helpers.send("#{source}s_search_path")
 
     %Q{
-      <input id="#{source}" class="auto-suggest #{options[:class]}" type="text" value="#{default}" data-source-url="#{source_path}", placeholder="e.g. lettuce">
-      <noscript class="text-warning">Warning: Javascript must be available to search and match crops</noscript>
-      <input id="#{resource}_#{source}_id" class="auto-suggest-id" type="hidden" name="#{resource}[#{source}_id]" value="#{default_id}">
+      <input id="#{source}" class="auto-suggest #{options[:class]}"
+        type="text" value="#{default}" data-source-url="#{source_path}",
+        placeholder="e.g. lettuce">
+      <noscript class="text-warning">
+        Warning: Javascript must be available to search and match crops
+      </noscript>
+      <input id="#{resource}_#{source}_id" class="auto-suggest-id"
+        type="hidden" name="#{resource}[#{source}_id]" value="#{default_id}">
     }.html_safe
   end
-
 end

app/helpers/crops_helper.rb

@@ -2,7 +2,7 @@ module CropsHelper
   def display_seed_availability(member, crop)
     total_quantity = 0
 
-    seeds = member.seeds.select {|seed| seed.crop.name == crop.name }
+    seeds = member.seeds.select { |seed| seed.crop.name == crop.name }
 
     seeds.each do |seed|
       total_quantity = total_quantity + seed.quantity if seed.quantity

app/helpers/gardens_helper.rb

@@ -1,10 +1,11 @@
 module GardensHelper
-
   def display_garden_description(garden)
     if garden.description.nil?
       "no description provided."
     else
-      truncate(garden.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", garden_path(garden) }
+      truncate(garden.description, length: 130, separator: ' ', omission: '... ') do
+        link_to "Read more", garden_path(garden)
+      end
     end
   end
 

app/helpers/harvests_helper.rb

@@ -1,48 +1,34 @@
 module HarvestsHelper
-
   def display_quantity(harvest)
     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.empty?
+    harvest.description
   end
-
 end

app/helpers/plantings_helper.rb

@@ -1,14 +1,13 @@
 module PlantingsHelper
-
   def display_days_before_maturity(planting)
     if planting.finished?
-      0
+      "0"
     elsif !planting.finished_at.nil?
-      ((p = planting.finished_at - DateTime.now).to_i) <= 0 ? 0 : p.to_i
-    elsif planting.days_before_maturity.nil?
+      ((p = planting.finished_at - Date.current).to_i) <= 0 ? "0" : p.to_i.to_s
+    elsif planting.planted_at.nil? || planting.days_before_maturity.nil?
       "unknown"
     else
-      ((p = (planting.planted_at + planting.days_before_maturity) - DateTime.now).to_i <= 0) ? 0 : p.to_i
+      ((p = (planting.planted_at + planting.days_before_maturity) - Date.current).to_i <= 0) ? "0" : p.to_i.to_s
     end
   end
 
@@ -32,14 +31,13 @@ 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
-
 end

app/mailers/notifier.rb

@@ -3,9 +3,12 @@ class Notifier < ActionMailer::Base
   default from: "Growstuff <noreply@growstuff.org>"
 
   def verifier
-    raise "RAILS_SECRET_TOKEN environment variable not set - have you created config/application.yml?" unless ENV['RAILS_SECRET_TOKEN']
+    unless ENV['RAILS_SECRET_TOKEN']
+      raise "RAILS_SECRET_TOKEN environment variable"\
+        "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)
@@ -13,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)
@@ -26,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)
@@ -48,5 +50,4 @@ class Notifier < ActionMailer::Base
     @member, @crop = member, crop
     mail(to: @member.email, subject: "#{crop.name.capitalize} has been rejected")
   end
-
 end

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,107 @@ 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 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.has_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 :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.has_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

@@ -16,10 +16,9 @@ class Account < ActiveRecord::Base
 
   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

@@ -19,5 +19,4 @@ class Comment < ActiveRecord::Base
       )
     end
   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

@@ -19,13 +19,22 @@ class Crop < ActiveRecord::Base
   belongs_to :parent, class_name: 'Crop'
   has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
   has_and_belongs_to_many :posts
-  before_destroy {|crop| crop.posts.clear}
+  before_destroy { |crop| crop.posts.clear }
 
   default_scope { order("lower(name) asc") }
-  scope :recent, -> { where(approval_status: "approved").reorder("created_at desc") }
-  scope :toplevel, -> { where(approval_status: "approved", parent_id: nil) }
-  scope :popular, -> { where(approval_status: "approved").reorder("plantings_count desc, lower(name) asc") }
-  scope :randomized, -> { where(approval_status: "approved").reorder('random()') } # ok on sqlite and psql, but not on mysql
+  scope :recent, lambda {
+    where(approval_status: "approved").reorder("created_at desc")
+  }
+  scope :toplevel, lambda {
+    where(approval_status: "approved", parent_id: nil)
+  }
+  scope :popular, lambda {
+    where(approval_status: "approved").reorder("plantings_count desc, lower(name) asc")
+  }
+  scope :randomized, lambda {
+    # ok on sqlite and psql, but not on mysql
+    where(approval_status: "approved").reorder('random()')
+  }
   scope :pending_approval, -> { where(approval_status: "pending") }
   scope :approved, -> { where(approval_status: "approved") }
   scope :rejected, -> { where(approval_status: "rejected") }
@@ -33,7 +42,7 @@ class Crop < ActiveRecord::Base
   ## Wikipedia urls are only necessary when approving a crop
   validates :en_wikipedia_url,
     format: {
-      with: /\Ahttps?:\/\/en\.wikipedia\.org\/wiki/,
+      with: /\Ahttps?:\/\/en\.wikipedia\.org\/wiki\/[[:alnum:]%_\.()-]+\z/,
       message: 'is not a valid English Wikipedia URL'
     },
     if: :approved?
@@ -57,30 +66,30 @@ class Crop < ActiveRecord::Base
     # use Rails.env as a part of index name (eg. development_growstuff)
     index_name [Rails.env, "growstuff"].join('_')
     settings index: { number_of_shards: 1 },
-      analysis: {
-        tokenizer: {
-          gs_edgeNGram_tokenizer: {
-            type: "edgeNGram",  # edgeNGram: NGram match from the start of a token
-            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" ]
-          }
-        },
-        analyzer: {
-          gs_edgeNGram_analyzer: {
-            tokenizer: "gs_edgeNGram_tokenizer",
-            filter: ["lowercase"]
-          }
-        },
-      } do
+             analysis: {
+               tokenizer: {
+                 gs_edgeNGram_tokenizer: {
+                   type: "edgeNGram", # edgeNGram: NGram match from the start of a token
+                   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"]
+                 }
+               },
+               analyzer: {
+                 gs_edgeNGram_analyzer: {
+                   tokenizer: "gs_edgeNGram_tokenizer",
+                   filter: ["lowercase"]
+                 }
+               },
+             } do
       mappings dynamic: 'false' do
         indexes :id, type: 'long'
         indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
         indexes :approval_status, type: 'string'
         indexes :scientific_names do
-          indexes :scientific_name,
+          indexes :name,
             type: 'string',
             analyzer: 'gs_edgeNGram_analyzer',
             # Disabling field-length norm (norm). If the norm option is turned on(by default),
@@ -94,35 +103,29 @@ class Crop < ActiveRecord::Base
     end
   end
 
-  def as_indexed_json(options={})
+  def as_indexed_json(options = {})
     self.as_json(
       only: [:id, :name, :approval_status],
       include: {
-        scientific_names: { only: :scientific_name },
+        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
+    __elasticsearch__.index_document if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
   end
 
   # End Elasticsearch section
 
   def to_s
-    return name
+    name
   end
 
   def default_scientific_name
-    if scientific_names.size > 0
-      return scientific_names.first.scientific_name
-    else
-      return nil
-    end
+    scientific_names.first.name if scientific_names.size > 0
   end
 
   # crop.default_photo
@@ -134,7 +137,7 @@ class Crop < ActiveRecord::Base
 
     # Crop has no photos? Look for the most recent harvest with a photo.
     harvest_with_photo = Harvest.where(crop_id: id).joins(:photos).order('harvests.id DESC').limit(1).first
-    return harvest_with_photo.photos.first if harvest_with_photo
+    harvest_with_photo.photos.first if harvest_with_photo
   end
 
   # crop.sunniness
@@ -143,13 +146,7 @@ class Crop < ActiveRecord::Base
   # key: sunniness (eg. 'sun')
   # value: count of how many times it's been used by plantings
   def sunniness
-    sunniness = Hash.new(0)
-    plantings.each do |p|
-      if !p.sunniness.blank?
-        sunniness[p.sunniness] += 1
-      end
-    end
-    return sunniness
+    count_uses_of_property 'sunniness'
   end
 
   # crop.planted_from
@@ -157,13 +154,7 @@ class Crop < ActiveRecord::Base
   # key: propagation method (eg. 'seed')
   # value: count of how many times it's been used by plantings
   def planted_from
-    planted_from = Hash.new(0)
-    plantings.each do |p|
-      if !p.planted_from.blank?
-        planted_from[p.planted_from] += 1
-      end
-    end
-    return planted_from
+    count_uses_of_property 'planted_from'
   end
 
   # crop.popular_plant_parts
@@ -173,11 +164,9 @@ class Crop < ActiveRecord::Base
   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
+      popular_plant_parts[h.plant_part] += 1 if h.plant_part
     end
-    return popular_plant_parts
+    popular_plant_parts
   end
 
   def interesting?
@@ -185,7 +174,7 @@ class Crop < ActiveRecord::Base
     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?
@@ -201,38 +190,38 @@ class Crop < ActiveRecord::Base
   end
 
   def approval_statuses
-    [ 'rejected', 'pending', 'approved' ]
+    ['rejected', 'pending', 'approved']
   end
 
   def reasons_for_rejection
-    [ "already in database", "not edible", "not enough information", "other" ]
+    ["already in database", "not edible", "not enough information", "other"]
   end
 
   # Crop.interesting
   # returns a list of interesting crops, for use on the homepage etc
   def Crop.interesting
-  howmany = 12 # max number to find
-  interesting_crops = []
+    howmany = 12 # max number to find
+    interesting_crops = []
     Crop.includes(:photos).randomized.each do |c|
       break if interesting_crops.size == howmany
       next unless c.interesting?
       interesting_crops.push(c)
     end
-    return interesting_crops
+    interesting_crops
   end
 
-# Crop.create_from_csv(row)
-# used by db/seeds.rb and rake growstuff:import_crops
-# CSV fields:
-# - name (required)
-# - en_wikipedia_url (required)
-# - parent (name, optional)
-# - scientific name (optional, can be picked up from parent if it has one)
+  # Crop.create_from_csv(row)
+  # used by db/seeds.rb and rake growstuff:import_crops
+  # CSV fields:
+  # - name (required)
+  # - en_wikipedia_url (required)
+  # - parent (name, optional)
+  # - scientific name (optional, can be picked up from parent if it has one)
 
   def Crop.create_from_csv(row)
-    name,en_wikipedia_url,parent,scientific_names,alternate_names = 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)
@@ -242,7 +231,7 @@ class Crop < ActiveRecord::Base
     )
 
     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,88 +241,65 @@ class Crop < ActiveRecord::Base
 
     crop.add_scientific_names_from_csv(scientific_names)
     crop.add_alternate_names_from_csv(alternate_names)
-
   end
 
   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
+    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.scientific_name}
+      names_to_add = parent.scientific_names.map { |s| s.name }
     else
       logger.warn("Warning: no scientific name (not even on parent crop) for #{self}")
     end
 
-    if names_to_add.size > 0
-      cropbot = Member.find_by_login_name('cropbot')
-      raise "cropbot account not found: run rake db:seed" unless cropbot
+    cropbot = Member.find_by(login_name: 'cropbot')
 
-      names_to_add.each do |n|
-        if self.scientific_names.exists?(scientific_name: n)
-          logger.warn("Warning: skipping duplicate scientific name #{n} for #{self}")
-        else
+    return unless names_to_add.size > 0
+    raise "cropbot account not found: run rake db:seed" unless cropbot
 
-          self.scientific_names.create(
-            scientific_name: n,
-            creator_id: cropbot.id
-          )
-        end
-      end
-    end
+    add_names_to_list(names_to_add, 'scientific')
   end
 
   def add_alternate_names_from_csv(alternate_names)
-    names_to_add = []
-    if ! alternate_names.blank? # i.e. we actually passed something in, which isn't a given
-      cropbot = Member.find_by_login_name('cropbot')
-      raise "cropbot account not found: run rake db:seed" unless cropbot
+    # i.e. we actually passed something in, which isn't a given
+    return if alternate_names.blank?
 
-      names_to_add = alternate_names.split(%r{,\s*})
-
-      names_to_add.each do |n|
-        if self.alternate_names.exists?(name: n)
-          logger.warn("Warning: skipping duplicate alternate name #{n} for #{self}")
-        else
-          self.alternate_names.create(
-            name: n,
-            creator_id: cropbot.id
-          )
-        end
-      end
-
-    end
+    cropbot = Member.find_by!(login_name: 'cropbot')
+    names_to_add = alternate_names.split(%r{,\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}",
+                                                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
@@ -344,37 +310,69 @@ class Crop < ActiveRecord::Base
 
       # 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 Crop.case_insensitive_name(name)
+    where(["lower(name) = :value", { value: name.downcase }])
+  end
+
+  private
+
+  def add_names_to_list(names_to_add, list_name)
+    names_to_add.each do |n|
+      if name_already_exists(list_name, n)
+        logger.warn("Warning: skipping duplicate #{list_name} name #{n} for #{self}")
+      else
+        create_crop_in_list(list_name, n)
+      end
+    end
+  end
+
+  def create_crop_in_list(list_name, name)
+    cropbot = Member.find_by(login_name: 'cropbot')
+    create_hash = {
+      creator_id: "#{cropbot.id}",
+      name: name
+    }
+    self.send("#{list_name}_names").create(create_hash)
+  end
+
+  def name_already_exists(list_name, name)
+    self.send("#{list_name}_names").exists?(name: name)
+  end
+
+  def count_uses_of_property(col_name)
+    data = Hash.new(0)
+    plantings.each do |p|
+      data[p.send("#{col_name}")] += 1 if !p.send("#{col_name}").blank?
+    end
+    data
+  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

@@ -11,6 +11,4 @@ class Follow < ActiveRecord::Base
       body: "#{self.follower.login_name} just followed you on #{ENV["GROWSTUFF_SITE_NAME"]}. "
     )
   end
-
-
 end

app/models/forum.rb

@@ -6,7 +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
@@ -33,7 +23,7 @@ class Garden < ActiveRecord::Base
 
   validates :name,
     format: {
-      with: /\S/
+      with: /\A\w+[\w ]+\z/
     },
     length: { maximum: 255 }
 
@@ -50,19 +40,15 @@ class Garden < ActiveRecord::Base
     "acres" => "acre"
   }
   validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
-        message: "%{value} is not a valid area unit" },
-        allow_nil: true,
-        allow_blank: true
+                                     message: "%{value} is not a valid area unit" },
+                        allow_nil: true,
+                        allow_blank: true
 
   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 == 0
+    self.area_unit = nil if area.blank?
   end
 
   def garden_slug
@@ -76,13 +62,13 @@ class Garden < ActiveRecord::Base
     seen_crops = []
 
     plantings.each do |p|
-      if (! seen_crops.include?(p.crop))
+      if (!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,16 +78,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,30 +1,20 @@
 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
-
   default_scope { order('created_at DESC') }
 
   validates :crop, approved: true
 
-  validates :crop, presence: {message: "must be present and exist in our database"}
+  validates :crop, presence: { message: "must be present and exist in our database" }
 
-  validates :plant_part, presence: {message: "must be present and exist in our database"}
+  validates :plant_part, presence: { message: "must be present and exist in our database" }
 
   validates :quantity,
     numericality: {
@@ -45,9 +35,9 @@ class Harvest < ActiveRecord::Base
     "bushels" => "bushel"
   }
   validates :unit, inclusion: { in: UNITS_VALUES.values,
-    message: "%{value} is not a valid unit" },
-    allow_nil: true,
-    allow_blank: true
+                                message: "%{value} is not a valid unit" },
+                   allow_nil: true,
+                   allow_blank: true
 
   validates :weight_quantity,
     numericality: { only_integer: false },
@@ -59,9 +49,9 @@ class Harvest < ActiveRecord::Base
     "oz" => "oz"
   }
   validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
-    message: "%{value} is not a valid unit" },
-    allow_nil: true,
-    allow_blank: true
+                                       message: "%{value} is not a valid unit" },
+                          allow_nil: true,
+                          allow_blank: true
 
   after_validation :cleanup_quantities
 
@@ -70,28 +60,16 @@ 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 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
 
   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 == 0
+    self.unit = nil if quantity.blank?
+    self.weight_quantity = nil if weight_quantity == 0
+    self.weight_unit = nil if weight_quantity.blank?
   end
 
   def harvest_slug
@@ -105,34 +83,32 @@ class Harvest < ActiveRecord::Base
     string = ''
     if self.quantity
       string += "#{number_to_human(self.quantity.to_s, strip_insignificant_zeros: true)} "
-      if self.unit == 'individual'
-        string += 'individual '
-      else
-        if self.quantity == 1
-          string += "#{self.unit} of "
-        else
-          string += "#{self.unit.pluralize} of "
-        end
-      end
+      string += if self.unit == 'individual'
+                  'individual '
+                elsif self.quantity == 1
+                  "#{self.unit} of "
+                else
+                  "#{self.unit.pluralize} of "
+                end
     end
 
-    if self.unit != 'individual' # buckets of apricot*s*
-      string += "#{self.crop.name.pluralize}"
-    elsif self.quantity == 1
-      string += "#{self.crop.name}"
-    else
-      string += "#{self.crop.name.pluralize}"
-    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
 
     if self.weight_quantity
-      string += " weighing #{number_to_human(self.weight_quantity, strip_insignificant_zeros: true)} #{self.weight_unit}"
+      string += " weighing #{number_to_human(self.weight_quantity, strip_insignificant_zeros: true)}"\
+        " #{self.weight_unit}"
     end
 
-    return string
+    string
   end
 
   def default_photo
-    return photos.first || crop.default_photo
+    photos.first || crop.default_photo
   end
-
 end

app/models/member.rb

@@ -4,7 +4,7 @@ class Member < ActiveRecord::Base
 
   friendly_id :login_name, use: [:slugged, :finders]
 
-  has_many :posts,   foreign_key: 'author_id'
+  has_many :posts, foreign_key: 'author_id'
   has_many :comments, foreign_key: 'author_id'
   has_many :forums, foreign_key: 'owner_id'
 
@@ -27,7 +27,6 @@ class Member < ActiveRecord::Base
 
   has_many :photos
 
-
   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") }
@@ -45,8 +44,8 @@ class Member < ActiveRecord::Base
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :confirmable, :lockable, :timeoutable, :omniauthable
+    :recoverable, :rememberable, :trackable, :validatable,
+    :confirmable, :lockable, :timeoutable, :omniauthable
 
   # set up geocoding
   geocoded_by :location
@@ -59,7 +58,7 @@ class Member < ActiveRecord::Base
 
   # Requires acceptance of the Terms of Service
   validates_acceptance_of :tos_agreement, allow_nil: true,
-    accept: true
+                                          accept: true
 
   validates :login_name,
     length: {
@@ -80,27 +79,25 @@ class Member < ActiveRecord::Base
     }
 
   # Give each new member a default garden
-  after_create {|member| Garden.create(name: "Garden", owner_id: member.id) }
+  after_create { |member| Garden.create(name: "Garden", owner_id: member.id) }
 
   # and an account record (for paid accounts etc)
   # we use find_or_create to avoid accidentally creating a second one,
   # which can happen sometimes especially with FactoryGirl associations
-  after_create {|member| Account.find_or_create_by(member_id: member.id) }
+  after_create { |member| Account.find_or_create_by(member_id: member.id) }
 
   after_save :update_newsletter_subscription
 
   # 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)
@@ -108,7 +105,7 @@ class Member < ActiveRecord::Base
   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
@@ -129,16 +126,16 @@ class Member < ActiveRecord::Base
 
   def is_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
@@ -153,32 +150,28 @@ 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
-    if set
-      result = flickr.photosets.getPhotos(
-        photoset_id: set,
-        page: page_num,
-        per_page: 30
-      )
-    else
-      result = flickr.people.getPhotos(
-        user_id: 'me',
-        page: page_num,
-        per_page: 30
-      )
-    end
-    if result
-      return [result.photo, result.total]
-    else
-      return [[], 0]
-    end
+  def flickr_photos(page_num = 1, set = nil)
+    result = if set
+               flickr.photosets.getPhotos(
+                 photoset_id: set,
+                 page: page_num,
+                 per_page: 30
+               )
+             else
+               flickr.people.getPhotos(
+                 user_id: 'me',
+                 page: page_num,
+                 per_page: 30
+               )
+             end
+    return [result.photo, result.total] if result
+    [[], 0]
   end
 
   # Returns a hash of Flickr photosets' ids and titles
@@ -187,7 +180,7 @@ class Member < ActiveRecord::Base
     flickr.photosets.getList.each do |p|
       sets[p.title] = p.id
     end
-    return sets
+    sets
   end
 
   def interesting?
@@ -195,7 +188,15 @@ 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.login_name_or_email(login)
+    where(["lower(login_name) = :value OR lower(email) = :value", { value: login.downcase }])
+  end
+
+  def Member.case_insensitive_login_name(login)
+    where(["lower(login_name) = :value", { value: login.downcase }])
   end
 
   def Member.interesting
@@ -207,18 +208,18 @@ class Member < ActiveRecord::Base
         interesting_members.push(m)
       end
     end
-    return interesting_members
+    interesting_members
   end
 
   def Member.nearest_to(place)
     nearby_members = []
     if place
-      latitude, longitude = Geocoder.coordinates(place, params: {limit: 1})
+      latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
       if latitude && longitude
         nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) }
       end
     end
-    return nearby_members
+    nearby_members
   end
 
   def update_newsletter_subscription
@@ -235,24 +236,22 @@ class Member < ActiveRecord::Base
     end
   end
 
-  def newsletter_subscribe(testing=false)
+  def newsletter_subscribe(gb = Gibbon::API.new, 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
-    })
+    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)
+  def newsletter_unsubscribe(gb = Gibbon::API.new, 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 }
-    })
+    gb.lists.unsubscribe({
+                           id: Growstuff::Application.config.newsletter_list_id,
+                           email: { email: email }
+                         })
   end
 
   def already_following?(member)
@@ -260,6 +259,6 @@ class Member < ActiveRecord::Base
   end
 
   def get_follow(member)
-    self.follows.where(followed_id: member.id).first if already_following?(member)
+    self.follows.find_by(followed_id: member.id) if already_following?(member)
   end
 end

app/models/notification.rb

@@ -7,6 +7,7 @@ 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
@@ -16,15 +17,10 @@ class Notification < ActiveRecord::Base
   end
 
   def replace_blank_subject
-    if self.subject.nil? or self.subject =~ /^\s*$/
-      self.subject = "(no subject)"
-    end
+    self.subject = "(no subject)" if self.subject.nil? or self.subject =~ /^\s*$/
   end
 
   def send_email
-    if self.recipient.send_notification_email
-      Notifier.notify(self).deliver_later
-    end
+    Notifier.notify(self).deliver_later if self.recipient.send_notification_email
   end
-
 end

app/models/order.rb

@@ -12,6 +12,8 @@ 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
@@ -19,7 +21,7 @@ class Order < ActiveRecord::Base
       subtotal = i.price * i.quantity
       sum += subtotal
     end
-    return sum
+    sum
   end
 
   # return items in the format ActiveMerchant/PayPal want them
@@ -27,12 +29,12 @@ class Order < ActiveRecord::Base
     items = []
     order_items.each do |i|
       items.push({
-        name: i.product.name,
-        quantity: i.quantity,
-        amount: i.price
-      })
+                   name: i.product.name,
+                   quantity: i.quantity,
+                   amount: i.price
+                 })
     end
-    return items
+    items
   end
 
   # record the paypal details for reference
@@ -54,43 +56,40 @@ 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 Order.search(args = {})
     if args[:for]
       case args[:by]
-        when "member"
-          member = Member.find_by_login_name(args[:for])
-          if member
-            return member.orders
-          end
-        when "order_id"
-          order = Order.find_by_id(args[:for])
-          if order
-            return [order]
-          end
-        when "paypal_token"
-          order = Order.find_by_paypal_express_token(args[:for])
-          if order
-            return [order]
-          end
-        when "paypal_payer_id"
-          order = Order.find_by_paypal_express_payer_id(args[:for])
-          if order
-            return [order]
-          end
-        when "referral_code"
-          # coerce to uppercase
-          return Order.where(referral_code: args[:for].upcase)
+      when "member"
+        member = Member.find_by(login_name: args[:for])
+        if member
+          return member.orders
+        end
+      when "order_id"
+        order = Order.find_by(id: args[:for])
+        if order
+          return [order]
+        end
+      when "paypal_token"
+        order = Order.find_by(paypal_express_token: args[:for])
+        if order
+          return [order]
+        end
+      when "paypal_payer_id"
+        order = Order.find_by(paypal_express_payer_id: args[:for])
+        if order
+          return [order]
+        end
+      when "referral_code"
+        # coerce to uppercase
+        return Order.where(referral_code: args[:for].upcase)
       end
     end
-    return []
+    []
   end
-
 end

app/models/order_item.rb

@@ -8,8 +8,6 @@ class OrderItem < ActiveRecord::Base
 
   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,24 @@
 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
   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 << self.send(association_name.to_s).to_a
     end
+    associations.flatten!
+  end
+
+  def destroy_if_unused
+    self.destroy unless all_associations.size > 0
   end
 
   # This is split into a side-effect free method and a side-effecting method
@@ -26,7 +28,7 @@ class Photo < ActiveRecord::Base
     info = flickr.photos.getInfo(photo_id: flickr_photo_id)
     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,
@@ -34,11 +36,9 @@ class Photo < ActiveRecord::Base
       fullsize_url: FlickRaw.url_z(info),
       link_url: FlickRaw.url_photopage(info)
     }
-
   end
 
   def set_flickr_metadata
     self.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,7 +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,22 +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
-
   default_scope { order("created_at desc") }
   scope :finished, -> { where(finished: true) }
   scope :current, -> { where(finished: false) }
@@ -32,7 +22,7 @@ class Planting < ActiveRecord::Base
 
   validates :crop, approved: true
 
-  validates :crop, presence: {message: "must be present and exist in our database"}
+  validates :crop, presence: { message: "must be present and exist in our database" }
 
   validates :quantity,
     numericality: {
@@ -42,9 +32,9 @@ class Planting < ActiveRecord::Base
 
   SUNNINESS_VALUES = %w(sun semi-shade shade)
   validates :sunniness, inclusion: { in: SUNNINESS_VALUES,
-        message: "%{value} is not a valid sunniness value" },
-        allow_nil: true,
-        allow_blank: true
+                                     message: "%{value} is not a valid sunniness value" },
+                        allow_nil: true,
+                        allow_blank: true
 
   PLANTED_FROM_VALUES = [
     'seed',
@@ -60,9 +50,9 @@ class Planting < ActiveRecord::Base
     'layering'
   ]
   validates :planted_from, inclusion: { in: PLANTED_FROM_VALUES,
-        message: "%{value} is not a valid planting method" },
-        allow_nil: true,
-        allow_blank: true
+                                        message: "%{value} is not a valid planting method" },
+                           allow_nil: true,
+                           allow_blank: true
 
   validate :finished_must_be_after_planted
 
@@ -78,7 +68,7 @@ class Planting < ActiveRecord::Base
 
   # location = garden owner + garden name, i.e. "Skud's backyard"
   def location
-    return "#{garden.owner.login_name}'s #{garden}"
+    "#{garden.owner.login_name}'s #{garden}"
   end
 
   # stringify as "beet in Skud's backyard" or similar
@@ -87,11 +77,11 @@ class Planting < ActiveRecord::Base
   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)
@@ -105,7 +95,7 @@ class Planting < ActiveRecord::Base
     if differences.compact.empty?
       nil
     else
-      differences.compact.sum/differences.compact.size
+      differences.compact.sum / differences.compact.size
     end
   end
 
@@ -120,7 +110,7 @@ class Planting < ActiveRecord::Base
 
     return 0 if current_date < planted_at
     return 100 if days > days_before_maturity
-    percent = (days/days_before_maturity*100).to_i
+    percent = (days / days_before_maturity * 100).to_i
 
     if percent >= 100
       percent = 100
@@ -132,7 +122,7 @@ class Planting < ActiveRecord::Base
   # return a list of interesting plantings, for the homepage etc.
   # we can't do this via a scope (as far as we know) so sadly we have to
   # do it this way.
-  def Planting.interesting(howmany=12, require_photo=true)
+  def Planting.interesting(howmany = 12, require_photo = true)
     interesting_plantings = []
     seen_owners = Hash.new(false) # keep track of which owners we've seen already
 
@@ -146,6 +136,6 @@ class Planting < ActiveRecord::Base
       interesting_plantings.push(p)
     end
 
-    return interesting_plantings
+    interesting_plantings
   end
 end

app/models/post.rb

@@ -5,26 +5,26 @@ class Post < ActiveRecord::Base
   belongs_to :forum
   has_many :comments, dependent: :destroy
   has_and_belongs_to_many :crops
-  before_destroy {|post| post.crops.clear}
+  before_destroy { |post| post.crops.clear }
   after_save :update_crops_posts_association
   # also has_many notifications, but kinda meaningless to get at them
   # from this direction, so we won't set up an association for now.
 
   after_create do
     recipients = []
-    sender    = self.author.id
+    sender = self.author.id
     self.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($1).first
       recipients << member if member && !recipients.include?(member)
     end
     self.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($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|
+    recipients.map { |r| r.id }.each do |recipient|
       if recipient != sender
         Notification.create(
           recipient_id: recipient,
@@ -44,7 +44,6 @@ class Post < ActiveRecord::Base
     },
     length: { maximum: 255 }
 
-
   def author_date_subject
     # slugs are created before created_at is set
     time = created_at || Time.zone.now
@@ -70,14 +69,15 @@ class Post < ActiveRecord::Base
   end
 
   private
-    def update_crops_posts_association
-      self.crops.destroy_all
-      # look for crops mentioned in the post. eg. [tomato](crop)
-      self.body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |m|
-        # find crop case-insensitively
-        crop = Crop.where('lower(name) = ?', $1.downcase).first
-        # create association
-        self.crops << crop if crop && !self.crops.include?(crop)
-      end
+
+  def update_crops_posts_association
+    self.crops.destroy_all
+    # look for crops mentioned in the post. eg. [tomato](crop)
+    self.body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |m|
+      # find crop case-insensitively
+      crop = Crop.case_insensitive_name($1).first
+      # create association
+      self.crops << crop if crop && !self.crops.include?(crop)
     end
+  end
 end

app/models/product.rb

@@ -11,5 +11,4 @@ class Product < ActiveRecord::Base
   def to_s
     name
   end
-
 end

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
@@ -9,7 +10,7 @@ class Seed < ActiveRecord::Base
 
   validates :crop, approved: true
 
-  validates :crop, presence: {message: "must be present and exist in our database"}
+  validates :crop, presence: { message: "must be present and exist in our database" }
   validates :quantity,
     numericality: {
       only_integer: true,
@@ -30,9 +31,10 @@ class Seed < ActiveRecord::Base
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally)
   validates :tradable_to, inclusion: { in: TRADABLE_TO_VALUES,
-        message: "You may only trade seed nowhere, locally, nationally, or internationally" },
-        allow_nil: false,
-        allow_blank: false
+                                       message: "You may only trade seed nowhere, "\
+                                                "locally, nationally, or internationally" },
+                          allow_nil: false,
+                          allow_blank: false
 
   ORGANIC_VALUES = [
     'certified organic',
@@ -40,9 +42,10 @@ class Seed < ActiveRecord::Base
     'conventional/non-organic',
     'unknown']
   validates :organic, inclusion: { in: ORGANIC_VALUES,
-        message: "You must say whether the seeds are organic or not, or that you don't know" },
-        allow_nil: false,
-        allow_blank: false
+                                   message: "You must say whether the seeds "\
+                                             "are organic or not, or that you don't know" },
+                      allow_nil: false,
+                      allow_blank: false
 
   GMO_VALUES = [
     'certified GMO-free',
@@ -50,21 +53,22 @@ class Seed < ActiveRecord::Base
     'GMO',
     'unknown']
   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
+                               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)
   validates :heirloom, inclusion: { in: HEIRLOOM_VALUES,
-        message: "You must say whether the seeds are heirloom, hybrid, or unknown" },
-        allow_nil: false,
-        allow_blank: false
+                                    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
+      false
     else
-      return true
+      true
     end
   end
 
@@ -72,7 +76,7 @@ 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
@@ -88,8 +92,7 @@ class Seed < ActiveRecord::Base
       end
     end
 
-    return interesting_seeds
-
+    interesting_seeds
   end
 
   def seed_slug

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/crops/_form.html.haml

@@ -55,7 +55,7 @@
         .col-md-2
           = label_tag :scientific_names, "Scientific name #{index+1}:", :class => 'control-label'
         .col-md-8
-          = text_field_tag "sci_name[#{index+1}]", sci.scientific_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
 

app/views/crops/_popover.html.haml

@@ -2,7 +2,7 @@
   %small
     - if crop.scientific_names.size > 0
       %i
-        = crop.scientific_names.first.scientific_name
+        = crop.scientific_names.first.name
     %br/
     Planted
     = pluralize(crop.plantings.size, "time")

app/views/crops/_scientific_names.html.haml

@@ -6,7 +6,7 @@
     %ul
       - crop.scientific_names.each do |sn|
         %li
-          = sn.scientific_name
+          = sn.name
           - if can? :edit, sn
             = link_to 'Edit', edit_scientific_name_path(sn), { :class => 'btn btn-default btn-xs' }
           - if can? :destroy, sn

app/views/crops/_thumbnail.html.haml

@@ -8,7 +8,7 @@
             = link_to crop.name, crop
           - if crop.scientific_names.size > 0
             .scientificname
-              = crop.scientific_names.first.scientific_name
+              = crop.scientific_names.first.name
           .plantingcount
             Planted
             = pluralize(crop.plantings.size, "time")

app/views/crops/wrangle.html.haml

@@ -54,7 +54,7 @@
       %td= link_to c.en_wikipedia_url, c.en_wikipedia_url
       %td
         - c.scientific_names.each do |s|
-          = link_to s.scientific_name, s
+          = link_to s.name, s
           %br/
       %td= c.requester.present? ? (link_to c.requester, c.requester) : "N/A"
       - unless @approval_status == "pending"

app/views/gardens/_thumbnail.html.haml

@@ -1,7 +1,7 @@
 .panel.panel-success
   .panel-heading
     %h3.panel-title
-      = link_to "#{garden.owner.login_name}'s garden", garden.owner
+      = link_to "#{garden.owner.login_name}'s garden", garden
       - if can? :edit, garden
         %a.pull-right{:href => edit_garden_path(garden), :role => "button", :id => "edit_garden_glyphicon"}
           %span.glyphicon.glyphicon-pencil{:title => "Edit"}

app/views/layouts/_header.html.haml

@@ -4,7 +4,7 @@
   .container
     .navbar-header
       %button.navbar-toggle(data-target="#navbar-collapse" data-toggle="collapse")
-        %span.sr-only Toggle Navigation
+        %span.sr-only= t('.toggle_navigation')
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
@@ -28,7 +28,7 @@
       %ul.nav.navbar-nav.navbar-right
         %li.dropdown<
           %a.dropdown-toggle{'data-toggle' => 'dropdown', :href => crops_path}
-            Crops
+            = t('.crops')
             %b.caret
           %ul.dropdown-menu
             %li= link_to t('.browse_crops'), crops_path
@@ -37,7 +37,7 @@
             %li= link_to t('.harvests'), harvests_path
         %li.dropdown<
           %a.dropdown-toggle{'data-toggle' => 'dropdown', :href => members_path}
-            Community
+            = t('.community')
             %b.caret
           %ul.dropdown-menu
             %li= link_to t('.community_map'), places_path
@@ -52,7 +52,7 @@
               - if current_member.notifications.unread_count > 0
                 = t('.your_stuff', unread_count: current_member.notifications.unread_count)
               - else
-                #{current_member.login_name}
+                = t('.current_memberlogin_name', :current_memberlogin_name => (current_member.login_name))
               %b.caret
             %ul.dropdown-menu
               %li= link_to t('.profile'), member_path(current_member)
@@ -75,11 +75,11 @@
                   %li= link_to t('.admin'), admin_path
 
 
-          %li= link_to "Sign out", destroy_member_session_path, :method => :delete
+          %li= link_to t('.sign_out'), destroy_member_session_path, :method => :delete
 
         - else
-          %li= link_to 'Sign in', new_member_session_path, :id => 'navbar-signin'
-          %li= link_to 'Sign up', new_member_registration_path, :id => 'navbar-signup'
+          %li= link_to t('.sign_in'), new_member_session_path, :id => 'navbar-signin'
+          %li= link_to t('.sign_up'), new_member_registration_path, :id => 'navbar-signup'
 
 
 - # anchor tag for accessibility link to skip the navigation menu

app/views/scientific_names/_form.html.haml

@@ -17,9 +17,9 @@
     .col-md-8
       = collection_select(:scientific_name, :crop_id, Crop.all, :id, :name, { :selected => @scientific_name.crop_id || @crop.id }, :class => 'form-control')
   .form-group
-    = f.label :scientific_name, :class => 'control-label col-md-2'
+    = f.label :name, :class => 'control-label col-md-2'
     .col-md-8
-      = f.text_field :scientific_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'

app/views/scientific_names/index.html.haml

@@ -12,7 +12,7 @@
 
   - @scientific_names.each do |scientific_name|
     %tr
-      %td= link_to scientific_name.scientific_name, scientific_name
+      %td= link_to scientific_name.name, scientific_name
       %td= scientific_name.crop_id
       %td= link_to 'Show', scientific_name
       %td

app/views/scientific_names/show.html.haml

@@ -2,7 +2,7 @@
   - @scientific_name.crop.photos.each do |photo|
     = tag("meta", property: "og:image", content: photo.fullsize_url)
 
-  = tag("meta", property: "og:title", content: @scientific_name.scientific_name)
+  = tag("meta", property: "og:title", content: @scientific_name.name)
   = 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'])
@@ -13,7 +13,7 @@
 
 %p
   %b Scientific name:
-  = @scientific_name.scientific_name
+  = @scientific_name.name
 %p
   %b Crop:
   = link_to @scientific_name.crop, @scientific_name.crop

bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

config.rb

@@ -1,5 +1,5 @@
 # Require any additional compass plugins here.
-
+# rubocop:disable Lint/UselessAssignment
 # Set this to the root of your project when deployed:
 http_path = "/"
 css_dir         = "app/assets/stylesheets"
@@ -16,7 +16,6 @@ images_dir      = "app/assets/images"
 # To disable debugging comments that display the original location of your selectors. Uncomment:
 # line_comments = false
 
-
 # If you prefer the indented syntax, you might want to regenerate this
 # project again passing --syntax sass, or you can uncomment this:
 preferred_syntax = :sass

config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Growstuff::Application

config/application.rb

@@ -82,7 +82,6 @@ module Growstuff
       g.javascripts      false
     end
 
-
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
     config.bot_email = "noreply@growstuff.org"
@@ -90,7 +89,7 @@ module Growstuff
     config.user_agent_email = "info@growstuff.org"
 
     Gibbon::API.api_key = ENV['GROWSTUFF_MAILCHIMP_APIKEY'] || 'notarealkey'
-      # API key can't be blank or tests fail
+    # API key can't be blank or tests fail
     Gibbon::API.timeout = 10
     Gibbon::API.throws_exceptions = false
     config.newsletter_list_id = ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']

config/boot.rb

@@ -3,4 +3,4 @@ require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

config/compass.rb

@@ -1,2 +1,3 @@
 # Require any additional compass plugins here.
+# rubocop:disable Lint/UselessAssignment
 project_type = :rails

config/database.yml

@@ -1,16 +1,10 @@
 development:
   adapter: postgresql
   database: growstuff_dev
-  host: localhost
-  user: postgres
-  password: postgres
 
 test:
   adapter: postgresql
   database: growstuff_test
-  host: localhost
-  user: postgres
-  password: postgres
 
 production:
   adapter: postgresql

config/environments/development.rb

@@ -48,11 +48,11 @@ Growstuff::Application.configure do
 
   config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.smtp_settings = {
-      port: '587',
-      address: 'smtp.mandrillapp.com',
-      user_name: ENV['GROWSTUFF_MANDRILL_USERNAME'],
-      password: ENV['GROWSTUFF_MANDRILL_APIKEY'],
-      authentication: :login
+    port: '587',
+    address: 'smtp.mandrillapp.com',
+    user_name: ENV['GROWSTUFF_MANDRILL_USERNAME'],
+    password: ENV['GROWSTUFF_MANDRILL_APIKEY'],
+    authentication: :login
   }
 
   config.host = 'localhost:8080'

config/environments/production.rb

@@ -70,12 +70,12 @@ Growstuff::Application.configure do
   config.action_mailer.default_url_options = { host: 'growstuff.org' }
 
   ActionMailer::Base.smtp_settings = {
-      port:                 ENV['SPARKPOST_SMTP_PORT'],
-      address:              ENV['SPARKPOST_SMTP_HOST'],
-      user_name:            ENV['SPARKPOST_SMTP_USERNAME'],
-      password:             ENV['SPARKPOST_SMTP_PASSWORD'],
-      authentication:       :login,
-      enable_starttls_auto: true
+    port:                 ENV['SPARKPOST_SMTP_PORT'],
+    address:              ENV['SPARKPOST_SMTP_HOST'],
+    user_name:            ENV['SPARKPOST_SMTP_USERNAME'],
+    password:             ENV['SPARKPOST_SMTP_PASSWORD'],
+    authentication:       :login,
+    enable_starttls_auto: true
   }
   ActionMailer::Base.delivery_method = :smtp
 

config/environments/staging.rb

@@ -72,12 +72,12 @@ Growstuff::Application.configure do
   config.action_mailer.default_url_options = { host: 'staging.growstuff.org' }
 
   ActionMailer::Base.smtp_settings = {
-      port:                 ENV['SPARKPOST_SMTP_PORT'],
-      address:              ENV['SPARKPOST_SMTP_HOST'],
-      user_name:            ENV['SPARKPOST_SMTP_USERNAME'],
-      password:             ENV['SPARKPOST_SMTP_PASSWORD'],
-      authentication:       :login,
-      enable_starttls_auto: true
+    port:                 ENV['SPARKPOST_SMTP_PORT'],
+    address:              ENV['SPARKPOST_SMTP_HOST'],
+    user_name:            ENV['SPARKPOST_SMTP_USERNAME'],
+    password:             ENV['SPARKPOST_SMTP_PASSWORD'],
+    authentication:       :login,
+    enable_starttls_auto: true
   }
   ActionMailer::Base.delivery_method = :smtp
 

config/environments/test.rb

@@ -6,6 +6,10 @@ Growstuff::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
+  # Do not compile assets on-demand. On-demand compilation slows down the test
+  # suite and causes random test failures.
+  config.assets.compile = false
+
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
@@ -26,7 +30,7 @@ Growstuff::Application.configure do
   config.action_dispatch.show_exceptions = true
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -54,7 +58,6 @@ Growstuff::Application.configure do
     ::STANDARD_GATEWAY = ActiveMerchant::Billing::PaypalBogusGateway.new
     ::EXPRESS_GATEWAY = ActiveMerchant::Billing::PaypalBogusGateway.new
   end
-
 end
 
 Geocoder.configure(lookup: :test)
@@ -101,7 +104,7 @@ Geocoder::Lookup::Test.add_stub(
 )
 
 # Unknown location
-Geocoder::Lookup::Test.add_stub( "Tatooine", [])
+Geocoder::Lookup::Test.add_stub("Tatooine", [])
 
 Capybara.configure do |config|
   config.always_include_port = true
@@ -110,16 +113,16 @@ end
 OmniAuth.config.test_mode = true
 # Fake the omniauth
 OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new({
-  provider: 'facebook',
-  uid: '123545',
-  info: {
-    name: "John Testerson",
-    nickname: 'JohnnyT',
-    email: 'example.oauth.facebook@example.com',
-    image: 'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
-  },
-  credentials: {
-    token: "token",
-    secret: "donttell"
-  }
-})
+                                                                provider: 'facebook',
+                                                                uid: '123545',
+                                                                info: {
+                                                                  name: "John Testerson",
+                                                                  nickname: 'JohnnyT',
+                                                                  email: 'example.oauth.facebook@example.com',
+                                                                  image: 'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
+                                                                },
+                                                                credentials: {
+                                                                  token: "token",
+                                                                  secret: "donttell"
+                                                                }
+                                                              })

config/initializers/comfortable_mexican_sofa.rb

@@ -9,7 +9,7 @@ ComfortableMexicanSofa.configure do |config|
 
   # Module responsible for authentication. You can replace it with your own.
   # It simply needs to have #authenticate method. See http_auth.rb for reference.
-     config.admin_auth = 'CmsDeviseAuth'
+  config.admin_auth = 'CmsDeviseAuth'
 
   # Module responsible for authorization on admin side. It should have #authorize
   # method that returns true or false based on params and loaded instance
@@ -91,13 +91,11 @@ ComfortableMexicanSofa.configure do |config|
   # Reveal partials that can be overwritten in the admin area.
   # Default is false.
   #   config.reveal_cms_partials = false
-
 end
 
 module CmsDeviseAuth
   def authenticate
-    unless current_member && current_member.has_role?(:admin)
-      redirect_to root_path, alert: 'Permission denied. Please sign in as an admin user to use the CMS admin area.'
-    end
+    return if current_member && current_member.has_role?(:admin)
+    redirect_to root_path, alert: 'Permission denied. Please sign in as an admin user to use the CMS admin area.'
   end
 end

config/initializers/devise.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/LineLength
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -25,7 +26,7 @@ Devise.setup do |config|
   # session. If you need permissions, you should implement that in a before filter.
   # You can also supply a hash where the value is a boolean determining whether
   # or not authentication should be aborted when the value is not present.
-  config.authentication_keys = [ :login ]
+  config.authentication_keys = [:login]
 
   # Configure parameters from the request object used for authentication. Each entry
   # given should be a request method and it will automatically be passed to the
@@ -37,12 +38,12 @@ Devise.setup do |config|
   # Configure which authentication keys should be case-insensitive.
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email ]
+  config.case_insensitive_keys = [:email]
 
   # Configure which authentication keys should have whitespace stripped.
   # These keys will have whitespace before and after removed upon creating or
   # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email, :login_name ]
+  config.strip_whitespace_keys = [:email, :login_name]
 
   # Tell if authentication through request.params is enabled. True by default.
   # It can be set to an array that will enable params authentication only for the
@@ -101,7 +102,7 @@ Devise.setup do |config|
   config.reconfirmable = true
 
   # Defines which key will be used when confirming an account
-  config.confirmation_keys = [ :login ]
+  config.confirmation_keys = [:login]
 
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
@@ -157,7 +158,7 @@ Devise.setup do |config|
   # ==> Configuration for :recoverable
   #
   # Defines which key will be used when recovering the password for an account
-  config.reset_password_keys = [ :login ]
+  config.reset_password_keys = [:login]
 
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to

config/locales/README.md

@@ -0,0 +1,15 @@
+i18n Documentation
+===================
+
+i18n Automation
+-------------
+Automate string extraction from haml into locale files using [haml-i18n-extractor](https://github.com/shaiguitar/haml-i18n-extractor)
+
+```rake i18n:extractor[relative_path_to_view]```
+
+
+####Example
+```rake i18n:extractor[app/views/layouts/_header.html.haml]```
+
+* Creates app/views/layouts/_header.html.i18n-extractor.haml with the expected haml changes to localize app/views/layouts/_header.html.haml. After reviewing the changes, copy app/views/layouts/_header.html.i18n-extractor.haml to app/views/layouts/_header.html.haml
+* Adds new keys to locales/en.yml

config/locales/en.yml

@@ -1,204 +1,198 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
 en:
-  forms:
-    optional: "(Optional)"
-  unauthorized:
-    read:
-      notification: "You must be signed in to view notifications."
-    create:
-      planting: "Please sign in or sign up to plant something."
-      post: "Please sign in or sign up to post."
-      seed: "Please sign in or sign up to add seeds."
-      notification: "Please sign in to send a message."
-      all: "Please sign in or sign up to create a %{subject}."
-    manage:
-      all: "Not authorized to %{action} %{subject}."
-
-  layouts:
-    header:
-      skip: "Skip navigation menu"
-      browse_crops: &browse_crops "Browse Crops"
-      seeds: "Seeds"
-      plantings: "Plantings"
-      harvests: "Harvests"
-      community_map: "Community Map"
-      browse_members: "Browse Members"
-      posts: "Posts"
-      forums: &forums "Forums"
-      support_growstuff: "Support Growstuff"
-      profile: "Profile"
-      gardens: "Gardens"
-      account: "Account"
-      inbox_unread: "Inbox (%{unread_count})"
-      inbox: "Inbox"
-      crop_wrangling: "Crop Wrangling"
-      admin: "Admin"
-      your_stuff: "Your Stuff (%{unread_count})"
-
-  crops:
-    index:
-      title: *browse_crops
-      subtitle: "%{crops_size} total"
-
-  gardens:
-    form:
-      location_helper: "If you have a location set in your profile, it will be used when
-                        you create a new garden."
-
-  seeds:
-    index:
-      title:
-        default: "Everyone's seeds"
-        crop_seeds: "Everyone's %{crop} seeds"
-        owner_seeds: "%{owner} seeds"
-    form:
-      trade_help: "Are you interested in trading or swapping seeds with other
-                   %{site_name} members?  If you
-                   list your seeds as available for trade, other members can
-                   contact you to request seeds.  You can list any conditions or
-                   other information in the description, above."
-
-  plantings:
-    index:
-      title:
-        default: "Everyone's plantings"
-        crop_plantings: "Everyone's %{crop} plantings"
-        owner_plantings: "%{owner} plantings"
-    form:
-      finish_helper: "A planting is finished when you've harvested all of the crop, or
-                      it dies, or it's otherwise no longer growing in your garden."
-
-  photos:
-    show:
-      thing_by: "A %{thing} by %{owner}"
-
-  harvests:
-    index:
-      title:
-        default: "Everyone's harvests"
-        crop_harvests: "Everyone's %{crop} harvests"
-        owner_harvests: "%{owner} harvests"
-
-  places:
-    index:
-      title: "%{site_name} Community Map"
-
-  members:
-    index:
-      title: "%{site_name} members"
-
-  posts:
-    index:
-      title:
-        default: "Everyone's posts"
-        author_posts: "%{author} posts"
-
-  shop:
-    index:
-      title: "Shop"
-
-  forums:
-    index:
-      title: *forums
-
-  home:
-    blurb:
-      intro: "%{site_name} is a community of food gardeners. We're building an open source platform to help you learn about growing food, track what you plant and harvest, and swap seeds and produce with other gardeners near you."
-      perks: "Join now for your free garden journal, seed sharing, forums, and more."
-      sign_up: "Sign up"
-      already_html: "Or %{sign_in} if you already have an account"
-      sign_in_linktext: "sign in"
-
-    crops:
-      our_crops: "Some of our crops"
-      recently_planted: "Recently planted"
-      recently_added: "Recently added crops"
-      view_all: "View all crops"
-
-    discuss:
-      discussion: "Discussion"
-      forums: "Forums"
-      view_all: "View all posts"
-
-    members:
-      title: "Some of our members"
-      view_all: "View all members"
-
-    open:
-      open_source_title: "Open Source"
-      open_source_body_html: "%{site_name} is open source software, which means that we share this website's code for free with our community and the world.  We believe that openness, sustainability, and social good go hand in hand.  You can read more about %{why} or check out our code on %{github}."
-      why_linktext: "why Growstuff is open source"
-      github_linktext: "Github"
-      open_data_title: "Open Data and APIs"
-      open_data_body_html: "We're building a database of crops, planting advice, seed sources, and other information that anyone can use for free, under a %{creative_commons_link}. You can use this data for research, to build apps, or for any purpose at all.  Read more about our %{wiki_link} and %{api_docs_link}."
-      creative_commons_linktext: "Creative Commons license"
-      api_docs_linktext: "API documentation"
-      get_involved_title: "Get Involved"
-      get_involved_body_html: "We believe in collaboration, and work closely with our members and the wider food-growing community. Our team includes volunteers from all walks of life and all skill levels. To get involved, visit %{talk_link} or find more information on the %{wiki_link}."
-      talk_linktext: "Growstuff Talk"
-      wiki_linktext: "Growstuff Wiki"
-      support_title: "Support Growstuff"
-      support_body_html: "Growstuff is independent, %{ad_free} and we have no outside investment.  You can support our work by %{buy_account}."
-      ad_free_linktext: "ad-free"
-      buy_account_linktext: "buying a paid account"
-
-    seeds:
-      title: "Seeds available to trade"
-      owner: "Owner"
-      crop: "Crop"
-      description: "Description"
-      trade_to: "Will trade to"
-      from: "From location"
-      unspecified: "unspecified"
-      details: "Details"
-      view_all: "View all seeds"
-
-    stats:
-      message_html: "So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}."
-      member_linktext: "%{count} members"
-      number_crops_linktext: "%{count} crops"
-      number_plantings_linktext: "%{count} times"
-      number_gardens_linktext: "%{count} gardens"
-
-    index:
-      welcome: "Welcome to %{site_name}, %{member_name}"
-      plant: "Plant"
-      harvest: "Harvest"
-      add_seeds: "Add seeds"
-      post: "Post"
-      edit_profile: "Edit profile"
-
   activerecord:
     models:
       comment:
-        one: "comment"
-        other: "comments"
+        one: comment
+        other: comments
       crop:
-        one: "crop"
-        other: "crops"
+        one: crop
+        other: crops
       follow:
-        one: "follow"
-        other: "follows"
+        one: follow
+        other: follows
       garden:
-        one: "garden"
-        other: "gardens"
+        one: garden
+        other: gardens
       harvest:
-        one: "harvest"
-        other: "harvests"
+        one: harvest
+        other: harvests
       member:
-        one: "member"
-        other: "members"
+        one: member
+        other: members
       photo:
-        one: "photo"
-        other: "photos"
+        one: photo
+        other: photos
       planting:
-        one: "planting"
-        other: "plantings"
+        one: planting
+        other: plantings
       post:
-        one: "post"
-        other: "posts"
+        one: post
+        other: posts
       seed:
-        one: "seed"
-        other: "seeds"
+        one: seed
+        other: seeds
+  crops:
+    index:
+      subtitle: "%{crops_size} total"
+      title: Browse Crops
+  forms:
+    optional: "(Optional)"
+  forums:
+    index:
+      title: Forums
+  gardens:
+    form:
+      location_helper: If you have a location set in your profile, it will be used when you create a new garden.
+  forums:
+    index:
+      title: Forums
+  harvests:
+    index:
+      title:
+        crop_harvests: Everyone's %{crop} harvests
+        default: Everyone's harvests
+        owner_harvests: "%{owner} harvests"
+  home:
+    blurb:
+      already_html: Or %{sign_in} if you already have an account
+      intro: "%{site_name} is a community of food gardeners. We're building an open
+        source platform to help you learn about growing food, track what you plant
+        and harvest, and swap seeds and produce with other gardeners near you."
+      perks: Join now for your free garden journal, seed sharing, forums, and more.
+      sign_in_linktext: sign in
+      sign_up: Sign up
+    crops:
+      our_crops: Some of our crops
+      recently_added: Recently added crops
+      recently_planted: Recently planted
+      view_all: View all crops
+    discuss:
+      discussion: Discussion
+      forums: Forums
+      view_all: View all posts
+    index:
+      add_seeds: Add seeds
+      edit_profile: Edit profile
+      harvest: Harvest
+      plant: Plant
+      post: Post
+      welcome: Welcome to %{site_name}, %{member_name}
+    members:
+      title: Some of our members
+      view_all: View all members
+    open:
+      ad_free_linktext: ad-free
+      api_docs_linktext: API documentation
+      buy_account_linktext: buying a paid account
+      creative_commons_linktext: Creative Commons license
+      get_involved_body_html: We believe in collaboration, and work closely with our
+        members and the wider food-growing community. Our team includes volunteers
+        from all walks of life and all skill levels. To get involved, visit %{talk_link}
+        or find more information on the %{wiki_link}.
+      get_involved_title: Get Involved
+      github_linktext: Github
+      open_data_body_html: We're building a database of crops, planting advice, seed
+        sources, and other information that anyone can use for free, under a %{creative_commons_link}.
+        You can use this data for research, to build apps, or for any purpose at all.  Read
+        more about our %{wiki_link} and %{api_docs_link}.
+      open_data_title: Open Data and APIs
+      open_source_body_html: "%{site_name} is open source software, which means that
+        we share this website's code for free with our community and the world.  We
+        believe that openness, sustainability, and social good go hand in hand.  You
+        can read more about %{why} or check out our code on %{github}."
+      open_source_title: Open Source
+      support_body_html: Growstuff is independent, %{ad_free} and we have no outside
+        investment.  You can support our work by %{buy_account}.
+      support_title: Support Growstuff
+      talk_linktext: Growstuff Talk
+      why_linktext: why Growstuff is open source
+      wiki_linktext: Growstuff Wiki
+    seeds:
+      crop: Crop
+      description: Description
+      details: Details
+      from: From location
+      owner: Owner
+      title: Seeds available to trade
+      trade_to: Will trade to
+      unspecified: unspecified
+      view_all: View all seeds
+    stats:
+      member_linktext: "%{count} members"
+      message_html: So far, %{member} have planted %{number_crops} %{number_plantings}
+        in %{number_gardens}.
+      number_crops_linktext: "%{count} crops"
+      number_gardens_linktext: "%{count} gardens"
+      number_plantings_linktext: "%{count} times"
+  layouts:
+    header:
+      account: Account
+      admin: Admin
+      browse_crops: Browse Crops
+      browse_members: Browse Members
+      community_map: Community Map
+      crop_wrangling: Crop Wrangling
+      forums: Forums
+      gardens: Gardens
+      harvests: Harvests
+      inbox: Inbox
+      inbox_unread: Inbox (%{unread_count})
+      plantings: Plantings
+      posts: Posts
+      profile: Profile
+      seeds: Seeds
+      skip: Skip navigation menu
+      support_growstuff: Support Growstuff
+      your_stuff: Your Stuff (%{unread_count})
+      toggle_navigation: Toggle Navigation
+      crops: Crops
+      community: Community
+      current_memberlogin_name: '"%{current_memberlogin_name}"'
+      sign_out: Sign out
+      sign_in: Sign in
+      sign_up: Sign up
+  members:
+    index:
+      title: "%{site_name} members"
+  photos:
+    show:
+      thing_by: A %{thing} by %{owner}
+  places:
+    index:
+      title: "%{site_name} Community Map"
+  plantings:
+    form:
+      finish_helper: A planting is finished when you've harvested all of the crop, or it dies, or it's otherwise no longer growing in your garden.
+    index:
+      title:
+        crop_plantings: Everyone's %{crop} plantings
+        default: Everyone's plantings
+        owner_plantings: "%{owner} plantings"
+  posts:
+    index:
+      title:
+        author_posts: "%{author} posts"
+        default: Everyone's posts
+  seeds:
+    form:
+      trade_help: Are you interested in trading or swapping seeds with other %{site_name} members?  If you list your seeds as available for trade, other members can contact you to request seeds.  You can list any conditions or other information in the description, above.
+    index:
+      title:
+        crop_seeds: Everyone's %{crop} seeds
+        default: Everyone's seeds
+        owner_seeds: "%{owner} seeds"
+  shop:
+    index:
+      title: Shop
+  unauthorized:
+    create:
+      all: Please sign in or sign up to create a %{subject}.
+      notification: Please sign in to send a message.
+      planting: Please sign in or sign up to plant something.
+      post: Please sign in or sign up to post.
+      seed: Please sign in or sign up to add seeds.
+    manage:
+      all: Not authorized to %{action} %{subject}.
+    read:
+      notification: You must be signed in to view notifications.

config/locales/ja.yml

@@ -1,3 +1,4 @@
+---
 ja:
   home:
     blurb:

config/routes.rb

@@ -1,10 +1,14 @@
-Growstuff::Application.routes.draw do
-
+Growstuff::Application.routes.draw do # rubocop:disable Metrics/BlockLength
   get '/robots.txt' => 'robots#robots'
 
   resources :plant_parts
 
-  devise_for :members, controllers: { registrations: "registrations", passwords: "passwords", sessions: "sessions", omniauth_callbacks: "omniauth_callbacks" }
+  devise_for :members, controllers: {
+    registrations: "registrations",
+    passwords: "passwords",
+    sessions: "sessions",
+    omniauth_callbacks: "omniauth_callbacks"
+  }
   devise_scope :member do
     get '/members/unsubscribe/:message' => 'members#unsubscribe', :as => 'unsubscribe_member'
   end
@@ -53,7 +57,6 @@ Growstuff::Application.routes.draw do
   get '/members/:login_name/follows' => 'members#view_follows', :as => 'member_follows'
   get '/members/:login_name/followers' => 'members#view_followers', :as => 'member_followers'
 
-
   get '/places' => 'places#index'
   get '/places/search' => 'places#search', :as => 'search_places'
   get '/places/:place' => 'places#show', :as => 'place'
@@ -86,7 +89,6 @@ Growstuff::Application.routes.draw do
 
   get '/.well-known/acme-challenge/:id' => 'pages#letsencrypt'
 
-# CMS stuff  -- must remain LAST
+  # CMS stuff  -- must remain LAST
   comfy_route :cms, path: '/', sitemap: false
-
 end

config/setup_load_paths.rb

@@ -1,7 +1,5 @@
 if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
   begin
-    rvm_path     = File.dirname(File.dirname(ENV['MY_RUBY_HOME']))
-    rvm_lib_path = File.join(rvm_path, 'lib')
     require 'rvm'
     RVM.use_from_path! File.dirname(File.dirname(__FILE__))
   rescue LoadError

config/unicorn.rb

@@ -4,7 +4,6 @@ timeout 30
 preload_app true
 
 before_fork do |server, worker|
-
   Signal.trap 'TERM' do
     puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
     Process.kill 'QUIT', Process.pid
@@ -15,7 +14,6 @@ before_fork do |server, worker|
 end
 
 after_fork do |server, worker|
-
   Signal.trap 'TERM' do
     puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
   end

db/migrate/20120903092956_devise_create_users.rb

@@ -33,7 +33,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
       ## Token authenticatable
       # t.string :authentication_token
 
-
       t.timestamps null: true
     end
 

db/migrate/20121109130033_add_creation_index_to_updates.rb

@@ -1,5 +1,5 @@
 class AddCreationIndexToUpdates < ActiveRecord::Migration
   def change
-      add_index :updates, [:created_at, :user_id]
+    add_index :updates, [:created_at, :user_id]
   end
 end

db/migrate/20130518002942_rename_account_detail_to_account.rb

@@ -2,5 +2,4 @@ class RenameAccountDetailToAccount < ActiveRecord::Migration
   def change
     rename_table :account_details, :accounts
   end
-
 end