Merge pull request #1591 from Br3nda/feature/photos-helper

Use photos helpers to find photos

.codeclimate.yml

@@ -0,0 +1,45 @@
+engines:
+  rubocop:
+    enabled: true
+  scss-lint:
+    enabled: true
+  shellcheck:
+    enabled: true
+  eslint:
+    enabled: true
+  coffeelint:
+    enabled: true
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+    exclude_fingerprints:
+    - 16dbcb58d6caa7ccfe241417831ecfa6
+    - 7d7dca4f27f50e3084f203280073cc74
+  fixme:
+    enabled: true
+    exclude_fingerprints:  # rubocop_todo filename
+    - 63b8552079d106832fbe281566b6d028
+    - d38afbaaea3ecaa9a4cf046b07a01cec
+    - 57ff3968fd371d3e1f75c237d6c78acf
+ratings:
+  paths:
+  - "**.rb"
+  - "**.js"
+  - "**.coffee"
+  - "**.sass"
+  - "**.haml"
+  - Gemfile.lock
+exclude_paths:
+- config/
+- db/
+- spec/
+- public/
+- app/assets/stylesheets/bootstrap-accessibility.css
+- app/assets/javascripts/bootstrap*

.esignore

@@ -0,0 +1 @@
+app/assets/javascripts/bootstrap-accessibility.min.js

.eslintrc.json

@@ -0,0 +1,11 @@
+{
+  "extends": "google",
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "rules": {
+    "no-var": "off",
+    "max-len": ["error", { "code": 120, "tabWidth": 4 }]
+  }
+}

.gitignore

@@ -7,8 +7,13 @@ coverage
 .*.sw*
 *~
 *.DS_Store
+config/application.yml
+config/database.yml
 credentials*.sh
 Pathogen:
 custom_plan.rb
 zeus.json
 .bundle
+.idea/**
+public/**
+node_modules

.haml-lint.yml

@@ -0,0 +1,9 @@
+linters:
+  LineLength:
+    max: 120
+  InstanceVariables:
+    enabled: false
+  IdNames:
+    enabled: false
+  ConsecutiveComments:
+    enabled: false

.hound.yml

@@ -0,0 +1,13 @@
+---
+fail_on_violations: true
+ruby:
+  config_file: .rubocop.yml
+haml:
+  config_file: .haml-lint.yml
+scss:
+  config_file: .scss-lint.yml
+eslint:
+  config_file: .eslintrc
+  ignore_file: .esignore
+jshint:
+  enabled: false

.mention-bot

@@ -0,0 +1,3 @@
+{
+    "userBlacklist": ["tygriffin","oshiho3"]
+}

.overcommit.yml

@@ -0,0 +1,102 @@
+---
+# Use this file to configure the Overcommit hooks you wish to use. This will
+# extend the default configuration defined in:
+# https://github.com/brigade/overcommit/blob/master/config/default.yml
+#
+# At the topmost level of this YAML file is a key representing type of hook
+# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
+# customize each hook, such as whether to only run it on certain files (via
+# `include`), whether to only display output if it fails (via `quiet`), etc.
+#
+# For a complete list of hooks, see:
+# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
+#
+# For a complete list of options that you can use to customize hooks, see:
+# https://github.com/brigade/overcommit#configuration
+#
+# Uncomment the following lines to make the configuration take effect.
+
+PreCommit:
+  ALL:
+    quiet: false
+    problem_on_unmodified_line: warn
+  RuboCop:
+    enabled: true
+    command: ['bundle', 'exec', 'rubocop', '-D', '--rails']
+  TrailingWhitespace:
+    enabled: true
+    exclude:
+      - '**/db/structure.sql'  # Ignore trailing whitespace in generated files
+  CoffeeLint:
+    enabled: true
+    on_fail: warn
+    command: ['npm', 'run', 'coffeelint']
+    required_executable: 'npm'
+  HardTabs:
+    enabled: true
+  AuthorEmail:
+    enabled: false
+  AuthorName:
+    enabled: false
+  CssLint:
+    enabled: true
+    exclude:
+      - '**/bootstrap.min.css'
+    command: ['npm', 'run', 'csslint']
+    required_executable: 'npm'
+  HamlLint:
+    enabled: true
+    include:
+      - 'app/views/**'
+    command: ['bundle', 'exec', 'haml-lint']
+  JsonSyntax:
+    enabled: true
+  BundleOutdated:
+    enabled: true
+    on_warn: warn
+  BundleAudit:
+    enabled: true
+    on_warn: warn
+  EsLint:
+    enabled: true
+    exclude:
+      - 'app/assets/**'
+      - 'spec/javascripts/support/vendor/**'
+      - '**/bootstrap*'
+    command: ['./node_modules/.bin/eslint']
+    required_executable: 'npm'
+  ScssLint:
+    enabled: true
+  RailsSchemaUpToDate:
+    enabled: true
+  MergeConflicts:
+    enabled: true
+  YamlLint:
+    enabled: true
+
+PostCheckout:
+  ALL:
+    quiet: false
+  BundleInstall:
+    enabled: true
+  RailsSchemaUpToDate:
+    enabled: true
+
+PostMerge:
+  BundleInstall:
+    enabled: true
+  RailsSchemaUpToDate:
+    enabled: true
+
+# PrePush:
+#   ALL:
+#     on_warn: fail  # Treat all warnings as failures
+#     quiet: false
+#   # Brakeman:
+#   #   enabled: true
+#   RSpec:
+#     enabled: true
+#     command: ['bundle', 'exec', 'rspec', '--fail-fast']
+#
+#  IndexTags:
+#    enabled: true # Generate a tags file with `ctags` each time HEAD changes

.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

.rubocop.yml

@@ -0,0 +1,75 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  Include:
+    - 'Rakefile'
+    - 'config.ru'
+    - 'lib/**/*.rake'
+  Exclude:
+    - 'db/schema.rb'
+    - 'vendor/**/*'
+  TargetRailsVersion: 4.0
+
+Rails:
+  Enabled: true
+
+Style/FileName:
+  Exclude:
+    - 'Guardfile'
+    - 'Gemfile'
+    - 'Gemfile.lock'
+
+Style/StringLiterals:
+  Enabled: false
+
+# Stop hound and codeclimate fighting
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: ()
+    '%i': ()
+    '%w': ()
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Metrics/LineLength:
+  Max: 120
+
+# turn these back on in Rails 5
+Rails/HttpPositionalArguments: # See https://github.com/bbatsov/rubocop/issues/3629
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Configuration parameters: Include.
+# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
+Rails/Output:
+  Exclude:
+    - 'config/unicorn.rb'
+    - 'db/seeds.rb'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+    - '**/*.rake'
+    - 'config/**/*.rb'
+
+# Remove the following once the code style matches
+Metrics/MethodLength:
+  Max: 34
+Metrics/AbcSize:
+  Max: 31
+Metrics/ClassLength:
+  Max: 179
+Metrics/CyclomaticComplexity:
+  Max: 11
+Metrics/PerceivedComplexity:
+  Max: 9

.rubocop_todo.yml

@@ -0,0 +1,93 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --no-offense-counts`
+# on 2018-02-05 14:37:22 +1300 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/tasks/testing.rake'
+
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/passwords_controller.rb'
+    - 'app/controllers/registrations_controller.rb'
+    - 'app/validators/approved_validator.rb'
+
+Rails/FilePath:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
+Rails/OutputSafety:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/auto_suggest_helper.rb'
+    - 'app/helpers/gardens_helper.rb'
+
+# Configuration parameters: Blacklist.
+# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/seeds.rb'
+
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Exclude:
+    - 'spec/factories/member.rb'
+    - 'spec/factories/post.rb'
+    - 'spec/models/post_spec.rb'
+
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Exclude:
+    - 'config/unicorn.rb'
+    - 'lib/tasks/growstuff.rake'
+
+Style/AsciiComments:
+  Exclude:
+    - 'config/initializers/comfortable_mexican_sofa.rb'
+
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'lib/actions/oauth_signup_action.rb'
+    - 'lib/haml/filters/escaped_markdown.rb'
+
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'app/controllers/follows_controller.rb'
+
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/helpers/harvests_helper.rb'
+    - 'app/helpers/plantings_helper.rb'
+    - 'lib/tasks/growstuff.rake'
+
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+    - 'spec/rails_helper.rb'
+    - 'spec/views/devise/registrations/edit_spec.rb'
+    - 'spec/views/members/index.html.haml_spec.rb'
+    - 'spec/views/posts/index.html.haml_spec.rb'

.ruby-gemset

@@ -0,0 +1 @@
+growstuffdev

.ruby-version

@@ -0,0 +1 @@
+2.4.1

.rvmrc

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p194@growstuffdev"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.14.10 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-  if [[ $- == *i* ]] # check for interactive shells
-  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create use  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi

.travis.yml

@@ -1,29 +1,73 @@
----
+sudo: required
 language: ruby
-bundler_args: --without development assets
-env: RAILS_ENV=travis
-rvm:
-  - 1.9.3
+cache:
+  bundler: true
+  directories:
+    - travis_phantomjs
+    - tmp/cache/assets/test/sprockets
+env:
+  matrix:
+    - GROWSTUFF_ELASTICSEARCH='true' RSPEC_TAG=elasticsearch STATIC_CHECKS=false
+    - GROWSTUFF_ELASTICSEARCH='false' RSPEC_TAG=~elasticsearch STATIC_CHECKS=false
+    - STATIC_CHECKS=true
+  global:
+    - GROWSTUFF_SITE_NAME="Growstuff (travis)"
+    - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
+before_install:
+  - ./script/install_phantomjs;
+  - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
+  # Force Travis to use Elastic Search 2.4.0
+  - >
+    if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
+      sudo dpkg -r elasticsearch;
+      curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb;
+      sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb;
+      sudo service elasticsearch start;
+      sleep 10;
+      curl localhost:9200;
+    fi
 before_script:
-  - psql -c 'create database growstuff_test;' -U postgres
+  - set -e
+  - >
+    if [ "${STATIC_CHECKS}" = "true" ]; then
+      ./script/install_linters;
+    else
+      RAILS_ENV=test bundle exec rake db:create db:migrate;
+      bundle exec rake assets:precompile;
+    fi
+  - set +e
 script:
-  - bundle exec rake db:migrate --trace
-  - bundle exec rspec spec/
-
-# after_success:
-# - if [[ "$TRAVIS_BRANCH" == "dev" ]]; then git remote add heroku git@heroku.com:growstuff-dev.git
-# - wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh
-# - echo "Host heroku.com" >> ~/.ssh/config
-# - echo "   StrictHostKeyChecking no" >> ~/.ssh/config
-# - echo "   CheckHostIP no" >> ~/.ssh/config
-# - echo "   UserKnownHostsFile=/dev/null" >> ~/.ssh/config
-# - heroku keys:clear
-# - yes | heroku keys:add
-# - yes | git push heroku dev:master
-# - heroku run rake db:migrate
-# - heroku restart
-# - fi
-
-# env:
-# global:
-# secure: "QFQbCdNGyjeatp/H0j0y0oGiue45fpG2w6eA2QAbq2RmvhabgXbd5WIobN90\ndrae3S7TRxPDpMpus90icykX6EzOTLXCEvaC4rh9pCcRktj3SZqq5b9rVTvs\n1MvlS6HhtsVqsrKjQUb0WmPpnganIzTs0RtGaQspo2joPJO18A4="
+  - set -e
+  - >
+    if [ "${STATIC_CHECKS}" = "true" ]; then
+      ./script/check_static.rb
+    else
+      bundle exec rake db:migrate --trace;
+      bundle exec rspec --tag $RSPEC_TAG spec/;
+      bundle exec rake jasmine:ci;
+    fi;
+  - set +e
+before_deploy:
+  - bundle exec script/heroku_maintenance.rb on
+deploy:
+  provider: heroku
+  api_key:
+    secure: "WrQxf0fEKkCdXrjcejurobOnNNz3he4dDwjBbToXbQTQNDObPp7NetJrLsfM8FiUFEeOuvhIHHiDQtMvY720zGGAGxDptvgFS+0QHCUqoTRZA/yFfUmHlG2jROXTzk5uVK0AE4k6Ion5kX8+mM0EnMT/7u+MTFiukrJctSiEXfg="
+  on:
+    repo: Growstuff/growstuff
+    condition: "$RSPEC_TAG = elasticsearch"
+  app:
+    dev: growstuff-staging
+    master: growstuff-prod
+    travis_deploy: tranquil-basin-3130
+    travis_containers: tranquil-basin-3130
+  run:
+    - "rake db:migrate"
+    - "script/deploy-tasks.sh"
+    - restart
+after_deploy:
+  - bundle exec script/heroku_maintenance.rb off
+addons:
+  code_climate:
+    repo_token: 462e015bbdaabfb20910fc07f2fea253410ecb131444e00f97dbf32dc6789ca6

.yamllint

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

CONTRIBUTING.md

@@ -1,35 +1,38 @@
-Thanks for contributing to Growstuff!  We have different contribution
-guidelines depending on whether your change is a small one (a one-line
-bugfix or similar) or a larger one.
+Thanks for contributing to Growstuff!
 
-## Small changes
+When you create a pull request, please include the following:
 
-Send us a pull request!  We will get one of our pairs of coders to
-review it.
+* Mention the issue it solves (eg. #123)
+* Your code should follow our [Coding style guide](https://github.com/Growstuff/growstuff/wiki/Development-process-overview#coding-practices)
+* Make sure you have automated tests for your work, where possible.
+* Add your name (and that of your pair partner, if any) to [CONTRIBUTORS.md](CONTRIBUTORS.md).
 
-If you are interested in becoming a more regular contributor or working
-on larger features, please see the [Growstuff
-wiki](http://wiki.growstuff.org/) for more information.
+All pull requests should pass our automatic continuous integration and style
+checks before being merged. You can run tests locally as follows:
 
-## Larger changes
+ - `rake spec` to run all Ruby tests
+ - `rake spec:models` to run Ruby model tests (or `rake spec:views` for view tests, etc)
+ - `rake static` to run all static checks (code style, unfixed Git conflicts, etc)
+ - `rake jasmine:ci` to run JavaScript unit tests in headless mode
+ - `rake jasmine` to start a server for running JavaScript unit tests in a
+   browser (eg for debugging). Point your browser at http://localhost:8888 to
+   run the tests.
+ - `rspec ./spec/path/to/my_spec.rb` to run all Ruby tests in the file `my_spec.rb`
+ - `rspec ./spec/path/to/my_spec.rb:45` to run the Ruby test starting on line 45 of
+   `my_spec.rb`. RSpec will output a list of command-lines in this form for all
+   failing tests so you can easily re-run particular ones.
+ - `rspec --only-failures` to re-run all Ruby tests that failed last time.
 
-Growstuff does pair programming (two coders working together) for all
-new features and other significant changes.  This means that if you
-submit a pull request and weren't working in a pair, we're unlikely to
-merge it into the project as-is.
+Growstuff runs several linters and checkers before a change is merged. These
+run from overcommit. To automatically run the same linters yourself you can
+install overcommit too.
 
-If you would like to work on any larger change, we would appreciate it
-if you would get in touch with us, preferably via our [mailing
-list](http://lists.growstuff.org/mailman/listinfo/discuss), and talk to
-us about it first.  We'll try and hook you up with a partner so you can
-work as a pair, either in person or remotely depending on where you are.
-The [Growstuff wiki](http://wiki.growstuff.org/) has lots more
-information on our dev process, to get you started if you would like to
-join us.
+ - `./script/install_linters`
 
-If you submit a larger change without working in a pair, we will treat
-your work as an experimental "spike" and get one of our pairs of
-programmers to look over it and maybe use what you've done as the basis
-for re-implementing it using our processes.  **We'd much rather work
-with you, so please talk to us first!**
+You can run `rake -T` to see a list of available Rake tasks. If you can't get
+some tests to pass, please submit a pull request anyway - we'll be happy to
+help you debug the failures.
 
+If you would like to discuss an idea before submitting a pull request,
+please open a [GitHub Issue](https://github.com/growstuff/growstuff/issues),
+where our dev team will be happy to help you.

CONTRIBUTORS.md

@@ -1,5 +1,5 @@
 This is a list of contributors to Growstuff's codebase.  We maintain
-this list because we work in pairs, but Github only knows about the
+this list because we often work in pairs, but Github only knows about the
 person who actually does the commits. This gives credit to both members
 of the pair.
 
@@ -8,13 +8,16 @@ submit the change with your pull request.
 
 ## Committers
 
-- Alex Bayley / [Skud](https://github.com/Skud)
 - Cesy / [cesy](https://github.com/cesy)
 - Miles Gould / [pozorvlak](https://github.com/pozorvlak)
-- Joseph Caudle / [jcaudle](https://github.com/jcaudle)
+- Mackenzie Morgan / [maco](https://github.com/maco)
+- Brenda Wallace / [br3nda](https://github.com/br3nda)
 
 ## Contributors
 
+- Alex Bayley / [Skud](https://github.com/Skud)
+- Taylor Griffin / [tygriffin](https://github.com/tygriffin)
+- Joseph Caudle / [jcaudle](https://github.com/jcaudle)
 - Ricky Amianym / [amianym](https://github.com/amianym)
 - Juliet Kemp / [julietk](https://github.com/julietk)
 - Federico Mena Quintero / [federicomenaquintero](https://github.com/federicomenaquintero)
@@ -22,7 +25,6 @@ submit the change with your pull request.
 - Maia Sauren / [sauramaia](https://github.com/sauramaia)
 - Norman Ancajas / [nbancajas](https://github.com/nbancajas)
 - Jonathan "Duke" Leto / [leto](https://github.com/leto)
-- Mackenzie Morgan / [maco](https://github.com/maco)
 - Amy Hendrix / [sabreuse](https://github.com/sabreuse)
 - CephLPod / [cephLpod](https://github.com/cephLpod/)
 - Gemma Mason / [gemmaellen](https://github.com/gemmaellen)
@@ -38,3 +40,50 @@ submit the change with your pull request.
 - Yaw Boakye / [yawboakye](https://github.com/yawboakye)
 - Ryan Clark / [IAMRYO](https://github.com/IAMRYO)
 - Marty Hines / [martyhines](https://github.com/martyhines)
+- Amelia Greenhall / [ameliagreenhall](https://github.com/ameliagreenhall)
+- Barb Natali / [barbnatali](https://github.com/barbnatali)
+- Marlena Compton / [Marlena](https://github.com/marlena)
+- Elizabeth A. Kari / [catfriend](https://github.com/catfriend)
+- Cheri Allen / [cherimarie](https://github.com/cherimarie)
+- Maki Sugita / [macckii](https:://github.com/macckii)
+- Shiho Takagi / [oshiho3](https://github.com/oshiho3)
+- Emma Winston / [emmawinston](https://github.com/emmawinston)
+- Kevin Rio / [krio](https://github.com/krio)
+- Yoong Kang Lim / [yoongkang](https://github.com/yoongkang)
+- Kevin Yang / [kevieyang](https://github.com/kevieyang)
+- Justin Hamman / [juzham](https://github.com/juzham)
+- Rocky Jaiswal / [rocky-jaiswal](https://github.com/rocky-jaiswal)
+- Robert Landreaux / [robertlandreaux](https://github.com/robertlandreaux)
+- Savant Krishna / [sksavant](https://github.com/sksavant)
+- Marlena Compton / [marlena](https://github/marlena)
+- Ryan Dy / [rdy](https://github/rdy)
+- Jake Yesbeck / [yez](https://github.com/yez)
+- Mauricio Gonzalez / [mauricio-gonzalez](https://github.com/mauricio-gonzalez)
+- Andrey Bazhutkin / [andrba](https://github.com/andrba)
+- Gabriel Sandoval / [gabrielsandoval](https://github.com/gabrielsandoval)
+- Cjay Billones / [CjayBillones](https://github.com/CjayBillones)
+- Katy Ereira / [maccath](https://github.com/maccath)
+- Gabrielle DeWitt / [gabrielle27](https://github.com/gabrielle27)
+- Manmeet Singh / [manmeetsingh](https://github.com/manmeetsingh)
+- Jym Paul Carandang / [jacarandang](https://github.com/jacarandang)
+- Anthony Atkinson / [sha1sum](https://github.com/sha1sum)
+- Terence Conquest / [twconquest](https://github.com/twconquest)
+- 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)
+- Jim Stallings / [jestallin](https://github.com/jestallin)
+- Alyssa Ransbury / [alran](https://github.com/alran)
+- Thomas Countz / [thomascountz](https://github.com/thomascountz)
+- Megan Talbot / [meganft](https://github.com/meganft)
+- Arun Kumar / [arun1595](https://github.com/arun1595)
+- Harry Brodsky / [hbrodsk1](https://github.com/hbrodsk1)
+- Jeff Kingswood / [ancyentmariner](https://github.com/ancyentmariner)
+- Logan Gingerich / [logangingerich](https://github.com/logangingerich)
+- Mark Taffman / [mftaff](https://github.com/mftaff)
+
+## Bots
+
+- Security and Dependency Updates / [deppbot](https://github.com/deppbot)

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,90 +1,60 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-ruby "1.9.3"
+ruby '2.4.1'
+
+gem 'rails', '~> 4.2.8'
 
 gem 'bundler', '>=1.1.5'
 
-gem 'rails', '3.2.13'
-gem 'rack', '~>1.4.5'
-gem 'json', '~>1.7.7'
+gem 'coffee-rails'
 gem 'haml'
-gem 'leaflet-rails'
-gem 'leaflet-markercluster-rails'
-gem 'unicorn' # http server
+gem 'sass-rails'
 
-gem 'cancan' # for checking member privileges
+# API data
+gem 'jsonapi-resources'
 
-gem 'gibbon' # for Mailchimp newsletter subscriptions
+# CSS framework
+gem 'bootstrap-sass'
+gem 'font-awesome-sass'
 
-gem 'csv_shaper' # CSV export
+gem 'uglifier' # JavaScript compressor
 
-# 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'
+# planting and harvest predictions
+gem 'active_median'
 
-group :production, :staging do
-  gem 'pg'
-  gem 'newrelic_rpm'
-  gem 'dalli'
-  gem 'memcachier'
-  gem 'rails_12factor' # supresses heroku plugin injection
-end
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  # CSS preprocessor, used for app/assets/stylesheets/application.css
-  gem 'sass-rails',   '~> 3.2.3'
-  # CoffeeScript is a Python-like language that compiles to JavaScript
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # less-rails depends on a JavaScript engine; we use therubyracer.
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # long term, we'll probably want node.js for performance, but this will do
-  # for now as it's easier for new people to install
-  gem 'therubyracer', '~> 0.10.2', :platforms => :ruby
-  # Another CSS preprocessor, used for Bootstrap overrides
-  gem "less-rails"
-  # CSS framework
-  gem "twitter-bootstrap-rails",
-    :git => 'https://github.com/seyhunak/twitter-bootstrap-rails.git',
-    :ref => '2c7c52'
-
-  gem 'uglifier', '>= 1.0.3' # JavaScript compressor
-
-  gem 'compass-rails', '~> 1.0.3' # Yet Another CSS framework
-end
-
-gem 'jquery-rails'
 gem 'flickraw'
+gem 'jquery-rails'
+gem 'jquery-ui-rails', '~> 5.0.2' # needs careful upgrade with change of location
+gem 'js-routes' # provides access to Rails routes in Javascript
 
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'cancancan'                    # for checking member privileges
+gem 'csv_shaper'                   # CSV export
+gem 'figaro'                       # for handling config via ENV variables
+gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
+# Maps
+gem 'leaflet-rails'
+gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
 
-# Use unicorn as the app server
-# gem 'unicorn'
+gem 'pg', '< 1.0.0'                # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
+gem 'ruby-units'                   # for unit conversion
+gem 'unicorn'                      # http server
 
-# To use debugger
-group :development do
-  # Installation of the debugger gem fails on Travis CI,
-  # so we don't use it in the test environment
-  gem 'debugger'
-  gem 'better_errors'
-  gem 'binding_of_caller'
-end
+gem 'comfortable_mexican_sofa'     # content management system
+
+gem 'bootstrap-kaminari-views'     # bootstrap views for kaminari
+gem 'kaminari'                     # pagination
+
+gem 'active_utils'
+gem 'sidekiq'
 
 # Markdown formatting for updates etc
 gem 'bluecloth'
 
 # Pagination
-gem 'will_paginate', '~> 3.0'
+gem 'will_paginate'
 
 # user signup/login/etc
 gem 'devise'
@@ -96,28 +66,94 @@ gem 'friendly_id'
 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'
 
 # For connecting to other services (eg Twitter)
-gem 'omniauth'
+gem 'omniauth', '~> 1.3'
+gem 'omniauth-facebook'
+gem 'omniauth-flickr', '>= 0.0.15'
 gem 'omniauth-twitter'
-gem 'omniauth-flickr'
+
+gem "chartkick"
+
+# client for Elasticsearch. Elasticsearch is a flexible
+# and powerful, distributed, real-time search and analytics engine.
+# An example of the use in the project is fuzzy crop search.
+
+# Project does not use semver, so we want to be in sync with the version of
+# elasticsearch we use
+# See https://github.com/elastic/elasticsearch-ruby#compatibility
+gem "elasticsearch-api", "~> 2.0.0"
+gem "elasticsearch-model"
+gem "elasticsearch-rails"
+gem "hashie", ">= 3.5.3"
 
 gem 'rake', '>= 10.0.0'
 
-group :development, :test do
-  gem 'sqlite3'                      # database engine
+# locale based flash notices for controllers
+gem "responders"
+
+# allows soft delete. Used for members.
+gem 'acts_as_paranoid', '~> 0.5.0'
+
+gem 'xmlrpc' # fixes rake error - can be removed if not needed later
+
+group :production, :staging do
+  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
+  gem 'dalli'
+  gem 'memcachier'
+  gem 'newrelic_rpm'
+  gem 'rails_12factor' # supresses heroku plugin injection
+  gem 'sparkpost_rails'
 end
 
-group :development, :test, :travis do
-  gem 'haml-rails'                   # HTML templating language
-  gem 'rspec-rails', '~> 2.12.1'     # unit testing framework
-  gem 'webrat'                       # provides HTML matchers for view tests
-  gem 'factory_girl_rails', '~> 4.0' # for creating test data
-  gem 'coveralls', require: false    # coverage analysis
+group :development do
+  # A debugger and irb alternative. Pry doesn't play nice
+  # with unicorn, so start a Webrick server when debugging
+  # with Pry
+  gem 'better_errors', '~> 2.2.0'
+  gem 'binding_of_caller'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'letter_opener'
+  gem 'pry'
+  gem 'quiet_assets'
 end
+
+group :development, :test do
+  gem 'bullet'                          # performance tuning by finding unnecesary queries
+  gem 'byebug'                          # debugging
+  gem 'capybara'                        # integration tests
+  gem 'capybara-email'                  # integration tests for email
+  gem 'capybara-screenshot'             # for test debugging
+  gem 'coveralls', require: false       # coverage analysis
+  gem 'database_cleaner'
+  gem 'factory_bot_rails'               # for creating test data
+  gem 'faker'
+  gem 'haml-i18n-extractor'
+  gem 'haml-rails'                      # HTML templating language
+  gem 'haml_lint'                       # Checks haml files for goodness
+  gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
+  gem 'jasmine'                         # javascript unit testing
+  gem 'poltergeist'                     # for headless JS testing
+  gem 'rainbow', '< 2.2.0' # See https://github.com/sickill/rainbow/issues/44
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-rails' # unit testing framework
+  gem 'rubocop'
+  gem 'selenium-webdriver'
+  gem 'webrat' # provides HTML matchers for view tests
+end
+
+group :test do
+  gem 'codeclimate-test-reporter', require: false
+  gem 'timecop'
+end
+
+group :travis do
+  gem 'platform-api'
+end
+gem 'loofah', '>= 2.2.1'
+gem 'rack-protection', '>= 2.0.1'

Gemfile.lock

@@ -1,314 +1,635 @@
-GIT
-  remote: https://github.com/alexreisner/geocoder.git
-  revision: 104d466ba7097b7dce5ba19f8e4091b7f69ccdf6
-  ref: 104d46
-  specs:
-    geocoder (1.1.8)
-
-GIT
-  remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
-  revision: 2c7c527c354d9068ce49346d4fd8389328d32ce6
-  ref: 2c7c52
-  specs:
-    twitter-bootstrap-rails (2.2.7)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
-
-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/
+  remote: https://rails-assets.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bcrypt-ruby (3.1.1)
-    better_errors (1.0.1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active_link_to (1.0.5)
+      actionpack
+      addressable
+    active_median (0.1.4)
+      activerecord
+    active_utils (3.3.9)
+      activesupport (>= 3.2, < 5.2.0)
+      i18n
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
+      globalid (>= 0.3.0)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts_as_paranoid (0.5.0)
+      activerecord (>= 4.0, < 5.1)
+      activesupport (>= 4.0, < 5.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (6.0.4)
+    ast (2.4.0)
+    autoprefixer-rails (7.2.5)
+      execjs
+    bcrypt (3.1.11)
+    better_errors (2.2.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
-    binding_of_caller (0.7.2)
+      rack (>= 0.9.0)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
-    bootstrap-datepicker-rails (1.1.1.3)
+    bonsai-elasticsearch-rails (0.2.0)
+      elasticsearch-model (~> 0)
+      elasticsearch-rails (~> 0)
+    bootstrap-datepicker-rails (1.7.1.1)
       railties (>= 3.0)
-    builder (3.0.4)
-    cancan (1.6.10)
-    chunky_png (1.2.8)
-    coderay (1.1.0)
-    coffee-rails (3.2.2)
+    bootstrap-kaminari-views (0.0.5)
+      kaminari (>= 0.13)
+      rails (>= 3.1)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    bootstrap_form (2.7.0)
+    builder (3.2.3)
+    bullet (5.7.2)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11.0)
+    byebug (10.0.0)
+    cancancan (2.1.3)
+    capybara (2.17.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    capybara-email (2.5.0)
+      capybara (~> 2.4)
+      mail
+    capybara-screenshot (1.0.18)
+      capybara (>= 1.0, < 3)
+      launchy
+    chartkick (2.2.5)
+    childprocess (0.8.0)
+      ffi (~> 1.0, >= 1.0.11)
+    climate_control (0.2.0)
+    cliver (0.3.2)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    codemirror-rails (5.16.0)
+      railties (>= 3.0, < 6.0)
+    coderay (1.1.2)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    colorize (0.5.8)
-    columnize (0.3.6)
-    commonjs (0.2.6)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
-    coveralls (0.6.7)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    csv_shaper (1.0.0)
+    coffee-script-source (1.12.2)
+    comfortable_mexican_sofa (1.12.10)
+      active_link_to (>= 1.0.0)
+      bootstrap-sass (>= 3.2.0)
+      bootstrap_form (>= 2.2.0)
+      codemirror-rails (>= 3.0.0)
+      coffee-rails (>= 3.1.0)
+      haml-rails (>= 0.3.0)
+      jquery-rails (>= 3.0.0)
+      jquery-ui-rails (>= 5.0.0)
+      kramdown (>= 1.0.0)
+      paperclip (>= 4.0.0)
+      plupload-rails (>= 1.2.1)
+      rails (>= 4.0.0, < 5.1)
+      rails-i18n (>= 4.0.0)
+      sass-rails (>= 4.0.3)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
+    coveralls (0.8.19)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6)
+    crass (1.0.3)
+    csv_shaper (1.3.0)
       activesupport (>= 3.0.0)
-    dalli (2.6.4)
-    debug_inspector (0.0.2)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
-    devise (3.0.0)
-      bcrypt-ruby (~> 3.0)
+    dalli (2.7.6)
+    database_cleaner (1.6.2)
+    debug_inspector (0.0.3)
+    devise (4.4.1)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.2)
+      responders
       warden (~> 1.2.3)
-    diff-lcs (1.1.3)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    easy_translate (0.5.1)
+      thread
+      thread_safe
+    elasticsearch (2.0.2)
+      elasticsearch-api (= 2.0.2)
+      elasticsearch-transport (= 2.0.2)
+    elasticsearch-api (2.0.2)
+      multi_json
+    elasticsearch-model (0.1.9)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
+    elasticsearch-rails (0.1.9)
+    elasticsearch-transport (2.0.2)
+      faraday
+      multi_json
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    excon (0.60.0)
+    execjs (2.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
-    flickraw (0.9.6)
-    friendly_id (4.0.9)
-    fssm (0.2.10)
-    gibbon (1.0.0)
+    faker (1.8.7)
+      i18n (>= 0.7)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.21)
+    figaro (1.1.1)
+      thor (~> 0.14)
+    flickraw (0.9.9)
+    font-awesome-sass (4.7.0)
+      sass (>= 3.2)
+    formatador (0.2.5)
+    friendly_id (5.2.3)
+      activerecord (>= 4.0.0)
+    geocoder (1.4.5)
+    gibbon (1.2.1)
       httparty
-      multi_json (>= 1.3.4)
-    gravatar-ultimate (1.0.3)
-    haml (4.0.3)
-      tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
-    hashie (2.0.5)
-    hike (1.2.3)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (3.0.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    kgio (2.8.0)
-    leaflet-markercluster-rails (0.6.0)
-      railties (>= 3.1)
-    leaflet-rails (0.6.2)
-    less (2.3.2)
-      commonjs (~> 0.2.6)
-    less-rails (2.3.3)
-      actionpack (>= 3.1)
-      less (~> 2.3.1)
-    libv8 (3.3.10.4)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    memcachier (0.0.2)
-    mime-types (1.23)
-    mini_portile (0.5.1)
-    multi_json (1.7.7)
-    multi_xml (0.5.5)
-    newrelic_rpm (3.6.5.130)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    oauth (0.4.7)
-    omniauth (1.1.4)
-      hashie (>= 1.2, < 3)
+      multi_json (>= 1.9.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    gravatar-ultimate (2.0.0)
+      activesupport (>= 2.3.14)
       rack
-    omniauth-flickr (0.0.11)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    haml-i18n-extractor (0.5.9)
+      activesupport
+      haml
+      highline
+      tilt
+      trollop (= 1.16.2)
+    haml-rails (1.0.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 6.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    haml_lint (0.26.0)
+      haml (>= 4.0, < 5.1)
+      rainbow
+      rake (>= 10, < 13)
+      rubocop (>= 0.49.0)
+      sysexits (~> 1.1)
+    hashie (3.5.7)
+    heroics (0.0.24)
+      erubis (~> 2.0)
+      excon
+      moneta
+      multi_json (>= 1.9.2)
+    highline (1.7.10)
+    html2haml (2.2.0)
+      erubis (~> 2.7.0)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
+    httparty (0.15.6)
+      multi_xml (>= 0.5.2)
+    i18n (0.9.3)
+      concurrent-ruby (~> 1.0)
+    i18n-tasks (0.9.12)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      easy_translate (>= 0.5.0)
+      erubis
+      highline (>= 1.7.3)
+      i18n
+      parser (>= 2.2.3.0)
+      term-ansicolor (>= 1.3.2)
+      terminal-table (>= 1.5.1)
+    jasmine (2.9.0)
+      jasmine-core (>= 2.9.0, < 3.0.0)
+      phantomjs
+      rack (>= 1.2.1)
+      rake
+    jasmine-core (2.99.0)
+    jquery-rails (4.3.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.4.3)
+      railties (>= 3.2)
+      sprockets-rails
+    json (2.1.0)
+    jsonapi-resources (0.9.0)
+      activerecord (>= 4.1)
+      concurrent-ruby
+      railties (>= 4.1)
+    jwt (1.5.6)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    kgio (2.11.2)
+    kramdown (1.16.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    leaflet-rails (1.3.1)
+      rails (>= 4.2.0)
+    letter_opener (1.6.0)
+      launchy (~> 2.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.12)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    memcachier (0.0.2)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    moneta (0.8.1)
+    multi_json (1.11.3)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
+    newrelic_rpm (4.8.0.341)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    oauth (0.5.4)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-flickr (0.0.19)
+      multi_json (~> 1.11.0)
       omniauth-oauth (~> 1.0)
-    omniauth-oauth (1.0.1)
+    omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.0.0)
-      multi_json (~> 1.3)
-      omniauth-oauth (~> 1.0)
-    orm_adapter (0.4.0)
-    pg (0.15.1)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
+    omniauth-twitter (1.4.0)
+      omniauth-oauth (~> 1.1)
       rack
-    rack-test (0.6.2)
+    orm_adapter (0.5.0)
+    paperclip (5.2.1)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      cocaine (~> 0.5.5)
+      mime-types
+      mimemagic (~> 0.3.0)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    pg (0.21.0)
+    phantomjs (2.1.1.0)
+    platform-api (2.1.0)
+      heroics (~> 0.0.23)
+      moneta (~> 0.8.1)
+    plupload-rails (1.2.1)
+      rails (>= 3.1)
+    poltergeist (1.17.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      websocket-driver (>= 0.2.0)
+    powerpack (0.1.1)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
+    quiet_assets (1.1.0)
+      railties (>= 3.1, < 5.0)
+    rack (1.6.9)
+    rack-protection (2.0.1)
+      rack
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails_12factor (0.0.2)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.10)
+      sprockets-rails
+    rails-assets-leaflet (1.3.1)
+    rails-assets-leaflet.markercluster (1.3.0)
+      rails-assets-leaflet (>= 1.0.3)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      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)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.1)
-    rails_stdout_logging (0.0.3)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    raindrops (0.11.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (2.1.0)
+    raindrops (0.19.0)
+    rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    redis (4.0.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-activemodel-mocks (1.0.3)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      rspec-mocks (>= 2.99, < 4.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    sass (3.2.9)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (2.1.2)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.6.3)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    ruby-units (2.2.1)
+    ruby_dep (1.5.0)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
+    rubyzip (1.2.1)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      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 (3.9.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    sexp_processor (4.10.0)
+    shellany (0.0.1)
+    sidekiq (5.1.0)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.4, < 5)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sparkpost_rails (1.5.0)
+      rails (>= 4.0, < 5.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sysexits (1.2.0)
+    temple (0.8.0)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (0.19.4)
+    thread (0.2.2)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    timecop (0.9.1)
+    tins (1.16.3)
+    trollop (1.16.2)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.5)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.3.0)
+    unicorn (5.4.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    warden (1.2.3)
+    uniform_notifier (1.11.0)
+    warden (1.2.7)
       rack (>= 1.0)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.4)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    will_paginate (3.1.6)
+    xmlrpc (0.3.0)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_utils (= 1.0.5)!
-  activemerchant (= 1.33.0)!
-  better_errors
+  active_median
+  active_utils
+  acts_as_paranoid (~> 0.5.0)
+  better_errors (~> 2.2.0)
   binding_of_caller
   bluecloth
+  bonsai-elasticsearch-rails
   bootstrap-datepicker-rails
+  bootstrap-kaminari-views
+  bootstrap-sass
+  bullet
   bundler (>= 1.1.5)
-  cancan
-  coffee-rails (~> 3.2.1)
-  compass-rails (~> 1.0.3)
+  byebug
+  cancancan
+  capybara
+  capybara-email
+  capybara-screenshot
+  chartkick
+  codeclimate-test-reporter
+  coffee-rails
+  comfortable_mexican_sofa
   coveralls
   csv_shaper
   dalli
-  debugger
+  database_cleaner
   devise
-  factory_girl_rails (~> 4.0)
+  elasticsearch-api (~> 2.0.0)
+  elasticsearch-model
+  elasticsearch-rails
+  factory_bot_rails
+  faker
+  figaro
   flickraw
+  font-awesome-sass
   friendly_id
-  geocoder!
-  gibbon
+  geocoder
+  gibbon (~> 1.2.0)
   gravatar-ultimate
+  guard
+  guard-rspec
   haml
+  haml-i18n-extractor
   haml-rails
+  haml_lint
+  hashie (>= 3.5.3)
+  i18n-tasks
+  jasmine
   jquery-rails
-  json (~> 1.7.7)
-  leaflet-markercluster-rails
+  jquery-ui-rails (~> 5.0.2)
+  js-routes
+  jsonapi-resources
+  kaminari
   leaflet-rails
-  less-rails
+  letter_opener
+  loofah (>= 2.2.1)
   memcachier
   newrelic_rpm
-  omniauth
-  omniauth-flickr
+  omniauth (~> 1.3)
+  omniauth-facebook
+  omniauth-flickr (>= 0.0.15)
   omniauth-twitter
-  pg
-  rack (~> 1.4.5)
-  rails (= 3.2.13)
+  pg (< 1.0.0)
+  platform-api
+  poltergeist
+  pry
+  quiet_assets
+  rack-protection (>= 2.0.1)
+  rails (~> 4.2.8)
+  rails-assets-leaflet.markercluster!
   rails_12factor
+  rainbow (< 2.2.0)
   rake (>= 10.0.0)
-  rspec-rails (~> 2.12.1)
-  sass-rails (~> 3.2.3)
-  sqlite3
-  therubyracer (~> 0.10.2)
-  twitter-bootstrap-rails!
-  uglifier (>= 1.0.3)
+  responders
+  rspec-activemodel-mocks
+  rspec-rails
+  rubocop
+  ruby-units
+  sass-rails
+  selenium-webdriver
+  sidekiq
+  sparkpost_rails
+  timecop
+  uglifier
   unicorn
   webrat
-  will_paginate (~> 3.0)
+  will_paginate
+  xmlrpc
+
+RUBY VERSION
+   ruby 2.4.1p111
+BUNDLED WITH
+   1.16.1

Guardfile

@@ -0,0 +1,13 @@
+guard :rspec,
+  cmd: 'bundle exec rspec --format documentation',
+  failed_mode: :keep do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/libs/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+end

README.md

@@ -1,13 +1,63 @@
 # Growstuff
 
-[![Build Status](https://travis-ci.org/Growstuff/growstuff.png)](https://travis-ci.org/Growstuff/growstuff)
+[![Build Status](https://travis-ci.org/Growstuff/growstuff.svg?branch=dev)](https://travis-ci.org/Growstuff/growstuff)
 [![Coverage Status](https://coveralls.io/repos/Growstuff/growstuff/badge.png)](https://coveralls.io/r/Growstuff/growstuff)
+[![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.
 
-Growstuff is an open source/open data project to create a website for food gardeners.
+Growstuff is an open source/open data project to create a website for
+food gardeners.  We crowdsource information on what our members are
+growing and harvesting, aggregate it, and make it available as open data
+via our API.
 
-You can find most of our documentation at: http://wiki.growstuff.org/
+Growstuff was founded in 2012 and has been built by dozens of
+[contributors](CONTRIBUTORS.md).  We are an inclusive, welcoming project, and
+encourage participation from people of all backgrounds and skill levels.
 
-Our development uses Extreme Programming practices, which means we pair on all our work.  Feel free to fork our code and explore, but if you would like to contribute back to us,
-please read http://wiki.growstuff.org/index.php/Development_process_overview before sending us a pull request.
+## Important links
+
+* [Issues](http://github.com/Growstuff/growstuff/issues) (features we're
+  working on, known bugs, etc)
+* [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
+
+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](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
+* We encourage [pair programming](http://wiki.growstuff.org/index.php/Pairing), especially for newer developers.
+* You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).
+
+## For designers, writers, researchers, data wranglers, and other contributors
+
+There are heaps of ways to get involved and contribute no matter what
+your skills and interests.
+
+You might like to check out:
+
+* The [New Contributor Guide](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide)
+  page on our wiki, which has lots of detail for different areas
+
+Here on Github, you might find these useful:
+
+* [Waffle](http://waffle.io/Growstuff/growstuff) has stories in "ready" that can be worked on.
+* [needs: design](https://github.com/Growstuff/growstuff/labels/needs:%20design) - tasks requiring high-level design
+* [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 on [Github](https://github.com/Growstuff/growstuff/issues).
+
+## Contact
+
+For more information about this project, contact [info@growstuff.org](mailto:info@growstuff.org).
+
+Security Issues: If you find an authorization bypass or data breach, please contact our maintainers directly at [maintainers@growstuff.org](mailto:maintainers@growstuff.org).
+
+You can also contact us on [Twitter](http://twitter.com/growstufforg/) or
+[Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494) or [Github](https://github.com/Growstuff/growstuff/issues)..

app/assets/javascripts/account_types.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/admin.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/admin/orders.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/append_date.js.coffee

@@ -0,0 +1,38 @@
+# Displays datepicker to finished at date
+# when marking a planting finished using a
+# button. The button must have class 'append-date'.
+
+jQuery ->
+
+  el = $('.append-date')
+
+  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) ->
+      link = $("<a href='#{href}' data-method='put'></a>")
+      $('body').append(link)
+      $(link).click()
+    )
+
+    $(this).blur (e) ->
+      $(this).text(originalText)
+      $(this).unbind('click.confirm')
+
+
+  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>")
+    $('body').append(link)
+    $(link).click()

app/assets/javascripts/application.js

@@ -10,10 +10,12 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require leaflet
-//= require leaflet.markercluster
-//= require jquery
-//= require jquery_ujs
-//= require twitter/bootstrap
-//= require_tree .
-//= require bootstrap-datepicker
+// = require leaflet
+// = require leaflet.markercluster
+// = require js-routes
+// = require jquery
+// = require jquery_ujs
+// = require jquery-ui/autocomplete
+// = require bootstrap-sprockets
+// = require bootstrap-datepicker
+// = require_tree .

app/assets/javascripts/auto_suggest.js.coffee

@@ -0,0 +1,37 @@
+# Uses JQuery's autocomplete to make a suggestion in lieu of a
+# preposterously long select dropdown. To implement add code to
+# the view like this:
+#
+# = auto_suggest @resource, :auto_suggest_source
+#
+# You must also add a search method to the resource's controller.
+
+jQuery ->
+
+  if el = $( '.auto-suggest' )
+
+    id = $( '.auto-suggest-id' )
+
+    el.autocomplete
+      minLength: 1,
+      source: el.attr( 'data-source-url' ),
+      focus: ( event, ui ) ->
+        el.val( ui.item.name )
+        id.val( ui.item.id )
+        false
+      select: ( event, ui ) ->
+        el.val( ui.item.name )
+        id.val( ui.item.id )
+        false
+      response: ( event, ui ) ->
+        id.val( "" )
+        for item in ui.content
+          if item.name == el.val()
+            id.val( item.id )
+
+    if el.data( 'uiAutocomplete' )
+      el.data( 'uiAutocomplete' )._renderItem = ( ul, item ) ->
+        $( '<li></li>' )
+          .data( 'item.autocomplete', item )
+          .append( "<a>#{item.name}</a>" )
+          .appendTo( ul )

app/assets/javascripts/charts.js

@@ -0,0 +1,2 @@
+// = require Chart.bundle
+// = require chartkick

app/assets/javascripts/comfy/admin/cms/custom.js.coffee

@@ -0,0 +1 @@
+# Custom JS for the admin area

app/assets/javascripts/comments.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/crops.js.coffee

@@ -1,3 +1,39 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
+jQuery ->
+  $('#add-sci_name-row').css("display", "inline-block")
+  $('#remove-sci_name-row').css("display", "inline-block")
+  $("#add-alt_name-row").css("display", "inline-block")
+  $("#remove-alt_name-row").css("display", "inline-block")
+
+-$ ->
+  sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
+
+  sci_index = $('#scientific_names .template').length + 1
+
+  $('#add-sci_name-row').click ->
+    compiled_input = $(sci_template.split("INDEX").join(sci_index))
+    $('#scientific_names').append(compiled_input)
+    sci_index = sci_index + 1
+
+  $('#remove-sci_name-row').click ->
+    if (sci_index > 2)
+      sci_index = sci_index - 1
+      tmp = 'sci_template[' + sci_index + ']'
+      element = document.getElementById(tmp)
+      element.remove()
+
+  alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control', id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
+
+  alt_index = $('#alternate_names .template').length + 1
+
+  $('#add-alt_name-row').click ->
+    compiled_input = $(alt_template.split("INDEX").join(alt_index))
+    $('#alternate_names').append(compiled_input)
+    alt_index = alt_index + 1
+
+  $('#remove-alt_name-row').click ->
+    if (alt_index > 2)
+      alt_index = alt_index - 1
+      tmp = 'alt_template[' + alt_index + ']'
+      element = document.getElementById(tmp)
+      console.log("%s",tmp)
+      element.remove()

app/assets/javascripts/crops.js.erb

@@ -0,0 +1,57 @@
+function showCropMap(cropmap) {
+  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
+  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
+  var mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
+
+  L.tileLayer(mapbox_base_url, {
+    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors under <a href="http://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="http://mapbox.com">Mapbox</a>',
+    maxZoom: 18
+  }).addTo(cropmap);
+  var markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 20 });
+
+  var things_to_map = location.pathname + '.json';
+  $.getJSON(things_to_map, function(crop) {
+    $.each(crop.plantings, function(i, planting) {
+      var owner = planting.owner;
+      if (owner.latitude && owner.longitude) {
+        var marker = new L.Marker(new L.LatLng(owner.latitude, owner.longitude));
+
+        var planting_url = "/plantings/" + planting.id;
+        var planting_link = "<a href='" + planting_url + "'>" + owner.login_name + "'s " + crop.name + "</a>";
+
+        var where = "<p><i>" + owner.location + "</i></p>";
+
+        var details = "<p>";
+        if (planting.quantity) {
+          details = details + "Quantity: " + planting.quantity + "<br/>";
+        }
+        if (planting.planted_from) {
+          details = details + "Planted from: " + planting.planted_from + "<br/>";
+        }
+        if (planting.sunniness) {
+          details = details + "Planted in: " + planting.sunniness+ "<br/>";
+        }
+        details = details + "</p>";
+        marker.bindPopup(planting_link + where + details).openPopup();
+        markers.addLayer(marker);
+      }
+    });
+  });
+
+  cropmap.addLayer(markers);
+}
+
+$(document).ready(function() {
+
+  if (document.getElementById("cropmap") !== null) {
+
+    L.Icon.Default.imagePath = '/assets';
+
+    var cropmap = L.map('cropmap').setView([0.0, -0.0], 2);
+    showCropMap(cropmap);
+  }
+
+  $('.btn.toggle.crop-hierarchy').click(function () {
+    $('.toggle.crop-hierarchy').toggleClass('hide');
+  });
+});

app/assets/javascripts/finish_planting.js.coffee

@@ -0,0 +1,19 @@
+# Clears the finished at date field when
+# a planting is marked unfinished, and
+# repopulates the field with a cached value
+# marking unfinished is undone.
+
+jQuery ->
+  previousValue = ''
+  $('#planting_finished').on('click', ->
+    finished = $('#planting_finished_at')
+    if @checked
+      if previousValue.length
+        date = previousValue
+        finished.val(date)
+      else
+        finished.trigger('focus')
+    else
+      previousValue = finished.val()
+      finished.val('')
+  )

app/assets/javascripts/finish_seed.js.coffee

@@ -0,0 +1,19 @@
+# Clears the finished at date field when
+# a seed is marked unfinished, and
+# repopulates the field with a cached value
+# marking unfinished is undone.
+
+jQuery ->
+  previousValue = ''
+  $('#seed_finished').on('click', ->
+    finished = $('#seed_finished_at')
+    if @checked
+      if previousValue.length
+        date = previousValue
+        finished.val(date)
+      else
+        finished.trigger('focus')
+    else
+      previousValue = finished.val()
+      finished.val('')
+  )

app/assets/javascripts/forums.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/gardens.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/harvests.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/home.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/members.js.erb

@@ -0,0 +1,28 @@
+if (document.getElementById("membermap") !== null) {
+  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
+  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
+  var 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';
+
+  $.getJSON(location.pathname + '.json', function(member) {
+    if (member.latitude && member.longitude) {
+      var membermap = L.map('membermap').setView([member.latitude, member.longitude], 4);
+
+      L.tileLayer(mapbox_base_url, {
+        attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors under <a href="http://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="http://mapbox.com">Mapbox</a>',
+        maxZoom: 18
+      }).addTo(membermap);
+      var marker = new L.Marker(new L.LatLng(member.latitude, member.longitude));
+
+      var member_url = "/members/" + member.slug;
+      var member_link = "<a href='" + member_url + "'>" + member.login_name + "</a>";
+
+      var where = "<p><i>" + member.location + "</i></p>";
+
+      marker.bindPopup(member_link + where).openPopup();
+      marker.addTo(membermap);
+    }
+  });
+
+}

app/assets/javascripts/notifications.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/order_items.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/orders.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/photos.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/places.js.erb

@@ -1,42 +1,45 @@
-places_base_path = "/places";
-things_to_map = location.pathname + '.json';
-cloudmade_key = "<%= Growstuff::Application.config.cloudmade_key %>";
-cloudmade_url = "http://{s}.tile.cloudmade.com/" + cloudmade_key + "/73038/256/{z}/{x}/{y}.png";
-nominatim_base_url = 'http://nominatim.openstreetmap.org/search/';
-nominatim_user_agent_email = "<%= Growstuff::Application.config.user_agent_email %>";
+if (document.getElementById("placesmap") !== null) {
+  places_base_path = "/places";
+  mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>";
+  mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>";
+  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 %>";
 
-L.Icon.Default.imagePath = '/assets'
+  L.Icon.Default.imagePath = '/assets'
 
-if (location.pathname === places_base_path) { //places index page
-  map = L.map('map').setView([0.0, -0.0], 2);
-  showMap(map);
-} else { // specific place page
-  place = location.pathname.replace(places_base_path + "/", '');
-  nominatim_query_url = nominatim_base_url + place;
-  nominatim_options = {
-    format: "json",
-    callback: "placeholder",
-    limit: 1,
-    email: nominatim_user_agent_email
-  };
-  $.getJSON(nominatim_query_url, nominatim_options, function(data) {
-    map = L.map('map').setView([data[0].lat, data[0].lon], 5);
-    showMap(map);
-  })
+  if (location.pathname === places_base_path) { //places index page
+    placesmap = L.map('placesmap').setView([0.0, -0.0], 2);
+    showMap(placesmap);
+  } else { // specific place page
+    place = location.pathname.replace(places_base_path + "/", '');
+    nominatim_query_url = nominatim_base_url + place;
+    nominatim_options = {
+      format: "json",
+      callback: "placeholder",
+      limit: 1,
+      email: nominatim_user_agent_email
+    };
+    $.getJSON(nominatim_query_url, nominatim_options, function(data) {
+      placesmap = L.map('placesmap').setView([data[0].lat, data[0].lon], 5);
+      showMap(placesmap);
+    })
+  }
 }
 
-function showMap(map) {
-  L.tileLayer(cloudmade_url, {
-    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors under <a href="http://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="http://cloudmade.com">Cloudmade</a>',
+function showMap(placesmap) {
+  L.tileLayer(mapbox_base_url, {
+    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors under <a href="http://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="http://mapbox.com">Mapbox</a>',
     maxZoom: 18
-  }).addTo(map);
-  markers = new L.MarkerClusterGroup({showCoverageOnHover: false});
+  }).addTo(placesmap);
+  markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 20 });
 
+  things_to_map = location.pathname + '.json';
   $.getJSON(things_to_map, function(members) {
     $.each(members, function(i, m) {
       if (m.latitude && m.longitude) {
         marker = new L.Marker(new L.LatLng(m.latitude, m.longitude));
-        link = "<p><a href='/members/" + m.login_name + "'>" + m.login_name + "</a></p>";
+        link = "<p><a href='/members/" + m.slug + "'>" + m.login_name + "</a></p>";
         where = "<p><i>" + m.location + "</i></p>";
         marker.bindPopup(link + where).openPopup();
         markers.addLayer(marker);
@@ -44,5 +47,5 @@ function showMap(map) {
     });
   });
 
-  map.addLayer(markers);
+  placesmap.addLayer(markers);
 }

app/assets/javascripts/posts.js

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

app/assets/javascripts/products.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/roles.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/scientific_names.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/updates.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/application.css

@@ -1,12 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require bootstrap-datepicker
- *= require leaflet.ie
- *= require leaflet
- *= require leaflet.markercluster
- *= require leaflet.markercluster.default
- *= require_tree .
-*/

app/assets/stylesheets/application.sass

@@ -0,0 +1,8 @@
+@import 'jquery-ui/autocomplete'
+@import 'bootstrap-datepicker'
+@import 'leaflet'
+@import 'leaflet.markercluster'
+@import 'custom_bootstrap/custom_bootstrap'
+@import 'overrides'
+@import 'graphs'
+@import 'predictions'

app/assets/stylesheets/bootstrap-accessibility.css

@@ -0,0 +1 @@
+.btn:focus{outline:dotted 2px #000}div.active:focus{outline:dotted 1px #000}a:focus{outline:dotted 1px #000}.close:hover,.close:focus{outline:dotted 1px #000}.nav>li>a:hover,.nav>li>a:focus{outline:dotted 1px #000}.carousel-indicators li,.carousel-indicators li.active{height:18px;width:18px;border-width:2px;position:relative;box-shadow:0px 0px 0px 1px #808080}.carousel-indicators.active li{background-color:rgba(100,149,253,0.6)}.carousel-indicators.active li.active{background-color:white}.carousel-tablist-highlight{display:block;position:absolute;outline:2px solid transparent;background-color:transparent;box-shadow:0px 0px 0px 1px transparent}.carousel-tablist-highlight.focus{outline:2px solid #6495ED;background-color:rgba(0,0,0,0.4)}a.carousel-control:focus{outline:2px solid #6495ED;background-image:linear-gradient(to right, transparent 0px, rgba(0,0,0,0.5) 100%);box-shadow:0px 0px 0px 1px #000000}.carousel-pause-button{position:absolute;top:-30em;left:-300em;display:block}.carousel-pause-button.focus{top:0.5em;left:0.5em}.carousel:hover .carousel-caption,.carousel.contrast .carousel-caption{background-color:rgba(0,0,0,0.5);z-index:10}.alert-success{color:#2d4821}.alert-info{color:#214c62}.alert-warning{color:#6c4a00;background-color:#f9f1c6}.alert-danger{color:#d2322d}.alert-danger:hover{color:#a82824}

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -1,183 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-
-// this padding needs to be done before the responsive stuff is imported
-body {
-  padding-top: @navbarHeight + 10px;
-  padding-bottom: @navbarHeight + 10px;
-}
-
-@import "twitter/bootstrap/responsive";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
-
-// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
-
-// Font Awesome
-@import "fontawesome/font-awesome";
-
-// Glyphicons
-//@import "twitter/bootstrap/sprites.less";
-
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
-//
-// Example:
-// @linkColor: #ff0000;
-
-// Base colours
-
-@beige: #f3f1ee;
-@brown: #413f3b;
-
-@green:  #5f8e43;
-@blue:   #2f4365;
-@red:    #8e4d43;
-@orange: #b2685c;
-@yellow: #b2935c;
-
-@bodyBackground: @beige;
-@textColor: @brown;
-
-@linkColor: @green;
-
-// Typography (with help from bootswatch.com's "readable" theme)
-@import url('//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic');
-@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
-@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@baseFontSize:          15px;
-@baseFontFamily:        @serifFontFamily;
-@baseLineHeight:        @baseFontSize * 1.5;
-@altFontFamily:         @sansFontFamily;
-
-@headingsFontFamily:    "Lora", Georgia, "Times New Roman", Times, serif;
-@headingsFontWeight:    bold;    // instead of browser default, bold
-@headingsColor:         inherit; // empty to use BS default, @textColor
-
-// Hero unit
-@heroUnitBackground: darken(@bodyBackground, 10%);
-
-// Nav bar
-@navbarBackground: @brown;
-@navbarBackgroundHighlight: @brown;
-@navbarText: @beige;
-@navbarLinkColor: darken(@beige, 20%);
-@navbarLinkColorHover: @beige;
-@navbarLinkColorActive: @beige;
-@navbarBrandColor: lighten(@green, 20%);
-
-@dropdownBackground: lighten(@beige, 10%);
-@dropdownLinkColor: @brown;
-@dropdownLinkColorHover: @brown;
-@dropdownLinkBackgroundHover: lighten(@green, 50%);
-
-
-ul.inline > li.first {
-  padding-left: 0px;
-}
-
-h2 {
-  font-size: 150%;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-.main {
-  padding-right: 1em;
-}
-
-.sidebar {
-  margin-left: -1px;
-  border-left: 1px solid darken(@beige, 10%);
-  padding-left: 1em;
-}
-
-// this is used for eg. crops and members index pages
-.six-across:nth-child(6n+1) {
-  margin-left: 0px
-}
-
-.three-across:nth-child(3n+1) {
-  margin-left: 0px;
-  clear: both;
-}
-
-// let's condense the hero unit a little
-.hero-unit {
-  padding-top: 30px;
-  padding-bottom: 30px;
-}
-
-// info under the main heading on homepage
-.hero-unit .info {
-  padding-top: 15px;
-}
-
-// signup widget on homepage
-.hero-unit .signup {
-  background-color: lighten(@green, 40%);
-  border: 1px solid lighten(@green, 20%);
-  border-radius: 6px;
-  padding: 15px;
-  text-align: center;
-  line-height: 110%;
-}
-
-// stats shown on homepage. eg. "999 members..."
-p.stats {
-  font-weight: bold;
-}
-
-.homepage-members {
-  height: 100px;
-}
-
-.homepage-members:nth-child(odd) {
-  margin-left: 0px;
-}
-
-#map {
-  height: 500px;
-}
-
-.member-location {
-  font-size: small;
-  font-style: italic;
-}
-
-.member-location a {
-  color: @brown;
-}
-
-// Overrides applying only to mobile view
-
-@media only screen and (max-width: 767px) {
-  .sidebar {
-    margin-left: 0;
-    border-left: none;
-    padding-left: 0;
-  }
-
-  #map {
-    height: 300px;
-  }
-}
-
-li.crop-hierarchy {
-  list-style-type: disc;
-}

app/assets/stylesheets/comfy/admin/cms/custom.sass

@@ -0,0 +1 @@
+// custom CSS for admin area

app/assets/stylesheets/custom_bootstrap/custom_bootstrap.sass

@@ -0,0 +1,59 @@
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+// Core variables and mixins
+@import "bootstrap-sprockets"
+@import "bootstrap/variables"
+// Modify this for custom colors, font-sizes, etc
+@import "custom_bootstrap/variables"
+@import "bootstrap/mixins"
+// Modify this for custom mixins
+@import "custom_bootstrap/mixins"
+
+// Reset and dependencies
+@import "bootstrap/normalize"
+@import "bootstrap/print"
+@import "bootstrap/glyphicons"
+
+// Core CSS
+@import "bootstrap/scaffolding"
+@import "bootstrap/type"
+@import "bootstrap/code"
+@import "bootstrap/grid"
+@import "bootstrap/tables"
+@import "bootstrap/forms"
+@import "bootstrap/buttons"
+
+// Components
+@import "bootstrap/component-animations"
+@import "bootstrap/dropdowns"
+@import "bootstrap/button-groups"
+@import "bootstrap/input-groups"
+@import "bootstrap/navs"
+@import "bootstrap/navbar"
+@import "bootstrap/breadcrumbs"
+@import "bootstrap/pagination"
+@import "bootstrap/pager"
+@import "bootstrap/labels"
+@import "bootstrap/badges"
+@import "bootstrap/jumbotron"
+@import "bootstrap/thumbnails"
+@import "bootstrap/alerts"
+@import "bootstrap/progress-bars"
+@import "bootstrap/media"
+@import "bootstrap/list-group"
+@import "bootstrap/panels"
+@import "bootstrap/responsive-embed"
+@import "bootstrap/wells"
+@import "bootstrap/close"
+
+// Components w/ JavaScript
+@import "bootstrap/modals"
+@import "bootstrap/tooltip"
+@import "bootstrap/popovers"
+@import "bootstrap/carousel"
+
+// Utility classes
+@import "bootstrap/utilities"
+@import "bootstrap/responsive-utilities"

app/assets/stylesheets/custom_bootstrap/mixins.sass

@@ -0,0 +1 @@
+// Use this file to override Twitter Bootstrap mixins or define own mixins.

app/assets/stylesheets/custom_bootstrap/variables.sass

@@ -0,0 +1,56 @@
+// Use this file to override Twitter Bootstrap variables or define own variables.
+
+// Import original variables so they can be used in overrides
+//@import 'bootstrap/variables.scss'
+
+// Base colours
+
+$beige: #f3f1ee
+$brown: #413f3b
+
+$green:  #5f8e43
+$blue:   #2f4365
+$red:    #8e4d43
+$orange: #ffa500
+$yellow: #b2935c
+$white:  #ffffff
+
+$body-bg: $beige
+$text-color: $brown
+$link-color: $green
+$graph-hover: $orange
+
+$brand-primary: $green
+
+$font-family-sans-serif:        "Helvetica Neue", Helvetica, Arial, sans-serif
+$font-family-serif:       Georgia, "Times New Roman", Times, serif
+$font-family-mono:        Monaco, Menlo, Consolas, "Courier New", monospace
+
+$font-size-base:          14px
+$font-family-base:        $font-family-sans-serif
+$line-height-base:        1.5
+$alt-font-family:         $font-family-serif
+
+$headings-font-family:    $font-family-sans-serif
+$headings-font-weight:    bold    // instead of browser default, bold
+$headings-color:         inherit // empty to use BS default, $textColor
+
+// Hero unit
+$jumbotron-bg: darken($body-bg, 10%)
+
+// Nav bar
+$navbar-default-bg: $brown
+$navbar-default-bg-highlight: $brown
+$navbar-default-color: $beige
+$navbar-default-link-color: darken($beige, 20%)
+$navbar-default-link-hover-color: $beige
+$navbar-default-link-active-color: darken($beige,80%)
+$navbar-default-brand-color: lighten($green, 20%)
+
+// Top nav collapse threshold
+$grid-float-breakpoint: $screen-md-min
+
+$dropdown-bg: lighten($beige, 10%)
+$dropdown-link-color: $brown
+$dropdown-link-hover-color: $brown
+$dropdown-link-hover-bg: lighten($green, 50%)

app/assets/stylesheets/graphs.sass

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

app/assets/stylesheets/leaflet_overrides.css.less

@@ -1,3 +0,0 @@
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-  border: none;
-}

app/assets/stylesheets/leaflet_overrides.sass

@@ -0,0 +1,10 @@
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip
+  border: none
+
+.thumbnail
+  background: #fff !important
+  border: solid 1px whitesmoke
+
+.thumbnail .crop-thumbnail .cropinfo
+  padding-top: 14px

app/assets/stylesheets/overrides.sass

@@ -0,0 +1,336 @@
+@import "bootstrap-sprockets"
+@import "bootstrap"
+@import "custom_bootstrap/variables"
+// this padding needs to be done before the responsive stuff is imported
+body
+  padding-top: $navbar-height
+
+// Font Awesome
+@import "font-awesome-sprockets"
+@import "font-awesome"
+
+.list-inline > li.first
+  padding-left: 0px
+
+h2
+  font-size: 150%
+
+h3
+  font-size: 120%
+
+.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)
+  margin-left: 0px
+
+.three-across:nth-child(3n+1)
+  margin-left: 0px
+  clear: both
+
+// let's condense the hero unit a little
+.jumbotron
+  padding-top: 30px
+  padding-bottom: 30px
+
+// info under the main heading on homepage
+.jumbotron .info
+  padding-top: 15px
+
+// signup widget on homepage
+.jumbotron .signup
+  background-color: lighten($green, 40%)
+  border: 1px solid lighten($green, 20%)
+  border-radius: 6px
+  line-height: 200%
+  padding: 15px
+  text-align: center
+
+// stats shown on homepage. eg. "999 members..."
+p.stats
+  font-weight: bold
+
+.member-cards
+  display: flex
+  flex: none
+  flex-wrap: wrap
+  justify-content: space-between
+
+.member-thumbnail
+  padding: .25em
+
+  div
+    width: 5em
+    display: inline-block
+    vertical-align: top
+
+.member-thumbnail div~div
+  padding-left: 1em
+  width: 15em
+
+.planting
+  dl.planting-attributes
+    dt
+      text-align: left
+    dd
+      margin-left: auto
+
+
+#placesmap, #cropmap
+  height: 500px
+
+#membermap
+  height: 250px
+
+.location-not-set
+  height: 250px
+  width: 100%
+  background-image: image-url('location-not-set.en.png')
+  background-repeat: no-repeat
+  background-position: center
+
+.member-location
+  font-size: small
+  font-style: italic
+
+
+.member-location a
+  color: $brown
+
+
+.photo-thumbnail
+  padding: 0
+  position: relative
+
+  img
+    width: 100%
+
+  .text
+    display: none
+    color: #000
+    position: absolute
+    bottom: 0
+    background: rgba(0, 0, 0, 0.8)
+    width: 100%
+    margin: 0
+
+  p
+    padding: 5px
+    margin: 0
+    color: #fff
+
+  &:hover
+    .text
+      display: block
+
+.thumbnail
+  border: none
+  text-align: center
+  margin-bottom: 1.5em
+
+  .member-thumbnail
+    text-align: left
+    img
+      height: 85px
+      width: 85px
+      max-width: 85px
+
+  .crop-thumbnail
+    height: 220px
+    .cropinfo
+      display: inline-block
+      max-width: 100%
+      white-space: nowrap
+      line-height: 1em
+      padding-bottom: 2px
+
+      .cropname
+        overflow: hidden
+        text-overflow: ellipsis
+
+      .scientificname
+        font-size: small
+        font-style: italic
+        overflow: hidden
+        text-overflow: ellipsis
+
+      .plantingcount
+        font-size: small
+
+    .crop-name a
+      padding-top: 2px
+
+    .scientific-name small
+      margin-bottom: -2px
+
+li.crop-hierarchy
+  list-style-type: disc
+
+.navbar-brand
+  margin: 0px
+  padding: 0px
+
+.navbar-bottom
+  margin: 40px 0px 0px 0px !important
+
+// footer
+footer
+  #footer1, #footer2, #footer3
+    text-align: left
+    padding-top: 1em
+    padding-bottom: 2em
+    ul
+      list-style-type: none
+      list-style-position: outside
+      padding-left: 0px
+      margin-left: 0px
+
+    a
+      color: $navbar-default-link-color
+      text-decoration: none
+
+    a:hover
+      color: $navbar-default-link-hover-color
+
+    a:active
+      color: $navbar-default-link-active-color
+
+  .navbar-bottom.navbar
+    border-radius: 0
+
+// ensure footer is pushed to bottom of browser window
+
+#maincontainer
+  min-height: 80%
+
+html, body
+  height: 100%
+
+.crop-image, .member-image
+  width: 100%
+  height: 100%
+
+// Autosuggest
+
+.ui-autocomplete
+  background: white
+  z-index: $zindex-tooltip
+
+.alert
+  a
+    font-weight: 800
+
+
+/* override "info" alert boxes to be green, not blue, on Growstuff */
+$state-info-text: darken($green, 10%)
+$state-info-bg: lighten($green, 50%)
+
+/* and set "success" to be the same, as it was just very slightly
+ * different because the default bootstrap green is slightly different
+ * from ours */
+$state-success-text: darken($green, 10%)
+$state-success-bg: lighten($green, 50%)
+
+.hide
+  display: none
+
+#add-sci_name-row, #remove-sci_name-row, #add-alt_name-row, #remove-alt_name-row
+  display: none
+
+.panel-footer
+  height: 6em
+
+.panel
+  .dl-horizontal
+    text-overflow: ellipsis
+    overflow: hidden
+
+.form-group.required .control-label:before
+  content: "* "
+  color: red
+
+.margin-bottom
+  margin-bottom: 1em
+
+.red
+  color: red
+
+.truncate
+  overflow: hidden
+  text-overflow: ellipsis
+  white-space: nowrap
+
+ul.plantings
+  list-style-type: none
+
+ul.thumbnail-buttons
+  list-style-type: none
+  text-align: right
+
+
+.hover-wrapper .text
+  position: absolute
+  visibility: hidden
+
+.hover-wrapper:hover .text
+  visibility: visible
+
+.homepage-listing
+  padding-bottom: 6px
+
+@media (min-width: $screen-md-min)
+  .planting-thumbnail
+    dl.planting-attributes
+      width: 100%
+
+      dt
+        text-align: left
+        width: 120px
+      dd
+        padding-left: 120px
+        margin-left: auto
+
+  .navbar .navbar-form
+    width: 250px
+
+// Overrides applying only to mobile view. This must be at the end of the overrides file.
+@media only screen and (max-width: 767px)
+  .sidebar
+    margin-left: 0
+    border-left: none
+    padding-left: 0
+
+  #map
+    height: 300px
+
+  .navbar .nav > li
+    display: block
+
+  .navbar .navbar-form
+    width: 185px
+    padding-left: 0
+    padding-right: 0
+  .homepage
+    .thumbnail
+      height: 180px
+    .seed-thumbnail
+      height: 220px

app/assets/stylesheets/predictions.sass

@@ -0,0 +1,11 @@
+.predictions
+  .metric
+    height: 180px
+    border: 1px solid lighten($green, 20%)
+    background: $white
+    margin: 4px
+    strong
+      font-size: 250%
+      font-align: center
+    h3
+

app/controllers/about_controller.rb

@@ -1,2 +0,0 @@
-class AboutController < ApplicationController
-end

app/controllers/account_types_controller.rb

@@ -1,70 +0,0 @@
-class AccountTypesController < ApplicationController
-  load_and_authorize_resource
-  # GET /account_types
-  def index
-    @account_types = AccountType.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-    end
-  end
-
-  # GET /account_types/1
-  def show
-    @account_type = AccountType.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-    end
-  end
-
-  # GET /account_types/new
-  def new
-    @account_type = AccountType.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-    end
-  end
-
-  # GET /account_types/1/edit
-  def edit
-    @account_type = AccountType.find(params[:id])
-  end
-
-  # POST /account_types
-  def create
-    @account_type = AccountType.new(params[:account_type])
-
-    respond_to do |format|
-      if @account_type.save
-        format.html { redirect_to @account_type, notice: 'Account type was successfully created.' }
-      else
-        format.html { render action: "new" }
-      end
-    end
-  end
-
-  # PUT /account_types/1
-  def update
-    @account_type = AccountType.find(params[:id])
-
-    respond_to do |format|
-      if @account_type.update_attributes(params[:account_type])
-        format.html { redirect_to @account_type, notice: 'Account type was successfully updated.' }
-      else
-        format.html { render action: "edit" }
-      end
-    end
-  end
-
-  # DELETE /account_types/1
-  def destroy
-    @account_type = AccountType.find(params[:id])
-    @account_type.destroy
-
-    respond_to do |format|
-      format.html { redirect_to account_types_url }
-    end
-  end
-end

app/controllers/accounts_controller.rb

@@ -1,39 +0,0 @@
-class AccountsController < ApplicationController
-  load_and_authorize_resource
-  # GET /accounts
-  def index
-    @accounts = Account.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-    end
-  end
-
-  # GET /accounts/1
-  def show
-    @account = Account.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-    end
-  end
-
-  # GET /accounts/1/edit
-  def edit
-    @account = Account.find(params[:id])
-  end
-
-  # PUT /accounts/1
-  def update
-    @account = Account.find(params[:id])
-
-    respond_to do |format|
-      if @account.update_attributes(params[:account])
-        format.html { redirect_to @account, notice: 'Account detail was successfully updated.' }
-      else
-        format.html { render action: "edit" }
-      end
-    end
-  end
-
-end

app/controllers/admin/members_controller.rb

@@ -0,0 +1,14 @@
+module Admin
+  class MembersController < ApplicationController
+    before_action :auth!
+    def index
+      @members = Member.order(:login_name).paginate(page: params[:page])
+    end
+
+    private
+
+    def auth!
+      authorize! :manage, :all
+    end
+  end
+end

app/controllers/admin/orders_controller.rb

@@ -1,22 +0,0 @@
-class Admin::OrdersController < ApplicationController
-  def index
-    authorize! :manage, :all
-    respond_to do |format|
-      format.html # index.html.haml
-    end
-  end
-
-  def search
-    authorize! :manage, :all
-    @orders = Order.search({:by => params[:search_by], :for => params[:search_text]})
-
-    if @orders.empty?
-      flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"
-    end
-
-    respond_to do |format|
-      format.html # index.html.haml
-    end
-
-  end
-end

app/controllers/admin_controller.rb

@@ -1,16 +1,12 @@
 class AdminController < ApplicationController
+  respond_to :html
   def index
     authorize! :manage, :all
-    respond_to do |format|
-      format.html # index.html.haml
-    end
   end
 
   def newsletter
     authorize! :manage, :all
     @members = Member.confirmed.wants_newsletter.all
-    respond_to do |format|
-      format.html # index.html.haml
-    end
+    respond_with @members
   end
 end

app/controllers/alternate_names_controller.rb

@@ -0,0 +1,60 @@
+class AlternateNamesController < ApplicationController
+  before_action :authenticate_member!, except: %i(index show)
+  load_and_authorize_resource
+  respond_to :html, :json
+  responders :flash
+
+  # GET /alternate_names
+  # GET /alternate_names.json
+  def index
+    @alternate_names = AlternateName.all.order(:name)
+    respond_with(@alternate_names)
+  end
+
+  # GET /alternate_names/new
+  # GET /alternate_names/new.json
+  def new
+    @alternate_name = AlternateName.new
+    @crop = Crop.find_or_initialize_by(id: params[:crop_id])
+  end
+
+  # GET /alternate_names/1/edit
+  def edit; end
+
+  # POST /alternate_names
+  # POST /alternate_names.json
+  def create
+    params[:alternate_name][:creator_id] = current_member.id
+    @alternate_name = AlternateName.new(alternate_name_params)
+
+    if @alternate_name.save
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully created.'
+    else
+      render action: "new"
+    end
+  end
+
+  # PUT /alternate_names/1
+  # PUT /alternate_names/1.json
+  def update
+    if @alternate_name.update(alternate_name_params)
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.'
+    else
+      render action: "edit"
+    end
+  end
+
+  # DELETE /alternate_names/1
+  # DELETE /alternate_names/1.json
+  def destroy
+    @crop = @alternate_name.crop
+    @alternate_name.destroy
+    redirect_to @crop, notice: 'Alternate name was successfully deleted.'
+  end
+
+  private
+
+  def alternate_name_params
+    params.require(:alternate_name).permit(:crop_id, :name, :creator_id)
+  end
+end

app/controllers/api/v1/base_controller.rb

@@ -0,0 +1,7 @@
+module Api
+  module V1
+    class BaseController < JSONAPI::ResourceController
+      abstract
+    end
+  end
+end

app/controllers/api/v1/crops_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class CropsController < BaseController
+    end
+  end
+end

app/controllers/api/v1/gardens_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class GardensController < BaseController
+    end
+  end
+end

app/controllers/api/v1/harvests_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class HarvestsController < BaseController
+    end
+  end
+end

app/controllers/api/v1/members_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class MembersController < BaseController
+    end
+  end
+end

app/controllers/api/v1/photos_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class PhotosController < BaseController
+    end
+  end
+end

app/controllers/api/v1/plantings_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class PlantingsController < BaseController
+    end
+  end
+end

app/controllers/api/v1/seeds_controller.rb

@@ -0,0 +1,6 @@
+module Api
+  module V1
+    class SeedsController < BaseController
+    end
+  end
+end

app/controllers/application_controller.rb

@@ -3,18 +3,26 @@ class ApplicationController < ActionController::Base
 
   include ApplicationHelper
 
-  after_filter :store_location
+  after_action :store_location
+  before_action :set_locale
 
   def store_location
-    # store last url - this is needed for post-login redirect to whatever the user last visited.
-    if (request.fullpath != new_member_session_path && \
-      !request.xhr?) # don't store ajax calls
-      session[:previous_url] = request.fullpath
+    unless request.path.in?(["/members/sign_in",
+                             "/members/sign_up",
+                             "/members/password/new",
+                             "/members/password/edit",
+                             "/members/confirmation",
+                             "/members/sign_out"]) || request.xhr?
+      store_location_for(:member, request.fullpath)
     end
   end
 
   def after_sign_in_path_for(resource)
-    session[:previous_url] || root_path
+    stored_location_for(:member) || root_path
+  end
+
+  def after_sign_out_path_for(resource_or_scope)
+    request.referer
   end
 
   # tweak CanCan defaults because we don't have a "current_user" method
@@ -26,7 +34,49 @@ class ApplicationController < ActionController::Base
 
   # CanCan error handling
   rescue_from CanCan::AccessDenied do |exception|
-    redirect_to request.referer || root_url, :alert => exception.message
+    redirect_to request.referer || root_url, alert: exception.message
   end
 
+  def set_locale
+    I18n.locale = params[:locale] || extract_locale_from_subdomain || I18n.default_locale
+  end
+
+  def extract_locale_from_subdomain
+    parsed_locale = request.subdomains.first
+    I18n.available_locales.map(&:to_s).include?(parsed_locale) ? parsed_locale : nil
+  end
+
+  before_action :configure_permitted_parameters, if: :devise_controller?
+
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.permit(:sign_up) do |member|
+      member.permit(:login_name, :email, :password, :password_confirmation,
+        :remember_me, :login,
+        # terms of service
+        :tos_agreement,
+        # profile stuff
+        :bio, :location, :latitude, :longitude,
+        # email settings
+        :show_email, :newsletter, :send_notification_email, :send_planting_reminder)
+    end
+
+    devise_parameter_sanitizer.permit(:account_update) do |member|
+      member.permit(:login_name, :email, :password, :password_confirmation,
+        :remember_me, :login,
+        # terms of service
+        :tos_agreement,
+        # profile stuff
+        :bio, :location, :latitude, :longitude,
+        # email settings
+        :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
+        # update password
+        :current_password)
+    end
+  end
+
+  def expire_homepage
+    expire_fragment("homepage_stats")
+  end
 end

app/controllers/authentications_controller.rb

@@ -1,37 +1,27 @@
+require './lib/actions/oauth_signup_action'
 class AuthenticationsController < ApplicationController
+  before_action :authenticate_member!
   load_and_authorize_resource
 
-  # GET /authentications
-  def index
-    @authentications = current_member.authentications if member_signed_in?
-
-    respond_to do |format|
-      format.html # index.html.erb
-    end
-  end
-
   # POST /authentications
   def create
     auth = request.env['omniauth.auth']
     @authentication = nil
     if auth
+      name = Growstuff::OauthSignupAction.new.determine_name(auth)
 
-      name = ''
-      case auth['provider']
-      when 'twitter'
-        name = auth['info']['nickname']
-      when 'flickr'
-        name = auth['info']['name']
-      else
-        name = auth['info']['name']
-      end
+      @authentication = current_member.authentications
+        .create_with(
+          name: name,
+          token: auth['credentials']['token'],
+          secret: auth['credentials']['secret']
+        )
+        .find_or_create_by(
+          provider: auth['provider'],
+          uid: auth['uid'],
+          name: name
+        )
 
-      @authentication = current_member.authentications.find_or_create_by_provider_and_uid(
-        :provider => auth['provider'],
-        :uid => auth['uid'],
-        :name => name,
-        :token => auth['credentials']['token'],
-        :secret => auth['credentials']['secret'])
       flash[:notice] = "Authentication successful."
     else
       flash[:notice] = "Authentication failed."
@@ -41,7 +31,6 @@ class AuthenticationsController < ApplicationController
 
   # DELETE /authentications/1
   def destroy
-    @authentication = Authentication.find(params[:id])
     @authentication.destroy
 
     respond_to do |format|

app/controllers/charts/crops_controller.rb

@@ -0,0 +1,30 @@
+module Charts
+  class CropsController < ApplicationController
+    respond_to :json
+
+    def sunniness
+      pie_chart_query 'sunniness'
+    end
+
+    def planted_from
+      pie_chart_query 'planted_from'
+    end
+
+    def harvested_for
+      @crop = Crop.find(params[:crop_id])
+      render json: Harvest.joins(:plant_part)
+        .where(crop: @crop)
+        .group("plant_parts.name").count(:id)
+    end
+
+    private
+
+    def pie_chart_query(field)
+      @crop = Crop.find(params[:crop_id])
+      render json: Planting.where(crop: @crop)
+        .where.not(field.to_sym => nil)
+        .where.not(field.to_sym => '')
+        .group(field.to_sym).count(:id)
+    end
+  end
+end

app/controllers/charts/gardens_controller.rb

@@ -0,0 +1,16 @@
+module Charts
+  class GardensController < ApplicationController
+    respond_to :json
+    def timeline
+      @data = []
+      @garden = Garden.find(params[:garden_id])
+      @garden.plantings.where.not(planted_at: nil)
+        .order(finished_at: :desc).each do |p|
+        # use finished_at if we have it, otherwise use predictions
+        finish = p.finished_at.presence || p.finish_predicted_at
+        @data << [p.crop.name, p.planted_at, finish] if finish.present?
+      end
+      render json: @data
+    end
+  end
+end

app/controllers/comments_controller.rb

@@ -1,103 +1,53 @@
 class CommentsController < ApplicationController
+  before_action :authenticate_member!, except: %i(index show)
   load_and_authorize_resource
+  respond_to :html, :json
+  respond_to :rss, only: :index
+  responders :flash
 
-  cache_sweeper :comment_sweeper
-
-  # GET /comments
-  # GET /comments.json
   def index
-    @comments = Comment.paginate(:page => params[:page])
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @comments }
-      format.rss { render :layout => false }
-    end
+    @comments = Comment.order(created_at: :desc).paginate(page: params[:page])
+    respond_with(@comments)
   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
     @comment = Comment.new
-    @post = Post.find_by_id(params[:post_id])
+    @post = Post.find_by(id: params[:post_id])
 
     if @post
       @comments = @post.comments
-      respond_to do |format|
-        format.html # new.html.erb
-        format.json { render json: @comment }
-      end
+      respond_with(@comments)
     else
-      redirect_to request.referer || root_url,
-        :alert => "Can't post a comment on a non-existent post"
+      redirect_to(request.referer || root_url,
+        alert: "Can't post a comment on a non-existent post")
     end
   end
 
-  # GET /comments/1/edit
   def edit
-    @comment = Comment.find(params[:id])
     @comments = @comment.post.comments
   end
 
-  # POST /comments
-  # POST /comments.json
   def create
-    params[:comment][:author_id] = current_member.id
-    @comment = Comment.new(params[:comment])
-
-    respond_to do |format|
-      if @comment.save
-        format.html { redirect_to @comment.post, notice: 'Comment was successfully created.' }
-        format.json { render json: @comment, status: :created, location: @comment }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @comment.errors, status: :unprocessable_entity }
-      end
-    end
+    @comment = Comment.new(comment_params)
+    @comment.author = current_member
+    @comment.save
+    respond_with @comment, location: @comment.post
   end
 
-  # PUT /comments/1
-  # PUT /comments/1.json
   def update
-    @comment = Comment.find(params[:id])
-
-    # you should never be able to change the author or post when
-    # updating
-    params[:comment].delete("post_id")
-    params[:comment].delete("author_id")
-
-    respond_to do |format|
-      if @comment.update_attributes(params[:comment])
-        format.html { redirect_to @comment.post, notice: 'Comment was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @comment.errors, status: :unprocessable_entity }
-      end
-    end
+    @comment.update(body: comment_params['body'])
+    respond_with @comment, location: @comment.post
   end
 
-  # DELETE /comments/1
-  # DELETE /comments/1.json
   def destroy
-    @comment = Comment.find(params[:id])
     @post = @comment.post
     @comment.destroy
+    respond_with(@post)
+  end
 
-    respond_to do |format|
-      format.html { redirect_to @post }
-      format.json { head :no_content }
-    end
+  private
+
+  def comment_params
+    params.require(:comment).permit(:body, :post_id)
   end
 end

app/controllers/crops_controller.rb

@@ -1,115 +1,194 @@
+require 'will_paginate/array'
+
 class CropsController < ApplicationController
+  before_action :authenticate_member!, except: %i(index hierarchy search show)
   load_and_authorize_resource
-  skip_authorize_resource :only => :hierarchy
+  skip_authorize_resource only: %i(hierarchy search)
+  respond_to :html, :json, :rss, :csv
+  responders :flash
 
-  cache_sweeper :crop_sweeper
-
-  # GET /crops
-  # GET /crops.json
   def index
-    @crops = Crop.includes(:scientific_names, {:plantings => :photos}).paginate(:page => params[:page])
-
-    respond_to do |format|
-      format.html 
-      format.json { render :json => @crops }
-      format.rss do
-        @crops = Crop.recent.includes(:scientific_names, :creator)
-        render :rss => @crops
-      end
-      format.csv do
-        @filename = "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
-        @crops = Crop.includes(:scientific_names, :plantings, :seeds, :creator)
-        render :csv => @crops
-      end
-    end
+    @sort = params[:sort]
+    @crops = crops
+    @num_requested_crops = requested_crops.size if current_member
+    @filename = filename
+    respond_with @crops
+  end
+
+  def requested
+    @requested = requested_crops.paginate(page: params[:page])
+    respond_with @requested
   end
 
-  # GET /crops/wrangle
   def wrangle
-    @crops = Crop.recent.paginate(:page => params[:page])
+    @approval_status = params[:approval_status]
+    @crops = case @approval_status
+             when "pending"
+               Crop.pending_approval
+             when "rejected"
+               Crop.rejected
+             else
+               Crop.recent
+             end.paginate(page: params[:page])
 
-    respond_to do |format|
-      format.html
-    end
+    @crop_wranglers = Role.crop_wranglers
+    respond_with @crops
   end
 
-  # GET /crops/hierarchy
   def hierarchy
     @crops = Crop.toplevel
+    respond_with @crops
+  end
+
+  def search
+    @term = params[:term]
+    @matches = Crop.search(@term)
+    @paginated_matches = @matches.paginate(page: params[:page])
+
+    respond_with @matches
+  end
+
+  def show
+    @crop = Crop.includes(:scientific_names, plantings: :photos).find(params[:id])
+    @posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
+    # respond_with(@crop)
     respond_to do |format|
       format.html
+      format.json { render json: @crop.to_json(crop_json_fields) }
     end
   end
 
-  # GET /crops/1
-  # GET /crops/1.json
-  def show
-    @crop = Crop.includes(:scientific_names, {:plantings => :photos}).find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.haml
-      format.json { render json: @crop }
-    end
-  end
-
-  # GET /crops/new
-  # GET /crops/new.json
   def new
     @crop = Crop.new
+    @crop.alternate_names.build
+    @crop.scientific_names.build
 
-    respond_to do |format|
-      format.html # new.html.haml
-      format.json { render json: @crop }
-    end
+    respond_with @crop
   end
 
-  # GET /crops/1/edit
   def edit
-    @crop = Crop.find(params[:id])
+    @crop.alternate_names.build if @crop.alternate_names.blank?
+    @crop.scientific_names.build if @crop.scientific_names.blank?
   end
 
-  # POST /crops
-  # POST /crops.json
   def create
-    params[:crop][:creator_id] = current_member.id
-    @crop = Crop.new(params[:crop])
+    @crop = Crop.new(crop_params)
 
-    respond_to do |format|
-      if @crop.save
-        format.html { redirect_to @crop, notice: 'Crop was successfully created.' }
-        format.json { render json: @crop, status: :created, location: @crop }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @crop.errors, status: :unprocessable_entity }
-      end
+    if current_member.role? :crop_wrangler
+      @crop.creator = current_member
+    else
+      @crop.requester = current_member
+      @crop.approval_status = "pending"
     end
+
+    notify_wranglers if Crop.transaction { @crop.save && save_crop_names }
+
+    respond_with @crop
   end
 
-  # PUT /crops/1
-  # PUT /crops/1.json
   def update
-    @crop = Crop.find(params[:id])
+    previous_status = @crop.approval_status
 
-    respond_to do |format|
-      if @crop.update_attributes(params[:crop])
-        format.html { redirect_to @crop, notice: 'Crop was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @crop.errors, status: :unprocessable_entity }
-      end
+    @crop.creator = current_member if previous_status == "pending"
+
+    if @crop.update(crop_params)
+      recreate_names('alt_name', 'alternate')
+      recreate_names('sci_name', 'scientific')
+
+      notifier.deliver_now! if previous_status == "pending"
+    end
+
+    respond_with @crop
+  end
+
+  def destroy
+    @crop.destroy
+    respond_with @crop
+  end
+
+  private
+
+  def notifier
+    case @crop.approval_status
+    when "approved"
+      Notifier.crop_request_approved(@crop.requester, @crop)
+    when "rejected"
+      Notifier.crop_request_rejected(@crop.requester, @crop)
     end
   end
 
-  # DELETE /crops/1
-  # DELETE /crops/1.json
-  def destroy
-    @crop = Crop.find(params[:id])
-    @crop.destroy
-
-    respond_to do |format|
-      format.html { redirect_to crops_url }
-      format.json { head :no_content }
+  def save_crop_names
+    params[:alt_name]&.values&.each do |value|
+      create_name!('alternate', value) unless value.empty?
     end
+    params[:sci_name]&.values&.each do |value|
+      create_name!('scientific', value) unless value.empty?
+    end
+  end
+
+  def notify_wranglers
+    return if current_member.role? :crop_wrangler
+    Role.crop_wranglers.each do |w|
+      Notifier.new_crop_request(w, @crop).deliver_now!
+    end
+  end
+
+  def recreate_names(param_name, name_type)
+    return if params[param_name].blank?
+    destroy_names(name_type)
+    params[param_name].each do |_i, value|
+      create_name!(name_type, value) unless value.empty?
+    end
+  end
+
+  def destroy_names(name_type)
+    @crop.send("#{name_type}_names").each(&:destroy)
+  end
+
+  def create_name!(name_type, value)
+    @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id)
+  end
+
+  def crop_params
+    params.require(:crop).permit(:en_wikipedia_url,
+      :name,
+      :parent_id,
+      :creator_id,
+      :perennial,
+      :approval_status,
+      :request_notes,
+      :reason_for_rejection,
+      :rejection_notes,
+      scientific_names_attributes: %i(scientific_name
+                                      _destroy
+                                      id))
+  end
+
+  def filename
+    "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
+  end
+
+  def crop_json_fields
+    {
+      include: {
+        plantings: {
+          include: {
+            owner: { only: %i(id login_name location latitude longitude) }
+          }
+        },
+        scientific_names: { only: [:name] },
+        alternate_names: { only: [:name] }
+      }
+    }
+  end
+
+  def crops
+    q = Crop.approved.includes(:scientific_names, plantings: :photos)
+    q = q.popular unless @sort == 'alpha'
+    q.order("LOWER(crops.name)").includes(:photos).paginate(page: params[:page])
+  end
+
+  def requested_crops
+    current_member.requested_crops.pending_approval
   end
 end

app/controllers/follows_controller.rb

@@ -0,0 +1,34 @@
+class FollowsController < ApplicationController
+  before_action :authenticate_member!
+  load_and_authorize_resource
+  skip_load_resource only: :create
+
+  # POST /follows
+  def create
+    @follow = current_member.follows.build(followed_id: follow_params[:followed_id])
+
+    if @follow.save
+      flash[:notice] = "Followed #{@follow.followed.login_name}"
+      redirect_to :back
+    else
+      flash[:error] = "Already following or error while following."
+      redirect_to :back
+    end
+  end
+
+  # DELETE /follows/1
+  def destroy
+    @follow = current_member.follows.find(follow_params[:id])
+    unfollowed_name = @follow.followed.login_name
+    @follow.destroy
+
+    flash[:notice] = "Unfollowed #{unfollowed_name}"
+    redirect_to root_path
+  end
+
+  private
+
+  def follow_params
+    params.permit(:id, :followed_id, :follower_id, :authenticity_token, :_method)
+  end
+end

app/controllers/forums_controller.rb

@@ -1,87 +1,56 @@
 class ForumsController < ApplicationController
   load_and_authorize_resource
-
-  cache_sweeper :forum_sweeper
+  respond_to :html, :json
 
   # GET /forums
   # GET /forums.json
   def index
-    @forums = Forum.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @forums }
-    end
+    @forums = Forum.all.order(:name)
+    respond_with(@forums)
   end
 
   # GET /forums/1
   # GET /forums/1.json
   def show
-    @forum = Forum.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @forum }
-    end
+    respond_with(@forum)
   end
 
   # GET /forums/new
   # GET /forums/new.json
   def new
     @forum = Forum.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @forum }
-    end
+    respond_with(@forum)
   end
 
   # GET /forums/1/edit
-  def edit
-    @forum = Forum.find(params[:id])
-  end
+  def edit; end
 
   # POST /forums
   # POST /forums.json
   def create
-    @forum = Forum.new(params[:forum])
-
-    respond_to do |format|
-      if @forum.save
-        format.html { redirect_to @forum, notice: 'Forum was successfully created.' }
-        format.json { render json: @forum, status: :created, location: @forum }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @forum.errors, status: :unprocessable_entity }
-      end
-    end
+    @forum = Forum.new(forum_params)
+    flash[:notice] = 'Forum was successfully created.' if @forum.save
+    respond_with(@forum)
   end
 
   # PUT /forums/1
   # PUT /forums/1.json
   def update
-    @forum = Forum.find(params[:id])
-
-    respond_to do |format|
-      if @forum.update_attributes(params[:forum])
-        format.html { redirect_to @forum, notice: 'Forum was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @forum.errors, status: :unprocessable_entity }
-      end
-    end
+    flash[:notice] = 'Forum was successfully updated.' if @forum.update(forum_params)
+    respond_with(@forum)
   end
 
   # DELETE /forums/1
   # DELETE /forums/1.json
   def destroy
-    @forum = Forum.find(params[:id])
     @forum.destroy
+    flash[:notice] = 'Forum was successfully deleted'
+    redirect_to forums_url
+  end
 
-    respond_to do |format|
-      format.html { redirect_to forums_url }
-      format.json { head :no_content }
-    end
+  private
+
+  def forum_params
+    params.require(:forum).permit(:description, :name, :owner_id, :slug)
   end
 end