Merge remote-tracking branch 'upstream/dev' into likeable

2026-03-12 11:59:30 -04:00 · 2016-12-09 11:42:32 +10:30
parent 07f7bd24d5 3e43a19e58
commit fef272e30f
387 changed files with 4525 additions and 3721 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -21,6 +21,10 @@ engines:
      - javascript
  fixme:
    enabled: true
+    exclude_fingerprints:  # rubocop_todo filename
+    - 63b8552079d106832fbe281566b6d028
+    - d38afbaaea3ecaa9a4cf046b07a01cec
+    - 57ff3968fd371d3e1f75c237d6c78acf
 ratings:
  paths:
  - "**.rb"
@@ -34,3 +38,4 @@ exclude_paths:
 - db/
 - spec/
 - public/
+- app/assets/stylesheets/bootstrap-accessibility.css
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -0,0 +1,78 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  Include:
+    - 'Rakefile'
+    - 'config.ru'
+    - 'lib/**/*.rake'
+  Exclude:
+    - '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'
+  # Set to 30 once all methods are fixed.
+  # Max: 30
+  Max: 104
+
+# Remove the following once the code style matches
+# Offense count: 59
+Metrics/AbcSize:
+  Max: 38
+
+# Offense count: 5
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 62
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 275
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 11
+
+Metrics/LineLength:
+  Max: 120
+
+# Offense count: 8
+Metrics/PerceivedComplexity:
+  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'
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -0,0 +1,733 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 500`
+# on 2016-11-13 10:16:38 +1300 using RuboCop version 0.45.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 24
+Lint/AmbiguousRegexpLiteral:
+  Exclude:
+    - 'app/models/order.rb'
+    - 'spec/controllers/admin/orders_controller_spec.rb'
+    - 'spec/controllers/orders_controller_spec.rb'
+    - 'spec/features/cms_spec.rb'
+    - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+    - 'spec/models/comment_spec.rb'
+    - 'spec/models/planting_spec.rb'
+    - 'spec/models/post_spec.rb'
+    - 'spec/views/members/show.rss.haml_spec.rb'
+    - 'spec/views/posts/show.html.haml_spec.rb'
+
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/tasks/testing.rake'
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+    - 'app/controllers/sessions_controller.rb'
+    - 'app/models/post.rb'
+    - 'config/unicorn.rb'
+    - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/passwords_controller.rb'
+    - 'app/controllers/registrations_controller.rb'
+    - 'app/models/crop.rb'
+    - 'app/validators/approved_validator.rb'
+    - 'spec/views/plantings/show.html.haml_spec.rb'
+
+# Offense count: 5
+Lint/Void:
+  Exclude:
+    - 'spec/models/crop_spec.rb'
+    - 'spec/models/garden_spec.rb'
+    - 'spec/models/post_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Performance/StringReplacement:
+  Exclude:
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/seed.rb'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 10
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/Date:
+  Exclude:
+    - 'app/controllers/harvests_controller.rb'
+    - 'app/controllers/plantings_controller.rb'
+    - 'db/seeds.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/controllers/plantings_controller_spec.rb'
+    - 'spec/factories/planting.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/shared_examples/append_date.rb'
+
+# Offense count: 11
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasAndBelongsToMany:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/member.rb'
+    - 'app/models/photo.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/post.rb'
+    - 'app/models/product.rb'
+    - 'app/models/role.rb'
+
+# Offense count: 3
+Rails/OutputSafety:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/auto_suggest_helper.rb'
+    - 'app/helpers/gardens_helper.rb'
+
+# Offense count: 9
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Exclude:
+    - 'app/helpers/plantings_helper.rb'
+    - 'spec/controllers/accounts_controller_spec.rb'
+    - 'spec/factories/member.rb'
+    - 'spec/factories/post.rb'
+    - 'spec/models/post_spec.rb'
+    - 'spec/views/plantings/index.html.haml_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/Validation:
+  Exclude:
+    - 'app/models/member.rb'
+    - 'app/models/order_item.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Exclude:
+    - 'app/models/notification.rb'
+    - 'app/models/photo.rb'
+    - 'config/unicorn.rb'
+    - 'lib/tasks/growstuff.rake'
+
+# Offense count: 2
+Style/AsciiComments:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'config/initializers/comfortable_mexican_sofa.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+  Exclude:
+    - 'app/helpers/auto_suggest_helper.rb'
+    - 'spec/support/feature_helpers.rb'
+
+# Offense count: 25
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'app/controllers/alternate_names_controller.rb'
+    - 'app/controllers/members_controller.rb'
+    - 'app/controllers/posts_controller.rb'
+    - 'app/controllers/scientific_names_controller.rb'
+    - 'spec/controllers/harvests_controller_spec.rb'
+    - 'spec/controllers/order_items_controller_spec.rb'
+    - 'spec/features/notifications_spec.rb'
+    - 'spec/models/ability_spec.rb'
+    - 'spec/models/comment_spec.rb'
+    - 'spec/models/follow_spec.rb'
+    - 'spec/models/member_spec.rb'
+    - 'spec/models/planting_spec.rb'
+    - 'spec/models/post_spec.rb'
+    - 'spec/views/crops/edit.html.haml_spec.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+    - 'app/controllers/posts_controller.rb'
+    - 'spec/models/ability_spec.rb'
+    - 'spec/models/member_spec.rb'
+    - 'spec/models/planting_spec.rb'
+
+# Offense count: 93
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Exclude:
+    - 'app/controllers/admin/orders_controller.rb'
+    - 'app/controllers/crops_controller.rb'
+    - 'app/controllers/posts_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/member.rb'
+    - 'app/models/order.rb'
+    - 'config/environments/test.rb'
+    - 'spec/controllers/admin/orders_controller_spec.rb'
+    - 'spec/controllers/comments_controller_spec.rb'
+    - 'spec/controllers/harvests_controller_spec.rb'
+    - 'spec/controllers/member_controller_spec.rb'
+    - 'spec/controllers/notifications_controller_spec.rb'
+    - 'spec/controllers/order_items_controller_spec.rb'
+    - 'spec/controllers/orders_controller_spec.rb'
+    - 'spec/controllers/places_controller_spec.rb'
+    - 'spec/controllers/plantings_controller_spec.rb'
+    - 'spec/controllers/posts_controller_spec.rb'
+    - 'spec/controllers/scientific_names_controller_spec.rb'
+    - 'spec/controllers/seeds_controller_spec.rb'
+    - 'spec/lib/actions/oauth_signup_action_spec.rb'
+    - 'spec/views/notifier/notify.html.haml_spec.rb'
+    - 'spec/views/photos/new.html.haml_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'app/controllers/admin/orders_controller.rb'
+    - 'lib/actions/oauth_signup_action.rb'
+    - 'lib/haml/filters/escaped_markdown.rb'
+    - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/ClassMethods:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'app/models/member.rb'
+    - 'app/models/order.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/post.rb'
+    - 'app/models/seed.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ColonMethodCall:
+  Exclude:
+    - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+Style/CommentAnnotation:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/DefWithParentheses:
+  Exclude:
+    - 'spec/views/posts/_single.html.haml_spec.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/EachForSimpleLoop:
+  Exclude:
+    - 'spec/models/crop_spec.rb'
+    - 'spec/views/home/_crops.html.haml_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLiteral:
+  Exclude:
+    - 'app/models/member.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: for, each
+Style/For:
+  Exclude:
+    - 'app/models/order.rb'
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/views/shop/index_spec.rb'
+
+# Offense count: 35
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+    - 'app/helpers/harvests_helper.rb'
+    - 'app/helpers/plantings_helper.rb'
+    - 'app/mailers/notifier.rb'
+    - 'app/models/ability.rb'
+    - 'app/models/account.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/member.rb'
+    - 'app/models/notification.rb'
+    - 'app/models/order.rb'
+    - 'app/models/order_item.rb'
+    - 'app/models/photo.rb'
+    - 'app/models/seed.rb'
+    - 'app/validators/approved_validator.rb'
+    - 'config/initializers/comfortable_mexican_sofa.rb'
+    - 'lib/geocodable.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+    - 'spec/support/elasticsearch_helpers.rb'
+
+# Offense count: 4
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+    - 'app/controllers/follows_controller.rb'
+
+# Offense count: 1
+Style/IfInsideElse:
+  Exclude:
+    - 'app/models/harvest.rb'
+
+# Offense count: 26
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/gardens_controller.rb'
+    - 'app/controllers/shop_controller.rb'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/member.rb'
+    - 'app/models/order.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/seed.rb'
+    - 'config/initializers/geocoder.rb'
+    - 'lib/tasks/growstuff.rake'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'spec/controllers/member_controller_spec.rb'
+    - 'spec/models/photo_spec.rb'
+
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Exclude:
+    - 'app/models/photo.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/views/plantings/new.html.haml_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineArrayBraceLayout:
+  Exclude:
+    - 'app/models/seed.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+    - 'app/controllers/posts_controller.rb'
+    - 'spec/models/ability_spec.rb'
+    - 'spec/models/member_spec.rb'
+    - 'spec/models/planting_spec.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineHashBraceLayout:
+  Exclude:
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/product.rb'
+    - 'app/models/seed.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/MultilineIfThen:
+  Exclude:
+    - 'lib/tasks/growstuff.rake'
+    - 'script/check_contributors_md'
+    - 'script/gemfile_check'
+
+# Offense count: 93
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/authentications_controller.rb'
+    - 'app/controllers/seeds_controller.rb'
+    - 'app/models/account.rb'
+    - 'app/models/crop.rb'
+    - 'spec/controllers/order_items_controller_spec.rb'
+    - 'spec/helpers/gardens_helper_spec.rb'
+    - 'spec/helpers/harvests_helper_spec.rb'
+    - 'spec/helpers/plantings_helper_spec.rb'
+    - 'spec/helpers/seeds_helper_spec.rb'
+    - 'spec/models/ability_spec.rb'
+    - 'spec/models/crop_spec.rb'
+    - 'spec/models/harvest_spec.rb'
+    - 'spec/models/member_spec.rb'
+    - 'spec/models/order_spec.rb'
+    - 'spec/models/plant_part_spec.rb'
+    - 'spec/models/planting_spec.rb'
+    - 'spec/models/post_spec.rb'
+    - 'spec/views/account_types/edit.html.haml_spec.rb'
+    - 'spec/views/account_types/new.html.haml_spec.rb'
+    - 'spec/views/account_types/show.html.haml_spec.rb'
+    - 'spec/views/crops/_grown_for.html.haml_spec.rb'
+    - 'spec/views/crops/_planting_advice.html.haml_spec.rb'
+    - 'spec/views/forums/edit.html.haml_spec.rb'
+    - 'spec/views/harvests/index.html.haml_spec.rb'
+    - 'spec/views/orders/show.html.haml_spec.rb'
+    - 'spec/views/photos/edit.html.haml_spec.rb'
+    - 'spec/views/plant_parts/edit.html.haml_spec.rb'
+    - 'spec/views/plant_parts/new.html.haml_spec.rb'
+    - 'spec/views/plantings/_form.html.haml_spec.rb'
+    - 'spec/views/plantings/edit.html.haml_spec.rb'
+    - 'spec/views/plantings/index.html.haml_spec.rb'
+    - 'spec/views/plantings/new.html.haml_spec.rb'
+    - 'spec/views/plantings/show.html.haml_spec.rb'
+    - 'spec/views/posts/edit.html.haml_spec.rb'
+    - 'spec/views/products/edit.html.haml_spec.rb'
+    - 'spec/views/products/new.html.haml_spec.rb'
+    - 'spec/views/roles/edit.html.haml_spec.rb'
+    - 'spec/views/roles/index.html.haml_spec.rb'
+    - 'spec/views/roles/new.html.haml_spec.rb'
+    - 'spec/views/roles/show.html.haml_spec.rb'
+    - 'spec/views/scientific_names/edit.html.haml_spec.rb'
+    - 'spec/views/scientific_names/show.html.haml_spec.rb'
+
+# Offense count: 2
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'app/controllers/notifications_controller.rb'
+    - 'app/controllers/order_items_controller.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/seed.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/garden.rb'
+    - 'script/check_contributors_md'
+
+# Offense count: 2
+Style/NestedTernaryOperator:
+  Exclude:
+    - 'app/controllers/harvests_controller.rb'
+    - 'app/controllers/plantings_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+  Exclude:
+    - 'app/models/post.rb'
+    - 'lib/tasks/growstuff.rake'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/NilComparison:
+  Exclude:
+    - 'lib/tasks/growstuff.rake'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IncludeSemanticChanges.
+Style/NonNilCheck:
+  Exclude:
+    - 'app/models/harvest.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
+# SupportedOctalStyles: zero_with_o, zero_only
+Style/NumericLiteralPrefix:
+  Exclude:
+    - 'spec/views/plantings/_form.html.haml_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 9
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/helpers/harvests_helper.rb'
+    - 'app/helpers/plantings_helper.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/photo.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'script/check_contributors_md'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/ParallelAssignment:
+  Exclude:
+    - 'app/mailers/notifier.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowSafeAssignment.
+Style/ParenthesesAroundCondition:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/orders_controller.rb'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/member.rb'
+    - 'config/factory_girl.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'app/helpers/auto_suggest_helper.rb'
+    - 'script/check_contributors_md'
+    - 'spec/features/signin_spec.rb'
+    - 'spec/features/signout_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'app/models/post.rb'
+    - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 3
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/member.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantParentheses:
+  Exclude:
+    - 'app/helpers/plantings_helper.rb'
+    - 'app/models/garden.rb'
+
+# Offense count: 56
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'app/models/comment.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/follow.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/member.rb'
+    - 'app/models/notification.rb'
+    - 'app/models/order.rb'
+    - 'app/models/photo.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/post.rb'
+    - 'app/models/seed.rb'
+    - 'lib/geocodable.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+    - 'spec/rails_helper.rb'
+    - 'spec/views/devise/registrations/edit_spec.rb'
+    - 'spec/views/members/index.html.haml_spec.rb'
+    - 'spec/views/posts/index.html.haml_spec.rb'
+    - 'spec/views/posts/show.html.haml_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SelfAssignment:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: use_perl_names, use_english_names
+Style/SpecialGlobalVars:
+  EnforcedStyle: use_perl_names
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+  Exclude:
+    - 'app/models/follow.rb'
+    - 'app/models/post.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+    - 'app/models/crop.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/post.rb'
+    - 'lib/tasks/growstuff.rake'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# SupportedStyles: require_parentheses, require_no_parentheses
+Style/TernaryParentheses:
+  Exclude:
+    - 'app/helpers/plantings_helper.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInArguments:
+  Exclude:
+    - 'app/models/post.rb'
+    - 'db/seeds.rb'
+    - 'lib/actions/oauth_signup_action.rb'
+    - 'lib/tasks/growstuff.rake'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'config/environments/test.rb'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnlessElse:
+  Exclude:
+    - 'app/controllers/omniauth_callbacks_controller.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'app/models/harvest.rb'
+    - 'spec/features/crops/crop_wranglers_spec.rb'
+    - 'spec/features/following_spec.rb'
+    - 'spec/features/shared_examples/append_date.rb'
+    - 'spec/models/crop_spec.rb'
+    - 'spec/models/forum_spec.rb'
+    - 'spec/models/member_spec.rb'
+    - 'spec/models/plant_part_spec.rb'
+    - 'spec/views/layouts/_header_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'spec/support/feature_helpers.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, MinSize, WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  Exclude:
+    - 'app/controllers/omniauth_callbacks_controller.rb'
+    - 'app/models/crop.rb'
+    - 'spec/models/seed_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'app/models/photo.rb'
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 sudo: false
 language: ruby
-cache: bundler
+cache:
+  bundler: true
+  directories:
+    - travis_phantomjs
 env:
  matrix:
    - GROWSTUFF_SITE_NAME="Growstuff (travis)" RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' GROWSTUFF_ELASTICSEARCH='true'
@@ -8,14 +11,27 @@ env:
  global:
    secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 rvm:
- 2.3.1
+  - 2.3.1
+before_install:
+  - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
+  - >
+    if [ $(phantomjs --version) != '2.1.1' ]; then
+    PHANTOM_URL=https://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:
- 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:
@@ -28,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:
--- a/.yamllint
+++ b/.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
--- a/CONTRIBUTING.md
+++ b/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).

--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -70,3 +70,6 @@ submit the change with your pull request.
 - Eric Tillberg / [Thrillberg](https://github.com/Thrillberg)
 - Lucas Nogueira / [lucasnogueira](https://github.com/lucasnogueira)
 - 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)
--- a/23
+++ b/23
@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'

 ruby '2.3.1'

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

 gem 'bundler', '>=1.1.5'

@@ -14,11 +15,11 @@ gem 'haml'
 gem 'bootstrap-sass', '~> 3.3.6'
 gem 'font-awesome-sass'

-gem 'uglifier', '~> 2.7.2'         # JavaScript compressor
+gem 'uglifier', '~> 2.7.2' # JavaScript compressor

 gem 'jquery-rails'
 gem 'jquery-ui-rails', '~> 5.0.2'
-gem 'js-routes'  # provides access to Rails routes in Javascript
+gem 'js-routes' # provides access to Rails routes in Javascript
 gem 'flickraw'

 gem 'leaflet-rails'
@@ -38,6 +39,7 @@ gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari

 gem 'activemerchant'
 gem 'active_utils'
+gem 'sidekiq'

 # Markdown formatting for updates etc
 gem 'bluecloth'
@@ -64,9 +66,10 @@ gem 'bootstrap-datepicker-rails'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-flickr', '>= 0.0.15'
+gem 'omniauth-facebook'

 # client for Elasticsearch. Elasticsearch is a flexible
-# and powerful, distributed, real-time search and analytics engine. 
+# and powerful, distributed, real-time search and analytics engine.
 # An example of the use in the project is fuzzy crop search.
 gem "elasticsearch-model"
 gem "elasticsearch-rails"
@@ -78,7 +81,8 @@ group :production, :staging do
  gem 'dalli'
  gem 'memcachier'
  gem 'rails_12factor' # supresses heroku plugin injection
-  gem 'bonsai-elasticsearch-rails'  # Integration with Bonsa-Elasticsearch on heroku
+  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
+  gem 'sparkpost_rails'
 end

 group :development do
@@ -106,11 +110,16 @@ 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
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      rack (~> 1.6)
      rack-test (~> 0.6.2)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
@@ -24,34 +24,35 @@ GEM
      actionpack
    active_merchant-paypal-bogus-gateway (0.1.0)
      activemerchant
-    active_utils (3.2.0)
-      activesupport (>= 3.2)
+    active_utils (3.2.3)
+      activesupport (>= 3.2, < 5.1.0)
      i18n
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
      globalid (>= 0.3.0)
-    activemerchant (1.59.0)
+    activemerchant (1.61.0)
      activesupport (>= 3.2.14, < 5.1)
      builder (>= 2.1.2, < 4.0.0)
      i18n (>= 0.6.9)
      nokogiri (~> 1.4)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.7.1)
      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      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.3.6.2)
+    autoprefixer-rails (6.4.0.2)
      execjs
    bcrypt (3.1.11)
    better_errors (2.1.1)
@@ -62,19 +63,19 @@ GEM
      debug_inspector (>= 0.0.1)
    bluecloth (2.2.0)
    bonsai-elasticsearch-rails (0.0.4)
-    bootstrap-datepicker-rails (1.6.1.1)
+    bootstrap-datepicker-rails (1.6.4.1)
      railties (>= 3.0)
    bootstrap-kaminari-views (0.0.5)
      kaminari (>= 0.13)
      rails (>= 3.1)
-    bootstrap-sass (3.3.6)
+    bootstrap-sass (3.3.7)
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
-    bootstrap_form (2.3.0)
+    bootstrap_form (2.5.2)
    builder (3.2.2)
-    byebug (9.0.5)
+    byebug (9.0.6)
    cancancan (1.15.0)
-    capybara (2.7.1)
+    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)
@@ -96,8 +97,8 @@ GEM
      climate_control (>= 0.0.3, < 1.0)
    codeclimate-test-reporter (0.6.0)
      simplecov (>= 0.7.1, < 1.0.0)
-    codemirror-rails (5.11)
-      railties (>= 3.0, < 5)
+    codemirror-rails (5.16.0)
+      railties (>= 3.0, < 6.0)
    coderay (1.1.1)
    coffee-rails (4.1.1)
      coffee-script (>= 2.2.0)
@@ -122,18 +123,19 @@ GEM
      rails-i18n (>= 4.0.0)
      sass-rails (>= 4.0.3)
    concurrent-ruby (1.0.2)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
-      term-ansicolor (~> 1.3)
+    connection_pool (2.2.0)
+    coveralls (0.8.16)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3.0)
      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    csv_shaper (1.2.0)
+      tins (>= 1.6.0, < 2)
+    csv_shaper (1.3.0)
      activesupport (>= 3.0.0)
    dalli (2.7.6)
    database_cleaner (1.5.3)
    debug_inspector (0.0.2)
-    devise (4.1.1)
+    devise (4.2.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0, < 5.1)
@@ -145,21 +147,21 @@ GEM
      json
      thread
      thread_safe
-    elasticsearch (1.0.18)
-      elasticsearch-api (= 1.0.18)
-      elasticsearch-transport (= 1.0.18)
-    elasticsearch-api (1.0.18)
+    elasticsearch (2.0.0)
+      elasticsearch-api (= 2.0.0)
+      elasticsearch-transport (= 2.0.0)
+    elasticsearch-api (2.0.0)
      multi_json
    elasticsearch-model (0.1.9)
      activesupport (> 3)
      elasticsearch (> 0.4)
      hashie
    elasticsearch-rails (0.1.9)
-    elasticsearch-transport (1.0.18)
+    elasticsearch-transport (2.0.0)
      faraday
      multi_json
    erubis (2.7.0)
-    excon (0.50.1)
+    excon (0.54.0)
    execjs (2.7.0)
    factory_girl (4.7.0)
      activesupport (>= 3.0.0)
@@ -168,7 +170,7 @@ GEM
      railties (>= 3.0.0)
    faraday (0.9.2)
      multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.14)
    figaro (1.1.1)
      thor (~> 0.14)
    flickraw (0.9.9)
@@ -181,7 +183,7 @@ GEM
    gibbon (1.2.1)
      httparty
      multi_json (>= 1.9.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
      activesupport (>= 4.1.0)
    gravatar-ultimate (2.0.0)
      activesupport (>= 2.3.14)
@@ -196,12 +198,18 @@ GEM
      shellany (~> 0.0)
      thor (>= 0.18.1)
    guard-compat (1.2.1)
-    guard-rspec (4.7.2)
+    guard-rspec (4.7.3)
      guard (~> 2.1)
      guard-compat (~> 1.1)
      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)
@@ -218,11 +226,10 @@ GEM
      haml (~> 4.0.0)
      nokogiri (~> 1.6.0)
      ruby_parser (~> 3.5)
-    httparty (0.13.7)
-      json (~> 1.8)
+    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)
@@ -232,21 +239,22 @@ GEM
      parser (>= 2.2.3.0)
      term-ansicolor (>= 1.3.2)
      terminal-table (>= 1.5.1)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.1)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (5.0.5)
      railties (>= 3.2.16)
-    js-routes (1.2.6)
+    js-routes (1.3.0)
      railties (>= 3.2)
      sprockets-rails
    json (1.8.3)
+    jwt (1.5.6)
    kaminari (0.17.0)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
    kgio (2.10.0)
-    kramdown (1.11.1)
+    kramdown (1.13.1)
    launchy (2.4.3)
      addressable (~> 2.3)
    leaflet-markercluster-rails (0.7.0)
@@ -268,69 +276,82 @@ GEM
    mime-types (3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
-    mimemagic (0.3.0)
+    mimemagic (0.3.2)
    mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
    multi_json (1.11.3)
    multi_xml (0.5.5)
    multipart-post (2.0.0)
    nenv (0.3.0)
-    newrelic_rpm (3.16.0.318)
-    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.0)
+    notiffany (0.1.1)
      nenv (~> 0.1)
      shellany (~> 0.0)
    oauth (0.5.1)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
    omniauth (1.3.1)
      hashie (>= 1.2, < 4)
      rack (>= 1.0, < 3)
+    omniauth-facebook (3.0.0)
+      omniauth-oauth2 (~> 1.2)
    omniauth-flickr (0.0.19)
      multi_json (~> 1.11.0)
      omniauth-oauth (~> 1.0)
    omniauth-oauth (1.1.0)
      oauth
      omniauth (~> 1.0)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
    omniauth-twitter (1.2.1)
      json (~> 1.3)
      omniauth-oauth (~> 1.1)
    orm_adapter (0.5.0)
-    paperclip (4.3.6)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    paperclip (5.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
      cocaine (~> 0.5.5)
      mime-types
-      mimemagic (= 0.3.0)
-    parser (2.3.1.2)
+      mimemagic (~> 0.3.0)
+    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)
-    pry (0.10.3)
+    powerpack (0.1.1)
+    pry (0.10.4)
      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)
      rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.7.1)
      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
@@ -340,7 +361,7 @@ GEM
      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
-    rails-i18n (4.0.8)
+    rails-i18n (4.0.9)
      i18n (~> 0.7)
      railties (~> 4.0)
    rails_12factor (0.0.3)
@@ -348,50 +369,59 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
-    raindrops (0.16.0)
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
+    rainbow (2.1.0)
+    raindrops (0.17.0)
+    rake (11.3.0)
+    rb-fsevent (0.9.8)
    rb-inotify (0.9.7)
      ffi (>= 0.5.0)
-    responders (2.2.0)
+    redis (3.3.2)
+    responders (2.3.0)
      railties (>= 4.2.0, < 5.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
    rspec-activemodel-mocks (1.0.3)
      activemodel (>= 3.0)
      activesupport (>= 3.0)
      rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby-units (2.0.0)
-    ruby_dep (1.3.1)
-    ruby_parser (3.8.2)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.45.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    ruby-units (2.0.1)
+    ruby_dep (1.4.0)
+    ruby_parser (3.8.3)
      sexp_processor (~> 4.1)
    rubyzip (1.2.0)
    sass (3.4.22)
-    sass-rails (5.0.5)
+    sass-rails (5.0.6)
      railties (>= 4.0.0, < 6)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
@@ -403,13 +433,24 @@ GEM
      websocket (~> 1.0)
    sexp_processor (4.7.0)
    shellany (0.0.1)
-    simplecov (0.11.2)
+    sidekiq (4.1.4)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      redis (~> 3.2, >= 3.2.1)
+      sinatra (>= 1.4.7)
+    simplecov (0.12.0)
      docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.0)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
    slop (3.6.0)
-    sprockets (3.6.2)
+    sparkpost_rails (1.4.0)
+      rails (>= 4.0, < 5.1)
+    sprockets (3.7.0)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
    sprockets-rails (3.1.1)
@@ -418,17 +459,20 @@ 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.3)
    thread (0.2.2)
    thread_safe (0.3.5)
    tilt (2.0.5)
-    tins (1.6.0)
+    tins (1.13.0)
+    trollop (1.16.2)
    tzinfo (1.2.2)
      thread_safe (~> 0.1)
    uglifier (2.7.2)
      execjs (>= 0.3.0)
      json (>= 1.8.0)
+    unicode-display_width (1.1.1)
    unicorn (5.1.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
@@ -487,6 +531,7 @@ DEPENDENCIES
  guard
  guard-rspec
  haml
+  haml-i18n-extractor
  haml-rails
  heroku-api
  i18n-tasks
@@ -500,20 +545,24 @@ DEPENDENCIES
  memcachier
  newrelic_rpm
  omniauth
+  omniauth-facebook
  omniauth-flickr (>= 0.0.15)
  omniauth-twitter
  pg
-  poltergeist (~> 1.6)
+  poltergeist
  pry
  quiet_assets
-  rails (~> 4.2.0)
+  rails (~> 4.2.7)
  rails_12factor
  rake (>= 10.0.0)
  rspec-activemodel-mocks
  rspec-rails
+  rubocop
  ruby-units
  sass-rails (~> 5.0.4)
  selenium-webdriver
+  sidekiq
+  sparkpost_rails
  uglifier (~> 2.7.2)
  unicorn
  webrat
@@ -523,4 +572,4 @@ RUBY VERSION
   ruby 2.3.1p112

 BUNDLED WITH
-   1.12.5
+   1.13.6
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ frontend features. We welcome contributions -- see
 * To set up your development environment, see [Getting started](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
 * We encourage [pair programming](http://wiki.growstuff.org/index.php/Pairing), especially for newer developers. [Find a pair programming partner.](http://talk.growstuff.org/t/find-a-pair-programming-partner/13)
 * Drop in to our [discussion forums](http://talk.growstuff.org/), IRC or Gitter to chat to other developers, get help, etc.
-* You may also be interested in our [API](http://wiki.growstuff.org/index.php/API).
+* You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).

 ## For designers, writers, researchers, data wranglers, and other contributors

--- a/app/assets/images/facebook-login-splash.png
+++ b/app/assets/images/facebook-login-splash.png
--- a/app/assets/javascripts/append_date.js.coffee
+++ b/app/assets/javascripts/append_date.js.coffee
@@ -5,16 +5,15 @@
 jQuery ->

  el = $('.append-date')
-  
-  el.datepicker({'format': 'yyyy-mm-dd'})

-  href = el.attr('href')
+  el.datepicker({'format': 'yyyy-mm-dd'})

  el.click (e) ->
    e.stopPropagation()
    e.preventDefault()

    originalText = $(this).text()
+    href = $(this).attr('href')
    $(this).text('Confirm without date')

    $(this).bind('click.confirm', (e) ->
@@ -30,6 +29,8 @@ jQuery ->

  el.one 'changeDate', ->
    date = $(this).datepicker('getDate')
+    href = $(this).attr('href')
+
    url  = "#{href}&planting[finished_at]=#{date}"

    link = $("<a href='#{url}' data-method='put'></a>")
--- a/app/assets/javascripts/crops.js.erb
+++ b/app/assets/javascripts/crops.js.erb
@@ -1,6 +1,7 @@
 if (document.getElementById("cropmap") !== null) {
  mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
-  mapbox_base_url = "https://c.tiles.mapbox.com/v3/" + mapbox_map_id + "/{z}/{x}/{y}.png";
+  mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
+  mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;

  L.Icon.Default.imagePath = '/assets'

--- a/app/assets/javascripts/members.js.erb
+++ b/app/assets/javascripts/members.js.erb
@@ -1,6 +1,7 @@
 if (document.getElementById("membermap") !== null) {
  mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
-  mapbox_base_url = "https://c.tiles.mapbox.com/v3/" + mapbox_map_id + "/{z}/{x}/{y}.png";
+  mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
+  mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;

  L.Icon.Default.imagePath = '/assets'

--- a/app/assets/javascripts/places.js.erb
+++ b/app/assets/javascripts/places.js.erb
@@ -1,7 +1,8 @@
 if (document.getElementById("placesmap") !== null) {
  places_base_path = "/places";
  mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
-  mapbox_base_url = "https://c.tiles.mapbox.com/v3/" + mapbox_map_id + "/{z}/{x}/{y}.png";
+  mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
+  mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
  nominatim_base_url = 'http://nominatim.openstreetmap.org/search/';
  nominatim_user_agent_email = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.user_agent_email %>";

--- a/app/assets/javascripts/seeds.js.coffee
+++ b/app/assets/javascripts/seeds.js.coffee
@@ -42,4 +42,3 @@ $ ->
      element = document.getElementById(tmp)
      console.log("%s",tmp)
      element.remove()
-    
--- a/app/assets/stylesheets/overrides.sass
+++ b/app/assets/stylesheets/overrides.sass
@@ -2,7 +2,7 @@
@import "bootstrap"
@import "custom_bootstrap/variables"
 // this padding needs to be done before the responsive stuff is imported
-body 
+body
  // modifying this for our promotional banner. can be replaced after if
  // needed.
  // padding-top: $navbar-height + 15px
@@ -19,14 +19,14 @@ body
 //@import "bootstrap/glyphicons"


-.list-inline > li.first 
+.list-inline > li.first
  padding-left: 0px

-h2 
+h2
  font-size: 150%


-//#subtitle 
+//#subtitle
 //  color: lighten($brown, 30%)
 //  font-style: italic
 //  font-weight: normal
@@ -34,36 +34,49 @@ h2
 //  padding-left: 1em
 //  padding-top: 0px

-h3 
+h3
  font-size: 120%

-.main 
+.main
  padding-right: 1em

+.navbar .navbar-form
+  padding-top: 0
+  padding-bottom: 0
+  margin-right: 0
+  margin-left: 15px
+  border: 0
+  -webkit-box-shadow: none
+  box-shadow: none
+
+.img-responsive
+  max-width: 100%
+  height: auto
+
 .sidebar
  border-left: 1px solid darken($beige, 10%)
  margin-left: -1px
  padding-left: 1em

 // this is used for eg. crops and members index pages
-.six-across:nth-child(6n+1) 
+.six-across:nth-child(6n+1)
  margin-left: 0px

-.three-across:nth-child(3n+1) 
+.three-across:nth-child(3n+1)
  margin-left: 0px
  clear: both

 // let's condense the hero unit a little
-.jumbotron 
+.jumbotron
  padding-top: 30px
  padding-bottom: 30px

 // info under the main heading on homepage
-.jumbotron .info 
+.jumbotron .info
  padding-top: 15px

 // signup widget on homepage
-.jumbotron .signup 
+.jumbotron .signup
  background-color: lighten($green, 40%)
  border: 1px solid lighten($green, 20%)
  border-radius: 6px
@@ -72,19 +85,19 @@ h3
  text-align: center

 // stats shown on homepage. eg. "999 members..."
-p.stats 
+p.stats
  font-weight: bold

-.member-cards 
+.member-cards
  display: flex
  flex: none
  flex-wrap: wrap
  justify-content: space-between

-.member-thumbnail 
+.member-thumbnail
  padding: .25em

-  div 
+  div
    width: 5em
    display: inline-block
    vertical-align: top
@@ -103,7 +116,7 @@ p.stats
      margin-left: auto

@media (min-width: $screen-md-min)
-  .planting-thumbnail 
+  .planting-thumbnail
    dl.planting-attributes
      font-size: 85%
      width: 100%
@@ -115,10 +128,14 @@ p.stats
        padding-left: 80px
        margin-left: auto

-#placesmap, #cropmap 
+  .navbar .navbar-form
+    width: 250px
+
+
+#placesmap, #cropmap
  height: 500px

-#membermap 
+#membermap
  height: 250px

 .location-not-set
@@ -128,23 +145,23 @@ p.stats
  background-repeat: no-repeat
  background-position: center

-.member-location 
+.member-location
  font-size: small
  font-style: italic


-.member-location a 
+.member-location a
  color: $brown


-.photo-thumbnail 
+.photo-thumbnail
  padding: 0
  position: relative

  img
    width: 100%
-  
-  .text 
+
+  .text
    display: none
    color: #000
    position: absolute
@@ -152,100 +169,100 @@ p.stats
    background: rgba(0, 0, 0, 0.8)
    width: 100%
    margin: 0
-  
-  p 
+
+  p
    padding: 5px
    margin: 0
    color: #fff
-  
-  &:hover 
-    .text 
+
+  &:hover
+    .text
      display: block

-.thumbnail 
+.thumbnail
  border: none
  text-align: center
  margin-bottom: 1.5em

-  .member-thumbnail 
+  .member-thumbnail
    text-align: left
-    img 
+    img
      height: 85px
      width: 85px
      max-width: 85px

-  .crop-thumbnail 
+  .crop-thumbnail
    height: 220px
-    .cropinfo 
+    .cropinfo
      display: inline-block
      max-width: 100%
      white-space: nowrap
      line-height: 1em
      padding-bottom: 2px

-      .cropname 
+      .cropname
        overflow: hidden
        text-overflow: ellipsis

-      .scientificname 
+      .scientificname
        font-size: small
        font-style: italic
        overflow: hidden
        text-overflow: ellipsis

-      .plantingcount 
+      .plantingcount
        font-size: small

-    .crop-name a 
+    .crop-name a
      padding-top: 2px

-    .scientific-name small 
+    .scientific-name small
      margin-bottom: -2px

-li.crop-hierarchy 
+li.crop-hierarchy
  list-style-type: disc

-.navbar-brand 
+.navbar-brand
  margin: 0px
  padding: 0px

-.navbar-bottom 
+.navbar-bottom
  margin: 40px 0px 0px 0px !important

 // footer
-footer 
-  #footer1, #footer2, #footer3 
+footer
+  #footer1, #footer2, #footer3
    text-align: left
    padding-top: 1em
    padding-bottom: 2em
-    ul 
+    ul
      list-style-type: none
      list-style-position: outside
      padding-left: 0px
      margin-left: 0px
-    
-    a 
+
+    a
      color: $navbar-default-link-color
      text-decoration: none
-    
-    a:hover 
+
+    a:hover
      color: $navbar-default-link-hover-color
-    
-    a:active 
+
+    a:active
      color: $navbar-default-link-active-color

-  .navbar-bottom.navbar 
+  .navbar-bottom.navbar
    border-radius: 0

 // ensure footer is pushed to bottom of browser window

-#maincontainer 
+#maincontainer
  min-height: 80%

-html, body 
+html, body
  height: 100%

-.crop-image, .member-image 
+.crop-image, .member-image
  width: 100%
  height: 100%

@@ -255,24 +272,29 @@ html, body
  background: white
  z-index: $zindex-tooltip

-.alert 
-  a 
+.alert
+  a
    font-weight: 800

 // Overrides applying only to mobile view. This must be at the end of the overrides file.

-@media only screen and (max-width: 767px) 
-  .sidebar 
+@media only screen and (max-width: 767px)
+  .sidebar
    margin-left: 0
    border-left: none
    padding-left: 0

-  #map 
+  #map
    height: 300px

-  .navbar .nav > li 
+  .navbar .nav > li
    display: block

+  .navbar .navbar-form
+    width: 185px
+    padding-left: 0
+    padding-right: 0
+
 /* override "info" alert boxes to be green, not blue, on Growstuff */
 $state-info-text: darken($green, 10%)
 $state-info-bg: lighten($green, 50%)
@@ -283,7 +305,7 @@ $state-info-bg: lighten($green, 50%)
 $state-success-text: darken($green, 10%)
 $state-success-bg: lighten($green, 50%)

-.hide 
+.hide
  display: none

 #add-sci_name-row, #remove-sci_name-row, #add-alt_name-row, #remove-alt_name-row
@@ -300,14 +322,14 @@ $state-success-bg: lighten($green, 50%)
 #gardens_panel_body
  height: 20em

-.form-group.required .control-label:before 
+.form-group.required .control-label:before
  content: "* "
  color: red

-.margin-bottom 
+.margin-bottom
  margin-bottom: 1em

-.red 
+.red
  color: red

 .truncate
--- a/app/constants/photo_models.rb
+++ b/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
--- a/app/controllers/account_types_controller.rb
+++ b/app/controllers/account_types_controller.rb
@@ -1,7 +1,7 @@
 class AccountTypesController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
  load_and_authorize_resource
-  
+
  # GET /account_types
  def index
    @account_types = AccountType.all
@@ -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|
@@ -70,7 +64,7 @@ class AccountTypesController < ApplicationController
    end
  end

-  private 
+  private

  def account_type_params
    params.require(:account_type).permit(:is_paid, :is_permanent_paid, :name)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,7 +1,7 @@
 class AccountsController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
  load_and_authorize_resource
-  
+
  # GET /accounts
  def index
    @accounts = Account.all
@@ -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
--- a/app/controllers/admin/orders_controller.rb
+++ b/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
--- a/app/controllers/alternate_names_controller.rb
+++ b/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

--- a/app/controllers/application_controller.rb
+++ b/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
--- a/app/controllers/authentications_controller.rb
+++ b/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
@@ -7,27 +7,18 @@ class AuthenticationsController < ApplicationController
    auth = request.env['omniauth.auth']
    @authentication = nil
    if auth
-
-      name = ''
-      case auth['provider']
-      when 'twitter'
-        name = auth['info']['nickname']
-      when 'flickr'
-        name = auth['info']['name']
-      else
-        name = auth['info']['name']
-      end
+      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
--- a/app/controllers/comments_controller.rb
+++ b/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

@@ -89,7 +85,7 @@ class CommentsController < ApplicationController
    end
  end

-  private 
+  private

  def comment_params
    params.require(:comment).permit(:author_id, :body, :post_id)
--- a/app/controllers/crops_controller.rb
+++ b/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|
@@ -86,14 +83,14 @@ class CropsController < ApplicationController
        # TODO RABL or similar one day to avoid presentation logic here
        owner_structure = {
          owner: {
-            only: [:id, :login_name, :location, :latitude, :longitude] 
+            only: [:id, :login_name, :location, :latitude, :longitude]
          }
        }
        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,14 +131,14 @@ 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|
-            Notifier.new_crop_request(w, @crop).deliver_now!
+            Notifier.new_crop_request(w, @crop).deliver_later!
          end
        end

@@ -160,36 +154,20 @@ 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
+        recreate_names('alt_name', 'alternate')
+        recreate_names('sci_name', 'scientific')

-          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
-        
        if previous_status == "pending"
          requester = @crop.requester
          new_status = @crop.approval_status
-          Notifier.crop_request_approved(requester, @crop).deliver_now! if new_status == "approved"
-          Notifier.crop_request_rejected(requester, @crop).deliver_now! if new_status == "rejected"
+          Notifier.crop_request_approved(requester, @crop).deliver_later! if new_status == "approved"
+          Notifier.crop_request_rejected(requester, @crop).deliver_later! if new_status == "rejected"
        end
        format.html { redirect_to @crop, notice: 'Crop was successfully updated.' }
        format.json { head :no_content }
@@ -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
--- a/app/controllers/follows_controller.rb
+++ b/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

--- a/app/controllers/gardens_controller.rb
+++ b/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
--- a/app/controllers/harvests_controller.rb
+++ b/app/controllers/harvests_controller.rb
@@ -1,20 +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]) }
@@ -33,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
@@ -43,7 +42,6 @@ class HarvestsController < ApplicationController

  # GET /harvests/1/edit
  def edit
-    @harvest = Harvest.find(params[:id])
  end

  # POST /harvests
@@ -67,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.' }
@@ -83,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|
@@ -96,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
--- a/app/controllers/home_controller.rb
+++ b/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
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -1,37 +1,46 @@
 class MembersController < ApplicationController
  load_and_authorize_resource

-  skip_authorize_resource only: [:nearby, :unsubscribe]
+  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

  def show
-    @member       = Member.confirmed.find(params[:id])
-    @twitter_auth = @member.auth('twitter')
-    @flickr_auth  = @member.auth('flickr')
-    @posts        = @member.posts
+    @member        = Member.confirmed.find(params[:id])
+    @twitter_auth  = @member.auth('twitter')
+    @flickr_auth   = @member.auth('flickr')
+    @facebook_auth = @member.auth('facebook')
+    @posts         = @member.posts
    # The garden form partial is called from the "New Garden" tab;
    # it requires a garden to be passed in @garden.
    # The new garden is not persisted unless Garden#save is called.
    @garden = Garden.new
-    
+
    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 }
@@ -70,10 +79,27 @@ class MembersController < ApplicationController
    end
  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
+    end
+  end
+
  private

  def expire_cache_fragments
    expire_fragment("homepage_stats")
  end

+  def member_params
+    params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter)
+  end
 end
--- a/app/controllers/notifications_controller.rb
+++ b/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|
@@ -46,7 +45,6 @@ class NotificationsController < ApplicationController
    @subject   = @sender_notification.subject =~ /^Re: / ?
      @sender_notification.subject :
      "Re: " + @sender_notification.subject
-    

    respond_to do |format|
      format.html # reply.html.haml
@@ -55,7 +53,6 @@ class NotificationsController < ApplicationController

  # DELETE /notifications/1
  def destroy
-    @notification = Notification.find(params[:id])
    @notification.destroy

    respond_to do |format|
@@ -67,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
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -0,0 +1,52 @@
+require './lib/actions/oauth_signup_action'
+
+#
+# Handle signup or signin
+# from various oauth providers
+#
+# Heavily overlaps with Authentications controller
+#
+class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def facebook
+    create
+  end
+
+  def failure
+    flash[:alert] = "Authentication failed."
+    redirect_to request.env['omniauth.origin'] || "/"
+  end
+
+  private
+
+  def create
+    auth = request.env['omniauth.auth']
+    action = Growstuff::OauthSignupAction.new
+
+    @authentication = nil
+    if auth
+      member = action.find_or_create_from_authorization(auth)
+      @authentication = action.establish_authentication(auth, member)
+
+      unless action.member_created?
+        sign_in_and_redirect member, event: :authentication # this will throw if @user is not activated
+        set_flash_message(:notice, :success, kind: auth['provider']) if is_navigational_format?
+      else
+        raise "Invalid provider" unless ['facebook', 'twitter', 'flickr'].index(auth['provider'].to_s)
+
+        session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
+        sign_in member
+        redirect_to finish_signup_url(member)
+      end
+    else
+      redirect_to request.env['omniauth.origin'] || edit_member_registration_path
+    end
+  end
+
+  def after_sign_in_path_for(resource)
+    if resource.tos_agreement
+      super resource
+    else
+      finish_signup_path(resource)
+    end
+  end
+end
--- a/app/controllers/order_items_controller.rb
+++ b/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
--- a/app/controllers/orders_controller.rb
+++ b/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|
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -1,7 +1,7 @@
 class PasswordsController < Devise::PasswordsController
+  protected

-protected
  def after_resetting_password_path_for(resource)
    root_path
  end
-end
+end
--- a/app/controllers/photos_controller.rb
+++ b/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,10 +77,9 @@ class PhotosController < ApplicationController
  # DELETE /photos/1
  # DELETE /photos/1.json
  def destroy
-    @photo = Photo.find(params[:id])
    @photo.destroy
    flash[:alert] = "Photo successfully deleted."
-    
+
    respond_to do |format|
      format.html { redirect_to photos_url }
      format.json { head :no_content }
@@ -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
--- a/app/controllers/places_controller.rb
+++ b/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
--- a/app/controllers/plant_parts_controller.rb
+++ b/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|
--- a/app/controllers/plantings_controller.rb
+++ b/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)
--- a/app/controllers/posts_controller.rb
+++ b/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|
--- a/app/controllers/products_controller.rb
+++ b/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
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,28 +1,29 @@
 class RegistrationsController < Devise::RegistrationsController
+  respond_to :json

  def edit
-    @twitter_auth = current_member.auth('twitter')
-    @flickr_auth  = current_member.auth('flickr')
+    @twitter_auth  = current_member.auth('twitter')
+    @flickr_auth   = current_member.auth('flickr')
+    @facebook_auth = current_member.auth('facebook')
    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
@@ -33,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
--- a/app/controllers/robots_controller.rb
+++ b/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

--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,7 +1,7 @@
 class RolesController < ApplicationController
-  before_filter :authenticate_member!
+  before_action :authenticate_member!
  load_and_authorize_resource
-  
+
  # GET /roles
  def index
    @roles = Role.all
@@ -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|
--- a/app/controllers/scientific_names_controller.rb
+++ b/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
--- a/app/controllers/seeds_controller.rb
+++ b/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|
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,4 +1,6 @@
 class SessionsController < Devise::SessionsController
+  respond_to :json
+
  def create
    super do |resource|
      if Crop.pending_approval.present? && current_member.has_role?(:crop_wrangler)
--- a/app/helpers/application_helper.rb
+++ b/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)
@@ -20,26 +18,26 @@ module ApplicationHelper
    currency = Growstuff::Application.config.currency
    link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}"

-    link_to "(convert)", link, target: "_blank"
+    link_to "(convert)", link, target: "_blank", rel: "noopener noreferrer"
  end

  def build_alert_classes(alert_type = :info)
    classes = 'alert alert-dismissable '
    case alert_type.to_sym
-      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}"
@@ -57,12 +55,25 @@ module ApplicationHelper
  # Falls back to Gravatar
  #
  def avatar_uri(member, size = 150)
-    return member.preferred_avatar_uri if member.preferred_avatar_uri.present?
+    if member.preferred_avatar_uri.present?
+      # Some avatars support different sizes
+      # http://graph.facebook.com/12345678/picture?width=150&height=150
+      uri = URI.parse(member.preferred_avatar_uri)
+
+      if uri.host == 'graph.facebook.com'
+        uri.query = "&width=#{size}&height=#{size}"
+      end
+
+      # TODO: Assess twitter - https://dev.twitter.com/overview/general/user-profile-images-and-banners
+      # TODO: Assess flickr  - https://www.flickr.com/services/api/misc.buddyicons.html
+
+      return uri.to_s
+    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
@@ -73,4 +84,3 @@ module ApplicationHelper
    "#{size} #{model_name}"
  end
 end
-
--- a/app/helpers/auto_suggest_helper.rb
+++ b/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
--- a/app/helpers/crops_helper.rb
+++ b/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
--- a/app/helpers/gardens_helper.rb
+++ b/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

--- a/app/helpers/harvests_helper.rb
+++ b/app/helpers/harvests_helper.rb
@@ -1,5 +1,4 @@
 module HarvestsHelper
-
  def display_quantity(harvest)
    human_quantity = display_human_quantity(harvest)
    weight = display_weight(harvest)
@@ -16,33 +15,24 @@ module HarvestsHelper
  end

  def display_human_quantity(harvest)
-    if ! harvest.quantity.blank? && harvest.quantity > 0
+    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)
+      elsif !harvest.unit.blank? # pluralize anything else
+        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}"
+        "#{number_to_human(harvest.quantity, strip_insignificant_zeros: true)} #{harvest.unit}"
      end
-    else
-      return nil
    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
--- a/app/helpers/plantings_helper.rb
+++ b/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
--- a/app/helpers/seeds_helper.rb
+++ b/app/helpers/seeds_helper.rb
@@ -1,11 +1,9 @@
 module SeedsHelper
-
  def display_seed_description(seed)
-  	if seed.description.nil?
-  		"no description provided."
+    if seed.description.nil?
+      "no description provided."
    else
-    	truncate(seed.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", seed_path(seed) }
+      truncate(seed.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", seed_path(seed) }
    end
  end
-  
-end
+end
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -3,17 +3,21 @@ 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)
    @notification = notification
    @reply_link = reply_link(@notification)

-    # Encrypting 
-    @signed_message = verifier.generate ({ member_id: @notification.recipient.id, type: :send_notification_email })
+    # Encrypting
+    message = { member_id: @notification.recipient.id, type: :send_notification_email }
+    @signed_message = verifier.generate(message)

    mail(to: @notification.recipient.email,
         subject: @notification.subject)
@@ -25,18 +29,19 @@ class Notifier < ActionMailer::Base
    @plantings = @member.plantings.first(5)
    @harvests = @member.harvests.first(5)

-    # Encrypting 
-    @signed_message = verifier.generate ({ member_id: @member.id, type: :send_planting_reminder })
+    # Encrypting
+    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?")
+           subject: "What have you planted lately?")
    end
  end

  def new_crop_request(member, request)
    @member, @request = member, request
-    mail(to: @member.email, subject: "#{@request.requester.login_name} has requested #{@request.name} as a new crop")    
+    mail(to: @member.email, subject: "#{@request.requester.login_name} has requested #{@request.name} as a new crop")
  end

  def crop_request_approved(member, crop)
@@ -48,5 +53,4 @@ class Notifier < ActionMailer::Base
    @member, @crop = member, crop
    mail(to: @member.email, subject: "#{crop.name.capitalize} has been rejected")
  end
-
 end
--- a/app/models/ability.rb
+++ b/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
@@ -22,7 +22,7 @@ class Ability
    cannot :read, AccountType

    # nobody should be able to view unapproved crops unless they
-    # are wranglers or admins 
+    # are wranglers or admins
    cannot :read, Crop
    can :read, Crop, approval_status: "approved"
    # scientific names should only be viewable if associated crop is approved
@@ -108,7 +108,7 @@ class Ability
      can :cancel,   Order, member_id: member.id, completed_at: nil
      can :destroy,  Order, member_id: member.id, completed_at: nil

-      can :create,  OrderItem
+      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 }
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -8,7 +8,7 @@ class Account < ActiveRecord::Base

  before_create do |account|
    unless account.account_type
-      account.account_type = AccountType.find_or_create_by(name: 
+      account.account_type = AccountType.find_or_create_by(name:
        Growstuff::Application.config.default_account_type
      )
    end
@@ -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
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -19,5 +19,4 @@ class Comment < ActiveRecord::Base
      )
    end
  end
-
 end
--- a/app/models/concerns/photo_capable.rb
+++ b/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
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -1,4 +1,4 @@
-class Crop < ActiveRecord::Base
+class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
  extend FriendlyId
  friendly_id :name, use: [:slugged, :finders]

@@ -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?
@@ -50,55 +59,57 @@ class Crop < ActiveRecord::Base

  ####################################
  # Elastic search configuration
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-  # In order to avoid clashing between different environments,
-  # 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
-    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,
-          type: 'string',
-          analyzer: 'gs_edgeNGram_analyzer',
-          # Disabling field-length norm (norm). If the norm option is turned on(by default), 
-          # higher weigh would be given for shorter fields, which in our case is irrelevant.
-          norms: { enabled: false }
-      end
-      indexes :alternate_names do
+  if ENV["GROWSTUFF_ELASTICSEARCH"] == "true"
+    include Elasticsearch::Model
+    include Elasticsearch::Model::Callbacks
+    # In order to avoid clashing between different environments,
+    # 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
+      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 :name,
+            type: 'string',
+            analyzer: 'gs_edgeNGram_analyzer',
+            # Disabling field-length norm (norm). If the norm option is turned on(by default),
+            # higher weigh would be given for shorter fields, which in our case is irrelevant.
+            norms: { enabled: false }
+        end
+        indexes :alternate_names do
+          indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
+        end
      end
    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
@@ -112,14 +123,12 @@ class Crop < ActiveRecord::Base
  # 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
+      scientific_names.first.name
    end
  end

@@ -128,7 +137,11 @@ class Crop < ActiveRecord::Base
  # later we can choose a default photo based on different criteria,
  # eg. popularity
  def default_photo
-    return photos.first
+    return photos.first if photos.any?
+
+    # 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
+    harvest_with_photo.photos.first if harvest_with_photo
  end

  # crop.sunniness
@@ -137,13 +150,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
@@ -151,13 +158,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
@@ -171,7 +172,7 @@ class Crop < ActiveRecord::Base
        popular_plant_parts[h.plant_part] += 1
      end
    end
-    return popular_plant_parts
+    popular_plant_parts
  end

  def interesting?
@@ -179,7 +180,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?
@@ -195,38 +196,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)
@@ -236,7 +237,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
@@ -246,64 +247,43 @@ 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

+    cropbot = Member.find_by(login_name: 'cropbot')
+
    if names_to_add.size > 0
-      cropbot = Member.find_by_login_name('cropbot')
      raise "cropbot account not found: run rake db:seed" unless 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
-
-          self.scientific_names.create(
-            scientific_name: n,
-            creator_id: cropbot.id
-          )
-        end
-      end
+      add_names_to_list(names_to_add, 'scientific')
    end
  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')
+    cropbot = Member.find_by(login_name: 'cropbot')
+
+    if !alternate_names.blank? # i.e. we actually passed something in, which isn't a given
      raise "cropbot account not found: run rake db:seed" unless cropbot

      names_to_add = alternate_names.split(%r{,\s*})
-
-      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
-
+      add_names_to_list(names_to_add, 'alternate')
    end
  end

  def rejection_explanation
    if reason_for_rejection == "other"
-      return rejection_notes
+      rejection_notes
    else
-      return reason_for_rejection
+      reason_for_rejection
    end
  end

@@ -311,23 +291,25 @@ class Crop < ActiveRecord::Base
  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
@@ -338,16 +320,55 @@ 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|
+      if !p.send("#{col_name}").blank?
+        data[p.send("#{col_name}")] += 1
+      end
+    end
+    data
+  end
+
  # Custom validations

  def approval_status_cannot_be_changed_again
@@ -370,5 +391,4 @@ class Crop < ActiveRecord::Base
      errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
    end
  end
-
 end
--- a/app/models/follow.rb
+++ b/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
--- a/app/models/forum.rb
+++ b/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
--- a/app/models/garden.rb
+++ b/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,9 +40,9 @@ 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

@@ -76,13 +66,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
@@ -101,7 +91,6 @@ class Garden < ActiveRecord::Base
  end

  def default_photo
-    return photos.first
+    photos.first
  end
-
 end
--- a/app/models/harvest.rb
+++ b/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,15 +49,15 @@ 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

  before_save :set_si_weight

-  # we're storing the harvest weight in kilograms in the db too 
+  # 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
@@ -105,34 +95,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
+    photos.first || crop.default_photo
  end
-
 end
--- a/app/models/member.rb
+++ b/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'

@@ -29,7 +29,6 @@ class Member < ActiveRecord::Base

  has_many :likes, :dependent => :destroy

-
  default_scope { order("lower(login_name) asc") }
  scope :confirmed, -> { where('confirmed_at IS NOT NULL') }
  scope :located, -> { where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL") }
@@ -47,8 +46,8 @@ class Member < ActiveRecord::Base
  # :token_authenticatable, :confirmable,
  # :lockable, :timeoutable and :omniauthable
  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :confirmable, :lockable, :timeoutable
+    :recoverable, :rememberable, :trackable, :validatable,
+    :confirmable, :lockable, :timeoutable, :omniauthable

  # set up geocoding
  geocoded_by :location
@@ -60,8 +59,8 @@ class Member < ActiveRecord::Base
  attr_accessor :login

  # Requires acceptance of the Terms of Service
-  validates_acceptance_of :tos_agreement, allow_nil: false,
-    accept: true
+  validates_acceptance_of :tos_agreement, allow_nil: true,
+                                          accept: true

  validates :login_name,
    length: {
@@ -82,27 +81,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)
@@ -110,7 +107,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
@@ -131,16 +128,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
@@ -155,27 +152,26 @@ 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
+  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
    if result
      return [result.photo, result.total]
    else
@@ -185,11 +181,11 @@ class Member < ActiveRecord::Base

  # Returns a hash of Flickr photosets' ids and titles
  def flickr_sets
-    sets = Hash.new 
+    sets = Hash.new
    flickr.photosets.getList.each do |p|
      sets[p.title] = p.id
    end
-    return sets
+    sets
  end

  def interesting?
@@ -197,7 +193,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
@@ -209,18 +213,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
@@ -237,24 +241,24 @@ class Member < ActiveRecord::Base
    end
  end

-  def newsletter_subscribe(testing=false)
+  def newsletter_subscribe(testing = false)
    return true if (Rails.env.test? && !testing)
    gb = Gibbon::API.new
-    res = gb.lists.subscribe({
-      id: Growstuff::Application.config.newsletter_list_id,
-      email: { email: email },
-      merge_vars: { login_name: login_name },
-      double_optin: false # they already confirmed their email with us
-    })
+    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(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)
@@ -262,7 +266,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
--- a/app/models/notification.rb
+++ b/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
@@ -23,8 +24,7 @@ class Notification < ActiveRecord::Base

  def send_email
    if self.recipient.send_notification_email
-      Notifier.notify(self).deliver_now
+      Notifier.notify(self).deliver_later
    end
  end
-
 end
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -12,14 +12,16 @@ class Order < ActiveRecord::Base

  before_save :standardize_referral_code

+  scope :by_member, ->(member) { where(member: member) }
+
  # total price of an order
  def total
    sum = 0
    for i in order_items do
      subtotal = i.price * i.quantity
-      sum += subtotal 
+      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
@@ -62,35 +64,34 @@ class Order < ActiveRecord::Base
  # 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
--- a/app/models/photo.rb
+++ b/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
--- a/app/models/plant_part.rb
+++ b/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
--- a/app/models/planting.rb
+++ b/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)
@@ -104,8 +94,8 @@ class Planting < ActiveRecord::Base

    if differences.compact.empty?
      nil
-    else  
-      differences.compact.sum/differences.compact.size
+    else
+      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
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -6,26 +6,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,
@@ -45,7 +45,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
@@ -71,14 +70,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
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -11,5 +11,4 @@ class Product < ActiveRecord::Base
  def to_s
    name
  end
-
 end
--- a/app/models/seed.rb
+++ b/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
--- a/app/views/alternate_names/_form.html.haml
+++ b/app/views/alternate_names/_form.html.haml
@@ -21,7 +21,7 @@
    = f.label :name, :class => 'control-label col-md-2'
    .col-md-8
      = 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'
--- a/app/views/comments/show.html.haml
+++ b/app/views/comments/show.html.haml
@@ -1,6 +1,6 @@
 = content_for :title, @comment.post.subject
 - content_for :opengraph do
-  = tag("meta", property: "og:image", content: avatar_uri(@comment.post.author, 200)) 
+  = tag("meta", property: "og:image", content: avatar_uri(@comment.post.author, 200))
  = tag("meta", property: "og:image:user_generated", content: "true")
  = tag("meta", property: "og:title", content: @comment.post.subject)
  = tag("meta", property: "og:description", content: strip_tags(@comment.post.body).split(' ')[0..20].join(' '))
--- a/app/views/crops/_find_seeds.html.haml
+++ b/app/views/crops/_find_seeds.html.haml
@@ -1,7 +1,7 @@
 %h4 Find #{ crop.name } seeds
 - if crop.seeds.empty?
  %p
-    There are no seeds available to trade.
+    There are no seeds available to trade on Growstuff right now.
 - else
  %ul
    - crop.seeds.tradable.each do |seed|
@@ -10,6 +10,8 @@
        = render :partial => 'members/location', :locals => { :member => seed.owner }
  %p
    = link_to "View all #{crop.name} seeds", seeds_by_crop_path(crop)
+%p
+  = link_to "Purchase seeds via Ebay", "http://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{URI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg", target: "_blank", rel: "noopener noreferrer"
 - if crop.approved?
  - if current_member
    %p= link_to "List #{crop.name} seeds to trade", new_seed_path(:crop_id => crop.id)
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -48,14 +48,14 @@
    Scientific names
    = button_tag "+", :id => "add-sci_name-row", :type => "button"
    = button_tag "-", :id => "remove-sci_name-row", :type => "button"
-    
+
  .form-group#scientific_names
    - @crop.scientific_names.each.with_index do |sci, index|
      .template.col-md-12{ :id => "sci_template[#{index+1}]" }
        .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

@@ -64,7 +64,7 @@
    = button_tag "+", :id => "add-alt_name-row", :type => "button"
    = button_tag "-", :id => "remove-alt_name-row", :type => "button"

-  .form-group#alternate_names 
+  .form-group#alternate_names
    - @crop.alternate_names.each.with_index do |alt, index|
      .template.col-md-12{ :id => "alt_template[#{index+1}]" }
        .col-md-2
--- a/app/views/crops/_popover.html.haml
+++ b/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")
--- a/app/views/crops/_scientific_names.html.haml
+++ b/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
--- a/app/views/crops/_thumbnail.html.haml
+++ b/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")
--- a/app/views/crops/new.html.haml
+++ b/app/views/crops/new.html.haml
@@ -1,7 +1,7 @@
- content_for :title, (can?(:wrangle, @crop) ? "New crop" : "Suggest a crop") 
+- content_for :title, (can?(:wrangle, @crop) ? "New crop" : "Suggest a crop")

 - unless can? :wrangler, @crop
-  
+
  %p Thanks for taking the time to suggest a crop! Our crop database is managed by volunteers, and we appreciate your help. Here are some things to consider when suggesting a new crop:

  %ul
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -2,7 +2,7 @@
 - content_for :subtitle, @crop.default_scientific_name
 - content_for :opengraph do
  - @crop.photos.each do |photo|
-    = tag("meta", property: "og:image", content: photo.fullsize_url) 
+    = tag("meta", property: "og:image", content: photo.fullsize_url)
  = tag("meta", property: "og:title", content: @crop.name)
  = tag("meta", property: "og:type", content: "website")
  = tag("meta", property: "og:url", content: request.original_url)
@@ -91,4 +91,11 @@

    %h4 Learn more about #{ @crop.name.pluralize }
    %ul
-      %li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url
+      %li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url, target: "_blank", rel: "noopener noreferrer"
+      %li
+        = link_to "OpenFarm - Growing guide", "https://openfarm.cc/en/crops/#{URI.escape @crop.name}", target: "_blank", rel: "noopener noreferrer"
+      %li
+        = link_to "Gardenate - Planting reminders", "http://www.gardenate.com/plant/#{URI.escape @crop.name}", target: "_blank", rel: "noopener noreferrer"
+      - if current_member && current_member.location
+        %li
+          = link_to "Google", "http://www.google.com/search?q=#{URI.escape ["Growing", @crop.name, current_member.location].join(" ")}", target: "_blank", rel: "noopener noreferrer"
--- a/app/views/crops/wrangle.html.haml
+++ b/app/views/crops/wrangle.html.haml
@@ -24,7 +24,7 @@
    %li{:class => @approval_status == "rejected" ? 'active' : ''}
      = link_to "Rejected", wrangle_crops_path(:approval_status => "rejected")

-%h2 
+%h2
  - if @approval_status == "pending"
    Requested Crops
  - elsif @approval_status == "rejected"
@@ -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"
--- a/app/views/devise/registrations/_edit_apps.html.haml
+++ b/app/views/devise/registrations/_edit_apps.html.haml
@@ -25,3 +25,15 @@
          = link_to "Disconnect", @flickr_auth, :confirm => "Are you sure you want to remove this connection?", :method => :delete, :class => "remove"
        - else
          =link_to 'Connect to Flickr', '/auth/flickr'
+
+  .row
+    .col-md-12
+      %p
+        = image_tag "facebook_32.png", :size => "32x32", :alt => 'Facebook logo'
+        - if @facebook_auth
+          You are connected to Facebook as
+          = succeed "." do
+            =link_to @facebook_auth.name, "http://facebook.com/profile/#{@facebook_auth.uid}"
+          = link_to "Disconnect", @facebook_auth, :confirm => "Are you sure you want to remove this connection?", :method => :delete, :class => "remove"
+        - else
+          =link_to 'Connect to Facebook', '/auth/facebook'
--- a/app/views/devise/registrations/_edit_profile.html.haml
+++ b/app/views/devise/registrations/_edit_profile.html.haml
@@ -18,11 +18,12 @@
      Profile picture
    .col-md-8
      = render :partial => "members/avatar", :locals => { :member => @member }
-      %p
-        %br/
-        To change your profile picture, visit
-        = succeed "." do
-          = link_to 'gravatar.com', "http://gravatar.com/"
+      - unless @member.preferred_avatar_uri.present?
+        %p
+          %br/
+          To change your profile picture, visit
+          = succeed "." do
+            = link_to 'gravatar.com', "http://gravatar.com/"

  .form-group
    .form-actions.col-md-offset-2.col-md-8
--- a/app/views/forums/index.html.haml
+++ b/app/views/forums/index.html.haml
@@ -1,4 +1,4 @@
- content_for :title, t('.title') 
+- content_for :title, t('.title')

 - if can? :create, Forum
  %p
--- a/app/views/gardens/_thumbnail.html.haml
+++ b/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"}
@@ -11,17 +11,17 @@
        = link_to image_tag((garden.default_photo ?  garden.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => garden.name, :class => 'img'), garden
      .col-md-8
        %dl.dl-horizontal
-          %dt Name : 
+          %dt Name :
          %dd= link_to garden.name, garden
-          %dt Location : 
+          %dt Location :
          %dd
            - if garden.location.blank?
              not specified
            - else
              = link_to garden.location, place_path(garden.location, anchor: "gardens")
-          %dt Area : 
+          %dt Area :
          %dd= garden.area.nil? ? "not specified" : pluralize(garden.area, garden.area_unit)
-          %dt Active? :       
+          %dt Active? :
          %dd= garden.active ? "Yes" : "No"
      .col-md-12
        %b
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -40,8 +40,8 @@
          %p No description available yet.

          - if can? :edit, @garden
-            %p 
-              Why not 
+            %p
+              Why not
              = link_to 'tell us more.', edit_garden_path(@garden)

    - if @garden.photos.size > 0 or (can? :edit, @garden and can? :create, Photo)
--- a/app/views/harvests/_thumbnail.html.haml
+++ b/app/views/harvests/_thumbnail.html.haml
@@ -1,23 +1,23 @@
 .panel.panel-success
  .panel-heading
    %h3.panel-title
-      = link_to "#{harvest.owner.login_name}'s harvest", harvest.owner
+      = link_to "#{harvest.owner.login_name}'s #{harvest.crop.name} harvest", harvest
      - if can? :edit, harvest
        %a.pull-right{:href => edit_harvest_path(harvest), :role => "button", :id => "edit_harvest_glyphicon"}
          %span.glyphicon.glyphicon-pencil{:title => "Edit"}
  .panel-body
    .row
      .col-md-4
-        = link_to image_tag((harvest.crop.default_photo ?  harvest.crop.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => harvest.crop.name, :class => 'img'), harvest.crop
+        = link_to image_tag((harvest.default_photo ?  harvest.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => harvest.crop.name, :class => 'img'), harvest.crop
      .col-md-8
        %dl.dl-horizontal
-          %dt Crop : 
+          %dt Crop :
          %dd= link_to harvest.crop.name, harvest.crop
-          %dt Plant part : 
+          %dt Plant part :
          %dd= link_to harvest.plant_part, harvest.plant_part
-          %dt Quantity : 
+          %dt Quantity :
          %dd= display_quantity(harvest)
-          %dt Harvest date :      
+          %dt Harvest date :
          %dd= harvest.harvested_at
  .panel-footer
    %dt Description
--- a/app/views/harvests/show.html.haml
+++ b/app/views/harvests/show.html.haml
@@ -1,7 +1,7 @@
 =content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
 - content_for :opengraph do
  - @harvest.photos.each do |photo|
-    = tag("meta", property: "og:image", content: photo.fullsize_url) 
+    = tag("meta", property: "og:image", content: photo.fullsize_url)
  = tag("meta", property: "og:image:user_generated", content: "true")
  = tag("meta", property: "og:title", content: "#{@harvest.crop} harvested by #{@harvest.owner}")
  = tag("meta", property: "og:type", content: "website")
@@ -17,8 +17,8 @@
      = link_to "view all #{@harvest.owner}'s harvests", harvests_by_owner_path(:owner => @harvest.owner.slug)
    %p
      %b Plant part:
-      - if @harvest.plant_part 
-        = link_to @harvest.plant_part, @harvest.plant_part 
+      - if @harvest.plant_part
+        = link_to @harvest.plant_part, @harvest.plant_part
      - else
        not specified
    %p
--- a/app/views/home/_stats.html.haml
+++ b/app/views/home/_stats.html.haml
@@ -2,7 +2,7 @@
  %p.stats
    = t('.message_html', { member: link_to(t('.member_linktext', count: Member.confirmed.size.to_i), members_path),
                           number_crops: link_to(t('.number_crops_linktext', count: Crop.count.to_i), crops_path),
-                           number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path), 
+                           number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path),
                           number_gardens: link_to(t('.number_gardens_linktext', count: Garden.count.to_i), gardens_path) })


--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -4,23 +4,31 @@
  .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
-      %a.navbar-brand(href=root_path)
+      %a.navbar-brand.hidden-xs(href=root_path)
        = image_tag("growstuff-brand.png", :size => "200x50", :alt => ENV['GROWSTUFF_SITE_NAME'])
-      = form_tag crops_search_path, :method => :get, :id => 'navbar-search', :class => 'navbar-form pull-right' do
-        .input
+      %a.navbar-brand.visible-xs(href=root_path)
+        = image_tag("growstuff-apple-touch-icon-precomposed.png", :size => "50x50", :class=>"img-responsive", :alt => ENV['GROWSTUFF_SITE_NAME'])
+
+      .form.navbar-form.pull-left
+        = form_tag crops_search_path, :method => :get, :id => 'navbar-search' do
          = label_tag :term, "Search crop database:", :class => 'sr-only'
-          = text_field_tag 'term', nil, :class => 'search-query input-medium form-control', :placeholder => 'Search crops'
-          = submit_tag "Search", :class => 'btn sr-only'
+          .input
+            .input-group
+              = text_field_tag 'term', nil, :class => 'search-query input-medium form-control', :placeholder => 'Search crops'
+              .input-group-btn
+                %button.btn.btn-default{:style => "height: 34px;"}
+                  = submit_tag "Search", :class => 'btn sr-only'
+                  %span.glyphicon.glyphicon-search

    .navbar-collapse.collapse#navbar-collapse
-      %ul.nav.navbar-nav.pull-right
+      %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
@@ -29,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
@@ -44,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)
@@ -67,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
--- a/app/views/members/_contact.html.haml
+++ b/app/views/members/_contact.html.haml
@@ -1,4 +1,4 @@
- if twitter_auth || flickr_auth || member.show_email
+- if twitter_auth || flickr_auth || facebook_auth || member.show_email
  %h4 Contact

  - if twitter_auth
@@ -11,6 +11,11 @@
      = image_tag "flickr_32.png", :size => "32x32", :alt => 'Flickr logo'
      =link_to flickr_auth.name, "http://flickr.com/photos/#{flickr_auth.uid}"

+  - if facebook_auth
+    %p
+      = image_tag "facebook_32.png", :size => "32x32", :alt => 'Facebook logo'
+      =link_to facebook_auth.name, "http://facebook.com/profile/#{facebook_auth.uid}"
+
  - if member.show_email
    %p
      Email:
--- a/app/views/members/_gardens.html.haml
+++ b/app/views/members/_gardens.html.haml
@@ -7,7 +7,7 @@
        - first_garden = false
        = link_to g.name, "#garden#{g.id}", 'data-toggle' => 'tab'
    - if current_member == member
-      %li.navbar-right 
+      %li.navbar-right
        = link_to new_garden_path, class: 'btn' do
          Add New Garden
  .tab-content{style: "padding-top: 1em"}
@@ -25,8 +25,8 @@
              %p No description available yet.

              - if can? :edit, g
-                %p 
-                  Why not 
+                %p
+                  Why not
                  = link_to 'tell us more.', edit_garden_path(g)


--- a/app/views/members/finish_signup.haml
+++ b/app/views/members/finish_signup.haml
@@ -0,0 +1,40 @@
+- content_for :title, "Join Growstuff"
+
+%p Sign up for a Growstuff account to track your veggie garden and connect with other local growers.
+
+= form_for(current_member, :as => 'member', :url => finish_signup_path(current_member), :html => { role: 'form'}) do |f|
+  - if @show_errors && current_member.errors.any?
+    %div.alert.alert-danger
+      - current_member.errors.full_messages.each do |msg|
+        = msg
+        %br
+
+  .form-group
+    = f.label :login_name
+    .controls
+      = f.text_field :login_name, :autofocus => true, class: 'form-control input-lg'
+      %p.help-block Choose a login name
+
+  .form-group
+    = f.label :email
+    .controls
+      = f.text_field :email, class: 'form-control input-lg', placeholder: 'Example: email@me.com'
+      %p.help-block Please confirm your email address.
+
+  .form-group
+    .col-md-offset-2.col-md-8.checkbox
+      %label
+        = f.check_box :tos_agreement
+        I agree to the
+        = succeed "." do
+          = link_to 'Terms of Service', "#{root_url}/policy/tos"
+  .form-group
+    .col-md-offset-2.col-md-8.checkbox
+      %label
+        = f.check_box :newsletter, :checked => true
+        Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']} newsletter
+      .help-inline
+        = render :partial => 'devise/registrations/newsletter_blurb'
+
+  %div.actions
+    = f.submit 'Continue', :class => 'btn btn-primary'
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -1,9 +1,9 @@
 - content_for :title, @member.login_name
 - content_for :subtitle, @member.location
 - content_for :opengraph do
-  = tag("meta", property: "og:image", content: avatar_uri(@member, 200))  
-  = tag("meta", property: "og:image:user_generated", content: "true")  
-  = tag("meta", property: "og:title", content: @member.login_name)  
+  = tag("meta", property: "og:image", content: avatar_uri(@member, 200))
+  = tag("meta", property: "og:image:user_generated", content: "true")
+  = tag("meta", property: "og:title", content: @member.login_name)
  = tag("meta", property: "og:type", content: "profile")
  = tag("meta", property: "og:url", content: request.original_url)
  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
@@ -37,4 +37,4 @@
    = render :partial => "avatar", :locals => { :member => @member }
    = render :partial => "account", :locals => { :member => @member }
    = render :partial => "stats", :locals => { :member => @member }
-    = render :partial => "contact", :locals => { :member => @member, :twitter_auth => @twitter_auth, :flickr_auth => @flickr_auth }
+    = render :partial => "contact", :locals => { :member => @member, :twitter_auth => @twitter_auth, :flickr_auth => @flickr_auth, :facebook_auth => @facebook_auth }
--- a/app/views/members/view_followers.html.haml
+++ b/app/views/members/view_followers.html.haml
@@ -7,10 +7,10 @@
 .row
  .col-md-12
    - @followers.each do |f|
-      .col-md-4.three-across      
-        .thumbnail 
+      .col-md-4.three-across
+        .thumbnail
          = render :partial => "members/thumbnail", :locals => { :member => f }
-          
+
 %div.pagination
  = page_entries_info @followers
  = will_paginate @followers
--- a/app/views/members/view_follows.html.haml
+++ b/app/views/members/view_follows.html.haml
@@ -7,8 +7,8 @@
 .row
  .col-md-12
    - @follows.each do |f|
-      .col-md-4.three-across      
-        .thumbnail 
+      .col-md-4.three-across
+        .thumbnail
          = render :partial => "members/thumbnail", :locals => { :member => f }

 %div.pagination
--- a/app/views/notifier/new_crop_request.html.haml
+++ b/app/views/notifier/new_crop_request.html.haml
@@ -2,7 +2,7 @@

 %p Hello #{@member.login_name},

-%p 
+%p
  #{@request.requester.login_name} has requested a new crop on #{site_name}.

 %ul
--- a/Show More
+++ b/Show More