Merge pull request #1032 from Growstuff/dev

Release 14

.codeclimate.yml

@@ -8,7 +8,7 @@ engines:
   eslint:
     enabled: true
   coffeelint:
-    enabled: true 
+    enabled: true
   brakeman:
     enabled: true
   bundler-audit:
@@ -25,7 +25,7 @@ ratings:
   paths:
   - "**.rb"
   - "**.js"
-  - "**.coffee" 
+  - "**.coffee"
   - "**.sass"
   - "**.haml"
   - Gemfile.lock

.ruby-version

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

.travis.yml

@@ -8,10 +8,12 @@ env:
   global:
     secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 rvm:
-- 2.2.4
+- 2.3.1
 before_script:
 - psql -c 'create database growstuff_test;' -U postgres
 script:
+- script/gemfile_check
+- bundle exec script/check_contributors_md
 - bundle exec rake db:migrate --trace
 - bundle exec rspec spec/
 services:
@@ -34,4 +36,6 @@ deploy:
     - restart
 after_deploy:
   - bundle exec script/heroku_maintenance.rb off
-
+addons:
+  code_climate:
+    repo_token: 462e015bbdaabfb20910fc07f2fea253410ecb131444e00f97dbf32dc6789ca6

CONTRIBUTORS.md

@@ -68,3 +68,6 @@ 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)

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,8 @@
 source 'https://rubygems.org'
 
-ruby '2.2.4'
+ruby '2.3.1'
 
-gem 'rails', '~> 4.1.11'
+gem 'rails', '~> 4.2.0'
 
 gem 'bundler', '>=1.1.5'
 
@@ -36,13 +36,8 @@ 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'
 
 # Markdown formatting for updates etc
 gem 'bluecloth'
@@ -51,7 +46,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 +55,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'
@@ -103,12 +96,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 +110,7 @@ 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"
 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)
@@ -67,13 +67,13 @@ GEM
     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)
+    byebug (9.0.5)
+    cancancan (1.15.0)
     capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
@@ -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,22 @@ 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)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)
     csv_shaper (1.2.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 +145,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 (1.0.18)
+      elasticsearch-api (= 1.0.18)
+      elasticsearch-transport (= 1.0.18)
+    elasticsearch-api (1.0.18)
       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 (1.0.18)
       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 +196,7 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.5)
+    guard-rspec (4.7.2)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
@@ -216,8 +218,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 +231,21 @@ 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.1.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.2.9)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
-    kaminari (0.16.3)
+    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,25 +257,28 @@ 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)
+    mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
-    mini_portile2 (2.0.0)
+    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.0.318)
+    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)
@@ -296,35 +301,44 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    parser (2.3.1.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)
+    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-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)
+      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.8)
       i18n (~> 0.7)
       railties (~> 4.0)
@@ -333,18 +347,18 @@ 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)
+    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)
+    responders (2.2.0)
+      railties (>= 4.2.0, < 5.1)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -376,39 +390,39 @@ GEM
       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)
+    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)
     slop (3.6.0)
-    sprockets (3.6.0)
+    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)
@@ -435,8 +449,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 +472,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
@@ -490,11 +505,11 @@ DEPENDENCIES
   poltergeist (~> 1.6)
   pry
   quiet_assets
-  rails (~> 4.1.11)
+  rails (~> 4.2.0)
   rails_12factor
   rake (>= 10.0.0)
   rspec-activemodel-mocks
-  rspec-rails (~> 3.4.0)
+  rspec-rails
   ruby-units
   sass-rails (~> 5.0.4)
   selenium-webdriver
@@ -504,7 +519,7 @@ DEPENDENCIES
   will_paginate (~> 3.0)
 
 RUBY VERSION
-   ruby 2.1.8p440
+   ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.4
+   1.12.5

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,19 +29,11 @@ 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.
+* Drop in to our [discussion forums](http://talk.growstuff.org/), IRC or Gitter to chat to other developers, get help, etc.
 * You may also be interested in our [API](http://wiki.growstuff.org/index.php/API).
 
-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
-```
-
 ## For designers, writers, researchers, data wranglers, and other contributors
 
 There are heaps of ways to get involved and contribute no matter what
@@ -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

@@ -8,13 +8,12 @@ jQuery ->
   
   el.datepicker({'format': 'yyyy-mm-dd'})
 
-  href = el.attr('href')
-
   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/stylesheets/overrides.sass

@@ -40,6 +40,19 @@ h3
 .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
@@ -115,6 +128,10 @@ p.stats
         padding-left: 80px
         margin-left: auto
 
+  .navbar .navbar-form
+    width: 250px
+
+
 #placesmap, #cropmap 
   height: 500px
 
@@ -273,6 +290,11 @@ html, body
   .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%)

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

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_now!
           end
         end
 
@@ -180,8 +188,8 @@ class CropsController < ApplicationController
         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_now! if new_status == "approved"
+          Notifier.crop_request_rejected(requester, @crop).deliver_now! if new_status == "rejected"
         end
         format.html { redirect_to @crop, notice: 'Crop was successfully updated.' }
         format.json { head :no_content }

app/controllers/harvests_controller.rb

@@ -27,17 +27,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/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/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

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")
@@ -50,5 +64,13 @@ module ApplicationHelper
       default: :identicon
     })
   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/mailers/notifier.rb

@@ -2,12 +2,10 @@ 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)

app/models/crop.rb

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

app/models/harvest.rb

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

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

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_now
     end
   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,7 +97,7 @@ 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
@@ -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/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/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,9 @@
 
     %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 "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/forums/index.html.haml

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

@@ -25,7 +25,7 @@
           %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
@@ -39,7 +47,7 @@
     - 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

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

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

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

@@ -33,7 +33,7 @@
           - 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/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'

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'
 

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

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

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

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
+end

config/environments/development.rb

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

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

config/environments/staging.rb

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

config/environments/test.rb

@@ -15,7 +15,7 @@ Growstuff::Application.configure do
   config.cache_classes = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching
@@ -49,6 +49,7 @@ Growstuff::Application.configure do
   end
 
   config.after_initialize do
+    require "active_merchant/ext/paypal_bogus_gateway"
     ActiveMerchant::Billing::Base.mode = :test
     ::STANDARD_GATEWAY = ActiveMerchant::Billing::PaypalBogusGateway.new
     ::EXPRESS_GATEWAY = ActiveMerchant::Billing::PaypalBogusGateway.new

config/initializers/devise.rb

@@ -121,7 +121,7 @@ Devise.setup do |config|
   # Email regex used to validate email formats. It simply asserts that
   # an one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
+  config.email_regexp = /\A[^@]+@[^@]+\z/
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this

config/locales/en.yml

@@ -179,6 +179,9 @@ en:
       crop:
         one: "crop"
         other: "crops"
+      follow:
+        one: "follow"
+        other: "follows"
       garden:
         one: "garden"
         other: "gardens"

config/routes.rb

@@ -83,6 +83,8 @@ Growstuff::Application.routes.draw do
   get '/admin/newsletter' => 'admin#newsletter', :as => :admin_newsletter
   get '/admin/:action' => 'admin#:action'
 
+  get '/.well-known/acme-challenge/:id' => 'pages#letsencrypt'
+
 # CMS stuff  -- must remain LAST
   comfy_route :cms, path: '/', sitemap: false
 

db/migrate/20120903092956_devise_create_users.rb

@@ -34,7 +34,7 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string :authentication_token
 
 
-      t.timestamps
+      t.timestamps null: true
     end
 
     add_index :users, :email,                unique: true

db/migrate/20121001212604_create_crops.rb

@@ -3,7 +3,7 @@ class CreateCrops < ActiveRecord::Migration
     create_table :crops do |t|
       t.string :system_name
       t.string :en_wikipedia_url
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20121105032913_create_gardens.rb

@@ -5,7 +5,7 @@ class CreateGardens < ActiveRecord::Migration
       t.integer :user_id
       t.string  :slug, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
 
     add_index :gardens, :user_id

db/migrate/20121107012827_create_scientific_names.rb

@@ -4,7 +4,7 @@ class CreateScientificNames < ActiveRecord::Migration
       t.string :scientific_name, null: false
       t.integer :crop_id, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20121108105440_create_updates.rb

@@ -5,7 +5,7 @@ class CreateUpdates < ActiveRecord::Migration
       t.string :subject, null: false
       t.text :body, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20121219022554_create_plantings.rb

@@ -7,7 +7,7 @@ class CreatePlantings < ActiveRecord::Migration
       t.integer :quantity
       t.text :description
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130206033956_create_comments.rb

@@ -5,7 +5,7 @@ class CreateComments < ActiveRecord::Migration
       t.integer :author_id
       t.text :body
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130212123628_create_notifications.rb

@@ -8,7 +8,7 @@ class CreateNotifications < ActiveRecord::Migration
       t.boolean :read
       t.integer :post_id
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130213014511_create_forums.rb

@@ -5,7 +5,7 @@ class CreateForums < ActiveRecord::Migration
       t.text :description, null: false
       t.integer :owner_id, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130214024117_create_roles.rb

@@ -4,7 +4,7 @@ class CreateRoles < ActiveRecord::Migration
       t.string :name, null: false
       t.text :description
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130404174459_create_authentications.rb

@@ -6,7 +6,7 @@ class CreateAuthentications < ActiveRecord::Migration
       t.string :uid
       t.string :token
       t.string :secret
-      t.timestamps
+      t.timestamps null: true
     end
     add_index :authentications, :member_id
   end

db/migrate/20130507105357_create_products.rb

@@ -5,7 +5,7 @@ class CreateProducts < ActiveRecord::Migration
       t.string :description, null: false
       t.decimal :min_price, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130507110411_create_orders.rb

@@ -3,7 +3,7 @@ class CreateOrders < ActiveRecord::Migration
     create_table :orders do |t|
       t.string :member_id, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130508104506_create_photos.rb

@@ -6,7 +6,7 @@ class CreatePhotos < ActiveRecord::Migration
       t.string :thumbnail_url, null: false
       t.string :fullsize_url, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130515033842_create_order_items.rb

@@ -6,7 +6,7 @@ class CreateOrderItems < ActiveRecord::Migration
       t.decimal :price
       t.integer :quantity
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130517015920_create_account_details.rb

@@ -5,7 +5,7 @@ class CreateAccountDetails < ActiveRecord::Migration
       t.integer :account_type_id
       t.datetime :paid_until
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130517051922_create_account_types.rb

@@ -5,7 +5,7 @@ class CreateAccountTypes < ActiveRecord::Migration
       t.boolean :is_paid
       t.boolean :is_permanent_paid
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130715110134_create_seeds.rb

@@ -7,7 +7,7 @@ class CreateSeeds < ActiveRecord::Migration
       t.integer :quantity
       t.date :use_by
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20130917053547_create_harvests.rb

@@ -8,7 +8,7 @@ class CreateHarvests < ActiveRecord::Migration
       t.string :units
       t.text :notes
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20131030230908_create_plant_parts.rb

@@ -3,7 +3,7 @@ class CreatePlantParts < ActiveRecord::Migration
     create_table :plant_parts do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20141018111015_create_alternate_names.rb

@@ -5,7 +5,7 @@ class CreateAlternateNames < ActiveRecord::Migration
       t.integer :crop_id, null: false
       t.integer :creator_id, null: false
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20141111130849_create_follows.rb

@@ -4,7 +4,7 @@ class CreateFollows < ActiveRecord::Migration
       t.integer :member_id
       t.integer :followed_id
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20150201052245_create_cms.rb

@@ -33,7 +33,7 @@ class CreateCms < ActiveRecord::Migration
       t.text    :js,          text_limit
       t.integer :position,    null: false, default: 0
       t.boolean :is_shared,   null: false, default: false
-      t.timestamps
+      t.timestamps null: true
     end
     add_index :comfy_cms_layouts, [:parent_id, :position]
     add_index :comfy_cms_layouts, [:site_id, :identifier], unique: true
@@ -52,7 +52,7 @@ class CreateCms < ActiveRecord::Migration
       t.integer :children_count,  null: false, default: 0
       t.boolean :is_published,    null: false, default: true
       t.boolean :is_shared,       null: false, default: false
-      t.timestamps
+      t.timestamps null: true
     end
     add_index :comfy_cms_pages, [:site_id, :full_path]
     add_index :comfy_cms_pages, [:parent_id, :position]
@@ -62,7 +62,7 @@ class CreateCms < ActiveRecord::Migration
       t.string     :identifier,  null: false
       t.text       :content,     text_limit
       t.references :blockable, polymorphic: true
-      t.timestamps
+      t.timestamps null: true
     end
     add_index :comfy_cms_blocks, [:identifier]
     add_index :comfy_cms_blocks, [:blockable_id, :blockable_type]
@@ -75,7 +75,7 @@ class CreateCms < ActiveRecord::Migration
       t.text    :content,     text_limit
       t.integer :position,    null: false, default: 0
       t.boolean :is_shared,   null: false, default: false
-      t.timestamps
+      t.timestamps null: true
     end
     add_index :comfy_cms_snippets, [:site_id, :identifier], unique: true
     add_index :comfy_cms_snippets, [:site_id, :position]
@@ -90,7 +90,7 @@ class CreateCms < ActiveRecord::Migration
       t.integer :file_file_size,    null: false
       t.string  :description,       limit: 2048
       t.integer :position,          null: false, default: 0
-      t.timestamps
+      t.timestamps null: true
     end
     add_index :comfy_cms_files, [:site_id, :label]
     add_index :comfy_cms_files, [:site_id, :file_file_name]

lib/tasks/growstuff.rake

@@ -49,7 +49,7 @@ namespace :growstuff do
 
     if Date.today.cwday == send_on_day and Date.today.cweek % every_n_weeks == 0
       Member.confirmed.find_each do |m|
-        Notifier.planting_reminder(m).deliver!
+        Notifier.planting_reminder(m).deliver_now!
       end
     end
   end

script/check_contributors_md

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+puts "Checking to see if you're in CONTRIBUTORS.md..."
+if ENV['TRAVIS'] then
+  if ENV['TRAVIS_PULL_REQUEST'] then
+    require 'httparty'
+    repo = ENV['TRAVIS_REPO_SLUG']
+    pr = ENV['TRAVIS_PULL_REQUEST']
+    url = "https://api.github.com/repos/#{repo}/pulls/#{pr}"
+    response = HTTParty.get(url).parsed_response
+    author = response['user']['login'] if response && response['user']
+
+    # Could not determine author
+    exit unless author
+  else
+    # We're in a Travis branch build; nothing to check
+    exit
+  end
+else
+  author = `git config github.user`.chomp
+  if $?.exitstatus > 0 then
+    abort %{
+Couldn't determine your GitHub username, and not in a Travis PR build
+Please set it using
+
+    git config --add github.user [username]
+}
+  end
+end
+
+if !system("grep #{author} CONTRIBUTORS.md") then
+  abort %{
+Thanks for your contribution, #{author}!
+Please add your name and GitHub handle to the file CONTRIBUTORS.md,
+commit it, and update your PR.
+  }
+end
+

script/gemfile_check

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'set'
+
+changed_file_list = `git diff --name-only --diff-filter=ACMRTUXB origin/dev...`
+files = Set.new changed_file_list.split
+if (files.include? "Gemfile") && !(files.include? "Gemfile.lock") then
+  abort "Looks like you committed changes to Gemfile but not Gemfile.lock"
+end

script/heroku_maintenance.rb

@@ -6,7 +6,7 @@ require 'yaml'
 heroku = Heroku::API.new(api_key: ENV['HEROKU_API_KEY'])
 branch = ENV['TRAVIS_BRANCH']
 travis_config = YAML.load_file('.travis.yml')
-if travis_config['deploy']['app'].has_key? branch
+if travis_config['deploy']['app'].key? branch
   app = travis_config['deploy']['app'][branch]
 else
   abort "No Heroku app found for branch #{branch}"

spec/features/comments/commenting_a_comment_spec.rb

@@ -27,7 +27,7 @@ feature 'Commenting on a post' do
       fill_in "comment_body", with: "Testing edit for comment"
       click_button "Post comment"
       expect(page).to have_content "Comment was successfully updated"
-      expect(page).to have_content "Edited by"
+      expect(page).to have_content "edited at"
     end
   end
 end

spec/features/crops/crop_detail_page_spec.rb

@@ -135,7 +135,9 @@ feature "crop detail page", js: true do
         expect(page).to have_content "Learn more about #{ crop.name }"
         expect(page).to have_link "Wikipedia (English)", href: crop.en_wikipedia_url
       end
-
+      scenario "has a link to gardenate" do
+        expect(page).to have_link "Gardenate - Planting reminders", href: "http://www.gardenate.com/plant/#{URI.escape crop.name}"
+      end
     end
   end
 

spec/features/plantings/planting_a_crop_spec.rb

@@ -231,7 +231,7 @@ feature "Planting a crop", :js do
   end
 
   describe "Planting sunniness" do
-    it "should show the image sunniness_sun.png" do
+    it "should show the a sunny image" do
       fill_autocomplete "crop", with: "mai"
       select_from_autocomplete "maize"
       within "form#new_planting" do
@@ -244,11 +244,10 @@ feature "Planting a crop", :js do
         click_button "Save"
       end
 
-      expect(page).to have_css("img[src*='sunniness_sun.png']")
-      expect(page).to have_css("img[alt=sun]")
+      expect(page).to have_css("img[alt='sun']")
     end
 
-    it "should show the image 'not specified.png'" do
+    it "should show a sunniness not specified image" do
       fill_autocomplete "crop", with: "mai"
       select_from_autocomplete "maize"
       within "form#new_planting" do
@@ -260,7 +259,6 @@ feature "Planting a crop", :js do
         click_button "Save"
       end
 
-      expect(page).to have_css("img[src*='sunniness_not specified.png']")
       expect(page).to have_css("img[alt='not specified']")
     end
   end

spec/features/posts/posting_a_post_spec.rb

@@ -27,7 +27,7 @@ feature 'Post a post' do
       fill_in "post_subject", with: "Testing Edit"
       click_button "Post"
       expect(page).to have_content "Post was successfully updated"
-      expect(page).to have_content "Edited by"
+      expect(page).to have_content "edited at"
     end
   end
-end
+end

spec/features/unsubscribing_spec.rb

@@ -15,7 +15,7 @@ feature "unsubscribe" do
     expect(member.send_notification_email).to eq(true)
 
     # generate planting reminder email
-    Notifier.planting_reminder(member).deliver
+    Notifier.planting_reminder(member).deliver_now
     open_email(member.email)
 
     # clicking 'Unsubscribe' link will unsubscribe the member
@@ -33,7 +33,7 @@ feature "unsubscribe" do
 
     # generate inbox notification email
     notification.recipient = member
-    Notifier.notify(notification).deliver
+    Notifier.notify(notification).deliver_now
     open_email(member.email)
 
     # clicking 'Unsubscribe' link will unsubscribe the member