Merge pull request #1052 from Growstuff/dev

Release 15

.codeclimate.yml

@@ -8,7 +8,7 @@ engines:
   eslint:
     enabled: true
   coffeelint:
-    enabled: true 
+    enabled: true
   brakeman:
     enabled: true
   bundler-audit:
@@ -21,11 +21,15 @@ engines:
       - javascript
   fixme:
     enabled: true
+    exclude_fingerprints:  # rubocop_todo filename
+    - 63b8552079d106832fbe281566b6d028
+    - d38afbaaea3ecaa9a4cf046b07a01cec
+    - 57ff3968fd371d3e1f75c237d6c78acf
 ratings:
   paths:
   - "**.rb"
   - "**.js"
-  - "**.coffee" 
+  - "**.coffee"
   - "**.sass"
   - "**.haml"
   - Gemfile.lock

.rubocop.yml

@@ -0,0 +1,48 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  Include:
+    - 'Rakefile'
+    - 'config.ru'
+    - 'lib/**/*.rake'
+  Exclude:
+    - 'db/schema.rb'
+    - 'vendor/**/*'
+
+Style/StringLiterals:
+  Enabled: false
+
+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: 115
+
+# 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
+
+# Offense count: 1108
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 223
+
+# Offense count: 8
+Metrics/PerceivedComplexity:
+  Max: 12

.ruby-version

@@ -1 +1 @@
-2.2.4
+2.3.1

.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,10 +11,19 @@ env:
   global:
     secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 rvm:
-- 2.2.4
+- 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 rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi
+  - if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi
+  - if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi
+  - phantomjs --version
 before_script:
 - psql -c 'create database growstuff_test;' -U postgres
 script:
+- bundle exec rubocop --display-cop-names --rails
+- script/gemfile_check
+- bundle exec script/check_contributors_md
 - bundle exec rake db:migrate --trace
 - bundle exec rspec spec/
 services:
@@ -34,4 +46,6 @@ deploy:
     - restart
 after_deploy:
   - bundle exec script/heroku_maintenance.rb off
-
+addons:
+  code_climate:
+    repo_token: 462e015bbdaabfb20910fc07f2fea253410ecb131444e00f97dbf32dc6789ca6

CONTRIBUTORS.md

@@ -68,3 +68,7 @@ submit the change with your pull request.
 - Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
 - DV Dasari / [dv2](https://github.com/dv2)
 - 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)

Capfile

@@ -1,4 +0,0 @@
-load 'deploy'
-# Uncomment if you are using Rails' asset pipeline
-    # load 'deploy/assets'
-load 'config/deploy' # remove this line to skip loading any of the default tasks

Gemfile

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
-ruby '2.2.4'
+ruby '2.3.1'
 
-gem 'rails', '~> 4.1.11'
+gem 'rails', '~> 4.2.1'
 
 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'
@@ -36,13 +37,9 @@ gem 'comfortable_mexican_sofa', '~> 1.12.0' # content management system
 gem 'kaminari'                     # pagination
 gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari
 
-# vendored activemerchant for testing- needed for bogus paypal
-# gateway monkeypatch
-gem 'activemerchant', '1.33.0',
-  :path    => 'vendor/gems/activemerchant-1.33.0',
-  :require => 'active_merchant'
-gem 'active_utils', '1.0.5',
-  :path    => 'vendor/gems/active_utils-1.0.5'
+gem 'activemerchant'
+gem 'active_utils'
+gem 'sidekiq'
 
 # Markdown formatting for updates etc
 gem 'bluecloth'
@@ -51,7 +48,7 @@ gem 'bluecloth'
 gem 'will_paginate', '~> 3.0'
 
 # user signup/login/etc
-gem 'devise', '~> 3.5.0'
+gem 'devise', '>= 4.0.0'
 
 # nicely formatted URLs
 gem 'friendly_id', '~> 5.0.4'
@@ -60,9 +57,7 @@ gem 'friendly_id', '~> 5.0.4'
 gem 'gravatar-ultimate'
 
 # For geolocation
-gem 'geocoder',
-  :git => 'https://github.com/alexreisner/geocoder.git',
-  :ref => '104d46'
+gem 'geocoder'
 
 # For easy calendar selection
 gem 'bootstrap-datepicker-rails'
@@ -71,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"
@@ -85,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
@@ -103,12 +100,12 @@ end
 
 group :development, :test do
   gem 'haml-rails'                      # HTML templating language
-  gem 'rspec-rails', '~> 3.4.0'         # unit testing framework
+  gem 'rspec-rails'                     # unit testing framework
   gem 'rspec-activemodel-mocks'
   gem 'byebug'                          # debugging
   gem 'database_cleaner', '~> 1.5.0'
   gem 'webrat'                          # provides HTML matchers for view tests
-  gem 'factory_girl_rails', '~> 4.5.0'  # for creating test data
+  gem 'factory_girl_rails'              # for creating test data
   gem 'coveralls', require: false       # coverage analysis
   gem 'capybara'                        # integration tests
   gem 'capybara-email'                  # integration tests for email
@@ -117,6 +114,8 @@ group :development, :test do
   gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
   gem 'selenium-webdriver'
   gem "codeclimate-test-reporter", group: :test, require: nil
+  gem "active_merchant-paypal-bogus-gateway"
+  gem 'rubocop', require: false
 end
 
 group :travis do

Gemfile.lock

@@ -1,57 +1,57 @@
-GIT
-  remote: https://github.com/alexreisner/geocoder.git
-  revision: 104d466ba7097b7dce5ba19f8e4091b7f69ccdf6
-  ref: 104d46
-  specs:
-    geocoder (1.1.8)
-
-PATH
-  remote: vendor/gems/active_utils-1.0.5
-  specs:
-    active_utils (1.0.5)
-      activesupport (>= 2.3.11)
-      i18n
-
-PATH
-  remote: vendor/gems/activemerchant-1.33.0
-  specs:
-    activemerchant (1.33.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.15)
-      actionpack (= 4.1.15)
-      actionview (= 4.1.15)
+    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)
-    actionpack (4.1.15)
-      actionview (= 4.1.15)
-      activesupport (= 4.1.15)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.15)
-      activesupport (= 4.1.15)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    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)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_link_to (1.0.3)
       actionpack
-    activemodel (4.1.15)
-      activesupport (= 4.1.15)
+    active_merchant-paypal-bogus-gateway (0.1.0)
+      activemerchant
+    active_utils (3.2.2)
+      activesupport (>= 3.2, < 5.1.0)
+      i18n
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      globalid (>= 0.3.0)
+    activemerchant (1.60.0)
+      activesupport (>= 3.2.14, < 5.1)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (>= 0.6.9)
+      nokogiri (~> 1.4)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.1.15)
-      activemodel (= 4.1.15)
-      activesupport (= 4.1.15)
-      arel (~> 5.0.0)
-    activesupport (4.1.15)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (5.0.1.20140414130214)
-    ast (2.2.0)
-    autoprefixer-rails (6.3.6.1)
+    arel (6.0.3)
+    ast (2.3.0)
+    autoprefixer-rails (6.4.0.2)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -62,19 +62,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.0)
     builder (3.2.2)
-    byebug (9.0.4)
-    cancancan (1.14.0)
-    capybara (2.7.1)
+    byebug (9.0.5)
+    cancancan (1.15.0)
+    capybara (2.8.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -94,10 +94,10 @@ GEM
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codeclimate-test-reporter (0.5.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,23 +122,23 @@ 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)
+    connection_pool (2.2.0)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       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 (3.5.10)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -146,41 +146,44 @@ GEM
       json
       thread
       thread_safe
-    elasticsearch (1.0.17)
-      elasticsearch-api (= 1.0.17)
-      elasticsearch-transport (= 1.0.17)
-    elasticsearch-api (1.0.17)
+    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.17)
+    elasticsearch-transport (2.0.0)
       faraday
       multi_json
     erubis (2.7.0)
-    excon (0.49.0)
+    excon (0.51.0)
     execjs (2.7.0)
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
       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.8)
+    flickraw (0.9.9)
     font-awesome-sass (4.6.2)
       sass (>= 3.2)
     formatador (0.2.5)
     friendly_id (5.0.5)
       activerecord (>= 4.0.0)
-    gibbon (1.2.0)
+    geocoder (1.3.7)
+    gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
@@ -194,7 +197,7 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.5)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
@@ -216,8 +219,7 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.13.3)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     i18n-tasks (0.9.5)
@@ -230,20 +232,22 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    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.5)
+    js-routes (1.3.0)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
-    kaminari (0.16.3)
+    jwt (1.5.4)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    kramdown (1.11.1)
+    kramdown (1.12.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     leaflet-markercluster-rails (0.7.0)
@@ -255,77 +259,103 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     memcachier (0.0.2)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mimemagic (0.3.0)
-    mini_portile2 (2.0.0)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
     multi_json (1.11.3)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    newrelic_rpm (3.15.2.317)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    notiffany (0.1.0)
+    newrelic_rpm (3.16.1.320)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    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.0)
+      mimemagic (~> 0.3.0)
+    parser (2.3.1.2)
       ast (~> 2.2)
     pg (0.18.4)
+    pkg-config (1.1.7)
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    poltergeist (1.9.0)
+    poltergeist (1.10.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       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)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.15)
-      actionmailer (= 4.1.15)
-      actionpack (= 4.1.15)
-      actionview (= 4.1.15)
-      activemodel (= 4.1.15)
-      activerecord (= 4.1.15)
-      activesupport (= 4.1.15)
+    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.1.15)
-      sprockets-rails (~> 2.0)
-    rails-i18n (4.0.8)
+      railties (= 4.2.7.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
     rails_12factor (0.0.3)
@@ -333,87 +363,108 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (4.1.15)
-      actionpack (= 4.1.15)
-      activesupport (= 4.1.15)
+    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.1.2)
+    rainbow (2.1.0)
+    raindrops (0.17.0)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
+    redis (3.3.1)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     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.2)
+      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)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.1)
+      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.2)
       sexp_processor (~> 4.1)
     rubyzip (1.2.0)
     sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (2.53.0)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       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.0)
+    sparkpost_rails (1.4.0)
+      rails (>= 4.0, < 5.1)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    terminal-table (1.5.2)
+    terminal-table (1.6.0)
     thor (0.19.1)
     thread (0.2.2)
     thread_safe (0.3.5)
-    tilt (2.0.4)
-    tins (1.6.0)
+    tilt (2.0.5)
+    tins (1.12.0)
     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)
@@ -435,8 +486,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_utils (= 1.0.5)!
-  activemerchant (= 1.33.0)!
+  active_merchant-paypal-bogus-gateway
+  active_utils
+  activemerchant
   better_errors
   binding_of_caller
   bluecloth
@@ -457,15 +509,15 @@ DEPENDENCIES
   csv_shaper
   dalli
   database_cleaner (~> 1.5.0)
-  devise (~> 3.5.0)
+  devise (>= 4.0.0)
   elasticsearch-model
   elasticsearch-rails
-  factory_girl_rails (~> 4.5.0)
+  factory_girl_rails
   figaro
   flickraw
   font-awesome-sass
   friendly_id (~> 5.0.4)
-  geocoder!
+  geocoder
   gibbon (~> 1.2.0)
   gravatar-ultimate
   guard
@@ -484,27 +536,31 @@ DEPENDENCIES
   memcachier
   newrelic_rpm
   omniauth
+  omniauth-facebook
   omniauth-flickr (>= 0.0.15)
   omniauth-twitter
   pg
   poltergeist (~> 1.6)
   pry
   quiet_assets
-  rails (~> 4.1.11)
+  rails (~> 4.2.1)
   rails_12factor
   rake (>= 10.0.0)
   rspec-activemodel-mocks
-  rspec-rails (~> 3.4.0)
+  rspec-rails
+  rubocop
   ruby-units
   sass-rails (~> 5.0.4)
   selenium-webdriver
+  sidekiq
+  sparkpost_rails
   uglifier (~> 2.7.2)
   unicorn
   webrat
   will_paginate (~> 3.0)
 
 RUBY VERSION
-   ruby 2.1.8p440
+   ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.4
+   1.13.6

README.md

@@ -19,8 +19,9 @@ encourage participation from people of all backgrounds and skill levels.
 
 * [Issues](http://github.com/Growstuff/growstuff/issues) (features we're
   working on, known bugs, etc)
-* [Discussion forums](http://wiki.growstuff.org/index.php/Discussion_forums) (mailing lists, IRC, etc)
-* [Wiki](http://wiki.growstuff.org/) (general documentation)
+* [Discussion forums](http://talk.growstuff.org/) (design ideas, planning releases)
+* [IRC](https://webchat.freenode.net/) growstuff channel (general chat, brainstorming and troubleshooting) or [Gitter](https://gitter.im/Growstuff/growstuff)
+* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc. Help by migrating from the [old wiki](https://web.archive.org/web/*/wiki.growstuff.org))
 
 ## For coders
 
@@ -28,18 +29,10 @@ Growstuff is built in Ruby on Rails and also uses JavaScript for
 frontend features. We welcome contributions -- see
 [CONTRIBUTING](CONTRIBUTING.md) for details.
 
-* To set up your development environment, see [Getting started](http://wiki.growstuff.org/index.php/Development/Getting_Started).
+* 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 one of our [discussion forums](http://wiki.growstuff.org/index.php/Discussion_forums) to chat to other developers, get help, etc.
-* You may also be interested in our [API](http://wiki.growstuff.org/index.php/API).
-
-The wiki is down right now, so here's what you need to do on Mac OS X to get set up.
-
-```
-gem install bundle
-gem install pg -v '0.18.4' -- --with-pg-config=/Applications/Postgres.app/Contents/Versions/latest/bin/pg_config
-bundle install
-```
+* 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](https://github.com/Growstuff/growstuff/wiki/API).
 
 ## For designers, writers, researchers, data wranglers, and other contributors
 
@@ -58,6 +51,7 @@ Here on Github, you might find these useful:
 * [needs: visual design](https://github.com/Growstuff/growstuff/labels/needs:%20visual design) - tasks requiring visual/graphical design
 * [needs: documentation](https://github.com/Growstuff/growstuff/labels/needs:%20documentation)
 * [needs: data](https://github.com/Growstuff/growstuff/labels/needs:%20data) - tasks requiring data entry, data design, data import, or similar
+* [curated:beginner](https://github.com/Growstuff/growstuff/labels/curated:%20beginner) - tasks that are ideal for beginner programmers or people new to the project
 
 Feel free to comment on any of the issues you find there, or open up a broader conversation on [Growstuff Talk](http://talk.growstuff.org).
 

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

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'
 

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'
 

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 %>";
 

app/assets/javascripts/seeds.js.coffee

@@ -42,4 +42,3 @@ $ ->
       element = document.getElementById(tmp)
       console.log("%s",tmp)
       element.remove()
-    

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

app/controllers/account_types_controller.rb

@@ -1,7 +1,7 @@
 class AccountTypesController < ApplicationController
   before_filter :authenticate_member!
   load_and_authorize_resource
-  
+
   # GET /account_types
   def index
     @account_types = AccountType.all
@@ -70,7 +70,7 @@ class AccountTypesController < ApplicationController
     end
   end
 
-  private 
+  private
 
   def account_type_params
     params.require(:account_type).permit(:is_paid, :is_permanent_paid, :name)

app/controllers/accounts_controller.rb

@@ -1,7 +1,7 @@
 class AccountsController < ApplicationController
   before_filter :authenticate_member!
   load_and_authorize_resource
-  
+
   # GET /accounts
   def index
     @accounts = Account.all

app/controllers/alternate_names_controller.rb

@@ -13,17 +13,6 @@ class AlternateNamesController < ApplicationController
     end
   end
 
-  # GET /alternate_names/1
-  # GET /alternate_names/1.json
-  def show
-    @alternate_name = AlternateName.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.haml
-      format.json { render json: @alternate_name }
-    end
-  end
-
   # GET /alternate_names/new
   # GET /alternate_names/new.json
   def new

app/controllers/application_controller.rb

@@ -52,7 +52,7 @@ class ApplicationController < ActionController::Base
   protected
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_up) do |member|
+    devise_parameter_sanitizer.permit(:sign_up) do |member|
       member.permit(:login_name, :email, :password, :password_confirmation,
         :remember_me, :login,
         # terms of service
@@ -64,7 +64,7 @@ class ApplicationController < ActionController::Base
       )
     end
 
-    devise_parameter_sanitizer.for(:account_update) do |member|
+    devise_parameter_sanitizer.permit(:account_update) do |member|
       member.permit(:login_name, :email, :password, :password_confirmation,
         :remember_me, :login,
         # terms of service

app/controllers/authentications_controller.rb

@@ -7,16 +7,7 @@ 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(

app/controllers/comments_controller.rb

@@ -14,17 +14,6 @@ class CommentsController < ApplicationController
     end
   end
 
-  # GET /comments/1
-  # GET /comments/1.json
-  def show
-    @comment = Comment.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @comment }
-    end
-  end
-
   # GET /comments/new
   # GET /comments/new.json
   def new
@@ -100,7 +89,7 @@ class CommentsController < ApplicationController
     end
   end
 
-  private 
+  private
 
   def comment_params
     params.require(:comment).permit(:author_id, :body, :post_id)

app/controllers/crops_controller.rb

@@ -83,8 +83,16 @@ class CropsController < ApplicationController
     respond_to do |format|
       format.html # show.html.haml
       format.json do
+        # TODO RABL or similar one day to avoid presentation logic here
+        owner_structure = {
+          owner: {
+            only: [:id, :login_name, :location, :latitude, :longitude]
+          }
+        }
         render json: @crop.to_json(include: {
-          plantings: { include: { owner: { only: [:id, :login_name, :location, :latitude, :longitude] }}}
+          plantings: {
+            include: owner_structure
+          }
         })
       end
     end
@@ -136,7 +144,7 @@ class CropsController < ApplicationController
         end
         unless current_member.has_role? :crop_wrangler
           Role.crop_wranglers.each do |w|
-            Notifier.new_crop_request(w, @crop).deliver!
+            Notifier.new_crop_request(w, @crop).deliver_later!
           end
         end
 
@@ -176,12 +184,12 @@ class CropsController < ApplicationController
             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! if new_status == "approved"
-          Notifier.crop_request_rejected(requester, @crop).deliver! 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 }

app/controllers/harvests_controller.rb

@@ -1,7 +1,6 @@
 class HarvestsController < ApplicationController
   before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
-  
 
   # GET /harvests
   # GET /harvests.json
@@ -27,17 +26,6 @@ class HarvestsController < ApplicationController
     end
   end
 
-  # GET /harvests/1
-  # GET /harvests/1.json
-  def show
-    @harvest = Harvest.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @harvest }
-    end
-  end
-
   # GET /harvests/new
   # GET /harvests/new.json
   def new

app/controllers/members_controller.rb

@@ -1,7 +1,7 @@
 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
 
@@ -20,15 +20,16 @@ class MembersController < ApplicationController
   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]) }
@@ -70,10 +71,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

app/controllers/notifications_controller.rb

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

app/controllers/omniauth_callbacks_controller.rb

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

app/controllers/pages_controller.rb

@@ -0,0 +1,6 @@
+class PagesController < ApplicationController
+  def letsencrypt
+    # use your code here, not mine
+    render text: "y9KNck8wqkoQLnlr2RgA2TVwWtyYb4PeY_hzGNx0Tfs.dlIPqFhMDCLyQEccczY3roHZ1UWu6UqVeyb9mkRxheU"
+  end
+end

app/controllers/passwords_controller.rb

@@ -4,4 +4,4 @@ protected
   def after_resetting_password_path_for(resource)
     root_path
   end
-end
+end

app/controllers/photos_controller.rb

@@ -13,17 +13,6 @@ class PhotosController < ApplicationController
     end
   end
 
-  # GET /photos/1
-  # GET /photos/1.json
-  def show
-    @photo = Photo.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @photo }
-    end
-  end
-
   # GET /photos/new
   # GET /photos/new.json
   def new
@@ -119,7 +108,7 @@ class PhotosController < ApplicationController
     @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 }

app/controllers/registrations_controller.rb

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

app/controllers/roles_controller.rb

@@ -1,7 +1,7 @@
 class RolesController < ApplicationController
   before_filter :authenticate_member!
   load_and_authorize_resource
-  
+
   # GET /roles
   def index
     @roles = Role.all

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)

app/helpers/application_helper.rb

@@ -19,10 +19,24 @@ module ApplicationHelper
     pid = price_in_dollars(price)
     currency = Growstuff::Application.config.currency
     link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}"
-    return link_to "(convert)",
-      link,
-      target: "_blank"
-  end 
+
+    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'
+    end
+    classes
+  end
 
   # Produces a cache key for uniquely identifying cached fragments.
   def cache_key_for(klass, identifier="all")
@@ -43,12 +57,32 @@ 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
     })
   end
-end
 
+  # Returns a string with the quantity and the right pluralization for a
+  # given collection and model.
+  def localize_plural(collection, model)
+    size       = collection.size
+    model_name = model.model_name.human(count: size)
+    "#{size} #{model_name}"
+  end
+end

app/helpers/crops_helper.rb

@@ -1,17 +1,21 @@
 module CropsHelper
   def display_seed_availability(member, crop)
     total_quantity = 0
-    member.seeds.each do |seed|
-      if seed.crop.name == crop.name
-        total_quantity = total_quantity + seed.quantity
-      end
+
+    seeds = member.seeds.select {|seed| seed.crop.name == crop.name }
+
+    seeds.each do |seed|
+      total_quantity = total_quantity + seed.quantity if seed.quantity
+    end
+
+    if !seeds.any?
+      return "You don't have any seeds of this crop."
     end
 
     if (total_quantity != 0)
-      "You have #{pluralize(total_quantity, "seed")} of this crop."
+      "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
     else
-      "You don't have any seeds of this crop."
+      "You have an unknown quantity of seeds of this crop."
     end
-  
   end
-end
+end

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

app/mailers/notifier.rb

@@ -2,19 +2,17 @@ class Notifier < ActionMailer::Base
   include NotificationsHelper
   default from: "Growstuff <noreply@growstuff.org>"
 
-  def verifier()
-    if ENV['RAILS_SECRET_TOKEN']
-      return ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
-    else
-      raise "RAILS_SECRET_TOKEN environment variable not set - have you created config/application.yml?"
-    end
+  def verifier
+    raise "RAILS_SECRET_TOKEN environment variable not set - have you created config/application.yml?" unless ENV['RAILS_SECRET_TOKEN']
+
+    return ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
   end
 
   def notify(notification)
     @notification = notification
     @reply_link = reply_link(@notification)
 
-    # Encrypting 
+    # Encrypting
     @signed_message = verifier.generate ({ member_id: @notification.recipient.id, type: :send_notification_email })
 
     mail(to: @notification.recipient.email,
@@ -27,7 +25,7 @@ class Notifier < ActionMailer::Base
     @plantings = @member.plantings.first(5)
     @harvests = @member.harvests.first(5)
 
-    # Encrypting 
+    # Encrypting
     @signed_message = verifier.generate ({ member_id: @member.id, type: :send_planting_reminder })
 
     if @member.send_planting_reminder
@@ -38,7 +36,7 @@ class Notifier < ActionMailer::Base
 
   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)

app/models/ability.rb

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

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

app/models/crop.rb

@@ -50,44 +50,46 @@ 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 :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
+          indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
+        end
       end
     end
   end
@@ -128,7 +130,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
+    return harvest_with_photo.photos.first if harvest_with_photo
   end
 
   # crop.sunniness
@@ -206,7 +212,7 @@ class Crop < ActiveRecord::Base
   # returns a list of interesting crops, for use on the homepage etc
   def Crop.interesting
   howmany = 12 # max number to find
-  interesting_crops = Array.new
+  interesting_crops = []
     Crop.includes(:photos).randomized.each do |c|
       break if interesting_crops.size == howmany
       next unless c.interesting?
@@ -312,7 +318,7 @@ class Crop < ActiveRecord::Base
     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 
+          # 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: {

app/models/harvest.rb

@@ -67,7 +67,7 @@ class Harvest < ActiveRecord::Base
 
   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
@@ -132,7 +132,7 @@ class Harvest < ActiveRecord::Base
   end
 
   def default_photo
-    return photos.first
+    return photos.first || crop.default_photo
   end
 
 end

app/models/member.rb

@@ -46,7 +46,7 @@ class Member < ActiveRecord::Base
   # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable,
-         :confirmable, :lockable, :timeoutable
+         :confirmable, :lockable, :timeoutable, :omniauthable
 
   # set up geocoding
   geocoded_by :location
@@ -58,7 +58,7 @@ class Member < ActiveRecord::Base
   attr_accessor :login
 
   # Requires acceptance of the Terms of Service
-  validates_acceptance_of :tos_agreement, allow_nil: false,
+  validates_acceptance_of :tos_agreement, allow_nil: true,
     accept: true
 
   validates :login_name,
@@ -130,7 +130,7 @@ class Member < ActiveRecord::Base
   def is_paid?
     if account.account_type.is_permanent_paid
       return true
-    elsif account.account_type.is_paid and account.paid_until >= Time.zone.now
+    elsif account.account_type.is_paid && account.paid_until >= Time.zone.now
       return true
     else
       return false
@@ -183,7 +183,7 @@ 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
@@ -200,7 +200,7 @@ class Member < ActiveRecord::Base
 
   def Member.interesting
     howmany = 12 # max number to find
-    interesting_members = Array.new
+    interesting_members = []
     Member.confirmed.located.recently_signed_in.each do |m|
       break if interesting_members.size == howmany
       if m.interesting?
@@ -222,7 +222,7 @@ class Member < ActiveRecord::Base
   end
 
   def update_newsletter_subscription
-    if confirmed_at_changed? and newsletter # just signed up
+    if confirmed_at_changed? && newsletter # just signed up
       newsletter_subscribe
     elsif confirmed_at # i.e. after member's confirmed their account
       if newsletter_changed? # edited member settings
@@ -262,5 +262,4 @@ class Member < ActiveRecord::Base
   def get_follow(member)
     self.follows.where(followed_id: member.id).first if already_following?(member)
   end
-
 end

app/models/notification.rb

@@ -23,7 +23,7 @@ class Notification < ActiveRecord::Base
 
   def send_email
     if self.recipient.send_notification_email
-      Notifier.notify(self).deliver
+      Notifier.notify(self).deliver_later
     end
   end
 

app/models/order.rb

@@ -17,7 +17,7 @@ class Order < ActiveRecord::Base
     sum = 0
     for i in order_items do
       subtotal = i.price * i.quantity
-      sum += subtotal 
+      sum += subtotal
     end
     return sum
   end

app/models/planting.rb

@@ -68,7 +68,7 @@ class Planting < ActiveRecord::Base
 
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
-    return unless planted_at and finished_at # only check if we have both
+    return unless planted_at && finished_at # only check if we have both
     errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
   end
 
@@ -97,14 +97,14 @@ class Planting < ActiveRecord::Base
   def calculate_days_before_maturity(planting, crop)
     p_crop = Planting.where(crop_id: crop).where.not(id: planting)
     differences = p_crop.collect do |p|
-      if p.finished and !p.finished_at.nil?
+      if p.finished && !p.finished_at.nil?
         (p.finished_at - p.planted_at).to_i
       end
     end
 
     if differences.compact.empty?
       nil
-    else  
+    else
       differences.compact.sum/differences.compact.size
     end
   end
@@ -133,7 +133,7 @@ class Planting < ActiveRecord::Base
   # 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)
-    interesting_plantings = Array.new
+    interesting_plantings = []
     seen_owners = Hash.new(false) # keep track of which owners we've seen already
 
     Planting.includes(:photos).each do |p|

app/models/post.rb

@@ -11,17 +11,17 @@ class Post < ActiveRecord::Base
   # from this direction, so we won't set up an association for now.
 
   after_create do
-    recipients = Array.new
+    recipients = []
     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
-      recipients << member if member and not recipients.include?(member)
+      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
-      recipients << member if member and not recipients.include?(member)
+      recipients << member if member && !recipients.include?(member)
     end
     # don't send notifications to yourself
     recipients.map{ |r| r.id }.each do |recipient|
@@ -64,7 +64,7 @@ class Post < ActiveRecord::Base
 
   # return posts sorted by recent activity
   def Post.recently_active
-    Post.all.sort do |a,b|
+    Post.all.sort do |a, b|
       b.recent_activity <=> a.recent_activity
     end
   end
@@ -77,7 +77,7 @@ class Post < ActiveRecord::Base
         # find crop case-insensitively
         crop = Crop.where('lower(name) = ?', $1.downcase).first
         # create association
-        self.crops << crop if crop and not self.crops.include?(crop) 
+        self.crops << crop if crop && !self.crops.include?(crop)
       end
     end
 end

app/models/seed.rb

@@ -79,7 +79,7 @@ class Seed < ActiveRecord::Base
   # returns a list of interesting seeds, for use on the homepage etc
   def Seed.interesting
     howmany = 12 # max number to find
-    interesting_seeds = Array.new
+    interesting_seeds = []
 
     Seed.tradable.each do |s|
       break if interesting_seeds.size == howmany

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'

app/views/alternate_names/show.html.haml

@@ -1,3 +1,10 @@
+= content_for :title, @alternate_name.name
+- content_for :opengraph do
+  = tag("meta", property: "og:title", content: @alternate_name.name)
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
+
 %p#notice= notice
 
 = render :partial => 'crops/approval_status_message', :locals => { :crop => @alternate_name.crop }

app/views/comments/_single.html.haml

@@ -5,10 +5,13 @@
         = render :partial => "members/avatar", :locals => { :member => comment.author }
       .col-md-11
         .comment-meta
-          = (comment.created_at == comment.updated_at) ? 'Posted by' : 'Edited by'
+          Posted by
           = link_to comment.author.login_name, member_path(comment.author)
           on
-          = (comment.created_at == comment.updated_at) ? comment.created_at : comment.updated_at
+          = comment.created_at
+          - if comment.updated_at > comment.created_at
+            and edited at
+            = comment.updated_at
 
         .comment-body
           :growstuff_markdown

app/views/comments/show.html.haml

@@ -1,4 +1,12 @@
 = 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:user_generated", content: "true")
+  = tag("meta", property: "og:title", content: @comment.post.subject)
+  = tag("meta", property: "og:description", content: strip_tags(@comment.post.body).split(' ')[0..20].join(' '))
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 = render :partial => "posts/single", :locals => { :post => @comment.post }
 

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)

app/views/crops/_form.html.haml

@@ -48,7 +48,7 @@
     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}]" }
@@ -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

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

app/views/crops/show.html.haml

@@ -1,5 +1,12 @@
 - content_for :title, @crop.name
 - 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:title", content: @crop.name)
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 = render :partial => 'approval_status_message', :locals => { :crop => @crop }
 
@@ -84,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"

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"

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'

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

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
@@ -7,7 +7,7 @@
 - @forums.each do |forum|
   %h2= forum
   %p
-    = pluralize(forum.posts.size, "post")
+    = localize_plural(forum.posts, Post)
     |
     =link_to "Visit forum", forum
     |

app/views/forums/show.html.haml

@@ -1,4 +1,11 @@
 - content_for :title, @forum.name
+- content_for :opengraph do
+  - if @forum.description
+    = tag("meta", property: "og:description", content: strip_tags(@forum.description).split(' ')[0..20].join(' '))
+  = tag("meta", property: "og:title", content: @forum.name)
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 %p#notice= notice
 

app/views/gardens/_thumbnail.html.haml

@@ -11,21 +11,21 @@
         = 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
-          = "#{pluralize(garden.plantings.size, "Planting")} : "
+          = "#{localize_plural(garden.plantings, Planting)} : "
         = display_garden_plantings(garden.plantings.current)
         - if garden.plantings.size > 2
           %br

app/views/gardens/show.html.haml

@@ -1,5 +1,13 @@
 =content_for :title, "#{@garden.owner}'s #{@garden}"
-
+- content_for :opengraph do
+  - @garden.photos.each do |photo|
+    = tag("meta", property: "og:image", content: photo.fullsize_url)
+  - if @garden.description
+    = tag("meta", property: "og:description", content: @garden.description)
+  = tag("meta", property: "og:title", content: "#{@garden.owner}'s #{@garden}")
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 .row
   .col-md-9
     - if can? :edit, @garden or can? :delete, @garden
@@ -32,14 +40,14 @@
           %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)
       .row-fluid
         %h3 Photos
-        %p= pluralize(@garden.photos.length, "photo")
+        %p= localize_plural(@garden.photos, Photo)
         .row-fluid
           %ul.thumbnails
             - @garden.photos.each do |p|

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

app/views/harvests/show.html.haml

@@ -1,4 +1,12 @@
 =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:user_generated", content: "true")
+  = tag("meta", property: "og:title", content: "#{@harvest.crop} harvested by #{@harvest.owner}")
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 .row
   .col-md-6
@@ -9,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

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

app/views/layouts/_header.html.haml

@@ -8,16 +8,24 @@
         %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

app/views/layouts/_meta.html.haml

@@ -1,11 +1,14 @@
 %head
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta property="og:image" content="#{image_url 'growstuff-apple-touch-icon-precomposed.png'}"/>
-  <meta property="og:title" content="#{content_for?(:title) ? yield(:title) + " - #{ ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']}" />
-  <meta property="og:type" content="website" />
-  <meta property="og:url" content="#{root_url}" />
-  <meta property="og:site_name" content="#{ENV['GROWSTUFF_SITE_NAME']}" />
+  - if content_for?(:opengraph)
+    = yield(:opengraph)
+  - else
+    = tag("meta", property: "og:image", content: image_url('facebook-thumbnail.png'))
+    = tag("meta", property: "og:title", content: "#{content_for?(:title) ? yield(:title) + " - #{ ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']}")
+    = tag("meta", property: "og:type", content: "website")
+    = tag("meta", property: "og:url", content: root_url)
+    = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
   - if (content_for?(:member_rss_login_name) && content_for(:member_rss_slug))
     = auto_discovery_link_tag(:rss, { :controller => "/members", :action => 'show', :format => "rss", :id => yield(:member_rss_slug) }, { :title => "#{ ENV['GROWSTUFF_SITE_NAME'] }- #{yield(:member_rss_login_name)}'s posts" })

app/views/layouts/application.html.haml

@@ -17,12 +17,7 @@
             %p
               .btn-group
                 = yield(:buttonbar)
-          - if notice
-            .alert.alert-success
-              = notice
-          - if alert
-            .alert.alert-warning
-              = alert
+          = render :partial => "shared/flash_messages", flash: flash
           = yield
 
     %footer

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:

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,15 +25,15 @@
               %p No description available yet.
 
               - if can? :edit, g
-                %p 
-                  Why not 
+                %p
+                  Why not
                   = link_to 'tell us more.', edit_garden_path(g)
 
 
           - if g.photos.size > 0 or (can? :edit, g and can? :create, Photo)
             .row
               %h3 Photos
-              %p= pluralize(g.photos.length, "photo")
+              %p= localize_plural(g.photos, Photo)
               .row
                 %ul.thumbnails
                   - g.photos.each do |p|

app/views/members/_stats.html.haml

@@ -3,28 +3,28 @@
 %ul.list-inline
   %li
     - if member.plantings.size > 0
-      = link_to pluralize(member.plantings.size, "planting"), plantings_by_owner_path(:owner => member)
+      = link_to localize_plural(member.plantings, Planting), plantings_by_owner_path(owner: member)
     - else
       0 plantings
   %li
     - if member.harvests.size > 0
-      = link_to pluralize(member.harvests.size, "harvest"), harvests_by_owner_path(:owner => member)
+      = link_to localize_plural(member.harvests, Harvest), harvests_by_owner_path(owner: member)
     - else
       0 harvests
   %li
     - if member.seeds.size > 0
-      = link_to pluralize(member.seeds.size, "seeds"), seeds_by_owner_path(:owner => member)
+      = link_to localize_plural(member.seeds, Seed), seeds_by_owner_path(owner: member)
     - else
       0 seeds
   %li
     - if member.posts.size > 0
-      = link_to pluralize(member.posts.size, "post"), posts_by_author_path(:author => member)
+      = link_to localize_plural(member.posts, Post), posts_by_author_path(author: member)
     - else
       0 posts
 
   %li
     - if member.followed.size > 0
-      = link_to pluralize(member.followed.size, "follow"), member_follows_path(member)
+      = link_to localize_plural(member.followed, Follow), member_follows_path(member)
     - else
       0 following
 

app/views/members/_thumbnail.html.haml

@@ -21,4 +21,4 @@
           ago.
       %p
         %small
-          = [pluralize(member.gardens.size, "garden"), pluralize(member.plantings.size, "planting"), pluralize(member.seeds.size, "seed")].join(", ")
+          = [localize_plural(member.gardens, Garden), localize_plural(member.plantings, Planting), localize_plural(member.seeds, Seed)].join(", ")

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'

app/views/members/show.html.haml

@@ -1,5 +1,12 @@
 - 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:type", content: "profile")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 - content_for :buttonbar do
   - if can? :update, @member
     = link_to 'Edit profile', edit_member_registration_path, :class => 'btn btn-default'
@@ -30,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 }

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

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

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

app/views/photos/show.html.haml

@@ -1,4 +1,11 @@
--content_for :title, @photo.title
+- content_for :title, @photo.title
+- content_for :opengraph do
+  = tag("meta", property: "og:title", content: @photo.title)
+  = tag("meta", property: "og:image", content: @photo.fullsize_url)
+  = tag("meta", property: "og:image:user_generated", content: "true")
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 .row
   .col-md-6

app/views/places/show.html.haml

@@ -1,4 +1,9 @@
 -content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}"
+- content_for :opengraph do
+  = tag("meta", property: "og:title", content: "#{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}")
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 = render partial: 'search_form'
 
@@ -29,7 +34,7 @@
 
   #plantings
   %h3= "Recent plantings near #{@place}"
-  
+
 
   - plantings = []
   - @nearby_members.first(10).each do |member|

app/views/plant_parts/show.html.haml

@@ -1,4 +1,9 @@
 - content_for :title, @plant_part.name.titlecase
+- content_for :opengraph do
+  = tag("meta", property: "og:title", content: @plant_part.name.titlecase)
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 - if @plant_part.crops.empty?
   %p No crops are harvested for this plant part (yet).

app/views/plantings/_thumbnail.html.haml

@@ -13,7 +13,7 @@
           %dd= link_to planting.garden.name, planting.garden
           %dt Planted on:
           %dd= planting.planted_at
-          %dt Quantity: 
+          %dt Quantity:
           %dd= "#{display_planting_quantity(planting)}"
           %dt Finished on:
           %dd= "#{display_finished(planting)}"

app/views/plantings/index.html.haml

@@ -1,4 +1,4 @@
-- content_for :title, @owner ? t('.title.owner_plantings', owner: @owner) : @crop ? t('.title.crop_plantings', crop: @crop.name) : t('.title.default') 
+- content_for :title, @owner ? t('.title.owner_plantings', owner: @owner) : @crop ? t('.title.crop_plantings', crop: @crop.name) : t('.title.default')
 - if @owner
   = link_to "View #{@owner}'s profile >>", member_path(@owner)
 

app/views/plantings/show.html.haml

@@ -1,4 +1,13 @@
 =content_for :title, "#{@planting.crop} in #{@planting.location}"
+- content_for :opengraph do
+  - @planting.crop.photos.each do |photo|
+    = tag("meta", property: "og:image", content: photo.fullsize_url)
+  = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
+  - if @planting.description
+    = tag("meta", property: "og:description", content: @planting.description)
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 .row.planting
   .col-md-6
@@ -22,11 +31,11 @@
       %dt Quantity:
       %dd
         ="#{display_planting_quantity(@planting)}"
-    
+
       - if !@planting.planted_from.blank?
         %dt Planted from:
         %dd= "#{display_planted_from(@planting)}"
-    
+
       %dt Sun or shade?
       %dd
         - sunniness = @planting.sunniness.blank? ? "not specified" : @planting.sunniness

app/views/posts/_comments.html.haml

@@ -1,7 +1,7 @@
 %a{:name => "comments"}
 - if post.comments
   %h2
-    =pluralize(post.comments.size, "comment")
+    =localize_plural(post.comments, Comment)
   - post.comments.post_order.each do |c|
     = render :partial => "comments/single", :locals => { :comment => c }
 

app/views/posts/_single.html.haml

@@ -9,13 +9,16 @@
 
         .post-meta
           %p
-            = (post.created_at == post.updated_at) ? 'Posted by' : 'Edited by'
+            Posted by
             = link_to post.author.login_name, member_path(post.author)
             - if post.forum
               in
               = link_to post.forum, post.forum
             on
-            = (post.created_at == post.updated_at) ? post.created_at : post.updated_at
+            = post.created_at
+            - if post.updated_at > post.created_at
+              and edited at
+              = post.updated_at
 
         .post-body
           :growstuff_markdown
@@ -24,7 +27,7 @@
         - unless defined?(hide_comments)
           .post-comments
             %ul.list-inline
-              %li.first= link_to pluralize(post.comments.size, "comment"),
+              %li.first= link_to localize_plural(post.comments, Comment),
                 post_path(post, :anchor => 'comments')
               -if can? :create, Comment
                 %li= link_to "Reply", new_comment_path(:post_id => post.id)

app/views/posts/_summary.html.haml

@@ -15,7 +15,10 @@
           %td.hidden-xs
             =link_to post.author, post.author
           %td
-            = post.recent_activity.to_date.to_formatted_s(:short)
+            - if post.updated_at > post.recent_activity
+              = post.updated_at.to_date.to_formatted_s(:short)
+            - else
+              = post.recent_activity.to_date.to_formatted_s(:short)
             // once the site gets more active, can change this to include time as well
             // can't make it relative (distance_of_time_in_words) as it's cached
           %td.hidden-xs

app/views/posts/show.html.haml

@@ -1,4 +1,11 @@
 = content_for :title, @post.subject
+- content_for :opengraph do
+  = tag("meta", property: "og:image", content: avatar_uri(@post.author, 200))
+  = tag("meta", property: "og:description", content: "#{strip_tags(@post.body).split(' ')[0..20].join(' ')}...")
+  = tag("meta", property: "og:title", content: @post.subject)
+  = tag("meta", property: "og:type", content: "article")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 - unless current_member
   .alert.alert-info
@@ -11,7 +18,7 @@
       = link_to 'hundreds of different crops', crops_url
     and a community from all around the world.
 
-    = render :partial => "shared/signin_signup", 
+    = render :partial => "shared/signin_signup",
       :locals => { :to => "or to start using #{ENV["GROWSTUFF_SITE_NAME"]} to track what you're planting and harvesting" }
 
 = render :partial => "single", :locals => { :post => @post, :subject => false, :hide_comments => true }

app/views/scientific_names/show.html.haml

@@ -1,3 +1,12 @@
+- content_for :opengraph do
+  - @scientific_name.crop.photos.each do |photo|
+    = tag("meta", property: "og:image", content: photo.fullsize_url)
+
+  = tag("meta", property: "og:title", content: @scientific_name.scientific_name)
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
+
 %p#notice= notice
 
 = render :partial => 'crops/approval_status_message', :locals => { :crop => @scientific_name.crop }

app/views/seeds/_thumbnail.html.haml

@@ -11,15 +11,15 @@
         = link_to image_tag((seed.crop.default_photo ?  seed.crop.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => seed.crop.name, :class => 'img'), seed.crop
       .col-md-8
         %dl.dl-horizontal
-          %dt Crop : 
+          %dt Crop :
           %dd= link_to seed.crop.name, seed.crop
-          %dt Plant before : 
+          %dt Plant before :
           %dd= seed.plant_before
-          %dt Quantity : 
+          %dt Quantity :
           %dd= seed.quantity
-          %dt Will trade to :     
+          %dt Will trade to :
           %dd= seed.tradable_to
-          %dt From location :   
+          %dt From location :
           %dd= seed.owner.location
           %dt Owner :
           %dd= link_to seed.owner.login_name, seed.owner

app/views/seeds/show.html.haml

@@ -1,4 +1,13 @@
 - content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
+- content_for :opengraph do
+  - @seed.crop.photos.each do |photo|
+    = tag("meta", property: "og:image", content: photo.fullsize_url)
+  - if @seed.description
+    = tag("meta", property: "og:description", content: @seed.description)
+  = tag("meta", property: "og:image", content: "#{@seed.owner}'s #{@seed.crop} seeds")
+  = tag("meta", property: "og:type", content: "website")
+  = tag("meta", property: "og:url", content: request.original_url)
+  = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
 .row
   .col-md-6
@@ -60,5 +69,9 @@
     - if @seed.owner.location
       %p
         %small
-          View other seeds, members and more near
-          = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+          View other seeds, members to trade with and more near
+          = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+    %p
+      %small
+        Or
+        = 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 @seed.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"

app/views/shared/_flash_messages.html.haml

@@ -0,0 +1,6 @@
+- flash.each do |type, content|
+  %div{ class: build_alert_classes(type), role: "alert" }
+    %button.close{ type: "button", "data-dismiss" => "alert" }
+      %span{ "aria-hidden" => true } ×
+      %span.sr-only Close
+    = content

app/views/shop/index.html.haml

@@ -81,5 +81,3 @@
         or
         =link_to "sign up", new_member_registration_path
         to purchase.
-
-

config.rb

@@ -22,4 +22,3 @@ images_dir      = "app/assets/images"
 preferred_syntax = :sass
 # and then run:
 # sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
-

config/application.rb

@@ -82,12 +82,6 @@ module Growstuff
       g.javascripts      false
     end
 
-    config.action_mailer.delivery_method = :sendmail
-      config.action_mailer.sendmail_settings = {
-        location: '/usr/sbin/sendmail',
-        arguments: '-i -t',
-        openssl_verify_mode: 'none'
-      }
 
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
@@ -112,5 +106,6 @@ module Growstuff
     # didn't work for us.
     config.cloudmade_key = '29a2d9e3cb3d429490a8f338b2388b1d'
 
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end

config/application.yml.example

@@ -62,6 +62,10 @@ GROWSTUFF_PAYPAL_USERNAME: "dummy"
 GROWSTUFF_PAYPAL_PASSWORD: "dummy"
 GROWSTUFF_PAYPAL_SIGNATURE: "dummy"
 
+# https://developers.facebook.com/
+GROWSTUFF_FACEBOOK_KEY: ""
+GROWSTUFF_FACEBOOK_SECRET: ""
+
 # Elasticsearch is used for flexible search and it requires another component
 # to be installed. To make it easy for people who don't need to test this feature
 # it's been turned off for test and development environment as a default.

config/environments/development.rb

@@ -31,7 +31,7 @@ Growstuff::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets, 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
@@ -61,6 +61,7 @@ Growstuff::Application.configure do
   # this config variable cannot be put in application.yml as it is needed
   # by the assets pipeline, which doesn't have access to ENV.
   config.mapbox_map_id = 'growstuff.i3n2il6a'
+  config.mapbox_access_token = 'pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA'
 
   config.after_initialize do
     ActiveMerchant::Billing::Base.mode = :test
@@ -74,4 +75,6 @@ Growstuff::Application.configure do
   end
 
   config.action_controller.action_on_unpermitted_parameters = :raise
+
+  config.active_job.queue_adapter = :sidekiq
 end

config/environments/production.rb

@@ -15,7 +15,7 @@ Growstuff::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -69,15 +69,15 @@ Growstuff::Application.configure do
   # Growstuff configuration
   config.action_mailer.default_url_options = { host: 'growstuff.org' }
 
-  config.action_mailer.smtp_settings = {
-      port: '587',
-      address: 'smtp.mandrillapp.com',
-      user_name: ENV['GROWSTUFF_MANDRILL_USERNAME'],
-      password: ENV['GROWSTUFF_MANDRILL_APIKEY'],
-      domain: 'heroku.com',
-      authentication: :plain
+  ActionMailer::Base.smtp_settings = {
+      port:                 ENV['SPARKPOST_SMTP_PORT'],
+      address:              ENV['SPARKPOST_SMTP_HOST'],
+      user_name:            ENV['SPARKPOST_SMTP_USERNAME'],
+      password:             ENV['SPARKPOST_SMTP_PASSWORD'],
+      authentication:       :login,
+      enable_starttls_auto: true
   }
-  config.action_mailer.delivery_method = :smtp
+  ActionMailer::Base.delivery_method = :smtp
 
   config.host = 'growstuff.org'
   config.analytics_code = <<-eos
@@ -89,6 +89,7 @@ Growstuff::Application.configure do
   # this config variable cannot be put in application.yml as it is needed
   # by the assets pipeline, which doesn't have access to ENV.
   config.mapbox_map_id = 'growstuff.i3n2c4ie'
+  config.mapbox_access_token = 'pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA'
 
   config.after_initialize do
     ActiveMerchant::Billing::Base.mode = :production
@@ -101,4 +102,5 @@ Growstuff::Application.configure do
     ::EXPRESS_GATEWAY = ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
   end
 
+  config.active_job.queue_adapter = :sidekiq
 end

config/environments/staging.rb

@@ -2,7 +2,7 @@ Growstuff::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   config.action_controller.action_on_unpermitted_parameters = :raise
-  
+
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
@@ -17,7 +17,7 @@ Growstuff::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -71,15 +71,15 @@ Growstuff::Application.configure do
   # Growstuff configuration
   config.action_mailer.default_url_options = { host: 'staging.growstuff.org' }
 
-  config.action_mailer.smtp_settings = {
-      port: '587',
-      address: 'smtp.mandrillapp.com',
-      user_name: ENV['GROWSTUFF_MANDRILL_USERNAME'],
-      password: ENV['GROWSTUFF_MANDRILL_APIKEY'],
-      domain: 'heroku.com',
-      authentication: :plain
+  ActionMailer::Base.smtp_settings = {
+      port:                 ENV['SPARKPOST_SMTP_PORT'],
+      address:              ENV['SPARKPOST_SMTP_HOST'],
+      user_name:            ENV['SPARKPOST_SMTP_USERNAME'],
+      password:             ENV['SPARKPOST_SMTP_PASSWORD'],
+      authentication:       :login,
+      enable_starttls_auto: true
   }
-  config.action_mailer.delivery_method = :smtp
+  ActionMailer::Base.delivery_method = :smtp
 
   config.host = 'staging.growstuff.org'
   config.analytics_code = ''
@@ -87,6 +87,7 @@ Growstuff::Application.configure do
   # this config variable cannot be put in application.yml as it is needed
   # by the assets pipeline, which doesn't have access to ENV.
   config.mapbox_map_id = 'growstuff.i3n2hao7'
+  config.mapbox_access_token = 'pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA'
 
   config.after_initialize do
     ActiveMerchant::Billing::Base.mode = :test
@@ -99,4 +100,5 @@ Growstuff::Application.configure do
     ::EXPRESS_GATEWAY = ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
   end
 
+  config.active_job.queue_adapter = :sidekiq
 end