Merge pull request #3280 from Growstuff/dev

Release 53

.codeclimate.yml

@@ -1,28 +1,37 @@
-engines:
-  rubocop:
-    enabled: true
-    channel: "rubocop-0-88"
-  scss-lint:
-    enabled: true
-  shellcheck:
-    enabled: true
-  eslint:
+plugins:
+  brakeman:
+    enabled: false # codeclimate's brakeman is stuck in rails 5 rules
+  bundler-audit:
     enabled: true
   coffeelint:
     enabled: true
-  brakeman:
-    enabled: true
-  bundler-audit:
-    enabled: true
   duplication:
     enabled: true
     config:
       languages:
       - ruby
       - javascript
+  editorconfig:
+    enabled: true
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  haml-lint:
+    enabled: true
+  nodesecurity:
+    enabled: true
+  rubocop:
+    enabled: true
+    channel: "rubocop-1-11"
+  scss-lint:
+    enabled: true
+  shellcheck:
+    enabled: true
 ratings:
   paths:
   - "**.rb"
+  - "**.ru"
   - "**.js"
   - "**.coffee"
   - "**.scss"

.devcontainer/.env

@@ -0,0 +1,2 @@
+# Ruby version
+VARIANT=3.1.4

.devcontainer/Dockerfile

@@ -0,0 +1,22 @@
+FROM mcr.microsoft.com/devcontainers/ruby:0-3.1-bullseye
+
+# Install Rails
+RUN gem install rails:7.0.4 webdrivers:5.2.0
+
+# Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
+# The value is a comma-separated list of allowed domains
+ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev,.preview.app.github.dev,.app.github.dev"
+
+#RUN bundle
+#RUN bundle exec rake db:create
+#RUN bundle exec rake db:migrate
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install additional gems.
+# RUN gem install <your-gem-names-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.devcontainer/create-db-user.sql

@@ -0,0 +1,2 @@
+CREATE USER vscode CREATEDB;
+CREATE DATABASE vscode WITH OWNER vscode;

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby-rails-postgres
+{
+"name": "Growstuff",
+"dockerComposeFile": "docker-compose.yml",
+"service": "app",
+"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+// Features to add to the dev container. More info: https://containers.dev/features.
+// Need something to get javascript working
+"features": {
+    "ghcr.io/devcontainers/features/node:1": {}
+},
+
+// Use 'forwardPorts' to make a list of ports inside the container available locally.
+// This can be used to network with other containers or the host.
+"forwardPorts": [3000, 5432, 9200],
+
+// Use 'postCreateCommand' to run commands after the container is created.
+// these don't actually work as postCreateCommands, you need to run them manually
+// for some unknown reason, Github codespaces use rbenv and rvm simultaneously
+// and you need both to be correct for it to work
+"postCreateCommand": "nice -n 19 bundle install && nice -n 19 bundle exec rake db:create && nice -n 19 bundle exec rake db:migrate && nice -n19 bundle exec rake db:seed"
+
+// Configure tool-specific properties.
+// "customizations": {},
+
+// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+// "remoteUser": "root"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,82 @@
+version: '3'
+
+services:
+  app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    depends_on:
+      db:
+        condition: service_healthy
+      elasticsearch:
+        condition: service_healthy
+    environment:
+      ELASTICSEARCH_URL: http://elasticsearch:9200/
+      APP_DOMAIN_NAME: localhost:3000
+      APP_PROTOCOL: http
+      DEVISE_SECRET_KEY: secret
+      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
+      GROWSTUFF_FLICKR_KEY: secretkey
+      GROWSTUFF_FLICKR_SECRET: secretsecret
+      GROWSTUFF_SITE_NAME: "Growstuff (local)"
+      RAILS_SECRET_TOKEN: supersecret
+    volumes:
+      - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+  db:
+    image: postgres:latest
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+      - ./create-db-user.sql:/docker-entrypoint-initdb.d/create-db-user.sql
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: growstuff_dev
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
+    container_name: elasticsearch
+    environment:
+      - xpack.security.enabled=false
+      - discovery.type=single-node
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    cap_add:
+      - IPC_LOCK
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "curl http://localhost:9200 | grep tagline",
+        ]
+      interval: 10s
+      timeout: 10s
+      retries: 120
+    volumes:
+      - esdata01:/usr/share/elasticsearch/data
+    ports:
+      - 9200:9200
+      - 9300:9300
+
+volumes:
+  postgres-data:
+  certs:
+    driver: local
+  esdata01:
+    driver: local

.github/dependabot.yml

@@ -0,0 +1,59 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "07:00"
+  open-pull-requests-limit: 20
+  versioning-strategy: lockfile-only
+  ignore:
+  - dependency-name: active_median
+    versions:
+    - "< 0.2.2, >= 0.2.1.a"
+  - dependency-name: rubocop
+    versions:
+    - "< 0.63, >= 0.62.a"
+  - dependency-name: rubocop
+    versions:
+    - "< 0.64, >= 0.63.a"
+  - dependency-name: sidekiq
+    versions:
+    - 5.2.4
+  - dependency-name: oj
+    versions:
+    - 3.11.4
+  - dependency-name: listen
+    versions:
+    - 3.5.0
+  - dependency-name: rspec-rails
+    versions:
+    - 4.1.0
+    - 5.0.0
+  - dependency-name: searchkick
+    versions:
+    - 4.4.3
+  - dependency-name: rswag-api
+    versions:
+    - 2.3.3
+  - dependency-name: rswag-specs
+    versions:
+    - 2.3.3
+  - dependency-name: rswag-ui
+    versions:
+    - 2.3.3
+  - dependency-name: timecop
+    versions:
+    - 0.9.3
+  - dependency-name: puma
+    versions:
+    - 5.2.0
+  - dependency-name: capybara
+    versions:
+    - 3.35.1
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "07:00"
+  open-pull-requests-limit: 10

.github/workflows/brakeman-analysis.yml

@@ -0,0 +1,40 @@
+# This workflow integrates Brakeman with GitHub's Code Scanning feature
+# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
+
+name: Brakeman Scan
+
+# This section configures the trigger for the workflow. Feel free to customize depending on your convention
+on:
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  brakeman-scan:
+    name: Brakeman Scan
+    runs-on: ubuntu-latest
+    steps:
+    # Checkout the repository to the GitHub Actions runner
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    # Customize the ruby version depending on your needs
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+
+    - name: Setup Brakeman
+      env:
+        BRAKEMAN_VERSION: '5.1.1' # SARIF support is provided in Brakeman version 4.10+
+      run: |
+        gem install brakeman --version $BRAKEMAN_VERSION
+
+    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+    - name: Scan
+      continue-on-error: true
+      run: |
+        brakeman -f sarif -o output.sarif.json .
+
+    # Upload the SARIF file generated in the previous step
+    - name: Upload SARIF
+      uses: github/codeql-action/upload-sarif@v2
+      with:
+        sarif_file: output.sarif.json

.github/workflows/ci.yml

@@ -0,0 +1,122 @@
+name: CI
+
+on: [pull_request]
+
+jobs:
+  contributors:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install ruby version specified in .ruby-version
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Install gem bundle
+        run: |
+          gem install bundler
+          bundle install
+      - name: Check contributors
+        run: |
+          bundle exec script/check_contributors_md.rb
+  rspec:
+    runs-on: ubuntu-latest
+    services:
+      db:
+        image: postgres
+        env:
+          ##
+          # The Postgres service fails its docker health check unless you
+          # specify these environment variables
+          #
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: growstuff_test
+        ports: ['5432:5432']
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      APP_DOMAIN_NAME: localhost:3000
+      APP_PROTOCOL: http
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
+      DEVISE_SECRET_KEY: secret
+      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
+      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
+      GROWSTUFF_FLICKR_KEY: secretkey"
+      GROWSTUFF_FLICKR_SECRET: secretsecret
+      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
+      RAILS_ENV: test
+      RAILS_SECRET_TOKEN: supersecret
+
+    steps:
+      - name: Checkout this repo
+        uses: actions/checkout@v3
+
+      - name: Configure sysctl limits
+        run: |
+          sudo swapoff -a
+          sudo sysctl -w vm.swappiness=1
+          sudo sysctl -w fs.file-max=262144
+          sudo sysctl -w vm.max_map_count=262144
+
+      - name: Start Elasticsearch
+        uses: elastic/elastic-github-actions/elasticsearch@master
+        with:
+          stack-version: 7.5.1
+
+      ##
+      # Cache Yarn modules
+      #
+      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
+      #
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Setup yarn cache
+        uses: actions/cache@v3
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install required OS packages
+        run: |
+          sudo apt-get -y install libpq-dev google-chrome-stable
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: '12'
+
+      - name: Install Ruby (version given by .ruby-version) and Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Install required JS packages
+        run: yarn install
+
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
+
+      - name: Prepare database for testing
+        run: bundle exec rails db:prepare
+        
+      - name: precompile assets
+        run: bundle exec rails assets:precompile
+        
+      - name: index into elastic search
+        run: bundle exec rails search:reindex
+
+      - name: Run rspec (report results to Percy.io and CodeClimate)
+        run: bundle exec rspec spec -fd
+
+      - name: Report to code climate
+        run: |
+          gem install codeclimate-test-reporter
+          codeclimate-test-reporter

.gitignore

@@ -1,5 +1,6 @@
 .byebug_history
 .bundle
+.env
 
 # Folders to ignore
 /log

.rubocop.yml

@@ -1,10 +1,13 @@
 inherit_from: .rubocop_todo.yml
-require: rubocop-rails
+require:
+ - rubocop-rails
+ - rubocop-rspec
 AllCops:
+  NewCops: enable
   Exclude:
     - 'db/schema.rb'
     - 'vendor/**/*'
-  TargetRailsVersion: 5.2
+  TargetRailsVersion: 6.0
 
 Rails:
   Enabled: true
@@ -15,6 +18,11 @@ Naming/FileName:
     - 'Gemfile'
     - 'Gemfile.lock'
 
+RSpec/DescribeClass:
+  Exclude:
+   - 'spec/views/**/*.rb'
+   - 'spec/features/**/*.rb'
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 

.rubocop_todo.yml

@@ -1,21 +1,384 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --no-offense-counts`
-# on 2019-12-16 21:01:58 +1300 using RuboCop version 0.77.0.
+# `rubocop --auto-gen-config`
+# on 2022-11-07 13:39:24 UTC using RuboCop version 1.38.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-Lint/AmbiguousOperator:
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
   Exclude:
-    - 'spec/controllers/crops_controller_spec.rb'
+    - 'db/migrate/20171129041341_create_photographings.rb'
+    - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
 
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/LineContinuationSpacing:
+  Exclude:
+    - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/seed.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/features/rss/plantings_spec.rb'
+    - 'spec/features/rss/posts_spec.rb'
+    - 'spec/features/rss/seeds_spec.rb'
+    - 'spec/models/seed_spec.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/LineEndStringConcatenationIndentation:
+  Exclude:
+    - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/seed.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/features/rss/plantings_spec.rb'
+    - 'spec/features/rss/posts_spec.rb'
+    - 'spec/features/rss/seeds_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 304
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'db/seeds.rb'
+    - 'spec/helpers/gardens_helper_spec.rb'
+    - 'spec/helpers/seeds_helper_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireParenthesesForMethodChains.
+Lint/AmbiguousRange:
+  Exclude:
+    - 'app/models/concerns/search_harvests.rb'
+    - 'app/models/concerns/search_plantings.rb'
+
+# Offense count: 2
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'app/models/harvest.rb'
+    - 'lib/actions/oauth_signup_action.rb'
+
+# Offense count: 8
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
+  Exclude:
+    - 'db/migrate/20171022032108_all_the_predictions.rb'
+    - 'spec/controllers/home_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/controllers/plant_parts_controller_spec.rb'
+    - 'spec/factories/crop_companions.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/requests/authentications_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Lint/RedundantDirGlobSort:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowNil.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/tasks/testing.rake'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, consistent
+Lint/SymbolConversion:
+  Exclude:
+    - 'app/controllers/likes_controller.rb'
+
+# Offense count: 8
+Lint/UselessAssignment:
+  Exclude:
+    - 'config.rb'
+    - 'config/compass.rb'
+    - 'lib/actions/oauth_signup_action.rb'
+
+# Offense count: 44
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 151
+
+# Offense count: 10
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, inherit_mode.
+# AllowedMethods: refine
+Metrics/BlockLength:
+  Max: 61
+
+# Offense count: 6
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 171
+
+# Offense count: 4
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 32
+
+# Offense count: 59
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+Metrics/MethodLength:
+  Max: 59
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 32
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: lowercase, uppercase
 Naming/HeredocDelimiterCase:
   Exclude:
     - 'config/environments/production.rb'
 
+# Offense count: 3
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/controllers/harvests_controller_spec.rb'
+    - 'spec/controllers/photos_controller_spec.rb'
+
+# Offense count: 15
+RSpec/Capybara/SpecificMatcher:
+  Exclude:
+    - 'spec/features/crops/browse_crops_spec.rb'
+    - 'spec/features/footer_spec.rb'
+    - 'spec/features/gardens/adding_gardens_spec.rb'
+    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/seeds/adding_seeds_spec.rb'
+
+# Offense count: 1
+RSpec/Capybara/VisibilityMatcher:
+  Exclude:
+    - 'spec/features/shared_examples/crop_suggest.rb'
+
+# Offense count: 292
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Enabled: false
+
+# Offense count: 36
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SkipBlocks, EnforcedStyle.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/models/like_spec.rb'
+    - 'spec/models/member_spec.rb'
+    - 'spec/services/timeline_service_spec.rb'
+
+# Offense count: 13
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/EmptyExampleGroup:
+  Exclude:
+    - 'spec/controllers/authentications_controller_spec.rb'
+    - 'spec/controllers/forums_controller_spec.rb'
+    - 'spec/controllers/home_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/controllers/plant_parts_controller_spec.rb'
+    - 'spec/controllers/seeds_controller_spec.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/requests/authentications_spec.rb'
+    - 'spec/views/home/index_spec.rb'
+    - 'spec/views/photos/edit.html.haml_spec.rb'
+    - 'spec/views/posts/_single.html.haml_spec.rb'
+
+# Offense count: 136
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 25
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ExcessiveDocstringSpacing:
+  Exclude:
+    - 'spec/controllers/crops_controller_spec.rb'
+    - 'spec/features/crops/crop_photos_spec.rb'
+
+# Offense count: 30
+RSpec/ExpectInHook:
+  Exclude:
+    - 'spec/controllers/garden_types_controller_spec.rb'
+    - 'spec/controllers/gardens_controller_spec.rb'
+    - 'spec/features/admin/forums_spec.rb'
+    - 'spec/features/crops/crop_photos_spec.rb'
+    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/shared_examples/append_date.rb'
+
+# Offense count: 1135
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/FactoryBot/SyntaxMethods:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/controllers/member_controller_spec.rb'
+    - 'spec/features/seeds/seed_photos.rb'
+    - 'spec/models/garden_type.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, each, example
+RSpec/HookArgument:
+  Exclude:
+    - 'spec/requests/api/v1/plantings_request_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/HooksBeforeExamples:
+  Exclude:
+    - 'spec/features/crops/creating_a_crop_spec.rb'
+
+# Offense count: 710
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Enabled: false
+
+# Offense count: 40
+RSpec/LetSetup:
+  Enabled: false
+
+# Offense count: 2
+RSpec/MessageChain:
+  Exclude:
+    - 'spec/models/member_spec.rb'
+
+# Offense count: 23
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 1
+RSpec/MultipleDescribes:
+  Exclude:
+    - 'spec/features/crops/crop_wranglers_spec.rb'
+
+# Offense count: 149
+RSpec/MultipleExpectations:
+  Max: 19
+
+# Offense count: 137
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 14
+
+# Offense count: 132
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Enabled: false
+
+# Offense count: 111
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 6
+
+# Offense count: 407
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
+  Enabled: false
+
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/Rails/HaveHttpStatus:
+  Exclude:
+    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
+    - 'spec/controllers/harvests_controller_spec.rb'
+    - 'spec/requests/harvests_spec.rb'
+
+# Offense count: 16
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpec/Rails/InferredSpecType:
+  Enabled: false
+
+# Offense count: 2
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/models/like_spec.rb'
+
+# Offense count: 6
+RSpec/RepeatedExample:
+  Exclude:
+    - 'spec/controllers/photos_controller_spec.rb'
+    - 'spec/features/members/following_spec.rb'
+    - 'spec/models/like_spec.rb'
+
+# Offense count: 4
+RSpec/RepeatedExampleGroupBody:
+  Exclude:
+    - 'spec/controllers/crops_controller_spec.rb'
+
+# Offense count: 6
+RSpec/ScatteredSetup:
+  Exclude:
+    - 'spec/features/percy/percy_spec.rb'
+    - 'spec/features/plantings/prediction_spec.rb'
+
+# Offense count: 3
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/controllers/garden_types_controller_spec.rb'
+    - 'spec/controllers/gardens_controller_spec.rb'
+    - 'spec/models/member_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: constant, string
+RSpec/VerifiedDoubleReference:
+  Exclude:
+    - 'spec/models/member_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/controllers/garden_types_controller_spec.rb'
+    - 'spec/controllers/gardens_controller_spec.rb'
+    - 'spec/views/devise/shared/_links_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/ActionControllerFlashBeforeRender:
+  Exclude:
+    - 'app/controllers/authentications_controller.rb'
+
+# Offense count: 26
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Enabled: false
+
+# Offense count: 11
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 Rails/CreateTableWithTimestamps:
@@ -30,12 +393,14 @@ Rails/CreateTableWithTimestamps:
     - 'db/migrate/20161201154922_add_photos_seeds_table.rb'
     - 'db/migrate/20171022032108_all_the_predictions.rb'
 
-# Configuration parameters: EnforcedStyle.
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
-    - 'app/mailers/notifier.rb'
+    - 'app/mailers/notifier_mailer.rb'
 
+# Offense count: 5
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -45,6 +410,7 @@ Rails/FilePath:
     - 'config/environments/development.rb'
     - 'db/seeds.rb'
 
+# Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -52,23 +418,39 @@ Rails/HasAndBelongsToMany:
     - 'app/models/member.rb'
     - 'app/models/role.rb'
 
+# Offense count: 5
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/member.rb'
 
+# Offense count: 1
 # Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/InverseOf:
+# Include: spec/**/*.rb, test/**/*.rb
+Rails/I18nLocaleAssignment:
   Exclude:
-    - 'app/models/concerns/ownable.rb'
+    - 'spec/features/locale_spec.rb'
 
+# Offense count: 33
+Rails/I18nLocaleTexts:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
+Rails/LexicallyScopedActionFilter:
+  Exclude:
+    - 'app/controllers/data_controller.rb'
+
+# Offense count: 2
 Rails/OutputSafety:
   Exclude:
     - 'app/helpers/auto_suggest_helper.rb'
     - 'app/helpers/gardens_helper.rb'
 
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Include.
 # Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
@@ -77,27 +459,53 @@ Rails/RakeEnvironment:
     - 'lib/tasks/i18n.rake'
     - 'lib/tasks/testing.rake'
 
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/RedundantPresenceValidationOnBelongsTo:
+  Exclude:
+    - 'app/models/alternate_name.rb'
+    - 'app/models/like.rb'
+    - 'app/models/planting.rb'
+    - 'app/models/scientific_name.rb'
+
+# Offense count: 9
 # Configuration parameters: Include.
-# Include: db/migrate/*.rb
+# Include: db/**/*.rb
 Rails/ReversibleMigration:
   Exclude:
+    - 'db/migrate/20130326092227_change_planted_at_to_date.rb'
     - 'db/migrate/20191119020643_upgrade_cms.rb'
 
-# Configuration parameters: Blacklist, Whitelist.
-# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
-Rails/SkipsModelValidations:
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/RootPathnameMethods:
   Exclude:
-    - 'db/migrate/20190317023129_finished_boolean.rb'
-    - 'db/seeds.rb'
-    - 'db/migrate/20190910022329_add_photo_source.rb'
+    - 'app/controllers/crops_controller.rb'
+    - 'app/helpers/icons_helper.rb'
 
-# Configuration parameters: AllowedChars.
-Style/AsciiComments:
+# Offense count: 6
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/UniqueValidationWithoutIndex:
   Exclude:
-    - 'config/initializers/comfortable_mexican_sofa.rb'
+    - 'app/models/follow.rb'
+    - 'app/models/garden.rb'
+    - 'app/models/like.rb'
+    - 'app/models/member.rb'
+    - 'app/models/plant_part.rb'
+    - 'app/models/role.rb'
 
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/WhereEquals:
+  Exclude:
+    - 'app/models/crop.rb'
+    - 'app/models/harvest.rb'
+    - 'app/models/planting.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
@@ -105,23 +513,133 @@ Style/ClassAndModuleChildren:
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
 
+# Offense count: 6
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CommentedKeyword:
   Exclude:
+    - 'db/migrate/20191119030244_cms_tags.rb'
     - 'spec/models/crop_spec.rb'
     - 'spec/models/photo_spec.rb'
     - 'spec/models/planting_spec.rb'
 
-Style/MixinUsage:
+# Offense count: 42
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars.
+Style/FetchEnvVar:
+  Enabled: false
+
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'config/initializers/new_framework_defaults_6_0.rb'
+    - 'db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb'
+    - 'db/migrate/20200815012538_remove_median_function.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - 'config/environments/production.rb'
+    - 'lib/tasks/openfarm.rake'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
   Exclude:
     - 'bin/setup'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: nonzero?
+Style/IfWithBooleanLiteralBranches:
+  Exclude:
+    - 'app/controllers/gardens_controller.rb'
+
+# Offense count: 2
+Style/MixinUsage:
+  Exclude:
     - 'bin/update'
     - 'spec/rails_helper.rb'
 
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/NegatedIfElseCondition:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
-    - 'spec/**/*'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
+
+# Offense count: 6
+Style/OpenStructUse:
+  Exclude:
+    - 'spec/helpers/event_helper_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'app/models/concerns/member_newsletter.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: same_as_string_literals, single_quotes, double_quotes
+Style/QuotedSymbols:
+  Exclude:
+    - 'app/models/seed.rb'
+    - 'spec/controllers/crops_controller_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Methods.
+Style/RedundantArgument:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SafeForConstants.
+Style/RedundantFetchBlock:
+  Exclude:
+    - 'config/puma.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/messages_controller.rb'
+    - 'app/models/photo_association.rb'
+
+# Offense count: 20
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'app/controllers/messages_controller.rb'
+    - 'app/helpers/buttons_helper.rb'
+    - 'config/initializers/rswag_api.rb'
+    - 'spec/helpers/gardens_helper_spec.rb'
+    - 'spec/helpers/seeds_helper_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowComments.
+# AllowedMethods: define_method, mail, respond_to
+Style/SymbolProc:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'

.ruby-version

@@ -1 +1 @@
-2.6.5
+3.1.4

.travis.yml

@@ -1,52 +1,18 @@
 sudo: required
 language: ruby
 dist: bionic
-services:
-  - postgresql
-  - xvfb
+branches:
+  only:
+    - mainline
+    - dev
 cache:
   bundler: true
+  yarn: true
   directories:
     - tmp/cache/assets/test/sprockets
-addons:
-  postgresql: "9.4"
-  code_climate:
-    repo_token:
-      secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk="
 env:
-  matrix:
-    - ELASTIC_SEARCH_VERSION="7.5.1-amd64" COVERAGE=true RAILS_ENV=test # Future target (production needs upgrading)
-    - STATIC_CHECKS=true
   global:
     - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
-    - GROWSTUFF_EMAIL="noreply@test.growstuff.org"g
-    - GROWSTUFF_SITE_NAME="Growstuff (travis)"
-    - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-before_install:
-  - sudo apt clean
-  - sudo apt update
-  - sudo apt install dpkg
-  - ./script/install_elasticsearch.sh
-  - sudo apt install google-chrome-stable
-  - ./script/install_linters.sh
-  - ./script/check_elasticsearch.sh
-script:
-  - >
-    if [ "${STATIC_CHECKS}" = "true" ]; then
-      ./script/check_static.rb
-    else
-      bundle exec rails db:create db:migrate;
-      bundle exec rails assets:precompile;
-      bundle exec rails search:reindex;
-      bundle exec rspec spec;
-      # npx percy exec -- bundle exec rspec spec # <- run this to send screen shots to percy
-    fi;
-after_script:
-  - >
-    if [ "${COVERAGE}" = "true" ]; then
-      gem install codeclimate-test-reporter
-      codeclimate-test-reporter
-    fi
 before_deploy:
   - bundle exec script/heroku_maintenance.rb on
 deploy:
@@ -59,7 +25,6 @@ deploy:
     dev: growstuff-staging
     mainline: growstuff-prod
   run:
-    - "rake db:migrate"
     - "script/deploy-tasks.sh"
     - restart
 after_deploy:

CODE_OF_CONDUCT.md

@@ -0,0 +1,129 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+info@growstuff.org. Any issues with a particular moderator can be reported to
+any one of the other moderators.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTORS.md

@@ -91,9 +91,11 @@ submit the change with your pull request.
 - Taylor William / [bestest-mensch](https://github.com/bestest-mensch)
 - André Aubin / [lambda2](https://github.com/lambda2)
 - Martina Simicic / [simicic](https://github.com/simicic)
+- Rowan Crawford / [wombleton](https://github.com/wombleton)
+- Ítalo Pires / [italopires](https://github.com/italopires)
 
 ## Bots
 
 ### Security and Dependency Updates
 - DeppBot / [deppbot](https://github.com/deppbot)
-- dependabot-preview[bot] [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)
+- `dependabot[bot]` [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)

Gemfile

@@ -2,19 +2,20 @@
 
 source 'https://rubygems.org'
 
-ruby '2.6.5'
+# Match ruby version in .ruby-version
+ruby File.read('.ruby-version')
 
-gem 'rails', '5.2.4.3'
+gem 'rails', '~> 7.0.4'
 
 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
 gem "sprockets", "<4"
 
-gem 'bundler', '>=1.1.5'
+gem 'bundler', '>= 2.3.10'
 
 gem 'coffee-rails'
 gem 'haml'
-gem 'sass-rails'
+gem 'sassc-rails'
 
 # API data
 gem 'jsonapi-resources'
@@ -23,7 +24,7 @@ gem 'rswag-api'
 gem 'rswag-ui'
 
 # CSS framework
-gem "bootstrap", ">= 4.3.1"
+gem "bootstrap", ">= 4.6.2"
 gem 'material-sass', '4.1.1'
 
 # Icons used by bootstrap/material-sass
@@ -38,7 +39,7 @@ gem 'oj' # Speeds up json
 
 # planting and harvest predictions
 # based on median values for the crop
-gem 'active_median', '0.1.4' # needs postgresql update https://github.com/Growstuff/growstuff/issues/1757
+gem 'active_median', '0.2.0'
 gem 'active_record_union'
 
 gem 'flickraw'
@@ -48,18 +49,17 @@ gem 'js-routes' # provides access to Rails routes in Javascript
 
 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
 
 # Maps
-gem 'leaflet-rails'
+gem 'leaflet-rails', '>= 1.9.2'
 gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
 
-gem 'pg', '< 1.0.0'                # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
+gem 'pg'
 gem 'ruby-units'                   # for unit conversion
 gem 'unicorn'                      # http server
 
-gem "comfortable_mexican_sofa", "~> 2.0.0"
+gem "comfortable_mexican_sofa", git: "https://github.com/restarone/comfortable-mexican-sofa.git"
 
 gem 'active_utils'
 gem 'sidekiq'
@@ -90,11 +90,10 @@ gem 'geocoder'
 gem 'bootstrap-datepicker-rails'
 
 # DRY-er easier bootstrap 4 forms
-gem "bootstrap_form", ">= 4.2.0"
+gem "bootstrap_form", ">= 4.5.0"
 
 # For connecting to other services (eg Twitter)
 gem 'omniauth', '~> 1.3'
-gem 'omniauth-facebook'
 gem 'omniauth-flickr', '>= 0.0.15'
 gem 'omniauth-twitter'
 
@@ -113,17 +112,17 @@ gem 'rake', '>= 10.0.0'
 gem "responders"
 
 # allows soft delete. Used for members.
-gem 'discard', '~> 1.0'
+gem 'discard', '>= 1.2'
 
 gem 'xmlrpc' # fixes rake error - can be removed if not needed later
 
 gem 'puma'
 
-gem 'loofah', '>= 2.2.1'
+gem 'loofah', '>= 2.19.1'
 gem 'rack-protection', '>= 2.0.1'
 
 # Member to member messaging system
-gem 'mailboxer'
+gem 'mailboxer', '>= 0.15.1'
 
 gem 'faraday'
 gem 'faraday_middleware'
@@ -163,8 +162,9 @@ group :development, :test do
   gem 'rubocop-rspec'
   gem 'webrat'                  # provides HTML matchers for view tests
 
+  gem 'dotenv-rails'
+
   # cli utils
-  gem 'coveralls', require: false # coverage analysis
   gem 'haml-i18n-extractor', require: false
   gem 'haml_lint', '>= 0.25.1', require: false # Checks haml files for goodness
   gem 'i18n-tasks', require: false # adds tests for finding missing and unused translations
@@ -174,7 +174,6 @@ end
 
 group :test do
   gem 'codeclimate-test-reporter', require: false
-  gem 'percy-capybara', '~> 4.0.0'
   gem 'rails-controller-testing'
   gem 'selenium-webdriver'
   gem 'timecop'
@@ -184,3 +183,5 @@ end
 group :travis do
   gem 'platform-api'
 end
+
+gem "percy-capybara", "~> 5.0.0"

README.md

@@ -1,7 +1,6 @@
 # 🌱 Growstuff
 
-[![Build Status](https://travis-ci.org/Growstuff/growstuff.svg?branch=dev)](https://travis-ci.org/Growstuff/growstuff)
-[![Coverage Status](https://coveralls.io/repos/github/Growstuff/growstuff/badge.svg?branch=dev)](https://coveralls.io/github/Growstuff/growstuff?branch=dev)
+![Build status](https://github.com/Growstuff/growstuff/workflows/CI/badge.svg)
 [![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.
@@ -21,7 +20,7 @@ encourage participation from people of all backgrounds and skill levels.
 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
   working on, known bugs, etc)
 * [![Gitter](https://badges.gitter.im/Growstuff/growstuff.svg)](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-* [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))
+* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)
 
 ## For coders
 
@@ -30,7 +29,6 @@ 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

app/assets/javascripts/cropmap.js.erb

@@ -1,10 +1,6 @@
 function showCropMap(cropmap) {
-  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_map_id %>";
-  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_access_token %>";
-  var mapbox_base_url = "https://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="https://openstreetmap.org">OpenStreetMap</a> contributors under <a href="https://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="https://mapbox.com">Mapbox</a>',
+  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
     maxZoom: 18
   }).addTo(cropmap);
   var markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 20 });

app/assets/javascripts/members.js.erb

@@ -1,10 +1,4 @@
 if (document.getElementById("membermap") !== null) {
-  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_map_id %>";
-  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_access_token %>";
-  var mapbox_base_url = "https://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
-
-  L.Icon.Default.imagePath = '/assets'
-
   L.Icon.Default.imagePath = '/assets';
 
   var default_marker_icon = L.icon({
@@ -18,8 +12,8 @@ if (document.getElementById("membermap") !== null) {
     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="https://openstreetmap.org">OpenStreetMap</a> contributors under <a href="https://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="https://mapbox.com">Mapbox</a>',
+      L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
         maxZoom: 18
       }).addTo(membermap);
       var marker = new L.Marker(new L.LatLng(member.latitude, member.longitude),

app/assets/javascripts/places.js.erb

@@ -1,8 +1,5 @@
 if (document.getElementById("placesmap") !== null) {
   var places_base_path = "/places";
-  var mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_map_id %>";
-  var mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Rails.application.config.mapbox_access_token %>";
-  var mapbox_base_url = "https://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token;
   var nominatim_base_url = 'https://nominatim.openstreetmap.org/search/';
   var nominatim_user_agent_email = "<%= Rails.env == 'test' ? 0 : Rails.application.config.user_agent_email %>";
 
@@ -31,8 +28,8 @@ if (document.getElementById("placesmap") !== null) {
 }
 
 function showMap(placesmap) {
-  L.tileLayer(mapbox_base_url, {
-    attribution: 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors under <a href="https://www.openstreetmap.org/copyright">ODbL</a> | Map imagery &copy; <a href="https://mapbox.com">Mapbox</a>',
+  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
     maxZoom: 18
   }).addTo(placesmap);
 
@@ -61,6 +58,7 @@ function showMap(placesmap) {
   });
 
   function fetchCropsForMap(url) {
+    var n = 0;
     $.getJSON(url, function(crop_data) {
       $.each(crop_data['data'], function(i, p) {
         if (p.attributes.latitude && p.attributes.longitude) {
@@ -81,7 +79,8 @@ function showMap(placesmap) {
           markers.addLayer(marker);
         }
       });
-      if (crop_data['links']['next']) {
+      // We fetch pages of 10 at a time. Stop after 200 crops; so we are showing only 'active' plantings.
+      if (crop_data['links']['next'] && n++ < 20) {
         fetchCropsForMap(crop_data['links']['next'])
       }
       return crop_data;

app/assets/stylesheets/_crops.scss

@@ -7,7 +7,7 @@
     bottom: 0;
     color: $white;
     margin: 0;
-    opacity: .8;
+    opacity: 0.8;
     position: absolute;
     text-align: center;
     width: 100%;
@@ -22,7 +22,7 @@
     h5.crop-sci-name {
       background-color: $beige;
       color: $black;
-      font-size: .7em;
+      font-size: 0.7em;
       margin-top: 0;
       padding-top: 0;
     }
@@ -45,7 +45,7 @@
 .planting {
   .crop-card {
     height: 100%;
-    margin: .1em;
+    margin: 0.1em;
     min-height: 300px;
   }
 
@@ -85,7 +85,7 @@
 @include media-breakpoint-down(xs) {
   .index-cards {
     .crop-thumbnail {
-      margin: .2em;
+      margin: 0.2em;
       width: 30%;
     }
   }

app/assets/stylesheets/_harvests.scss

@@ -2,7 +2,7 @@
   .text {
     color: $white;
     margin: 0;
-    opacity: .8;
+    opacity: 0.8;
     position: absolute;
     text-align: center;
     top: 30%;
@@ -12,7 +12,7 @@
     h3,
     h4,
     h5 {
-      margin: 0
+      margin: 0;
     }
 
     h3 {

app/assets/stylesheets/_members.scss

@@ -2,7 +2,7 @@
   border-radius: 12px;
   height: 200px;
   margin: 1em;
-  padding: .25em;
+  padding: 0.25em;
 
   div {
     display: inline-block;
@@ -11,12 +11,11 @@
   }
 }
 
-.member-thumbnail div~div {
+.member-thumbnail div ~ div {
   padding-left: 1em;
   width: 15em;
 }
 
-
 .member-chip {
   background-color: lighten($green, 30%);
 
@@ -35,7 +34,7 @@
 }
 
 .location-not-set {
-  background-image: image-url('location-not-set.en.png');
+  background-image: image-url("location-not-set.en.png");
   background-position: center;
   background-repeat: no-repeat;
   height: 250px;

app/assets/stylesheets/_variables.scss

@@ -15,30 +15,36 @@ $body-bg: $beige;
 $text-color: $brown;
 $link-color: $green;
 
-$default-font: 'Raleway',
-"Fira Sans",
-Helvetica,
-Arial,
-sans-serif;
+$default-font: "Raleway", "Fira Sans", Helvetica, Arial, sans-serif;
 
-$primary: (color: $green,
+$primary: (
+  color: $green,
   dark: darken($green, 20%),
-  light: lighten($green, 20%));
-$secondary: (color: $blue,
+  light: lighten($green, 20%),
+);
+$secondary: (
+  color: $blue,
   dark: darken($blue, 20%),
-  light: lighten($blue, 20%));
-$success: (color: $green,
+  light: lighten($blue, 20%),
+);
+$success: (
+  color: $green,
   dark: darken($green, 20%),
-  light: lighten($green, 20%));
-$danger: (color: $red,
+  light: lighten($green, 20%),
+);
+$danger: (
+  color: $red,
   dark: darken($red, 20%),
-  light: lighten($red, 20%));
-$dark: (color: $brown,
+  light: lighten($red, 20%),
+);
+$dark: (
+  color: $brown,
   dark: darken($brown, 20%),
-  light: lighten($brown, 20%));
+  light: lighten($brown, 20%),
+);
 
-
-$grid-breakpoints: ( // Extra small screen / phone
+$grid-breakpoints: (
+  // Extra small screen / phone
   xs: 0,
   // Small screen / phone
   sm: 576px,
@@ -47,7 +53,8 @@ $grid-breakpoints: ( // Extra small screen / phone
   // Large screen / desktop
   lg: 1200px,
   // Extra large screen / wide desktop
-  xl: 1800px);
+  xl: 1800px
+);
 
 // Nav bar
 $navbar-default-bg: $brown;

app/assets/stylesheets/application.scss

@@ -1,33 +1,32 @@
 // Import original variables so they can be used in overrides
 
-@import 'variables';
-@import 'material';
-
-@import 'jquery-ui/autocomplete';
-@import 'bootstrap-datepicker';
-@import 'leaflet';
-@import 'leaflet.markercluster';
+@import "variables";
+@import "material";
 
+@import "jquery-ui/autocomplete";
+@import "bootstrap-datepicker";
+@import "leaflet";
+@import "leaflet.markercluster";
 
 // Font Awesome
-@import 'font-awesome-sprockets';
-@import 'font-awesome';
-@import 'material_icons';
-@import 'rails_bootstrap_forms';
+@import "font-awesome-sprockets";
+@import "font-awesome";
+@import "material_icons";
+@import "rails_bootstrap_forms";
 
-@import 'overrides';
-@import 'mobile';
+@import "overrides";
+@import "mobile";
 
-@import 'crops';
-@import 'harvests';
-@import 'likes';
-@import 'members';
-@import 'notifications';
-@import 'plantings';
-@import 'photos';
-@import 'posts';
-@import 'seeds';
+@import "crops";
+@import "harvests";
+@import "likes";
+@import "members";
+@import "notifications";
+@import "plantings";
+@import "photos";
+@import "posts";
+@import "seeds";
 
-@import 'predictions';
-@import 'homepage';
-@import 'maps';
+@import "predictions";
+@import "homepage";
+@import "maps";

app/assets/stylesheets/mobile.scss

@@ -1,7 +1,6 @@
 // Overrides applying only to mobile view. This must be at the end of the overrides file.
 // Extra small devices (portrait phones, less than 576px)
 @include media-breakpoint-down(md) {
-
   .container {
     margin: 2px;
     padding: 0;
@@ -11,7 +10,7 @@
     width: 100%;
   }
 
-  .navbar .nav>li {
+  .navbar .nav > li {
     display: block;
   }
 
@@ -33,11 +32,10 @@
     }
 
     .site-name:after {
-      content: '';
+      content: "";
       display: inline-block;
       width: 100%;
     }
-
   }
 
   h1 {
@@ -66,14 +64,13 @@
     height: 300px;
   }
 
-
   section .btn {
     width: 100%;
   }
 
   .index-cards {
     .card {
-      margin: .2em;
+      margin: 0.2em;
       width: 48%;
 
       // Shrink title to fit more on page
@@ -87,7 +84,6 @@
         object-fit: cover;
         width: 100%;
       }
-
     }
   }
 }

app/assets/stylesheets/overrides.scss

@@ -10,9 +10,9 @@ body {
 
 .navbar-brand {
   .site-name {
-    font-family: 'Modak', cursive;
+    font-family: "Modak", cursive;
     font-size: 3em;
-    margin: .3em;
+    margin: 0.3em;
   }
 
   img {
@@ -46,7 +46,6 @@ body {
   font-size: 5em;
 }
 
-
 .ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -82,9 +81,8 @@ h3 {
   font-size: 120%;
 }
 
-
 section {
-  margin: .5em 0 0;
+  margin: 0.5em 0 0;
   padding: 0 0 1em;
 
   h2 {
@@ -92,7 +90,7 @@ section {
     box-shadow: 1px 1px 1px 1px darken($beige, 20%);
     color: $white;
     font-weight: normal;
-    padding: .2em;
+    padding: 0.2em;
 
     a {
       color: $white;
@@ -100,7 +98,16 @@ section {
   }
 
   .card {
+    background: $white;
     box-shadow: 1px 3px 3px 1px darken($beige, 20%);
+    cursor: pointer;
+    transition: 0.3s transform cubic-bezier(0.155, 1.105, 0.295, 1.12), 0.3s box-shadow,
+      0.3s -webkit-transform cubic-bezier(0.155, 1.105, 0.295, 1.12);
+  }
+
+  .card:hover {
+    box-shadow: 0 10px 20px darken($beige, 30%), 0 4px 8px darken($beige, 40%);
+    transform: scale(1.1);
   }
 }
 
@@ -117,7 +124,7 @@ section {
   .card {
     background: $white;
     border-radius: 5%;
-    margin: .5em .5em .5em 0;
+    margin: 0.5em 0.5em 0.5em 0;
     width: 200px;
 
     .img-card {
@@ -232,7 +239,6 @@ ul.associations {
 
 // footer
 footer {
-
   #footer1,
   #footer2,
   #footer3 {
@@ -370,7 +376,7 @@ ul.thumbnail-buttons {
   }
 
   .info {
-    padding: .5em;
+    padding: 0.5em;
     text-align: center;
   }
 }
@@ -386,7 +392,7 @@ ul.thumbnail-buttons {
   display: inline-block;
   height: 30px;
   line-height: 30px;
-  margin: .2em;
+  margin: 0.2em;
   padding: 0 25px;
 
   a {
@@ -411,14 +417,14 @@ ul.thumbnail-buttons {
 .progress-fade::before {
   background: $beige;
   bottom: 0;
-  content: '';
+  content: "";
   display: block;
   left: 0;
-  opacity: .7;
+  opacity: 0.7;
   position: absolute;
   right: 0;
   top: 0;
-  transition: background .3s linear;
+  transition: background 0.3s linear;
 }
 
 .progress-fade:hover::before {

app/controllers/admin/members_controller.rb

@@ -13,12 +13,6 @@ module Admin
       @members = @members.order(:login_name).paginate(page: params[:page])
     end
 
-    def destroy
-      @member = Member.find_by!(slug: params[:slug])
-      @member.discard
-      redirect_to admin_members_path
-    end
-
     def edit
       @member = Member.find_by!(slug: params[:slug])
     end
@@ -30,6 +24,12 @@ module Admin
       respond_with @member, location: admin_members_path
     end
 
+    def destroy
+      @member = Member.find_by!(slug: params[:slug])
+      @member.discard
+      redirect_to admin_members_path
+    end
+
     private
 
     def search_term

app/controllers/authentications_controller.rb

@@ -14,14 +14,14 @@ class AuthenticationsController < ApplicationController
 
       @authentication = current_member.authentications
         .create_with(
-          name:   name,
+          name:,
           token:  auth['credentials']['token'],
           secret: auth['credentials']['secret']
         )
         .find_or_create_by(
           provider: auth['provider'],
           uid:      auth['uid'],
-          name:     name
+          name:
         )
 
       flash[:notice] = "Authentication successful."

app/controllers/conversations_controller.rb

@@ -7,9 +7,10 @@ class ConversationsController < ApplicationController
   before_action :check_current_subject_in_conversation, only: %i(show update destroy)
 
   def index
-    @conversations = if @box.eql? "inbox"
+    @conversations = case @box
+                     when "inbox"
                        mailbox.inbox
-                     elsif @box.eql? "sent"
+                     when "sent"
                        mailbox.sentbox
                      else
                        mailbox.trash
@@ -59,7 +60,7 @@ class ConversationsController < ApplicationController
       'sent'  => { 'total' => mailbox.sentbox.size, 'unread' => 0 },
       'trash' => { 'total' => mailbox.trash.size, 'unread' => 0 }
     }
-    @box = if params[:box].blank? || !@boxes.keys.include?(params[:box])
+    @box = if params[:box].blank? || @boxes.keys.exclude?(params[:box])
              'inbox'
            else
              params[:box]
@@ -70,7 +71,7 @@ class ConversationsController < ApplicationController
     @conversation = Mailboxer::Conversation.find_by(id: params[:id])
     return unless @conversation.nil? || !@conversation.is_participant?(current_member)
 
-    redirect_to conversations_path(box: box)
+    redirect_to conversations_path(box:)
     nil
   end
 end

app/controllers/crops_controller.rb

@@ -57,14 +57,11 @@ class CropsController < ApplicationController
     @crops = CropSearchService.search(@term,
                                       page:           params[:page],
                                       per_page:       Crop.per_page,
-                                      current_member: current_member)
+                                      current_member:)
     respond_with @crops
   end
 
   def show
-    @crop = Crop.includes(
-      :scientific_names, :alternate_names, :parent, :varieties
-    ).find_by!(slug: params[:slug])
     respond_to do |format|
       format.html do
         @posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
@@ -89,7 +86,6 @@ class CropsController < ApplicationController
   end
 
   def edit
-    @crop = Crop.find_by!(slug: params[:slug])
     @crop.alternate_names.build if @crop.alternate_names.blank?
     @crop.scientific_names.build if @crop.scientific_names.blank?
   end
@@ -110,14 +106,13 @@ class CropsController < ApplicationController
   end
 
   def update
-    @crop = Crop.find_by!(slug: params[:slug])
-
     if can?(:wrangle, @crop)
       @crop.approval_status = 'rejected' if params.fetch("reject", false)
       @crop.approval_status = 'approved' if params.fetch("approve", false)
     end
 
     @crop.creator = current_member if @crop.approval_status == "pending"
+
     if @crop.update(crop_params)
       recreate_names('alt_name', 'alternate')
       recreate_names('sci_name', 'scientific')
@@ -145,26 +140,22 @@ class CropsController < ApplicationController
   def notifier
     case @crop.approval_status
     when "approved"
-      Notifier.crop_request_approved(@crop.requester, @crop)
+      NotifierMailer.crop_request_approved(@crop.requester, @crop)
     when "rejected"
-      Notifier.crop_request_rejected(@crop.requester, @crop)
+      NotifierMailer.crop_request_rejected(@crop.requester, @crop)
     end
   end
 
   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
+    AlternateName.create!(names_params(:alt_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id } })
+    ScientificName.create!(names_params(:sci_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id } })
   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!
+      NotifierMailer.new_crop_request(w, @crop).deliver_now!
     end
   end
 
@@ -187,21 +178,20 @@ class CropsController < ApplicationController
 
   def crop_params
     params.require(:crop).permit(
-      :en_wikipedia_url,
-      :name,
-      :parent_id,
-      :perennial,
-      :request_notes,
-      :reason_for_rejection,
+      :name, :en_wikipedia_url,
+      :parent_id, :perennial,
+      :request_notes, :reason_for_rejection,
       :rejection_notes,
-      scientific_names_attributes: %i(scientific_name
-                                      _destroy
-                                      id)
+      scientific_names_attributes: %i(scientific_name _destroy id)
     )
   end
 
+  def names_params(name_type)
+    params.require(name_type).values&.reject { |n| n.empty? }
+  end
+
   def filename
-    "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
+    "Growstuff-Crops-#{Time.zone.now.to_fs(:number)}.csv"
   end
 
   def crop_json_fields
@@ -212,8 +202,7 @@ class CropsController < ApplicationController
             owner: { only: %i(id login_name location latitude longitude) }
           }
         },
-        scientific_names: { only: [:name] },
-        alternate_names:  { only: [:name] }
+        scientific_names: { only: [:name] }, alternate_names:  { only: [:name] }
       }
     }
   end

app/controllers/follows_controller.rb

@@ -5,6 +5,10 @@ class FollowsController < ApplicationController
   load_and_authorize_resource
   skip_load_resource only: :create
 
+  def index
+    @follows = @member.followed.paginate(page: params[:page])
+  end
+
   def create
     @follow = current_member.follows.build(followed: Member.find(params[:followed]))
 
@@ -25,10 +29,6 @@ class FollowsController < ApplicationController
     redirect_to @unfollowed
   end
 
-  def index
-    @follows = @member.followed.paginate(page: params[:page])
-  end
-
   def followers
     @followers = @member.followers.paginate(page: params[:page])
   end

app/controllers/harvests_controller.rb

@@ -20,7 +20,7 @@ class HarvestsController < DataController
       where['planting_id'] = @planting.id
     end
 
-    @harvests = Harvest.search('*', where:    where,
+    @harvests = Harvest.search('*', where:,
                                     limit:    100,
                                     page:     params[:page],
                                     load:     false,
@@ -92,7 +92,7 @@ class HarvestsController < DataController
                 elsif @crop
                   "#{@crop.to_param}-"
                 end
-    "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(:number)}.csv"
+    "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_fs(:number)}.csv"
   end
 
   def update_crop_medians

app/controllers/likes_controller.rb

@@ -39,7 +39,7 @@ class LikesController < ApplicationController
     {
       id:              like.likeable.id,
       like_count:      like.likeable.likes.count,
-      liked_by_member: liked_by_member,
+      liked_by_member:,
       description:     ActionController::Base.helpers.pluralize(like.likeable.likes.count, "like")
     }
   end
@@ -50,7 +50,7 @@ class LikesController < ApplicationController
       format.json do
         render(json: render_json(
           like,
-          liked_by_member: liked_by_member
+          liked_by_member:
         ), status: status_code)
       end
     end

app/controllers/members_controller.rb

@@ -18,7 +18,6 @@ class MembersController < ApplicationController
     @member        = Member.confirmed.kept.find_by!(slug: params[:slug])
     @twitter_auth  = @member.auth('twitter')
     @flickr_auth   = @member.auth('flickr')
-    @facebook_auth = @member.auth('facebook')
     @posts         = @member.posts
 
     @activity = TimelineService.member_query(@member).limit(30)

app/controllers/omniauth_callbacks_controller.rb

@@ -9,10 +9,6 @@ require './lib/actions/oauth_signup_action'
 # Heavily overlaps with Authentications controller
 #
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def facebook
-    create
-  end
-
   def failure
     flash[:alert] = "Authentication failed."
     redirect_to request.env['omniauth.origin'] || "/"
@@ -32,7 +28,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     @authentication = action.establish_authentication(auth, member)
 
     if action.member_created?
-      raise "Invalid provider" unless %w(facebook twitter flickr).index(auth['provider'].to_s)
+      raise "Invalid provider" unless %w(twitter flickr).index(auth['provider'].to_s)
 
       session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
       sign_in member

app/controllers/photos_controller.rb

@@ -2,36 +2,28 @@
 
 class PhotosController < ApplicationController
   before_action :authenticate_member!, except: %i(index show)
+  before_action :set_crop_and_planting, only: :index
   after_action :expire_homepage, only: %i(create destroy)
   load_and_authorize_resource
   respond_to :html, :json
   responders :flash
 
-  def show
-    @crops = Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: @photo })
-    respond_with(@photo)
-  end
-
   def index
-    where = {}
-    if params[:crop_slug]
-      @crop = Crop.find params[:crop_slug]
-      where = { crops: @crop.id }
-    elsif params[:planting_id]
-      @planting = Planting.find params[:planting_id]
-      where = { planting_id: @planting.id }
-    end
-
     @photos = Photo.search(
       load:     false,
       boost_by: [:created_at],
-      where:    where,
+      where:    index_where_clause,
       page:     params[:page],
       limit:    Photo.per_page
     )
     respond_with(@photos)
   end
 
+  def show
+    @crops = Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: @photo })
+    respond_with(@photo)
+  end
+
   def new
     @photo = Photo.new
     @item = item_to_link_to
@@ -100,8 +92,15 @@ class PhotosController < ApplicationController
 
   def retrieve_from_flickr
     @flickr_auth = current_member.auth('flickr')
+    return if @flickr_auth.nil?
+
+    unless current_member.flickr_auth_valid?
+      current_member.remove_stale_flickr_auth
+      @please_reconnect_flickr = true
+      return
+    end
+
     @current_set = params[:set]
-    return unless @flickr_auth
 
     page = params[:page] || 1
 
@@ -112,4 +111,19 @@ class PhotosController < ApplicationController
       pager.replace photos
     end
   end
+
+  def index_where_clause
+    if params[:crop_slug]
+      { crops: @crop.id }
+    elsif params[:planting_id]
+      { planting_id: @planting.id }
+    else
+      {}
+    end
+  end
+
+  def set_crop_and_planting
+    @crop = Crop.find params[:crop_slug] if params[:crop_slug]
+    @planting = Planting.find params[:planting_id] if params[:planting_id]
+  end
 end

app/controllers/plantings_controller.rb

@@ -12,23 +12,23 @@ class PlantingsController < DataController
 
     if params[:member_slug]
       @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+      where['owner_id'] = @owner.id unless @owner.nil?
     end
 
     if params[:crop_slug]
       @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id
+      where['crop_id'] = @crop.id unless @crop.nil?
     end
 
     @plantings = Planting.search(
-      where:    where,
+      where:,
       page:     params[:page],
       limit:    30,
       boost_by: [:created_at],
       load:     false
     )
 
-    @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
+    @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_fs(:number)}.csv"
 
     respond_with(@plantings)
   end

app/controllers/registrations_controller.rb

@@ -6,7 +6,6 @@ class RegistrationsController < Devise::RegistrationsController
   def edit
     @twitter_auth  = current_member.auth('twitter')
     @flickr_auth   = current_member.auth('flickr')
-    @facebook_auth = current_member.auth('facebook')
     render "edit"
   end
 

app/controllers/seeds_controller.rb

@@ -24,7 +24,7 @@ class SeedsController < DataController
 
     @filename = csv_filename
     @seeds = Seed.search(
-      where:    where,
+      where:,
       page:     params[:page],
       limit:    30,
       boost_by: [:created_at],
@@ -89,9 +89,9 @@ class SeedsController < DataController
 
   def csv_filename
     if @owner
-      "Growstuff-#{@owner.to_param}-Seeds-#{Time.zone.now.to_s(:number)}.csv"
+      "Growstuff-#{@owner.to_param}-Seeds-#{Time.zone.now.to_fs(:number)}.csv"
     else
-      "Growstuff-Seeds-#{Time.zone.now.to_s(:number)}.csv"
+      "Growstuff-Seeds-#{Time.zone.now.to_fs(:number)}.csv"
     end
   end
 end

app/helpers/application_helper.rb

@@ -24,14 +24,14 @@ module ApplicationHelper
   # Produces a cache key for uniquely identifying cached fragments.
   def cache_key_for(klass, identifier = "all")
     count          = klass.count
-    max_updated_at = klass.maximum(:updated_at).try(:utc).try(:to_s, :number)
+    max_updated_at = klass.maximum(:updated_at).try(:utc).try(:to_fs, :number)
     "#{klass.name.downcase.pluralize}/#{identifier}-#{count}-#{max_updated_at}"
   end
 
   def required_field_help_text
-    asterisk = content_tag :span, '*', class: ['red']
-    text = content_tag :em, 'denotes a required field'
-    content_tag :div, asterisk + ' '.html_safe + text, class: ['margin-bottom']
+    asterisk = tag.span('*', class: ['red'])
+    text = tag.em('denotes a required field')
+    tag.div(asterisk + ' '.html_safe + text, class: ['margin-bottom'])
   end
 
   #
@@ -55,7 +55,7 @@ module ApplicationHelper
       return uri.to_s
     end
 
-    Gravatar.new(member.email).image_url(size:    size,
+    Gravatar.new(member.email).image_url(size:,
                                          default: :identicon,
                                          ssl:     true)
   end
@@ -69,14 +69,13 @@ module ApplicationHelper
   def show_inactive_tickbox_path(type, owner: nil, crop: nil, show_all: false)
     all = show_all ? '' : 1
 
-    path = if owner.present?
-             public_send("member_#{type}_path", owner, all: all)
-           elsif crop.present?
-             public_send("crop_#{type}_path", crop, all: all)
-           else
-             public_send("#{type}_path", all: all)
-           end
-    path
+    if owner.present?
+      public_send("member_#{type}_path", owner, all:)
+    elsif crop.present?
+      public_send("crop_#{type}_path", crop, all:)
+    else
+      public_send("#{type}_path", all:)
+    end
   end
 
   def title(type, owner, crop, planting)

app/helpers/buttons_helper.rb

@@ -44,19 +44,19 @@ module ButtonsHelper
   end
 
   def seed_edit_button(seed, classes: "btn btn-raised btn-info")
-    edit_button(edit_seed_path(seed), classes: classes)
+    edit_button(edit_seed_path(seed), classes:)
   end
 
   def harvest_edit_button(harvest, classes: "btn btn-raised btn-info")
-    edit_button(edit_harvest_path(harvest), classes: classes)
+    edit_button(edit_harvest_path(harvest), classes:)
   end
 
   def garden_edit_button(garden, classes: "btn btn-raised btn-info")
-    edit_button(edit_garden_path(garden), classes: classes)
+    edit_button(edit_garden_path(garden), classes:)
   end
 
   def planting_edit_button(planting, classes: "btn btn-raised btn-info")
-    edit_button(edit_planting_path(planting), classes: classes)
+    edit_button(edit_planting_path(planting), classes:)
   end
 
   def planting_finish_button(planting, classes: 'btn btn-default btn-secondary')

app/helpers/crops_helper.rb

@@ -2,7 +2,7 @@
 
 module CropsHelper
   def display_seed_availability(member, crop)
-    seeds = member.seeds.where(crop: crop)
+    seeds = member.seeds.where(crop:)
     total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
 
     return "You don't have any seeds of this crop." if seeds.none?

app/helpers/editable_form_helper.rb

@@ -2,7 +2,7 @@
 
 module EditableFormHelper
   def editable(field_type, model, field, display_field:, collection: [])
-    render 'shared/editable/form', field_type: field_type,
-                                   model: model, field: field, display_field: display_field, collection: collection
+    render 'shared/editable/form', field_type:,
+                                   model:, field:, display_field:, collection:
   end
 end

app/helpers/posts_helper.rb

@@ -2,11 +2,11 @@
 
 module PostsHelper
   def display_post_truncated(post, length: 300)
-    truncate(strip_tags(post.body), length: length,
+    truncate(strip_tags(post.body), length:,
                                     separator: ' ', omission: '... ') { link_to "Read more", post_path(post) }
   end
 
   def post_stripped_tags(post, length: 300)
-    truncate(strip_tags(post.body), length: length)
+    truncate(strip_tags(post.body), length:)
   end
 end

app/mailers/notifier_mailer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Notifier < ApplicationMailer
+class NotifierMailer < ApplicationMailer
   # include NotificationsHelper
   default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
 

app/models/ability.rb

@@ -70,7 +70,7 @@ class Ability
     can :create, Notification do |n|
       n.recipient_id != member.id
     end
-    # note we don't support update for notifications
+    # NOTE: we don't support update for notifications
 
     # only crop wranglers can create/edit/destroy crops
     if member.role? :crop_wrangler

app/models/comment.rb

@@ -4,7 +4,7 @@ class Comment < ApplicationRecord
   belongs_to :author, class_name: 'Member', inverse_of: :comments
   belongs_to :post, counter_cache: true
 
-  scope :post_order, -> { reorder("created_at ASC") } # for display on post page
+  scope :post_order, -> { order(created_at: :asc) } # for display on post page
 
   after_create do
     recipient = post.author.id
@@ -15,7 +15,7 @@ class Comment < ApplicationRecord
         recipient_id: recipient,
         sender_id:    sender,
         subject:      "#{author} commented on #{post.subject}",
-        body:         body,
+        body:,
         post_id:      post.id
       )
     end

app/models/concerns/member_flickr.rb

@@ -19,6 +19,24 @@ module MemberFlickr
       @flickr
     end
 
+    def flickr_auth_valid?
+      # no flickr token saved for this member
+      return false if flickr.nil?
+
+      # test the token/secret we have
+      flickr.test.login # This throws exception if fails
+
+      # success!
+      true
+    rescue FlickRaw::FailedResponse, FlickRaw::OAuthClient::FailedResponse
+      # token for this user doesn't work
+      false
+    end
+
+    def remove_stale_flickr_auth
+      authentications.find_by(provider: "flickr")&.delete
+    end
+
     # Fetches a collection of photos from Flickr
     # Returns a [[page of photos], total] pair.
     # Total is needed for pagination.

app/models/concerns/member_newsletter.rb

@@ -32,8 +32,8 @@ module MemberNewsletter
 
       gibbon.lists.subscribe(
         id:           Rails.application.config.newsletter_list_id,
-        email:        { email: email },
-        merge_vars:   { login_name: login_name },
+        email:        { email: },
+        merge_vars:   { login_name: },
         double_optin: false # they already confirmed their email with us
       )
     end
@@ -42,7 +42,7 @@ module MemberNewsletter
       return true if Rails.env.test? && !testing
 
       gibbon.lists.unsubscribe(id:    Rails.application.config.newsletter_list_id,
-                               email: { email: email })
+                               email: { email: })
     end
   end
 end

app/models/concerns/ownable.rb

@@ -4,8 +4,7 @@ module Ownable
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :owner, class_name: 'Member',
-                       foreign_key: 'owner_id', counter_cache: true
+    belongs_to :owner, class_name: 'Member', counter_cache: true
 
     default_scope { joins(:owner).merge(Member.kept) } # Ensures the owner still exists
   end

app/models/concerns/predict_harvest.rb

@@ -33,7 +33,7 @@ module PredictHarvest
         days_to_first_harvest = (first_harvest_date - planted_at).to_i
         days_to_last_harvest = (last_harvest_date - planted_at).to_i if finished?
       end
-      update(days_to_first_harvest: days_to_first_harvest, days_to_last_harvest: days_to_last_harvest)
+      update(days_to_first_harvest:, days_to_last_harvest:)
     end
 
     # status

app/models/concerns/search_crops.rb

@@ -29,19 +29,19 @@ module SearchCrops
 
     def search_data
       {
-        name:             name,
-        description:      description,
-        slug:             slug,
+        name:,
+        description:,
+        slug:,
         alternate_names:  alternate_names.pluck(:name),
         scientific_names: scientific_names.pluck(:name),
         photos_count:     photo_associations_count,
         # boost the crops that are planted the most
-        plantings_count:  plantings_count,
-        harvests_count:   harvests_count,
+        plantings_count:,
+        harvests_count:,
         # boost this crop for these members
         planters_ids:     plantings.pluck(:owner_id),
         has_photos:       photos.size.positive?,
-        thumbnail_url:    thumbnail_url,
+        thumbnail_url:,
         scientific_name:  default_scientific_name&.name,
         created_at:       created_at.to_i
       }

app/models/concerns/search_harvests.rb

@@ -17,22 +17,22 @@ module SearchHarvests
 
     def search_data
       {
-        slug:             slug,
-        quantity:         quantity,
+        slug:,
+        quantity:,
 
         # crop
-        crop_id:          crop_id,
-        crop_name:        crop_name,
+        crop_id:,
+        crop_name:,
         crop_slug:        crop.slug,
 
         # owner
-        owner_id:         owner_id,
-        owner_login_name: owner_login_name,
-        owner_slug:       owner_slug,
+        owner_id:,
+        owner_login_name:,
+        owner_slug:,
         plant_part_name:  plant_part&.name,
 
         # planting
-        planting_id:      planting_id,
+        planting_id:,
         planting_slug:    planting&.slug,
 
         # photo
@@ -43,7 +43,7 @@ module SearchHarvests
         photos_count:     photos.count,
 
         # timestamps
-        harvested_at:     harvested_at,
+        harvested_at:,
         created_at:       created_at.to_i
       }
     end
@@ -58,7 +58,7 @@ module SearchHarvests
         }
         one_record = search('*',
                             limit:    1,
-                            where:    where,
+                            where:,
                             boost_by: [:created_at],
                             load:     false).first
         return records if one_record.nil?

app/models/concerns/search_photos.rb

@@ -15,20 +15,20 @@ module SearchPhotos
 
     def search_data
       {
-        id:                     id,
-        title:                  title,
-        thumbnail_url:          thumbnail_url,
-        fullsize_url:           fullsize_url,
+        id:,
+        title:,
+        thumbnail_url:,
+        fullsize_url:,
         # crops
         crops:                  crops.pluck(:id),
         # likes
-        liked_by_members_names: liked_by_members_names,
+        liked_by_members_names:,
         # owner
-        owner_id:               owner_id,
-        owner_login_name:       owner_login_name,
-        owner_slug:             owner_slug,
+        owner_id:,
+        owner_login_name:,
+        owner_slug:,
         # counts
-        likes_count:            likes_count,
+        likes_count:,
 
         created_at:             created_at.to_i
       }

app/models/concerns/search_plantings.rb

@@ -18,39 +18,39 @@ module SearchPlantings
 
     def search_data
       {
-        slug:                       slug,
-        active:                     active,
+        slug:,
+        active:,
         finished:                   finished?,
         has_photos:                 photos.size.positive?,
-        location:                   location,
+        location:,
         percentage_grown:           percentage_grown.to_i,
-        planted_at:                 planted_at,
-        planted_from:               planted_from,
+        planted_at:,
+        planted_from:,
         planted_year:               planted_at&.year,
-        quantity:                   quantity,
-        sunniness:                  sunniness,
-        garden_id:                  garden_id,
+        quantity:,
+        sunniness:,
+        garden_id:,
 
-        first_harvest_predicted_at: first_harvest_predicted_at,
-        finish_predicted_at:        finish_predicted_at,
+        first_harvest_predicted_at:,
+        finish_predicted_at:,
 
         # crops
-        crop_id:                    crop_id,
-        crop_name:                  crop_name,
-        crop_slug:                  crop_slug,
-        crop_perennial:             crop_perennial,
+        crop_id:,
+        crop_name:,
+        crop_slug:,
+        crop_perennial:,
 
         # owner
-        owner_id:                   owner_id,
-        owner_location:             owner_location,
-        owner_login_name:           owner_login_name,
-        owner_slug:                 owner_slug,
+        owner_id:,
+        owner_location:,
+        owner_login_name:,
+        owner_slug:,
 
         # photos
         thumbnail_url:              default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
         # counts
         photos_count:               photos.size,
-        harvests_count:             harvests_count,
+        harvests_count:,
 
         # timestamps
         created_at:                 created_at.to_i
@@ -67,7 +67,7 @@ module SearchPlantings
         }
         one_record = search('*',
                             limit:    1,
-                            where:    where,
+                            where:,
                             boost_by: [:created_at],
                             load:     false).first
         return records if one_record.nil?

app/models/concerns/search_seeds.rb

@@ -18,31 +18,31 @@ module SearchSeeds
 
     def search_data
       {
-        slug:             slug,
+        slug:,
         finished:         finished?,
-        gmo:              gmo,
-        active:           active,
-        heirloom:         heirloom,
+        gmo:,
+        active:,
+        heirloom:,
         location:         owner.location,
-        organic:          organic,
-        quantity:         quantity,
-        plant_before:     plant_before&.to_s(:ymd),
-        tradable_to:      tradable_to,
-        tradable:         tradable,
+        organic:,
+        quantity:,
+        plant_before:     plant_before&.to_fs(:ymd),
+        tradable_to:,
+        tradable:,
 
         # crop
-        crop_id:          crop_id,
+        crop_id:,
         crop_name:        crop.name,
         crop_slug:        crop.slug,
 
         # owner
-        owner_id:         owner_id,
-        owner_location:   owner_location,
-        owner_login_name: owner_login_name,
-        owner_slug:       owner_slug,
+        owner_id:,
+        owner_location:,
+        owner_login_name:,
+        owner_slug:,
 
         # planting
-        parent_planting:  parent_planting,
+        parent_planting:,
 
         # counts
         photos_count:     photos.size,
@@ -56,7 +56,7 @@ module SearchSeeds
     end
 
     def self.homepage_records(limit)
-      search('*', limit:    limit,
+      search('*', limit:,
                   where:    {
                     finished: false,
                     tradable: true

app/models/crop.rb

@@ -50,10 +50,11 @@ class Crop < ApplicationRecord
   ## Wikipedia urls are only necessary when approving a crop
   validates :en_wikipedia_url,
             format: {
-              with:    %r{\Ahttps?:\/\/en\.wikipedia\.org\/wiki\/[[:alnum:]%_\.()-]+\z},
+              with:    %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
               message: 'is not a valid English Wikipedia URL'
             },
             if:     :approved?
+  validates :name, uniqueness: { scope: :approval_status }, if: :pending?
 
   def to_s
     name

app/models/csv_importer.rb

@@ -10,9 +10,9 @@ class CsvImporter
   def import_crop(row)
     name, en_wikipedia_url, parent_name, scientific_names, alternate_names = row
 
-    @crop = Crop.find_or_create_by(name: name)
+    @crop = Crop.find_or_create_by(name:)
     @crop.update(
-      en_wikipedia_url: en_wikipedia_url,
+      en_wikipedia_url:,
       creator_id:       cropbot.id
     )
 
@@ -47,8 +47,8 @@ class CsvImporter
     return if names_to_add.empty?
 
     names_to_add.each do |name|
-      sciname = ScientificName.find_by(name: name, crop: @crop)
-      sciname ||= ScientificName.create!(name: name, crop: @crop, creator: cropbot)
+      sciname = ScientificName.find_by(name:, crop: @crop)
+      sciname ||= ScientificName.create!(name:, crop: @crop, creator: cropbot)
       @crop.scientific_names << sciname
     end
   end
@@ -58,7 +58,7 @@ class CsvImporter
     return if alternate_names.blank?
 
     alternate_names.split(/,\s*/).each do |name|
-      altname = AlternateName.find_by(name: name, crop: @crop)
+      altname = AlternateName.find_by(name:, crop: @crop)
       altname ||= AlternateName.create! name: name, crop: @crop, creator: cropbot
       @crop.alternate_names << altname
     end

app/models/garden.rb

@@ -14,6 +14,8 @@ class Garden < ApplicationRecord
 
   # set up geocoding
   geocoded_by :location
+  before_validation :strip_blanks
+  after_validation :cleanup_area
   after_validation :geocode
   after_validation :empty_unwanted_geocodes
   after_save :mark_inactive_garden_plantings_as_finished
@@ -25,7 +27,6 @@ class Garden < ApplicationRecord
   validates :location, length: { maximum: 255 }
   validates :slug, uniqueness: true
 
-  before_validation :strip_blanks
   validates :name, uniqueness: { scope: :owner_id }
   validates :name,
             format: { without: /\n/, message: "must contain no newlines" },
@@ -51,8 +52,6 @@ class Garden < ApplicationRecord
                                        message: "%<value>s is not a valid area unit" },
                         allow_blank: true
 
-  after_validation :cleanup_area
-
   def cleanup_area
     self.area = nil if area&.zero?
     self.area_unit = nil if area.blank?

app/models/member.rb

@@ -21,7 +21,7 @@ class Member < ApplicationRecord
   has_many :harvests, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
   has_and_belongs_to_many :roles
   has_many :notifications, foreign_key: 'recipient_id', inverse_of: :recipient
-  has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender
+  has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender, class_name: "Notification"
   has_many :authentications, dependent: :destroy
   has_many :photos, inverse_of: :owner
   has_many :likes, dependent: :destroy
@@ -127,7 +127,7 @@ class Member < ApplicationRecord
   end
 
   def auth(provider)
-    authentications.find_by(provider: provider)
+    authentications.find_by(provider:)
   end
 
   def unread_count

app/models/photo.rb

@@ -7,7 +7,7 @@ class Photo < ApplicationRecord
 
   PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze
 
-  has_many :photo_associations, foreign_key: :photo_id, dependent: :delete_all, inverse_of: :photo
+  has_many :photo_associations, dependent: :delete_all, inverse_of: :photo
 
   # This doesn't work, ActiveRecord tries to use the polymoriphinc photographable
   # relationship instead.
@@ -27,7 +27,7 @@ class Photo < ApplicationRecord
              source_type: type
   end
 
-  scope :by_crop, ->(crop) { joins(:photo_associations).where(photo_associations: { crop: crop }) }
+  scope :by_crop, ->(crop) { joins(:photo_associations).where(photo_associations: { crop: }) }
   scope :by_model, lambda { |model_name|
     joins(:photo_associations).where(photo_associations: { photographable_type: model_name.to_s })
   }

app/models/photo_association.rb

@@ -33,8 +33,8 @@ class PhotoAssociation < ApplicationRecord
   end
 
   def crop_present
-    if %w(Planting Seed Harvest).include?(photographable_type)
-      errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
-    end
+    return unless %w(Planting Seed Harvest).include?(photographable_type)
+
+    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
   end
 end

app/models/planting.rb

@@ -25,10 +25,9 @@ class Planting < ApplicationRecord
 
   #
   # Ancestry of food
-  belongs_to :parent_seed, class_name:  'Seed', # parent
-                           foreign_key: 'parent_seed_id',
-                           optional:    true,
-                           inverse_of:  :child_plantings
+  belongs_to :parent_seed, class_name: 'Seed', # parent,
+                           optional:   true,
+                           inverse_of: :child_plantings
   has_many :child_seeds, class_name:  'Seed', # children
                          foreign_key: 'parent_planting_id',
                          inverse_of:  :parent_planting,
@@ -90,7 +89,7 @@ class Planting < ApplicationRecord
 
   # stringify as "beet in Skud's backyard" or similar
   def to_s
-    I18n.t('plantings.string', crop: crop.name, garden: garden.name, owner: owner)
+    I18n.t('plantings.string', crop: crop.name, garden: garden.name, owner:)
   end
 
   def finished?
@@ -110,7 +109,7 @@ class Planting < ApplicationRecord
 
     # latitude, longitude = Geocoder.coordinates(location, params: { limit: 1 })
     Planting.joins(:garden)
-      .where(crop: crop)
+      .where(crop:)
       .located
       .where('gardens.latitude < ? AND gardens.latitude > ?',
              latitude + 10, latitude - 10)

app/models/post.rb

@@ -14,10 +14,10 @@ class Post < ApplicationRecord
   has_many :crop_posts, dependent: :delete_all
   has_many :crops, through: :crop_posts
 
+  after_create :send_notification
   #
   # Triggers
   after_save :update_crop_posts_association
-  after_create  :send_notification
 
   default_scope { joins(:author).merge(Member.kept) } # Ensures the owner still exists
 
@@ -68,7 +68,7 @@ class Post < ApplicationRecord
       crop_name = Regexp.last_match(1)
       crop = Crop.case_insensitive_name(crop_name).first
       # create association
-      crops << crop if crop && !crops.include?(crop)
+      crops << crop if crop && crops.exclude?(crop)
     end
   end
 
@@ -78,22 +78,22 @@ class Post < ApplicationRecord
     body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_REGEX) do |_m|
       # find member case-insensitively and add to list of recipients
       member = Member.case_insensitive_login_name(Regexp.last_match(1)).first
-      recipients << member if member && !recipients.include?(member)
+      recipients << member if member && recipients.exclude?(member)
     end
     body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_AT_REGEX) do |_m|
       # find member case-insensitively and add to list of recipients
-      member = Member.case_insensitive_login_name(Regexp.last_match(1)[1..-1]).first
-      recipients << member if member && !recipients.include?(member)
+      member = Member.case_insensitive_login_name(Regexp.last_match(1)[1..]).first
+      recipients << member if member && recipients.exclude?(member)
     end
     # don't send notifications to yourself
     recipients.map(&:id).each do |recipient_id|
       next unless recipient_id != sender
 
       Notification.create(
-        recipient_id: recipient_id,
+        recipient_id:,
         sender_id:    sender,
         subject:      "#{author} mentioned you in their post #{subject}",
-        body:         body
+        body:
       )
     end
   end

app/models/role.rb

@@ -11,7 +11,7 @@ class Role < ApplicationRecord
     %i(crop_wranglers admins).each do |method|
       define_method method do
         slug = method.to_s.singularize.dasherize
-        Role.where(slug: slug).try(:first).try(:members)
+        Role.where(slug:).try(:first).try(:members)
       end
     end
   end

app/models/seed.rb

@@ -16,7 +16,7 @@ class Seed < ApplicationRecord
   #
   # Relationships
   belongs_to :crop
-  belongs_to :parent_planting, class_name: 'Planting', foreign_key: 'parent_planting_id',
+  belongs_to :parent_planting, class_name: 'Planting',
                                optional: true, inverse_of: :child_seeds # parent
   has_many :child_plantings, class_name: 'Planting',
                              foreign_key: 'parent_seed_id', dependent: :nullify,
@@ -69,6 +69,6 @@ class Seed < ApplicationRecord
   end
 
   def to_s
-    I18n.t('seeds.string', crop: crop.name, owner: owner)
+    I18n.t('seeds.string', crop: crop.name, owner:)
   end
 end

app/resources/api/v1/member_resource.rb

@@ -5,10 +5,10 @@ module Api
     class MemberResource < BaseResource
       immutable
 
-      has_many :gardens
-      has_many :plantings
-      has_many :harvests
-      has_many :seeds
+      has_many :gardens, foreign_key: 'owner_id'
+      has_many :plantings, foreign_key: 'owner_id'
+      has_many :harvests, foreign_key: 'owner_id'
+      has_many :seeds, foreign_key: 'owner_id'
 
       has_many :photos
 

app/resources/api/v1/planting_resource.rb

@@ -33,6 +33,7 @@ module Api
       filter :planted_from
       filter :garden
       filter :owner
+      filter :owner_id
       filter :finished
 
       attribute :percentage_grown

app/services/crop_search_service.rb

@@ -4,8 +4,8 @@ class CropSearchService
   # Crop.search(string)
   def self.search(query, page: 1, per_page: 12, current_member: nil)
     search_params = {
-      page:         page,
-      per_page:     per_page,
+      page:,
+      per_page:,
       fields:       %i(name^5 alternate_names scientific_names),
       match:        :word_start,
       boost_by:     [:plantings_count],
@@ -16,28 +16,28 @@ class CropSearchService
     # prioritise crops the member has planted
     search_params[:boost_where] = { planters_ids: current_member.id } if current_member
 
-    Crop.search(query, search_params)
+    Crop.search(query, **search_params)
   end
 
   def self.random_with_photos(limit)
     body = {
-      "query": {
-        "function_score": {
-          "query":        { "query_string": { "query": 'has_photos:true' } },
-          "random_score": { "seed": DateTime.now.to_i }
+      query: {
+        function_score: {
+          query:        { query_string: { query: 'has_photos:true' } },
+          random_score: { seed: DateTime.now.to_i }
         }
       }
     }
     Crop.search(
-      limit: limit,
+      limit:,
       load:  false,
-      body:  body
+      body:
     )
   end
 
   def self.recent(limit)
     Crop.search(
-      limit:    limit,
+      limit:,
       load:     false,
       boost_by: { created_at: { factor: 100 } } # default factor is 1
     )

app/services/openfarm_service.rb

@@ -10,7 +10,7 @@ class OpenfarmService
 
   def import!
     Crop.all.order(updated_at: :desc).each do |crop|
-      Rails.logger.debug("#{crop.id}, #{crop.name}")
+      Rails.logger.debug { "#{crop.id}, #{crop.name}" }
       update_crop(crop) if crop.valid?
     end
   end
@@ -64,9 +64,9 @@ class OpenfarmService
       if photo.valid?
         Photo.transaction do
           photo.save
-          PhotoAssociation.find_or_create_by! photo: photo, photographable: crop
+          PhotoAssociation.find_or_create_by! photo:, photographable: crop
         end
-        Rails.logger.debug "\t saved photo #{photo.id} #{photo.source_id}"
+        Rails.logger.debug { "\t saved photo #{photo.id} #{photo.source_id}" }
       else
         Rails.logger.warn "Photo not valid"
       end

app/validators/approved_validator.rb

@@ -2,6 +2,6 @@
 
 class ApprovedValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
-    record.errors[attribute] << (options[:message] || 'must be approved') unless record.crop.try(:approved?)
+    record.errors.add(attribute, options[:message] || 'must be approved') unless record.crop.try(:approved?)
   end
 end

app/views/comments/index.rss.haml

@@ -16,6 +16,6 @@
           :escaped_markdown
             #{ strip_tags comment.body }
 
-        %pubdate= comment.created_at.to_s(:rfc822)
+        %pubdate= comment.created_at.to_fs(:rfc822)
         %link= post_url(comment.post)
         %guid= comment_url(comment)

app/views/crops/_form.html.haml

@@ -19,7 +19,7 @@
         %p
           %span.help-block
             For detailed crop wrangling guidelines, please consult the
-            = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+            = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
             on the Growstuff wiki.
 
       -# Everyone (wranglers and requesters) sees the basic info section

app/views/crops/_info.haml

@@ -22,7 +22,7 @@
       - else
         Nobody is growing this yet. You could be the first!
     - if @crop.description.present?
-      %p= @crop.description
+      %p= simple_format @crop.description
   .col-md-3
     = image_tag crop_image_path(@crop),
       class: 'img-responsive shadow rounded crop-hero-photo', alt: 'photo of crop'

app/views/crops/index.csv.shaper

@@ -107,8 +107,8 @@ csv.headers *all_headers
 
     csv.cell :added_by_member_id, c.creator.id
     csv.cell :added_by_member_name, c.creator.to_s
-    csv.cell :date_added, c.created_at.to_s(:db)
-    csv.cell :last_modified, c.updated_at.to_s(:db)
+    csv.cell :date_added, c.created_at.to_fs(:db)
+    csv.cell :last_modified, c.updated_at.to_fs(:db)
 
     csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
 

app/views/crops/index.rss.haml

@@ -6,6 +6,6 @@
     - @crops.each do |crop|
       %item
         %title= crop.name
-        %pubdate= crop.created_at.to_s(:rfc822)
+        %pubdate= crop.created_at.to_fs(:rfc822)
         %link= crop_url(crop)
         %guid= crop_url(crop)

app/views/crops/show.html.haml

@@ -34,18 +34,21 @@
       = cute_icon
       = render 'crops/photos', crop: @crop
 
-    - if @crop.plantings.any?
+    - if @crop.plantings.any? or @crop.harvests.any?
       %section.charts
         .row
-          .col-lg-4.col-12
-            %h2 Sunniness
-            = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
-          .col-lg-4.col-12
-            %h2 Planted from
-            = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
-          .col-lg-4.col-12
-            %h2 Harvested for
-            = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
+          - if @crop.sunniness.any?
+            .col-lg-4.col-12
+              %h2 Sunniness
+              = pie_chart crop_sunniness_path(@crop, format: :json), legend: "bottom"
+          - if @crop.planted_from.any?
+            .col-lg-4.col-12
+              %h2 Planted from
+              = pie_chart crop_planted_from_path(@crop, format: :json), legend: "bottom"
+          - if @crop.harvests.any?
+            .col-lg-4.col-12
+              %h2 Harvested for
+              = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
     - if @crop.varieties.any?
       %section.varieties

app/views/devise/registrations/_edit_apps.html.haml

@@ -28,17 +28,3 @@
                     method: :delete, class: "remove btn btn-danger"
         - else
           = link_to 'Connect to Flickr', '/members/auth/flickr', class: 'btn'
-
-  .row
-    .col-md-12
-      %p
-        = image_tag "facebook_32.png", size: "32x32", alt: 'Facebook logo'
-        - if @facebook_auth
-          You are connected to Facebook as
-          = succeed "." do
-            = link_to @facebook_auth.name, "https://facebook.com/profile/#{@facebook_auth.uid}"
-          = link_to "Disconnect", @facebook_auth,
-                    confirm: "Are you sure you want to remove this connection?",
-                    method: :delete, class: "remove btn btn-danger"
-        - else
-          = link_to 'Connect to Facebook', '/members/auth/facebook', class: 'btn'

app/views/gardens/_form.html.haml

@@ -27,7 +27,7 @@
         - else
           = link_to "Change your location.", edit_member_registration_path
       .row
-        .col-md-5.col-12= f.number_field :area, class: 'input-small'
+        .col-md-5.col-12= f.number_field :area, class: 'input-small', step: "any"
         .col-md-7.col-12= f.select(:area_unit, Garden::AREA_UNITS_VALUES, { include_blank: false })
         .col-12= f.select(:garden_type_id, GardenType.all.order(:name).pluck(:name, :id),
                           selected: @garden.garden_type_id, include_blank: true)

app/views/harvests/_form.html.haml

@@ -31,7 +31,7 @@
                 = link_to "Request new crops.", new_crop_path
 
         .col-md-4
-          = f.text_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_s(:ymd) : '',
+          = f.text_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '',
                          class: 'add-datepicker', label: 'When?'
         .col-12
           = f.form_group :plant_part_id, label: { text: "Harvested Plant Part" } do

app/views/harvests/index.csv.shaper

@@ -34,12 +34,12 @@ csv.headers :id,
 
     csv.cells :quantity, :unit, :weight_quantity, :weight_unit, :si_weight
 
-    csv.cell :date_harvested, h.created_at.to_s(:db)
+    csv.cell :date_harvested, h.created_at.to_fs(:db)
 
     csv.cell :description
 
-    csv.cell :date_added, h.created_at.to_s(:db)
-    csv.cell :last_modified, h.updated_at.to_s(:db)
+    csv.cell :date_added, h.created_at.to_fs(:db)
+    csv.cell :last_modified, h.updated_at.to_fs(:db)
 
     csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
 

app/views/layouts/_head.html.haml

@@ -30,6 +30,6 @@
   = csrf_meta_tags
   = stylesheet_link_tag "application", media: "all"
 
-  %link{ href: "/growstuff-apple-touch-icon-precomposed.png", rel: "apple-touch-icon-precomposed" }
+  %link{ href: path_to_image("growstuff-apple-touch-icon-precomposed.png"), rel: "apple-touch-icon-precomposed" }
   %link{ href: "https://fonts.googleapis.com/css?family=Modak|Raleway&display=swap", rel: "stylesheet" }
   = favicon_link_tag 'favicon.ico'

app/views/members/_contact.html.haml

@@ -1,4 +1,4 @@
-- if twitter_auth || flickr_auth || facebook_auth || member.show_email
+- if twitter_auth || flickr_auth || member.show_email
   %h4 Contact
 
   - if twitter_auth
@@ -11,11 +11,6 @@
       = image_tag "flickr_32.png", size: "32x32", alt: 'Flickr logo'
       = link_to flickr_auth.name, "https://flickr.com/photos/#{flickr_auth.uid}"
 
-  - if facebook_auth
-    %p
-      = image_tag "facebook_32.png", size: "32x32", alt: 'Facebook logo'
-      = link_to facebook_auth.name, "https://facebook.com/profile/#{facebook_auth.uid}"
-
   - if member.show_email
     %p
       Email:

app/views/members/_member.haml

@@ -1,19 +1,18 @@
 - cache member do
   .card.card-double
     .card-body
-      .row
-        .col-12.col-md-6
-          = render "members/avatar", member: member
-        .col-12.col-md-6
-          %h4.login-name= link_to member, member
-          = link_to "view all #{member}'s gardens", member_gardens_path(member)
-          %p
-            %small
-              Joined
-              = distance_of_time_in_words(member.created_at, Time.zone.now)
-              ago.
-          - if member.location.present?
-            = link_to member.location, place_path(member.location)
+      %h4.login-name= link_to member, member
+      %div
+        = render "members/avatar", member: member
+      %div
+        = link_to "view all #{member}'s gardens", member_gardens_path(member)
+        %p
+          %small
+            Joined
+            = distance_of_time_in_words(member.created_at, Time.zone.now)
+            ago.
+        - if member.location.present?
+          = link_to member.location, place_path(member.location)
     .card-footer
       %ul.nav.nav-justified.small
         %li.nav-item.border-right

app/views/members/_stats.html.haml

@@ -2,39 +2,39 @@
   %h3 Activity
 %ul.list-group.list-group-flush
   %li.list-group-item
-    - if !member.gardens.empty?
+    - if member.gardens.present?
       = link_to localize_plural(member.gardens, Garden), member_gardens_path(member)
     - else
       0 gardens
   %li.list-group-item
-    - if !member.plantings.empty?
+    - if member.plantings.present?
       = link_to localize_plural(member.plantings, Planting), member_plantings_path(member)
     - else
       0 plantings
   %li.list-group-item
-    - if !member.harvests.empty?
+    - if member.harvests.present?
       = link_to localize_plural(member.harvests, Harvest), member_harvests_path(member)
     - else
       0 harvests
   %li.list-group-item
-    - if !member.seeds.empty?
+    - if member.seeds.present?
       = link_to localize_plural(member.seeds, Seed), member_seeds_path(member)
     - else
       0 seeds
   %li.list-group-item
-    - if !member.posts.empty?
+    - if member.posts.present?
       = link_to localize_plural(member.posts, Post), member_posts_path(member)
     - else
       0 posts
 
   %li.list-group-item
-    - if !member.followed.empty?
+    - if member.followed.present?
       = link_to localize_plural(member.followed, Follow), member_follows_path(member)
     - else
       0 following
 
   %li.list-group-item
-    - if !member.followers.empty?
+    - if member.followers.present?
       = link_to pluralize(member.followers.size, "follower"), member_followers_path(member)
     - else
       0 followers

app/views/members/show.html.haml

@@ -30,7 +30,7 @@
             = truncate(@member.location, length: 25, separator: ' ', omission: '... ')
         %p
           %strong Member since
-          = @member.created_at.to_s(:date)
+          = @member.created_at.to_fs(:date)
         %p
           %strong Last Login
           = @member.last_sign_in_at
@@ -57,8 +57,7 @@
       = render "stats", member: @member
       .card-footer
         = render "contact", member: @member, twitter_auth: @twitter_auth,
-                                              flickr_auth: @flickr_auth,
-                                              facebook_auth: @facebook_auth
+                                              flickr_auth: @flickr_auth
 
   .col-md-10
     %section= render "map", member: @member

app/views/members/show.rss.haml

@@ -6,7 +6,7 @@
     - @member.posts.each do |post|
       %item
         %title #{post.subject} by #{post.author.login_name}
-        %pubdate= post.created_at.to_s(:rfc822)
+        %pubdate= post.created_at.to_fs(:rfc822)
         %link= post_url(post)
         %guid= post_url(post)
         %description

app/views/photos/new.html.haml

@@ -3,7 +3,17 @@
 %h1 New Photo
 %h2 Choose photo for #{link_to @item, @item}
 
-- if @flickr_auth
+- if @please_reconnect_flickr
+  %h2.alert Please reconnect your flickr account
+
+  %p the token has expired or been revoked.
+
+  = link_to '/members/auth/flickr', class: "btn btn-lg" do
+    = icon 'fab', 'flickr'
+    Reconnect Flickr
+
+
+- elsif @flickr_auth
   %p
     Connected to Flickr as
     = succeed "." do
@@ -37,7 +47,9 @@
   .row.pagination
     .col-md-12= will_paginate @photos
 - else
-  .alert
-    You must
-    = link_to "connect your account to Flickr", '/members/auth/flickr'
-    to add photos.
+  %h2.alert You must connect your account to Flickr to add photos.
+
+  %p
+    = link_to '/members/auth/flickr', class: :btn do
+      = icon 'fab', 'flickr'
+      connect to Flickr

app/views/places/_map_attribution.html.haml

@@ -2,5 +2,3 @@ Map data ©
 = link_to "OpenStreetMap", "https://openstreetmap.org"
 contributors under
 = link_to "ODbL", "https://www.openstreetmap.org/copyright"
-| Imagery ©
-= link_to "CloudMade", "https://cloudmade.com"

app/views/places/_search_form.html.haml

@@ -1,6 +1,6 @@
 %form.form-inline{ action: search_places_path, method: :get, role: 'form' }
   .form-group
     = label_tag :new_place, "Change location:", class: 'sr-only'
-    = text_field_tag :new_place, '', class: 'form-control', placeholder: "New location..."
+    = text_field_tag :new_place, '', class: 'form-control', placeholder: "Search for city, suburb or state..."
   = submit_tag "Search", class: 'btn btn-primary', id: "search_button"
 %br/