Only build the dev and mainline branches

this company used to produce the leaflet widget, but that staff member moved elsewhere in like 2012 and took the code with them and made it open source. the credit is no longer needed

.codeclimate.yml

@@ -1,33 +1,25 @@
-plugins:
+engines:
+  rubocop:
+    enabled: true
+    channel: "rubocop-0-88"
+  scss-lint:
+    enabled: true
+  shellcheck:
+    enabled: true
+  eslint:
+    enabled: true
+  coffeelint:
+    enabled: true
   brakeman:
     enabled: false # codeclimate's brakeman is stuck in rails 5 rules
   bundler-audit:
     enabled: true
-  coffeelint:
-    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"

.devcontainer/.env

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

.devcontainer/Dockerfile

@@ -1,33 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
-
-# Install Rails
-RUN gem install rails:7.0.8
-
-# 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 bash-completion
-
-# Chrome for testing packages. https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#chrome-doesnt-launch-on-linux
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils
-
-# [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
-
-# We run as the vscode user.
-# Make sure this is writable as https://github.com/rubygems/rubygems/issues/6272 was removed
-RUN su root -c "mkdir -p /usr/local/rvm/gems/default/cache/bundler/"
-RUN su root -c "mkdir -p /usr/local/rvm/gems/default/bundler/gems/"
-RUN su root -c "chown -R vscode:rvm /usr/local/rvm/gems/"
-RUN su root -c "chmod -R 0755 /usr/local/rvm/gems/"

.devcontainer/create-db-user.sql

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

.devcontainer/devcontainer.json

@@ -1,38 +0,0 @@
-// 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, 8081],
-
-// 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": {
-    "vscode": {
-        "extensions": [
-            "karunamurti.haml",
-            "redhat.vscode-yaml",
-            "CraigMaslowski.erb"
-        ]
-    }
-}
-
-// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-// "remoteUser": "root"
-}

.devcontainer/docker-compose.yml

@@ -1,83 +0,0 @@
-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
-    restart: unless-stopped
-    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

@@ -1,16 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "07:00"
-  open-pull-requests-limit: 20
-  versioning-strategy: lockfile-only
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "07:00"
-  open-pull-requests-limit: 10
-

.github/workflows/ci.yml

@@ -6,117 +6,10 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v1
+
       - 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@v4
-
-      - 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@v4
-        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@v4
-        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
+          ./script/check_contributors_md.rb

.rubocop.yml

@@ -1,17 +1,10 @@
 inherit_from: .rubocop_todo.yml
-require:
- - rubocop-factory_bot
- - rubocop-capybara
- - rubocop-rails
- - rubocop-rspec
- - rubocop-rspec_rails
- - rubocop-rake
+require: rubocop-rails
 AllCops:
-  NewCops: enable
   Exclude:
     - 'db/schema.rb'
     - 'vendor/**/*'
-  TargetRailsVersion: 7.1
+  TargetRailsVersion: 6.0
 
 Rails:
   Enabled: true
@@ -22,11 +15,6 @@ Naming/FileName:
     - 'Gemfile'
     - 'Gemfile.lock'
 
-RSpec/DescribeClass:
-  Exclude:
-   - 'spec/views/**/*.rb'
-   - 'spec/features/**/*.rb'
-
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
@@ -72,3 +60,75 @@ Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/20190317023129_finished_boolean.rb'
     - 'db/seeds.rb'
+
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/DuplicateElsifCondition:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/AccessorGrouping:
+  Enabled: true
+Style/ArrayCoercion:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: false
+Style/CaseLikeIf:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashAsLastArrayItem:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashLikeCase:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
+Rails/ActiveRecordCallbacksOrder:
+  Enabled: true
+Rails/FindById:
+  Enabled: true
+Rails/Inquiry:
+  Enabled: true
+Rails/MailerName:
+  Enabled: true
+Rails/MatchRoute:
+  Enabled: true
+Rails/NegateInclude:
+  Enabled: true
+Rails/Pluck:
+  Enabled: true
+Rails/PluckInWhere:
+  Enabled: true
+Rails/RenderInline:
+  Enabled: true
+Rails/RenderPlainText:
+  Enabled: true
+Rails/ShortI18n:
+  Enabled: true
+Rails/WhereExists:
+  Enabled: true

.rubocop_todo.yml

@@ -1,452 +1,50 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
+# `rubocop --auto-gen-config --no-offense-counts`
+# on 2019-12-16 21:01:58 +1300 using RuboCop version 0.77.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 231
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: link_or_button, strict
-Capybara/ClickLinkOrButtonStyle:
-  Enabled: false
-
-# Offense count: 39
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: DefaultSelector.
-Capybara/RSpec/HaveSelector:
-  Exclude:
-    - 'spec/features/conversations/index_spec.rb'
-    - 'spec/features/footer_spec.rb'
-    - 'spec/features/gardens/adding_gardens_spec.rb'
-    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
-    - 'spec/features/members/list_spec.rb'
-    - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/seeds/adding_seeds_spec.rb'
-    - 'spec/features/shared_examples/crop_suggest.rb'
-    - 'spec/helpers/application_helper_spec.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
-
-# Offense count: 14
-Capybara/SpecificMatcher:
-  Exclude:
-    - '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
-Capybara/VisibilityMatcher:
-  Exclude:
-    - 'spec/features/shared_examples/crop_suggest.rb'
-
-# Offense count: 6
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
-# SupportedStyles: explicit, implicit
-FactoryBot/AssociationStyle:
-  Exclude:
-    - 'spec/factories/alternate_names.rb'
-    - 'spec/factories/crop.rb'
-    - 'spec/factories/like.rb'
-    - 'spec/factories/scientific_name.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
-# SupportedStyles: create_list, n_times
-FactoryBot/CreateList:
-  Exclude:
-    - 'spec/views/comments/index.rss.haml_spec.rb'
-    - 'spec/views/photos/index.html.haml_spec.rb'
-    - 'spec/views/posts/index.html.haml_spec.rb'
-
-# Offense count: 4
-# Configuration parameters: Include, MaxAmount.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
-FactoryBot/ExcessiveCreateList:
-  Exclude:
-    - 'spec/controllers/posts_controller_spec.rb'
-    - 'spec/features/crops/show_spec.rb'
-    - 'spec/features/percy/percy_spec.rb'
-
-# Offense count: 1127
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'app/helpers/crops_helper.rb'
-    - 'db/seeds.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: RequireParenthesesForMethodChains.
-Lint/AmbiguousRange:
-  Exclude:
-    - 'app/models/concerns/search_activities.rb'
-    - '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: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopDisableDirective:
-  Exclude:
-    - 'db/migrate/20230313015323_create_active_storage_tables.active_storage.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: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-Lint/UselessAssignment:
-  Exclude:
-    - 'config.rb'
-    - 'config/compass.rb'
-
-# Offense count: 52
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 151
-
-# Offense count: 14
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
-# AllowedMethods: refine
-Metrics/BlockLength:
-  Max: 115
-
-# Offense count: 7
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 183
-
-# Offense count: 6
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/CyclomaticComplexity:
-  Max: 32
-
-# Offense count: 71
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
-Metrics/MethodLength:
-  Max: 127
-
-# Offense count: 2
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ModuleLength:
-  Max: 125
-
-# Offense count: 5
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/PerceivedComplexity:
-  Max: 32
-
-# Offense count: 3
-RSpec/AnyInstance:
-  Exclude:
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/photos_controller_spec.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, OnlyStaticConstants.
-# 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).
-# Configuration parameters: AutoCorrect.
-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: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/models/ability_spec.rb'
-
-# Offense count: 140
-# Configuration parameters: CountAsOne.
-RSpec/ExampleLength:
-  Max: 25
-
-# Offense count: 32
-RSpec/ExpectInHook:
-  Exclude:
-    - 'spec/controllers/garden_types_controller_spec.rb'
-    - 'spec/controllers/gardens_controller_spec.rb'
-    - 'spec/features/admin/forums_spec.rb'
-    - 'spec/features/admin/plant_parts_spec.rb'
-    - 'spec/features/admin/roles_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: 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).
-# Configuration parameters: AutoCorrect.
-RSpec/HooksBeforeExamples:
-  Exclude:
-    - 'spec/features/crops/creating_a_crop_spec.rb'
-
-# Offense count: 37
-# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
-RSpec/IndexedLet:
-  Exclude:
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/plantings_controller_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-    - 'spec/features/members/list_spec.rb'
-    - 'spec/features/members/profile_spec.rb'
-    - 'spec/features/percy/percy_spec.rb'
-    - 'spec/features/planting_reminder_spec.rb'
-    - 'spec/features/timeline/index_spec.rb'
-    - 'spec/models/crop_spec.rb'
-    - 'spec/models/member_spec.rb'
-    - 'spec/views/forums/index.html.haml_spec.rb'
-
-# Offense count: 720
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Enabled: false
-
-# Offense count: 40
-RSpec/LetSetup:
-  Enabled: false
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/MatchArray:
-  Exclude:
-    - 'spec/models/post_spec.rb'
-
-# 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: 152
-RSpec/MultipleExpectations:
-  Max: 19
-
-# Offense count: 138
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 14
-
-# Offense count: 133
-# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
-# SupportedStyles: always, named_only
-RSpec/NamedSubject:
-  Enabled: false
-
-# Offense count: 111
-# Configuration parameters: AllowedGroups.
-RSpec/NestedGroups:
-  Max: 6
-
-# Offense count: 403
-# Configuration parameters: AllowedPatterns.
-# AllowedPatterns: ^expect_, ^assert_
-RSpec/NoExpectationExample:
-  Enabled: false
-
-# Offense count: 3
-RSpec/PendingWithoutReason:
-  Exclude:
-    - 'spec/features/seeds/misc_seeds_spec.rb'
-    - 'spec/features/unsubscribing_spec.rb'
-
-# 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:
+Lint/AmbiguousOperator:
   Exclude:
     - 'spec/controllers/crops_controller_spec.rb'
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
-RSpec/ScatteredSetup:
-  Exclude:
-    - 'spec/features/percy/percy_spec.rb'
-    - 'spec/features/plantings/prediction_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
-RSpec/SpecFilePathFormat:
-  Exclude:
-    - 'spec/controllers/member_controller_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:
+# SupportedStyles: lowercase, uppercase
+Naming/HeredocDelimiterCase:
   Exclude:
-    - 'spec/models/member_spec.rb'
+    - 'config/environments/production.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: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ResponseMethods.
-# ResponseMethods: response, last_response
-RSpecRails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/harvests_spec.rb'
-
-# Offense count: 16
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpecRails/InferredSpecType:
-  Enabled: false
-
-# Offense count: 28
-# Configuration parameters: Database, Include.
-# SupportedDatabases: mysql, postgresql
-# Include: db/**/*.rb
-Rails/BulkChangeTable:
-  Enabled: false
-
-# Offense count: 4
 # Configuration parameters: Include.
-# Include: db/**/*.rb
+# Include: db/migrate/*.rb
 Rails/CreateTableWithTimestamps:
   Exclude:
+    - 'db/migrate/20130214034838_add_members_roles_table.rb'
+    - 'db/migrate/20130507113915_add_orders_products_table.rb'
+    - 'db/migrate/20130531110729_add_photos_plantings_table.rb'
+    - 'db/migrate/20140905001730_add_harvests_photos_table.rb'
+    - 'db/migrate/20140928044231_add_crops_posts_table.rb'
+    - 'db/migrate/20150127043022_add_gardens_photos_table.rb'
     - 'db/migrate/20150201052245_create_cms.rb'
+    - 'db/migrate/20161201154922_add_photos_seeds_table.rb'
     - 'db/migrate/20171022032108_all_the_predictions.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowToTime.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
-    - 'app/mailers/notifier_mailer.rb'
+    - 'app/mailers/notifier.rb'
 
-# Offense count: 11
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-# AllowedMethods: order, limit, select, lock
-Rails/FindEach:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: slashes, arguments
+Rails/FilePath:
   Exclude:
-    - 'app/controllers/conversations_controller.rb'
-    - 'db/migrate/20171105011017_set_prediction_data.rb'
-    - 'db/migrate/20171129041341_create_photographings.rb'
-    - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
-    - 'db/migrate/20191119030244_cms_tags.rb'
+    - 'app/controllers/crops_controller.rb'
+    - 'config/application.rb'
+    - 'config/environments/development.rb'
+    - 'db/seeds.rb'
 
-# Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -454,46 +52,23 @@ 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: spec/**/*.rb, test/**/*.rb
-Rails/I18nLocaleAssignment:
+# Include: app/models/**/*.rb
+Rails/InverseOf:
   Exclude:
-    - 'spec/features/locale_spec.rb'
+    - 'app/models/concerns/ownable.rb'
 
-# Offense count: 33
-Rails/I18nLocaleTexts:
-  Enabled: false
-
-# Offense count: 3
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
-Rails/LexicallyScopedActionFilter:
-  Exclude:
-    - 'app/controllers/data_controller.rb'
-    - 'app/controllers/registrations_controller.rb'
-
-# Offense count: 2
 Rails/OutputSafety:
   Exclude:
     - 'app/helpers/auto_suggest_helper.rb'
     - 'app/helpers/gardens_helper.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rails/PluralizationGrammar:
-  Exclude:
-    - 'spec/requests/plantings_spec.rb'
-
-# Offense count: 4
-# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Include.
 # Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
@@ -502,102 +77,27 @@ Rails/RakeEnvironment:
     - 'lib/tasks/i18n.rake'
     - 'lib/tasks/testing.rake'
 
-# Offense count: 9
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedReceivers.
-# AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
-Rails/RedundantActiveRecordAllMethod:
-  Exclude:
-    - 'app/controllers/admin/roles_controller.rb'
-    - 'app/controllers/alternate_names_controller.rb'
-    - 'app/controllers/forums_controller.rb'
-    - 'app/controllers/plant_parts_controller.rb'
-    - 'app/controllers/scientific_names_controller.rb'
-    - 'app/services/openfarm_service.rb'
-    - 'spec/features/percy/percy_spec.rb'
-    - 'spec/models/harvest_spec.rb'
-
-# 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: 15
-# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Include.
-# Include: spec/controllers/**/*.rb, spec/requests/**/*.rb, test/controllers/**/*.rb, test/integration/**/*.rb
-Rails/ResponseParsedBody:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/api/v1/crop_request_spec.rb'
-    - 'spec/requests/api/v1/gardens_request_spec.rb'
-    - 'spec/requests/api/v1/harvests_request_spec.rb'
-    - 'spec/requests/api/v1/members_request_spec.rb'
-    - 'spec/requests/api/v1/photos_request_spec.rb'
-    - 'spec/requests/api/v1/plantings_request_spec.rb'
-    - 'spec/requests/api/v1/seeds_request_spec.rb'
-
-# Offense count: 9
-# Configuration parameters: Include.
-# Include: db/**/*.rb
+# Include: db/migrate/*.rb
 Rails/ReversibleMigration:
   Exclude:
-    - 'db/migrate/20130326092227_change_planted_at_to_date.rb'
     - 'db/migrate/20191119020643_upgrade_cms.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/RootPathnameMethods:
+# 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:
   Exclude:
-    - 'app/controllers/crops_controller.rb'
-    - 'app/helpers/icons_helper.rb'
+    - 'db/migrate/20190317023129_finished_boolean.rb'
+    - 'db/seeds.rb'
+    - 'db/migrate/20190910022329_add_photo_source.rb'
 
-# Offense count: 21
-# Configuration parameters: Include.
-# Include: db/**/*.rb
-Rails/ThreeStateBooleanColumn:
-  Enabled: false
-
-# Offense count: 6
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UniqueValidationWithoutIndex:
+# Configuration parameters: AllowedChars.
+Style/AsciiComments:
   Exclude:
-    - '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'
+    - 'config/initializers/comfortable_mexican_sofa.rb'
 
-# 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: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/WhereRange:
-  Exclude:
-    - 'app/models/concerns/predict_planting.rb'
-    - 'app/models/garden.rb'
-
-# Offense count: 1
-Rake/MethodDefinitionInTask:
-  Exclude:
-    - 'lib/tasks/growstuff.rake'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
@@ -605,121 +105,23 @@ 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'
 
-# Offense count: 3
-# 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'
-    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'lib/tasks/gbif.rake'
-    - 'lib/tasks/openfarm.rake'
-
-# 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: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MinMaxComparison:
-  Exclude:
-    - 'app/models/concerns/predict_planting.rb'
-
-# Offense count: 2
 Style/MixinUsage:
   Exclude:
+    - 'bin/setup'
     - 'bin/update'
     - 'spec/rails_helper.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'app/models/activity.rb'
-
-# Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'spec/**/*'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
-    - 'app/models/concerns/predict_planting.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: 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: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/messages_controller.rb'
-
-# Offense count: 24
-# 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, AllowComments.
-# AllowedMethods: define_method, mail, respond_to
-Style/SymbolProc:
-  Exclude:
-    - 'app/controllers/crops_controller.rb'

.ruby-version

@@ -1 +1 @@
-3.3.4
+2.6.5

.travis.yml

@@ -1,18 +1,52 @@
 sudo: required
 language: ruby
 dist: bionic
+services:
+  - postgresql
+  - xvfb
 branches:
   only:
-    - mainline
-    - dev
+  - mainline
+  - dev
 cache:
   bundler: true
-  yarn: true
   directories:
     - tmp/cache/assets/test/sprockets
+addons:
+  postgresql: "9.4" # Matches production
+  code_climate:
+    repo_token:
+      secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk="
 env:
+  matrix:
+    - "TEST_GROUP=1"
+    - "TEST_GROUP=2"
+    - "TEST_GROUP=3"
   global:
     - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
+    - ELASTIC_SEARCH_VERSION="7.5.1-amd64"
+    - COVERAGE=true
+    - GROWSTUFF_EMAIL="noreply@test.growstuff.org"g
+    - GROWSTUFF_SITE_NAME="Growstuff (travis)"
+    - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx']
+    - RAILS_ENV=test
+before_install:
+  - sudo apt clean
+  - sudo apt update
+  - sudo apt install dpkg
+  - ./script/install_elasticsearch.sh
+  - sudo apt install google-chrome-stable
+  - ./bin/setup
+script:
+  # - bundle exec rails db:create db:migrate
+  # - bundle exec rails assets:precompile
+  # - bundle exec rails search:reindex
+  # - bundle exec rspec spec -fd
+  - bundle exec parallel_test spec/ -n 3 --only-group $TEST_GROUP --group-by filesize --type rspec
+after_script:
+  - >
+    gem install codeclimate-test-reporter
+    codeclimate-test-reporter
 before_deploy:
   - bundle exec script/heroku_maintenance.rb on
 deploy:
@@ -25,6 +59,7 @@ deploy:
     dev: growstuff-staging
     mainline: growstuff-prod
   run:
+    - "rake db:migrate"
     - "script/deploy-tasks.sh"
     - restart
 after_deploy:

CODE_OF_CONDUCT.md

@@ -1,129 +0,0 @@
-# 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,14 +91,9 @@ 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)
-- Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
-- Dominick Thornton / [domthor](https://github.com/domthor)
 
 ## Bots
 
 ### Security and Dependency Updates
-- `codefactor-io[bot]`
 - DeppBot / [deppbot](https://github.com/deppbot)
-- `dependabot[bot]` [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)
+- dependabot-preview[bot] [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)

Gemfile

@@ -2,20 +2,19 @@
 
 source 'https://rubygems.org'
 
-# Match ruby version in .ruby-version
-ruby File.read('.ruby-version')
+ruby '2.6.5'
 
-gem 'rails', '~> 7.2.0'
+gem 'rails', '6.0.3.2'
 
 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
 gem "sprockets", "<4"
 
-gem 'bundler', '>= 2.4.22'
+gem 'bundler', '>=1.1.5'
 
 gem 'coffee-rails'
 gem 'haml'
-gem 'sassc-rails'
+gem 'sass-rails'
 
 # API data
 gem 'jsonapi-resources'
@@ -24,7 +23,7 @@ gem 'rswag-api'
 gem 'rswag-ui'
 
 # CSS framework
-gem "bootstrap", ">= 5.0.0"
+gem "bootstrap", ">= 4.3.1"
 gem 'material-sass', '4.1.1'
 
 # Icons used by bootstrap/material-sass
@@ -33,32 +32,33 @@ gem 'material_icons'
 # icons
 gem 'font-awesome-sass'
 
-gem 'terser'
+gem 'uglifier' # JavaScript compressor
 
 gem 'oj' # Speeds up json
 
 # planting and harvest predictions
 # based on median values for the crop
-gem 'active_median'
+gem 'active_median', '0.2.0'
 gem 'active_record_union'
 
 gem 'flickraw'
 gem 'jquery-rails'
-gem 'jquery-ui-rails', github: 'jquery-ui-rails/jquery-ui-rails', tag: 'v7.0.0' # See https://github.com/jquery-ui-rails/jquery-ui-rails/issues/146
+gem 'jquery-ui-rails'
+gem 'js-routes' # provides access to Rails routes in Javascript
 
 gem 'cancancan'                    # for checking member privileges
 gem 'csv_shaper'                   # CSV export
 gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 
 # Maps
-gem 'leaflet-rails', '>= 1.9.2'
+gem 'leaflet-rails'
 gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
 
-gem 'pg'
+gem 'pg', '< 1.0.0'                # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
 gem 'ruby-units'                   # for unit conversion
 gem 'unicorn'                      # http server
 
-gem "comfortable_mexican_sofa", git: "https://github.com/restarone/comfortable-mexican-sofa.git"
+gem "comfortable_mexican_sofa", "~> 2.0.0"
 
 gem 'active_utils'
 gem 'sidekiq'
@@ -68,7 +68,7 @@ gem 'bluecloth'
 
 # Pagination
 gem 'will_paginate'
-gem 'will_paginate-bootstrap-style'
+gem 'will_paginate-bootstrap4'
 
 # user signup/login/etc
 gem 'devise'
@@ -89,10 +89,11 @@ gem 'geocoder'
 gem 'bootstrap-datepicker-rails'
 
 # DRY-er easier bootstrap 4 forms
-gem "bootstrap_form", ">= 4.5.0"
+gem "bootstrap_form", ">= 4.2.0"
 
 # For connecting to other services (eg Twitter)
 gem 'omniauth', '~> 1.3'
+gem 'omniauth-facebook'
 gem 'omniauth-flickr', '>= 0.0.15'
 gem 'omniauth-twitter'
 
@@ -100,7 +101,7 @@ gem 'omniauth-twitter'
 gem "chartkick"
 
 # clever elastic search
-gem 'elasticsearch', '~> 7.0.0'
+gem 'elasticsearch', '< 7.0.0'
 gem 'searchkick'
 
 gem "hashie", ">= 3.5.3"
@@ -111,32 +112,23 @@ gem 'rake', '>= 10.0.0'
 gem "responders"
 
 # allows soft delete. Used for members.
-gem 'discard', '>= 1.2'
+gem 'discard', '~> 1.2'
 
 gem 'xmlrpc' # fixes rake error - can be removed if not needed later
 
 gem 'puma'
 
-gem 'loofah', '>= 2.19.1'
+gem 'loofah', '>= 2.2.1'
 gem 'rack-protection', '>= 2.0.1'
 
 # Member to member messaging system
-gem 'mailboxer', '>= 0.15.1'
+gem 'mailboxer'
 
 gem 'faraday'
+gem 'faraday_middleware'
 
 gem 'rack-cors'
 
-gem 'icalendar'
-
-# for signups as requested by email service
-gem 'recaptcha'
-
-# External APIs for data
-gem "gbifrb"
-
-gem "msgpack"
-
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'
@@ -162,22 +154,19 @@ group :development, :test do
   gem 'factory_bot_rails'       # for creating test data
   gem 'faker'
   gem 'haml-rails'              # HTML templating language
-  gem 'pry'
   gem 'query_diet'
+  gem 'parallel_tests'
   gem 'rspec-activemodel-mocks'
   gem 'rspec-rails'             # unit testing framework
   gem 'rswag-specs'
-  gem 'rubocop-capybara'
-  gem 'rubocop-factory_bot'
   gem 'rubocop-rails'
-  gem 'rubocop-rake'
   gem 'rubocop-rspec'
-  gem 'rubocop-rspec_rails'
   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
@@ -186,17 +175,14 @@ group :development, :test do
 end
 
 group :test do
-  gem 'axe-core-capybara'
-  gem 'axe-core-rspec'
   gem 'codeclimate-test-reporter', require: false
+  gem 'percy-capybara', '~> 4.0.0'
   gem 'rails-controller-testing'
   gem 'selenium-webdriver'
   gem 'timecop'
-  gem 'vcr'
+  gem 'webdrivers'
 end
 
 group :travis do
   gem 'platform-api'
 end
-
-gem "percy-capybara", "~> 5.0.0"

README.md

@@ -1,6 +1,7 @@
 # 🌱 Growstuff
 
-![Build status](https://github.com/Growstuff/growstuff/workflows/CI/badge.svg)
+[![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)
 [![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.
@@ -15,17 +16,12 @@ Growstuff was founded in 2012 and has been built by dozens of
 [contributors](CONTRIBUTORS.md).  We are an inclusive, welcoming project, and
 encourage participation from people of all backgrounds and skill levels.
 
-## Want to contribute?
-
-Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
-Dive on in and submit your PRs.
-
 ## Important links
 
 * [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.)
+* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc. Help by migrating from the [old wiki](https://web.archive.org/web/*/wiki.growstuff.org))
 
 ## For coders
 
@@ -34,6 +30,7 @@ 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/images/icons/activity-add.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!-- MIT Licenced, https://www.svgrepo.com/svg/336823/plan -->
-<svg width="800px" height="800px" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="48" height="48" fill="white" fill-opacity="0.01"/>
-<path d="M5 19H43V41C43 42.1046 42.1046 43 41 43H7C5.89543 43 5 42.1046 5 41V19Z" fill="#2F88FF" stroke="#000000" stroke-width="4" stroke-linejoin="round"/>
-<path d="M5 10C5 8.89543 5.89543 8 7 8H41C42.1046 8 43 8.89543 43 10V19H5V10Z" stroke="#000000" stroke-width="4" stroke-linejoin="round"/>
-<path d="M16 31L22 37L34 25" stroke="white" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M16 5V13" stroke="#000000" stroke-width="4" stroke-linecap="round"/>
-<path d="M32 5V13" stroke="#000000" stroke-width="4" stroke-linecap="round"/>
-</svg>

app/assets/javascripts/application.js

@@ -12,23 +12,13 @@
 //
 // = require leaflet
 // = require leaflet.markercluster
+// = require js-routes
 // = require popper
 // = require jquery
 // = require jquery_ujs
 // = require jquery-ui/widgets/autocomplete
 // = require bootstrap-sprockets
 // = require bootstrap-datepicker
+// = require bootstrap
 // = require material
 // = require_tree .
-
-document.addEventListener('DOMContentLoaded', function(event) {
-    var popoverTrigger = Array.prototype.slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
-    popoverTrigger.map(function(popoverTrigger2) {
-        return new bootstrap.Popover(popoverTrigger2);
-    });
-
-    var tooltipTrigger = Array.prototype.slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
-    tooltipTrigger.map(function(tooltipTrigger2) {
-        return new bootstrap.Tooltip(tooltipTrigger2);
-    });
-  });

app/assets/javascripts/bootstrap.js.coffee

@@ -0,0 +1,4 @@
+jQuery ->
+  $("a[rel=popover]").popover()
+  $(".tooltip").tooltip()
+  $("a[rel=tooltip]").tooltip()

app/assets/javascripts/cropmap.js.erb

@@ -1,6 +1,10 @@
 function showCropMap(cropmap) {
-  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+  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>',
     maxZoom: 18
   }).addTo(cropmap);
   var markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 20 });

app/assets/javascripts/crops.js.coffee

@@ -5,7 +5,7 @@ jQuery ->
   $(".remove-altname-row").css("display", "inline-block")
 
 -$ ->
-  sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='scientific-name-auto-suggest form-control' id='sci_name[INDEX]' data-source-url='/scientific_names/gbif_suggest')'></input><span class='help-block'>Scientific name of crop</span><input type='text' id='sci_gbif_key[INDEX]' class=''></div><div class='col-md-2'></div></div>"
+  sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
 
   sci_index = $('#scientific_names .template').length + 1
 
@@ -21,7 +21,7 @@ jQuery ->
       element = document.getElementById(tmp)
       element.remove()
 
-  alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control' id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
+  alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control', id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
 
   alt_index = $('#alternate_names .template').length + 1
 

app/assets/javascripts/likes.js

@@ -1,19 +1,11 @@
 $(document).ready(function() {
   $('.like-btn').show();
 
-  /**
-   * Handles the result of an ajax call and updates UI
-   *
-   * @param {object} data JSON data from ajax response
-   * @param {string} type object type (ie: post, activity, etc)
-   */
-  var likeableSuccess = function(data, type) {
-    var target = '.' + type + '-' + data.id;
-    var objectClass = type.charAt(0).toUpperCase() + type.slice(1);
-    var likeButton = $(target + ' .' + type + '-like');
-    var likeBadge = $(target + ' .like-badge');
+  $('.post-like').on('ajax:success', function(event, data) {
+    var likeButton = $('#post-' + data.id + ' .post-like');
+    var likeBadge = $('#post-'+ data.id + ' .like-badge');
 
-    $(target + ' .like-count').text(data.like_count);
+    $('#post-' + data.id + ' .like-count').text(data.like_count);
     if (data.liked_by_member) {
       likeBadge.addClass('liked');
       likeButton.data('method', 'delete');
@@ -22,26 +14,11 @@ $(document).ready(function() {
     } else {
       likeBadge.removeClass('liked');
       likeButton.data('method', 'post');
-      likeButton.attr('href', '/likes.json?type=' + objectClass + '&id=' + data.id);
+      likeButton.attr('href', '/likes.json?type=Post&id=' + data.id);
       likeButton.text('Like');
     }
-  };
-
-  $('.post-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'post');
   });
 
-  $('.activity-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'activity');
-  });
-
-  $('.planting-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'planting');
-  });
-
-  $('.harvest-like').on('ajax:success', function(event, data) {
-    likeableSuccess(data, 'harvest');
-  });
 
   $('.photo-like').on('ajax:success', function(event, data) {
     var likeBadge = $('#photo-'+ data.id + ' .like-badge');

app/assets/javascripts/members.js.erb

@@ -1,4 +1,10 @@
 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({
@@ -12,8 +18,8 @@ if (document.getElementById("membermap") !== null) {
     if (member.latitude && member.longitude) {
       var membermap = L.map('membermap').setView([member.latitude, member.longitude], 4);
 
-      L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+      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>',
         maxZoom: 18
       }).addTo(membermap);
       var marker = new L.Marker(new L.LatLng(member.latitude, member.longitude),

app/assets/javascripts/nav.js

@@ -0,0 +1 @@
+$('.dropdown-toggle').dropdown();

app/assets/javascripts/places.js.erb

@@ -1,5 +1,8 @@
 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 %>";
 
@@ -28,8 +31,8 @@ if (document.getElementById("placesmap") !== null) {
 }
 
 function showMap(placesmap) {
-  L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+  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>',
     maxZoom: 18
   }).addTo(placesmap);
 
@@ -58,7 +61,6 @@ 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) {
@@ -79,8 +81,7 @@ function showMap(placesmap) {
           markers.addLayer(marker);
         }
       });
-      // 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) {
+      if (crop_data['links']['next']) {
         fetchCropsForMap(crop_data['links']['next'])
       }
       return crop_data;

app/assets/javascripts/scientific_name_auto_suggest.js.coffee

@@ -1,31 +0,0 @@
-# TODO: This assumes one autocomplete per page.
-# Needs to be a function so that when we append one of these, it gets uniquely associated with the hidden controls.
-jQuery ->
-
-  if el = $( '.scientific-name-auto-suggest' )
-
-    id = $( '.scientific-name-auto-suggest-id' )
-
-    el.autocomplete
-      minLength: 3,
-      source: el.attr( 'data-source-url' ),
-      focus: ( event, ui ) ->
-        el.val( ui.item.canonicalName )
-        id.val( ui.item.nameKey )
-        false
-      select: ( event, ui ) ->
-        el.val( ui.item.canonicalName )
-        id.val( ui.item.nameKey )
-        false
-      response: ( event, ui ) ->
-        id.val( "" )
-        for item in ui.content
-          if item.name == el.val()
-            id.val( item.nameKey )
-
-    if el.data( 'uiAutocomplete' )
-      el.data( 'uiAutocomplete' )._renderItem = ( ul, item ) ->
-        $( '<li class="list-group-item"></li>' )
-          .data( 'item.autocomplete', item )
-          .append( "<a>#{item.canonicalName} (#{item.scientificName}) - #{item.rank}</a>" )
-          .appendTo( ul )

app/assets/javascripts/tab_navigation.js

@@ -1,22 +0,0 @@
-$(document).ready(function() {
-    var url = location.href.replace(/\/$/, '');
-
-    if (location.hash) {
-        var hash = url.split('#');
-        var triggerEl = document.querySelector('#myTab a[href="#' + hash[1] + '"]');
-        var tab = new bootstrap.Tab(triggerEl);
-        tab.show();
-        url = location.href.replace(/\/#/, '#');
-        history.replaceState(null, null, url);
-        setTimeout(function() {
-            $(window).scrollTop(0);
-        }, 20);
-    }
-
-    $('a[data-bs-toggle="tab"]').on('click', function() {
-        var newUrl;
-        var hash = $(this).attr('href');
-        newUrl = url.split('#')[0] + hash;
-        history.replaceState(null, null, newUrl);
-    });
-});

app/assets/javascripts/tooltips.js

@@ -0,0 +1,3 @@
+$(function() {
+  $('[data-toggle="tooltip"]').tooltip();
+});

app/assets/stylesheets/_crops.scss

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

app/assets/stylesheets/_harvests.scss

@@ -2,7 +2,7 @@
   .text {
     color: $white;
     margin: 0;
-    opacity: 0.8;
+    opacity: .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: 0.25em;
+  padding: .25em;
 
   div {
     display: inline-block;
@@ -11,11 +11,12 @@
   }
 }
 
-.member-thumbnail div ~ div {
+.member-thumbnail div~div {
   padding-left: 1em;
   width: 15em;
 }
 
+
 .member-chip {
   background-color: lighten($green, 30%);
 
@@ -34,28 +35,15 @@
 }
 
 .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;
   width: 100%;
 }
-.card {
-  .badge-location {
-    background-color: darken($blue, 10%);
-    border-radius: 5%;
-    color: $white;
 
-    .fa-map-marker {
-      padding-right: 0.5em;
-    }
-  }
-
-  .badge {
-    text-overflow: ellipsis;
-    white-space: normal;
-    align-items: end;
-    max-height: 1rlh;
-    -webkit-line-clamp: 1;
-  }
-}
+.badge-location {
+  background-color: darken($blue, 10%);
+  border-radius: 5%;
+  color: $white;
+}

app/assets/stylesheets/_seeds.scss

@@ -1,6 +1,6 @@
 .seed-card {
   .text {
-    opacity: 0.95;
+    opacity: 0.8;
     margin: 0;
     padding: 0;
     position: absolute;

app/assets/stylesheets/_variables.scss

@@ -1,10 +1,10 @@
 //$screen-md-min: 1028px
 
 // Base colours
-$beige: #f4f2ef;
+$beige: #f3f1ee;
 $brown: #413f3b;
 
-$green: #57803c;
+$green: #5f8e43;
 $blue: #2f4365;
 $red: #ff4d43;
 $orange: #ffa500;
@@ -15,36 +15,30 @@ $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,
@@ -53,8 +47,7 @@ $grid-breakpoints: (
   // 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,32 +1,33 @@
 // Import original variables so they can be used in overrides
 
-@import "variables";
-@import "material";
+@import 'variables';
+@import 'material';
+
+@import 'jquery-ui/autocomplete';
+@import 'bootstrap-datepicker';
+@import 'leaflet';
+@import 'leaflet.markercluster';
 
-@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,6 +1,7 @@
 // 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;
@@ -10,7 +11,7 @@
     width: 100%;
   }
 
-  .navbar .nav > li {
+  .navbar .nav>li {
     display: block;
   }
 
@@ -32,10 +33,11 @@
     }
 
     .site-name:after {
-      content: "";
+      content: '';
       display: inline-block;
       width: 100%;
     }
+
   }
 
   h1 {
@@ -54,12 +56,6 @@
     margin-bottom: 0;
   }
 
-  .card-footer {
-    .d-flex {
-      flex-direction: column;
-    }
-  }
-
   .sidebar {
     border-left: 0;
     margin-left: 0;
@@ -70,13 +66,14 @@
     height: 300px;
   }
 
+
   section .btn {
     width: 100%;
   }
 
   .index-cards {
     .card {
-      margin: 0.2em;
+      margin: .2em;
       width: 48%;
 
       // Shrink title to fit more on page
@@ -90,6 +87,7 @@
         object-fit: cover;
         width: 100%;
       }
+
     }
   }
 }

app/assets/stylesheets/overrides.scss

@@ -8,18 +8,15 @@ body {
   font-family: $default-font;
 }
 
-.navbar {
-  flex-wrap: nowrap;
-}
 .navbar-brand {
   .site-name {
-    font-family: "Modak", cursive;
+    font-family: 'Modak', cursive;
     font-size: 3em;
-    margin: 0.3em;
+    margin: .3em;
   }
 
   img {
-    height: 100%;
+    height: 60px;
   }
 }
 
@@ -49,6 +46,7 @@ body {
   font-size: 5em;
 }
 
+
 .ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -84,8 +82,9 @@ h3 {
   font-size: 120%;
 }
 
+
 section {
-  margin: 0.5em 0 0;
+  margin: .5em 0 0;
   padding: 0 0 1em;
 
   h2 {
@@ -93,7 +92,7 @@ section {
     box-shadow: 1px 1px 1px 1px darken($beige, 20%);
     color: $white;
     font-weight: normal;
-    padding: 0.2em;
+    padding: .2em;
 
     a {
       color: $white;
@@ -101,18 +100,7 @@ section {
   }
 
   .card {
-    background: $white;
     box-shadow: 1px 3px 3px 1px darken($beige, 20%);
-    cursor: pointer;
-    transition:
-      0.1s transform cubic-bezier(0.155, 1.105, 0.295, 1.12),
-      0.1s box-shadow,
-      0.1s -webkit-transform cubic-bezier(0.155, 1.105, 0.295, 1.12);
-  }
-
-  .card:hover {
-    box-shadow:
-      1px 3px 3px 1px darken($beige, 30%);
   }
 }
 
@@ -129,7 +117,7 @@ section {
   .card {
     background: $white;
     border-radius: 5%;
-    margin: 0.5em 0.5em 0.5em 0;
+    margin: .5em .5em .5em 0;
     width: 200px;
 
     .img-card {
@@ -149,6 +137,10 @@ section {
       color: $brown;
     }
   }
+
+  .card:hover {
+    background-color: $beige;
+  }
 }
 
 .img-cover,
@@ -240,6 +232,7 @@ ul.associations {
 
 // footer
 footer {
+
   #footer1,
   #footer2,
   #footer3 {
@@ -355,9 +348,7 @@ ul.thumbnail-buttons {
     text-align: center;
   }
 }
-.text-muted {
-  color: $blue;
-}
+
 .jumbotron {
   background-color: $beige;
   margin-bottom: 1em;
@@ -367,27 +358,19 @@ ul.thumbnail-buttons {
   h1 {
     font-size: 400%;
   }
-  .stats a {
-    color: $black;
-  }
 
   // signup widget on homepage
   .signup {
-    background-color: darken($green, 20%);
-    border: 1px solid darken($green, 20%);
-    color: $white;
+    background-color: lighten($green, 40%);
+    border: 1px solid lighten($green, 20%);
     border-radius: 6px;
     line-height: 200%;
     padding: 15px;
     text-align: center;
-
-    .btn-info {
-      background-color: $blue;
-    }
   }
 
   .info {
-    padding: 0.5em;
+    padding: .5em;
     text-align: center;
   }
 }
@@ -403,7 +386,7 @@ ul.thumbnail-buttons {
   display: inline-block;
   height: 30px;
   line-height: 30px;
-  margin: 0.2em;
+  margin: .2em;
   padding: 0 25px;
 
   a {
@@ -428,14 +411,14 @@ ul.thumbnail-buttons {
 .progress-fade::before {
   background: $beige;
   bottom: 0;
-  content: "";
+  content: '';
   display: block;
   left: 0;
-  opacity: 0.7;
+  opacity: .7;
   position: absolute;
   right: 0;
   top: 0;
-  transition: background 0.3s linear;
+  transition: background .3s linear;
 }
 
 .progress-fade:hover::before {

app/controllers/activities_controller.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-class ActivitiesController < DataController
-  def index
-    @show_all = params[:all] == '1'
-
-    where = {}
-    where['active'] = true unless @show_all
-
-    if params[:member_slug]
-      @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id unless @owner.nil?
-    end
-
-    @activities = Activity.search(
-      where:,
-      page:     params[:page],
-      limit:    30,
-      boost_by: [:created_at],
-      load:     false
-    )
-    @filename = "Growstuff-#{specifics}Activities-#{Time.zone.now.to_fs(:number)}.csv"
-    respond_with(@activities)
-  end
-
-  def show
-    respond_with @activity
-  end
-
-  def new
-    @activity = Activity.new(
-      owner: current_member
-    )
-    if params[:garden_id]
-      @activity.garden = Garden.find_by(
-        owner: current_member,
-        id:    params[:garden_id]
-      )
-    end
-
-    if params[:planting_id]
-      @activity.planting = Planting.find_by(
-        owner: current_member,
-        id:    params[:planting_id]
-      )
-    end
-
-    respond_with @activity
-  end
-
-  def edit
-    # the following are needed to display the form but aren't used
-    @gardens = @activity.owner.gardens.active.order_by_name
-    @plantings = @activity.owner.plantings.active
-  end
-
-  def create
-    @activity = Activity.new(activity_params)
-    @activity.owner = current_member
-    @activity.save
-    respond_with @activity
-  end
-
-  def update
-    @activity.update(activity_params)
-    respond_with @activity
-  end
-
-  def destroy
-    @activity.destroy
-    respond_with @activity, location: @activity.garden
-  end
-
-  private
-
-  def activity_params
-    params.require(:activity).permit(
-      :name, :description, :category, :finished,
-      :garden_id, :planting_id, :due_date
-    )
-  end
-
-  def specifics
-    return if @owner.blank?
-
-    "#{@owner.to_param}-"
-  end
-end

app/controllers/admin/members_controller.rb

@@ -13,6 +13,12 @@ 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
@@ -24,12 +30,6 @@ 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/admin/roles_controller.rb

@@ -8,7 +8,7 @@ module Admin
     responders :flash
 
     def index
-      @roles = Role.all.order(:name).paginate(page: params[:page])
+      @roles = Role.all.order(:name)
       respond_with @roles
     end
 
@@ -33,7 +33,7 @@ module Admin
 
     def destroy
       @role.destroy
-      respond_with @role, location: admin_roles_path, notice: "Role was successfully deleted"
+      respond_with @role, location: admin_roles_path
     end
 
     private

app/controllers/admin_controller.rb

@@ -8,7 +8,7 @@ class AdminController < ApplicationController
 
   def newsletter
     authorize! :manage, :all
-    @members = Member.confirmed.wants_newsletter.all.paginate(page: params[:page], per_page: 100)
+    @members = Member.confirmed.wants_newsletter.all
     respond_with @members
   end
 end

app/controllers/alternate_names_controller.rb

@@ -9,7 +9,7 @@ class AlternateNamesController < ApplicationController
   # GET /alternate_names
   # GET /alternate_names.json
   def index
-    @alternate_names = AlternateName.all.order(:name).paginate(page: params[:page], per_page: 100)
+    @alternate_names = AlternateName.all.order(:name)
     respond_with(@alternate_names)
   end
 

app/controllers/application_controller.rb

@@ -2,8 +2,6 @@
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  # Working from codespaces, we want to turn off validation
-  skip_before_action :verify_authenticity_token if Rails.env.development? && ENV['CODESPACE_NAME']
 
   include ApplicationHelper
 

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

@@ -71,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:)
+    redirect_to conversations_path(box: box)
     nil
   end
 end

app/controllers/crops_controller.rb

@@ -10,6 +10,7 @@ class CropsController < ApplicationController
   responders :flash
 
   def index
+    @sort = params[:sort]
     @crops = Crop.search('*', boost_by: %i(plantings_count harvests_count),
                               limit:    100,
                               page:     params[:page],
@@ -45,12 +46,6 @@ class CropsController < ApplicationController
     respond_with @crop, location: @crop
   end
 
-  def gbif
-    @crop = Crop.find(params[:crop_slug])
-    @crop.update_gbif_data!
-    respond_with @crop, location: @crop
-  end
-
   def hierarchy
     @crops = Crop.toplevel.order(:name)
     respond_with @crops
@@ -62,26 +57,21 @@ class CropsController < ApplicationController
     @crops = CropSearchService.search(@term,
                                       page:           params[:page],
                                       per_page:       Crop.per_page,
-                                      current_member:)
-
-    respond_to do |format|
-      format.html do
-        render
-      end
-      format.json do
-        render json: @crops.to_a
-      end
-    end
+                                      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])
         @companions = @crop.companions.approved
       end
       format.svg do
-        icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
+        icon_data = @crop.svg_icon.presence || File.read(Rails.root.join('app', 'assets', 'images', 'icons', 'sprout.svg'))
         send_data(icon_data, type: "image/svg+xml", disposition: "inline")
       end
       format.json do
@@ -99,6 +89,7 @@ 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
@@ -113,24 +104,20 @@ class CropsController < ApplicationController
       @crop.approval_status = "pending"
     end
 
-    if Crop.transaction { @crop.save && save_crop_names }
-      notify_wranglers
-    else
-      @crop.alternate_names.build
-      @crop.scientific_names.build
-    end
+    notify_wranglers if Crop.transaction { @crop.save && save_crop_names }
 
     respond_with @crop
   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')
@@ -138,7 +125,6 @@ class CropsController < ApplicationController
       if @crop.approval_status_changed?(from: "pending", to: "approved")
         notifier.deliver_now!
         @crop.update_openfarm_data!
-        @crop.update_gbif_data!
       end
     else
       @crop.approval_status = @crop.approval_status_was
@@ -166,8 +152,12 @@ class CropsController < ApplicationController
   end
 
   def save_crop_names
-    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 } })
+    params[:alt_name]&.values&.each do |value|
+      create_name!('alternate', value) unless value.empty?
+    end
+    params[:sci_name]&.values&.each do |value|
+      create_name!('scientific', value) unless value.empty?
+    end
   end
 
   def notify_wranglers
@@ -182,7 +172,7 @@ class CropsController < ApplicationController
     return if params[param_name].blank?
 
     destroy_names(name_type)
-    params[param_name].each_value do |value|
+    params[param_name].each do |_i, value|
       create_name!(name_type, value) unless value.empty?
     end
   end
@@ -197,20 +187,21 @@ class CropsController < ApplicationController
 
   def crop_params
     params.require(:crop).permit(
-      :name, :en_wikipedia_url,
-      :parent_id, :perennial,
-      :request_notes, :reason_for_rejection,
+      :en_wikipedia_url,
+      :name,
+      :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_fs(:number)}.csv"
+    "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
   end
 
   def crop_json_fields
@@ -221,7 +212,8 @@ 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,10 +5,6 @@ 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]))
 
@@ -29,6 +25,10 @@ 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/gardens_controller.rb

@@ -16,7 +16,6 @@ class GardensController < DataController
 
   def show
     @current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc)
-    @current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
     @suggested_companions = Crop.approved.where(
       id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)

app/controllers/harvests_controller.rb

@@ -20,7 +20,7 @@ class HarvestsController < DataController
       where['planting_id'] = @planting.id
     end
 
-    @harvests = Harvest.search('*', where:,
+    @harvests = Harvest.search('*', where:    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_fs(:number)}.csv"
+    "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(: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
@@ -58,7 +58,7 @@ class LikesController < ApplicationController
 
   def failed(like, message)
     respond_to do |format|
-      format.json { render(json: { error: message }, status: :forbidden) }
+      format.json { render(json: { 'error': message }, status: :forbidden) }
       format.html do
         flash[:error] = message
         if like&.likeable

app/controllers/members_controller.rb

@@ -18,6 +18,7 @@ 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)
@@ -61,7 +62,7 @@ class MembersController < ApplicationController
   end
 
   def unsubscribe
-    verifier = ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
+    verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
     decrypted_message = verifier.verify(params[:message])
 
     @member = Member.find(decrypted_message[:member_id])

app/controllers/messages_controller.rb

@@ -21,7 +21,7 @@ class MessagesController < ApplicationController
     return if params[:recipient_id].blank?
 
     @recipient = Member.find_by(id: params[:recipient_id])
-    nil if @recipient.nil?
+    return if @recipient.nil?
   end
 
   def create

app/controllers/omniauth_callbacks_controller.rb

@@ -9,6 +9,10 @@ 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'] || "/"
@@ -28,7 +32,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     @authentication = action.establish_authentication(auth, member)
 
     if action.member_created?
-      raise "Invalid provider" unless %w(twitter flickr).index(auth['provider'].to_s)
+      raise "Invalid provider" unless %w(facebook twitter flickr).index(auth['provider'].to_s)
 
       session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
       sign_in member
@@ -41,7 +45,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def after_sign_in_path_for(resource)
     if resource.tos_agreement
-      super
+      super resource
     else
       finish_signup_path(resource)
     end

app/controllers/photos_controller.rb

@@ -8,6 +8,11 @@ class PhotosController < ApplicationController
   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
     @photos = Photo.search(
       load:     false,
@@ -19,11 +24,6 @@ class PhotosController < ApplicationController
     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
@@ -63,7 +63,7 @@ class PhotosController < ApplicationController
 
   def photo_params
     params.require(:photo).permit(:source_id, :source, :title, :license_name,
-                                  :license_url, :thumbnail_url, :fullsize_url, :link_url, :date_taken)
+                                  :license_url, :thumbnail_url, :fullsize_url, :link_url)
   end
 
   # Item with photos attached
@@ -92,15 +92,8 @@ 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
 

app/controllers/plant_parts_controller.rb

@@ -6,7 +6,7 @@ class PlantPartsController < ApplicationController
   responders :flash
 
   def index
-    @plant_parts = PlantPart.all.order(:name).paginate(page: params[:page], per_page: 100)
+    @plant_parts = PlantPart.all.order(:name)
     respond_with(@plant_parts)
   end
 

app/controllers/plantings_controller.rb

@@ -3,7 +3,6 @@
 class PlantingsController < DataController
   after_action :update_crop_medians, only: %i(create update destroy)
   after_action :update_planting_medians, only: :update
-  respond_to :ics, only: [:index] # TODO: This can be shifted up when all relevant controllers respond to ical
 
   def index
     @show_all = params[:all] == '1'
@@ -13,30 +12,30 @@ class PlantingsController < DataController
 
     if params[:member_slug]
       @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id unless @owner.nil?
+      where['owner_id'] = @owner.id
     end
 
     if params[:crop_slug]
       @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id unless @crop.nil?
+      where['crop_id'] = @crop.id
     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_fs(:number)}.csv"
+    @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
+
     respond_with(@plantings)
   end
 
   def show
     @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
     @harvests = Harvest.search(where: { planting_id: @planting.id })
-    @current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
     @matching_seeds = matching_seeds
     @crop = @planting.crop
 

app/controllers/registrations_controller.rb

@@ -3,11 +3,10 @@
 class RegistrationsController < Devise::RegistrationsController
   respond_to :json
 
-  prepend_before_action :check_captcha, only: [:create] # Change this to be any actions you want to protect with recaptcha.
-
   def edit
     @twitter_auth  = current_member.auth('twitter')
     @flickr_auth   = current_member.auth('flickr')
+    @facebook_auth = current_member.auth('facebook')
     render "edit"
   end
 
@@ -48,25 +47,6 @@ class RegistrationsController < Devise::RegistrationsController
       render "edit"
     end
   end
-
-  private
-
-  def sign_up_params
-    params.require(:member).permit(:login_name, :email, :tos_agreement, :newsletter, :password, :password_confirmation)
-  end
-
-  def check_captcha
-    return if verify_recaptcha # verify_recaptcha(action: 'signup') for v3
-
-    self.resource = resource_class.new sign_up_params
-    resource.validate # Look for any other validation errors besides reCAPTCHA
-    set_minimum_password_length
-
-    respond_with_navigational(resource) do
-      flash.discard(:recaptcha_error) # We need to discard flash to avoid showing it on the next page reload
-      render :new
-    end
-  end
 end
 
 # check if we need the current password to update fields

app/controllers/scientific_names_controller.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 class ScientificNamesController < ApplicationController
-  before_action :authenticate_member!, except: %i(index show gbif_suggest)
-  load_and_authorize_resource except: [:gbif_suggest]
+  before_action :authenticate_member!, except: %i(index show)
+  load_and_authorize_resource
   respond_to :html, :json
   responders :flash
 
   # GET /scientific_names
   # GET /scientific_names.json
   def index
-    @scientific_names = ScientificName.all.order(:name).paginate(page: params[:page], per_page: 100)
+    @scientific_names = ScientificName.all.order(:name)
     respond_with(@scientific_names)
   end
 
@@ -35,7 +35,7 @@ class ScientificNamesController < ApplicationController
   def create
     @scientific_name = ScientificName.new(scientific_name_params)
     @scientific_name.creator = current_member
-    gbif_sync!(@scientific_name)
+
     @scientific_name.save
     respond_with(@scientific_name.crop)
   end
@@ -43,9 +43,7 @@ class ScientificNamesController < ApplicationController
   # PUT /scientific_names/1
   # PUT /scientific_names/1.json
   def update
-    @scientific_name.assign_attributes(scientific_name_params)
-    gbif_sync!(@scientific_name)
-    @scientific_name.save
+    @scientific_name.update(scientific_name_params)
     respond_with(@scientific_name.crop)
   end
 
@@ -58,26 +56,9 @@ class ScientificNamesController < ApplicationController
     respond_with(@crop)
   end
 
-  def gbif_suggest
-    render json: gbif_service.suggest(params[:term])
-  end
-
   private
 
-  def gbif_sync!(model)
-    return unless model.gbif_key
-
-    result = gbif_service.fetch(model.gbif_key)
-
-    model.gbif_rank = result["rank"]
-    model.gbif_status = result["status"]
-  end
-
   def scientific_name_params
-    params.require(:scientific_name).permit(:crop_id, :name, :gbif_key)
-  end
-
-  def gbif_service
-    GbifService.new
+    params.require(:scientific_name).permit(:crop_id, :name)
   end
 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],
@@ -35,7 +35,7 @@ class SeedsController < DataController
   end
 
   def show
-    @photos = @seed.photos.includes(:owner).order(created_at: :desc, id: :desc).paginate(page: params[:page], per_page: 30)
+    @photos = @seed.photos.includes(:owner).order(created_at: :desc).paginate(page: params[:page])
     respond_with(@seed)
   end
 
@@ -89,9 +89,9 @@ class SeedsController < DataController
 
   def csv_filename
     if @owner
-      "Growstuff-#{@owner.to_param}-Seeds-#{Time.zone.now.to_fs(:number)}.csv"
+      "Growstuff-#{@owner.to_param}-Seeds-#{Time.zone.now.to_s(:number)}.csv"
     else
-      "Growstuff-Seeds-#{Time.zone.now.to_fs(:number)}.csv"
+      "Growstuff-Seeds-#{Time.zone.now.to_s(:number)}.csv"
     end
   end
 end

app/helpers/application_helper.rb

@@ -24,7 +24,7 @@ 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_fs, :number)
+    max_updated_at = klass.maximum(:updated_at).try(:utc).try(:to_s, :number)
     "#{klass.name.downcase.pluralize}/#{identifier}-#{count}-#{max_updated_at}"
   end
 
@@ -34,13 +34,6 @@ module ApplicationHelper
     tag.div(asterisk + ' '.html_safe + text, class: ['margin-bottom'])
   end
 
-  # A helper to replace the complex template compilation mess
-  # of HAML, Tilt, and dynamic compilation with interpolated ruby.
-  def markdownify(text)
-    translator = Haml::Filters::GrowstuffMarkdown.new
-    translator.expand_members!(translator.expand_crops!(text.to_s))
-  end
-
   #
   # Returns an image uri for a given member.
   #
@@ -62,7 +55,7 @@ module ApplicationHelper
       return uri.to_s
     end
 
-    Gravatar.new(member.email).image_url(size:,
+    Gravatar.new(member.email).image_url(size:    size,
                                          default: :identicon,
                                          ssl:     true)
   end
@@ -77,11 +70,11 @@ module ApplicationHelper
     all = show_all ? '' : 1
 
     if owner.present?
-      public_send("member_#{type}_path", owner, all:)
+      public_send("member_#{type}_path", owner, all: all)
     elsif crop.present?
-      public_send("crop_#{type}_path", crop, all:)
+      public_send("crop_#{type}_path", crop, all: all)
     else
-      public_send("#{type}_path", all:)
+      public_send("#{type}_path", all: all)
     end
   end
 

app/helpers/buttons_helper.rb

@@ -18,30 +18,6 @@ module ButtonsHelper
     end
   end
 
-  def garden_plan_something_button(garden, classes: "btn btn-default")
-    return unless can? :edit, garden
-
-    link_to new_activity_path(garden_id: garden.id), class: classes do
-      activity_icon + ' ' + t('buttons.new_activity')
-    end
-  end
-
-  def plan_something_button
-    return unless can? :create, Activity
-
-    link_to new_activity_path, class: "btn btn-default" do
-      activity_icon + ' ' + t('buttons.new_activity')
-    end
-  end
-
-  def planting_plan_something_button(planting, classes: "btn btn-default")
-    return unless can? :edit, planting
-
-    link_to new_activity_path(planting_id: planting.id), class: classes do
-      activity_icon + ' ' + t('buttons.new_activity')
-    end
-  end
-
   def garden_mark_active_button(garden, classes: 'btn')
     link_to t('buttons.mark_as_active'),
             garden_path(garden, garden: { active: 1 }),
@@ -68,32 +44,19 @@ module ButtonsHelper
   end
 
   def seed_edit_button(seed, classes: "btn btn-raised btn-info")
-    edit_button(edit_seed_path(seed), classes:)
+    edit_button(edit_seed_path(seed), classes: classes)
   end
 
   def harvest_edit_button(harvest, classes: "btn btn-raised btn-info")
-    edit_button(edit_harvest_path(harvest), classes:)
+    edit_button(edit_harvest_path(harvest), classes: classes)
   end
 
   def garden_edit_button(garden, classes: "btn btn-raised btn-info")
-    edit_button(edit_garden_path(garden), classes:)
+    edit_button(edit_garden_path(garden), classes: classes)
   end
 
   def planting_edit_button(planting, classes: "btn btn-raised btn-info")
-    edit_button(edit_planting_path(planting), classes:)
-  end
-
-  def activity_edit_button(activity, classes: "btn btn-raised btn-info")
-    edit_button(edit_activity_path(activity), classes:)
-  end
-
-  def activity_finish_button(activity, classes: 'btn btn-default btn-secondary')
-    return unless can?(:edit, activity) || activity.finished
-
-    link_to activity_path(slug: activity.slug, activity: { finished: 1 }),
-            method: :put, class: "#{classes} append-date" do
-      finished_icon + ' ' + t('buttons.mark_as_finished')
-    end
+    edit_button(edit_planting_path(planting), classes: classes)
   end
 
   def planting_finish_button(planting, classes: 'btn btn-default btn-secondary')

app/helpers/crops_helper.rb

@@ -2,19 +2,19 @@
 
 module CropsHelper
   def display_seed_availability(member, crop)
-    seeds = member.seeds.where(crop:)
+    seeds = member.seeds.where(crop: crop)
     total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
 
     return "You don't have any seeds of this crop." if seeds.none?
 
-    if total_quantity == 0
-      "You have an unknown quantity of seeds of this crop."
-    else
+    if total_quantity != 0
       "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
+    else
+      "You have an unknown quantity of seeds of this crop."
     end
   end
 
   def crop_ebay_seeds_url(crop)
-    "https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
+    "https://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{CGI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg"
   end
 end

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:,
-                                   model:, field:, display_field:, collection:
+    render 'shared/editable/form', field_type: field_type,
+                                   model: model, field: field, display_field: display_field, collection: collection
   end
 end

app/helpers/gardens_helper.rb

@@ -11,12 +11,10 @@ module GardensHelper
     end
   end
 
-  # TODO: Not used?
   def display_garden_name(garden)
     truncate(garden.name, length: 50, separator: ' ', omission: '... ')
   end
 
-  # TODO: Only used by specs?
   def display_garden_plantings(plantings)
     if plantings.blank?
       "None"

app/helpers/icons_helper.rb

@@ -71,10 +71,6 @@ module IconsHelper
     icon('fas', 'seedling')
   end
 
-  def activity_icon
-    icon('fas', 'fa-truck-pickup')
-  end
-
   def post_icon
     image_icon 'post'
   end
@@ -97,7 +93,7 @@ module IconsHelper
 
   def plant_part_icon(name)
     if File.exist? Rails.root.join('app', 'assets', 'images', 'icons', 'plant_parts', "#{name}.svg")
-      image_tag "icons/plant_parts/#{name}.svg", class: 'img img-icon', 'aria-hidden' => "true", alt: name
+      image_tag "icons/plant_parts/#{name}.svg", class: 'img img-icon', 'aria-hidden' => "true"
     else
       planting_icon
     end
@@ -105,7 +101,7 @@ module IconsHelper
 
   def crop_icon(crop)
     if crop.svg_icon.present?
-      image_tag(crop_path(crop, format: 'svg'), class: 'crop-icon', alt: crop)
+      image_tag(crop_path(crop, format: 'svg'), class: 'crop-icon')
     elsif crop.parent.present?
       crop_icon(crop.parent)
     else
@@ -127,6 +123,6 @@ module IconsHelper
   end
 
   def image_icon(icon)
-    image_tag "icons/#{icon}.svg", class: 'img img-icon', 'aria-hidden' => "true", alt: icon
+    image_tag "icons/#{icon}.svg", class: 'img img-icon', 'aria-hidden' => "true"
   end
 end

app/helpers/posts_helper.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 module PostsHelper
+  def display_post_truncated(post, length: 300)
+    truncate(strip_tags(post.body), length: length,
+                                    separator: ' ', omission: '... ') { link_to "Read more", post_path(post) }
+  end
+
   def post_stripped_tags(post, length: 300)
-    truncate(strip_tags(markdownify(post.body)), length:)
+    truncate(strip_tags(post.body), length: length)
   end
 end

app/mailers/notifier_mailer.rb

@@ -2,15 +2,15 @@
 
 class NotifierMailer < ApplicationMailer
   # include NotificationsHelper
-  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
 
   def verifier
     unless ENV['RAILS_SECRET_TOKEN']
-      raise "RAILS_SECRET_TOKEN environment variable" \
-            "not set - have you created config/application.yml?"
+      raise "RAILS_SECRET_TOKEN environment variable"\
+        "not set - have you created config/application.yml?"
     end
 
-    ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
+    ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
   end
 
   def notify(notification)
@@ -27,7 +27,7 @@ class NotifierMailer < ApplicationMailer
 
   def planting_reminder(member)
     @member = member
-    @sitename = ENV.fetch('GROWSTUFF_SITE_NAME', nil)
+    @sitename = ENV['GROWSTUFF_SITE_NAME']
 
     @late = []
     @super_late = []

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
@@ -79,7 +79,6 @@ class Ability
       can :manage, ScientificName
       can :manage, AlternateName
       can :openfarm, Crop
-      can :gbif, Crop
     end
 
     # any member can create a crop provisionally
@@ -109,10 +108,6 @@ class Ability
     can :update,  Planting, garden: { owner_id: member.id }, crop: { approval_status: 'approved' }
     can :destroy, Planting, garden: { owner_id: member.id }, crop: { approval_status: 'approved' }
 
-    can :create,  Activity
-    can :update,  Activity, owner_id: member.id
-    can :destroy, Activity, owner_id: member.id
-
     can :create,  Harvest
     can :update,  Harvest, owner_id: member.id
     can :destroy, Harvest, owner_id: member.id
@@ -153,10 +148,5 @@ class Ability
     can :destroy, PlantPart do |pp|
       pp.harvests.empty?
     end
-    # Admins can't delete themselves
-    cannot :destroy, Member
-    can :destroy, Member do |other_member|
-      other_member&.id != member.id
-    end
   end
 end

app/models/activity.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class Activity < ApplicationRecord
-  extend FriendlyId
-  include Ownable
-  include Finishable
-  include SearchActivities
-  include Likeable
-
-  belongs_to :garden, optional: true
-  belongs_to :planting, optional: true
-
-  friendly_id :activity_slug, use: %i(slugged finders)
-
-  CATEGORIES = ["General", "Weeding", "Soil Cultivation", "Fertilizing", "Pruning", "Topical Application/Treating", "Watering"]
-
-  validates :name, presence: true
-  validates :category, inclusion: { in: CATEGORIES }, presence: true
-  validates :owner, presence: true
-
-  validates :slug, uniqueness: true
-
-  delegate :location, :latitude, :longitude, to: :owner
-  delegate :login_name, :slug, :location, to: :owner, prefix: true
-
-  def activity_slug
-    "#{owner.login_name}-#{name}-#{id}".downcase.tr(' ', '-')
-  end
-
-  def to_s
-    name
-  end
-end

app/models/comment.rb

@@ -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/gbif_data.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module GbifData
-  extend ActiveSupport::Concern
-
-  included do
-    def update_gbif_data!
-      GbifService.new.update_crop(self)
-    end
-  end
-end

app/models/concerns/member_flickr.rb

@@ -9,8 +9,8 @@ module MemberFlickr
       if @flickr.nil?
         flickr_auth = auth('flickr')
         if flickr_auth
-          FlickRaw.api_key = ENV.fetch('GROWSTUFF_FLICKR_KEY', nil)
-          FlickRaw.shared_secret = ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil)
+          FlickRaw.api_key = ENV['GROWSTUFF_FLICKR_KEY']
+          FlickRaw.shared_secret = ENV['GROWSTUFF_FLICKR_SECRET']
           @flickr = FlickRaw::Flickr.new
           @flickr.access_token = flickr_auth.token
           @flickr.access_secret = flickr_auth.secret
@@ -19,24 +19,6 @@ 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: },
-        merge_vars:   { login_name: },
+        email:        { email: email },
+        merge_vars:   { login_name: 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/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_last_harvest:)
+      update(days_to_first_harvest: days_to_first_harvest, days_to_last_harvest: days_to_last_harvest)
     end
 
     # status

app/models/concerns/predict_planting.rb

@@ -77,22 +77,9 @@ module PredictPlanting
         finish_predicted_at <= Time.zone.today
     end
 
-    # Deactivate any plantings over time_limit that are super late in small batches.
-    def self.archive!(time_limit: 3.years.ago, limit: 1000)
-      active_plantings = Planting.annual.active.where("planted_at < ?", time_limit).order(planted_at: :asc).limit(limit)
-      active_plantings.each do |planting|
-        if planting.finish_is_predicatable? && planting.super_late?
-          planting.finished = true
-          planting.save
-        end
-      end
-    end
-
     private
 
     def calculate_percentage_grown
-      return 0 if age_in_days < 0
-
       percent = (age_in_days / expected_lifespan.to_f) * 100
       (percent > 100 ? 100 : percent)
     end

app/models/concerns/search_activities.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-module SearchActivities
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   active:     { type: :boolean },
-                   created_at: { type: :integer }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        active:,
-        finished:         finished?,
-        name:,
-        due_date:,
-        category:,
-        garden_id:,
-        garden_name:      garden&.name,
-        planting_id:,
-        planting_name:    planting&.crop&.name,
-        description:,
-
-        # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
-
-        # timestamps
-        created_at:       created_at.to_i,
-        updated_at:       updated_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      records = []
-      owners = []
-      1..limit.times do
-        where = {
-          # photos_count: { gt: 0 },
-          owner_id: { not: owners }
-        }
-        one_record = search('*',
-                            limit:    1,
-                            where:,
-                            boost_by: [:created_at],
-                            load:     false).first
-        return records if one_record.nil?
-
-        owners << one_record.owner_id
-        records << one_record
-      end
-      records
-    end
-  end
-end

app/models/concerns/search_crops.rb

@@ -29,19 +29,19 @@ module SearchCrops
 
     def search_data
       {
-        name:,
-        description:,
-        slug:,
+        name:             name,
+        description:      description,
+        slug:             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:,
-        harvests_count:,
+        plantings_count:  plantings_count,
+        harvests_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:,
-        quantity:,
+        slug:             slug,
+        quantity:         quantity,
 
         # crop
-        crop_id:,
-        crop_name:,
+        crop_id:          crop_id,
+        crop_name:        crop_name,
         crop_slug:        crop.slug,
 
         # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
+        owner_id:         owner_id,
+        owner_login_name: owner_login_name,
+        owner_slug:       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:,
-        title:,
-        thumbnail_url:,
-        fullsize_url:,
+        id:                     id,
+        title:                  title,
+        thumbnail_url:          thumbnail_url,
+        fullsize_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_login_name:,
-        owner_slug:,
+        owner_id:               owner_id,
+        owner_login_name:       owner_login_name,
+        owner_slug:             owner_slug,
         # counts
-        likes_count:,
+        likes_count:            likes_count,
 
         created_at:             created_at.to_i
       }

app/models/concerns/search_plantings.rb

@@ -18,45 +18,42 @@ module SearchPlantings
 
     def search_data
       {
-        slug:,
-        active:,
+        slug:                       slug,
+        active:                     active,
         finished:                   finished?,
         has_photos:                 photos.size.positive?,
-        location:,
+        location:                   location,
         percentage_grown:           percentage_grown.to_i,
-        planted_at:,
-        planted_from:,
+        planted_at:                 planted_at,
+        planted_from:               planted_from,
         planted_year:               planted_at&.year,
-        quantity:,
-        sunniness:,
-        garden_id:,
-        garden_name:                garden&.name,
-        description:,
+        quantity:                   quantity,
+        sunniness:                  sunniness,
+        garden_id:                  garden_id,
 
-        first_harvest_predicted_at:,
-        finish_predicted_at:,
+        first_harvest_predicted_at: first_harvest_predicted_at,
+        finish_predicted_at:        finish_predicted_at,
 
         # crops
-        crop_id:,
-        crop_name:,
-        crop_slug:,
-        crop_perennial:,
+        crop_id:                    crop_id,
+        crop_name:                  crop_name,
+        crop_slug:                  crop_slug,
+        crop_perennial:             crop_perennial,
 
         # owner
-        owner_id:,
-        owner_location:,
-        owner_login_name:,
-        owner_slug:,
+        owner_id:                   owner_id,
+        owner_location:             owner_location,
+        owner_login_name:           owner_login_name,
+        owner_slug:                 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,
-        updated_at:                 updated_at.to_i
+        created_at:                 created_at.to_i
       }
     end
 
@@ -70,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:,
-        active:,
-        heirloom:,
+        gmo:              gmo,
+        active:           active,
+        heirloom:         heirloom,
         location:         owner.location,
-        organic:,
-        quantity:,
-        plant_before:     plant_before&.to_fs(:ymd),
-        tradable_to:,
-        tradable:,
+        organic:          organic,
+        quantity:         quantity,
+        plant_before:     plant_before&.to_s(:ymd),
+        tradable_to:      tradable_to,
+        tradable:         tradable,
 
         # crop
-        crop_id:,
+        crop_id:          crop_id,
         crop_name:        crop.name,
         crop_slug:        crop.slug,
 
         # owner
-        owner_id:,
-        owner_location:,
-        owner_login_name:,
-        owner_slug:,
+        owner_id:         owner_id,
+        owner_location:   owner_location,
+        owner_login_name: owner_login_name,
+        owner_slug:       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:,
+      search('*', limit:    limit,
                   where:    {
                     finished: false,
                     tradable: true

app/models/crop.rb

@@ -4,7 +4,6 @@ class Crop < ApplicationRecord
   extend FriendlyId
   include PhotoCapable
   include OpenFarmData
-  include GbifData
   include SearchCrops
 
   friendly_id :name, use: %i(slugged finders)
@@ -55,7 +54,6 @@ class Crop < ApplicationRecord
               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:)
+    @crop = Crop.find_or_create_by(name: 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:, crop: @crop)
-      sciname ||= ScientificName.create!(name:, crop: @crop, creator: cropbot)
+      sciname = ScientificName.find_by(name: name, crop: @crop)
+      sciname ||= ScientificName.create!(name: name, crop: @crop, creator: cropbot)
       @crop.scientific_names << sciname
     end
   end
@@ -58,8 +58,8 @@ class CsvImporter
     return if alternate_names.blank?
 
     alternate_names.split(/,\s*/).each do |name|
-      altname = AlternateName.find_by(name:, crop: @crop)
-      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
+      altname = AlternateName.find_by(name: name, crop: @crop)
+      altname ||= AlternateName.create! name: name, crop: @crop, creator: cropbot
       @crop.alternate_names << altname
     end
   end

app/models/follow.rb

@@ -10,7 +10,7 @@ class Follow < ApplicationRecord
       recipient_id: followed_id,
       sender_id:    follower_id,
       subject:      "#{follower.login_name} is now following you",
-      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
+      body:         "#{follower.login_name} just followed you on #{ENV['GROWSTUFF_SITE_NAME']}. "
     )
   end
 end

app/models/forum.rb

@@ -4,7 +4,6 @@ class Forum < ApplicationRecord
   extend FriendlyId
   include Ownable
   validates :name, presence: true
-  validates :description, presence: true
   friendly_id :name, use: %i(slugged finders)
 
   has_many :posts, dependent: :destroy

app/models/garden.rb

@@ -9,7 +9,6 @@ class Garden < ApplicationRecord
 
   has_many :plantings, dependent: :destroy
   has_many :crops, through: :plantings
-  has_many :activities, dependent: :destroy
 
   belongs_to :garden_type, optional: true
 
@@ -79,16 +78,6 @@ class Garden < ApplicationRecord
 
   def reindex(refresh: false); end
 
-  # Deactivate any gardens with no active plantings
-  def self.archive!(time_limit: 3.years.ago, limit: 1000)
-    Garden.active.where("gardens.updated_at < ?", time_limit).order(updated_at: :asc).limit(limit).each do |active_garden|
-      unless active_garden.plantings.active.any?
-        active_garden.active = false
-        active_garden.save
-      end
-    end
-  end
-
   protected
 
   def strip_blanks

app/models/harvest.rb

@@ -6,7 +6,6 @@ class Harvest < ApplicationRecord
   include PhotoCapable
   include Ownable
   include SearchHarvests
-  include Likeable
 
   friendly_id :harvest_slug, use: %i(slugged finders)
 

app/models/member.rb

@@ -19,10 +19,9 @@ class Member < ApplicationRecord
   has_many :plantings, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
   has_many :seeds, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
   has_many :harvests, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
-  has_many :activities, 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, class_name: "Notification"
+  has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender
   has_many :authentications, dependent: :destroy
   has_many :photos, inverse_of: :owner
   has_many :likes, dependent: :destroy
@@ -128,7 +127,7 @@ class Member < ApplicationRecord
   end
 
   def auth(provider)
-    authentications.find_by(provider:)
+    authentications.find_by(provider: provider)
   end
 
   def unread_count

app/models/photo.rb

@@ -9,20 +9,15 @@ class Photo < ApplicationRecord
 
   has_many :photo_associations, dependent: :delete_all, inverse_of: :photo
 
-  # This doesn't work, ActiveRecord tries to use the polymoriphic photographable
+  # This doesn't work, ActiveRecord tries to use the polymoriphinc photographable
   # relationship instead.
   # has_many :crops, through: :photo_associations, counter_cache: true
   def crops
     Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: self })
   end
 
-  validates :fullsize_url, url: true, presence: true
-  validates :thumbnail_url, url: true, presence: true
-  validates :link_url, url: true, presence: true
-  validates :owner, presence: true
-  validates :title, presence: true
-  validates :license_name, presence: true # Should assert this is one of CC-BY, CC-BY-NC, etc
-  validates :license_url,  url: true, allow_blank: true
+  validates :fullsize_url, url: true
+  validates :thumbnail_url, url: true
 
   # creates a relationship for each assignee type
   PHOTO_CAPABLE.each do |type|
@@ -32,7 +27,7 @@ class Photo < ApplicationRecord
              source_type: type
   end
 
-  scope :by_crop, ->(crop) { joins(:photo_associations).where(photo_associations: { crop: }) }
+  scope :by_crop, ->(crop) { joins(:photo_associations).where(photo_associations: { crop: 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
-    return unless %w(Planting Seed Harvest).include?(photographable_type)
-
-    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
+    if %w(Planting Seed Harvest).include?(photographable_type)
+      errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
+    end
   end
 end

app/models/planting.rb

@@ -8,7 +8,6 @@ class Planting < ApplicationRecord
   include PredictPlanting
   include PredictHarvest
   include SearchPlantings
-  include Likeable
 
   friendly_id :planting_slug, use: %i(slugged finders)
 
@@ -23,7 +22,6 @@ class Planting < ApplicationRecord
   belongs_to :garden
   belongs_to :crop, counter_cache: true
   has_many :harvests, dependent: :destroy
-  has_many :activities, dependent: :destroy
 
   #
   # Ancestry of food
@@ -91,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:)
+    I18n.t('plantings.string', crop: crop.name, garden: garden.name, owner: owner)
   end
 
   def finished?
@@ -111,7 +109,7 @@ class Planting < ApplicationRecord
 
     # latitude, longitude = Geocoder.coordinates(location, params: { limit: 1 })
     Planting.joins(:garden)
-      .where(crop:)
+      .where(crop: crop)
       .located
       .where('gardens.latitude < ? AND gardens.latitude > ?',
              latitude + 10, latitude - 10)

app/models/post.rb

@@ -24,11 +24,8 @@ class Post < ApplicationRecord
   #
   # Validations
   validates :subject, presence: true, length: { maximum: 255 }
-  validates :body, presence: true
 
   def author_date_subject
-    return unless author
-
     # slugs are created before created_at is set
     time = created_at || Time.zone.now
     "#{author.login_name} #{time.strftime('%Y%m%d')} #{subject}"
@@ -93,10 +90,10 @@ class Post < ApplicationRecord
       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:).try(:first).try(:members)
+        Role.where(slug: slug).try(:first).try(:members)
       end
     end
   end

app/models/seed.rb

@@ -33,17 +33,17 @@ class Seed < ApplicationRecord
   validates :days_until_maturity_max, allow_nil:    true,
                                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :tradable_to, allow_blank: false,
-                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
-                                                                          "locally, nationally, or internationally" }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, "\
+                                                "locally, nationally, or internationally" }
   validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
-                                                                  "are organic or not, or that you don't know" }
+                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds "\
+                                             "are organic or not, or that you don't know" }
   validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
-                                                          "genetically modified or not, or that you don't know" }
+                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are "\
+                                                        "genetically modified or not, or that you don't know" }
   validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
-                                                                    "are heirloom, hybrid, or unknown" }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds"\
+                                                                  "are heirloom, hybrid, or unknown" }
 
   #
   # Delegations
@@ -56,7 +56,7 @@ class Seed < ApplicationRecord
   default_scope { joins(:owner).merge(Member.kept) } # Ensure owner exists
   scope :tradable, -> { where.not(tradable_to: 'nowhere') }
   scope :interesting, -> { tradable.has_location }
-  scope :has_location, -> { joins(:owner).where.not('members.location': nil) }
+  scope :has_location, -> { joins(:owner).where.not("members.location": nil) }
   scope :recent, -> { order(created_at: :desc) }
   scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
 
@@ -69,6 +69,6 @@ class Seed < ApplicationRecord
   end
 
   def to_s
-    I18n.t('seeds.string', crop: crop.name, owner:)
+    I18n.t('seeds.string', crop: crop.name, owner: owner)
   end
 end

app/resources/api/v1/member_resource.rb

@@ -5,10 +5,10 @@ module Api
     class MemberResource < BaseResource
       immutable
 
-      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 :gardens
+      has_many :plantings
+      has_many :harvests
+      has_many :seeds
 
       has_many :photos
 

app/resources/api/v1/planting_resource.rb

@@ -33,7 +33,6 @@ 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:,
-      per_page:,
+      page:         page,
+      per_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/gbif_service.rb

@@ -1,193 +0,0 @@
-# frozen_string_literal: true
-
-require 'English'
-class GbifService
-  def initialize
-    @cropbot = Member.find_by(login_name: 'cropbot')
-    @species = Gbif::Species
-  end
-
-  def suggest(term)
-    # Query the GBIF name autocomplete and discover the scientific name.
-    # [
-    #   {
-    #   "key": 2932942,
-    #   "nameKey": 1970347,
-    #   "kingdom": "Plantae",
-    #   "phylum": "Tracheophyta",
-    #   "order": "Solanales",
-    #   "family": "Solanaceae",
-    #   "genus": "Capsicum",
-    #   "species": "Capsicum chinense",
-    #   "kingdomKey": 6,
-    #   "phylumKey": 7707728,
-    #   "classKey": 220,
-    #   "orderKey": 1176,
-    #   "familyKey": 7717,
-    #   "genusKey": 2932937,
-    #   "speciesKey": 2932942,
-    #   "parent": "Capsicum",
-    #   "parentKey": 2932937,
-    #   "nubKey": 2932942,
-    #   "scientificName": "Capsicum chinense Jacq.",
-    #   "canonicalName": "Capsicum chinense",
-    #   "rank": "SPECIES",
-    #   "status": "ACCEPTED",
-    #   "synonym": false,
-    #   "higherClassificationMap": {
-    #   "6": "Plantae",
-    #   "220": "Magnoliopsida",
-    #   "1176": "Solanales",
-    #   "7717": "Solanaceae",
-    #   "2932937": "Capsicum",
-    #   "7707728": "Tracheophyta"
-    #   },
-    #   "class": "Magnoliopsida"
-    #   },
-    #   {
-    #   "key": 12079498,
-    #   "nameKey": 81778754,
-    #   "kingdom": "Plantae",
-    #   "phylum": "Tracheophyta",
-    #   "order": "Solanales",
-    #   "family": "Solanaceae",
-    #   "genus": "Capsicum",
-    #   "species": "Capsicum chinense",
-    #   "kingdomKey": 6,
-    #   "phylumKey": 7707728,
-    #   "classKey": 220,
-    #   "orderKey": 1176,
-    #   "familyKey": 7717,
-    #   "genusKey": 2932937,
-    #   "speciesKey": 2932942,
-    #   "parent": "Capsicum",
-    #   "parentKey": 2932937,
-    #   "nubKey": 12079498,
-    #   "scientificName": "Capsicum annuum var. chinense (Jacq.) Alef.",
-    #   "canonicalName": "Capsicum annuum chinense",
-    #   "rank": "VARIETY",
-    #   "status": "SYNONYM",
-    #   "synonym": true,
-    #   "higherClassificationMap": {
-    #   "6": "Plantae",
-    #   "220": "Magnoliopsida",
-    #   "1176": "Solanales",
-    #   "7717": "Solanaceae",
-    #   "2932937": "Capsicum",
-    #   "2932942": "Capsicum chinense",
-    #   "7707728": "Tracheophyta"
-    #   },
-    #   "class": "Magnoliopsida"
-    #   }
-    #   ]
-
-    @species.name_suggest(q: term)
-  end
-
-  def import!
-    Crop.order(updated_at: :desc).each do |crop|
-      Rails.logger.debug { "#{crop.id}, #{crop.name}" }
-      update_crop(crop) if crop.valid?
-    rescue ActiveRecord::RecordInvalid
-      Rails.logger.error($ERROR_INFO.message)
-    end
-  end
-
-  def update_crop(crop)
-    # Attempt to resolve the scientific names via /species/match.
-    gbif_usage_key = crop.scientific_names.detect { |sn| sn.gbif_key.present? }&.gbif_key
-    unless gbif_usage_key
-      crop.scientific_names.each do |sn|
-        result = @species.name_backbone(name: sn.name) # , higherTaxonKey: 6, nameType: 'SCIENTIFIC')
-        next unless result["confidence"] > 95 && result["matchType"] == "EXACT"
-
-        sn.gbif_key = result["usageKey"]
-        sn.gbif_rank = result["rank"]
-        sn.gbif_status = result["status"]
-        sn.save!
-      end
-
-      gbif_usage_key = crop.scientific_names.detect { |sn| sn.gbif_key.present? }&.gbif_key
-    end
-
-    # No match? Fall back to common names
-    unless gbif_usage_key
-      query_results = @species.name_lookup(q: crop.name, higherTaxonKey: 6)
-
-      # We only want one result, otherwise it needs human.
-      return unless query_results["results"].length == 1
-
-      query_result = query_results["results"].first
-
-      gbif_usage_key = query_result["key"]
-
-      crop.scientific_names.create!(gbif_key: gbif_usage_key, name: query_result["canonicalName"], creator: @cropbot)
-    end
-
-    gbif_record = fetch(gbif_usage_key)
-    if gbif_record.present?
-      #   crop.update! openfarm_data: gbif_record.fetch('data', false)
-      #   save_companions(crop, gbif_record)
-      save_photos(crop, gbif_usage_key)
-    else
-      Rails.logger.debug "\tcrop not found on GBIF"
-      #   crop.update!(openfarm_data: false)
-    end
-  end
-
-  def save_photos(crop, key)
-    #  https://api.gbif.org/v1/occurrence/search?taxon_key=3084850
-
-    occurrences = Gbif::Occurrences.search(taxonKey: key, mediatype: 'StillImage', limit: 3, hasCoordinate: true)
-    occurrences["results"].each do |result|
-      next unless result["media"]
-
-      media = result["media"].first
-      next unless media["identifier"]
-
-      # Example: "https://inaturalist-open-data.s3.amazonaws.com/photos/250226497/original.jpg"
-      url = media["identifier"]
-      md5 = Digest::MD5.hexdigest(url)
-      width = 200
-      thumbnail = "https://api.gbif.org/v1/image/cache/#{width}x/occurrence/#{result['key']}/media/#{md5}"
-
-      next unless url.start_with? 'http'
-      next if Photo.find_by(source_id: result["key"], source: 'gbif')
-      next if media["references"].blank?
-
-      photo = Photo.new(
-        # This is for the overall observation which may technically have multiple media. However, we're only taking the first.
-        source_id:     result["key"],
-        source:        'gbif',
-        owner:         @cropbot,
-        thumbnail_url: thumbnail,
-        fullsize_url:  url,
-        title:         "Photo by #{media['creator']} via #{media['publisher']} (Copyright #{media['rightsHolder']})",
-        license_name:  case media["license"]
-                       when "http://creativecommons.org/licenses/by/4.0/"
-                         "CC BY 4.0"
-                       when "http://creativecommons.org/licenses/by-nc/4.0/"
-                         "CC BY-NC 4.0"
-                       else
-                         media["license"]
-                       end,
-        license_url:   media["license"],
-        link_url:      media["references"]
-      )
-      photo.date_taken = DateTime.parse(media["created"]) if media["created"]
-      if photo.valid?
-        Photo.transaction do
-          photo.save
-          PhotoAssociation.find_or_create_by! photo:, photographable: crop
-        end
-        Rails.logger.debug { "\t saved photo #{photo.id} #{photo.source_id}" }
-      else
-        Rails.logger.warn "Photo not valid"
-      end
-    end
-  end
-
-  def fetch(key)
-    Gbif::Request.new("species/#{key}", nil, nil, nil).perform
-  end
-end

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:, photographable: crop
+          PhotoAssociation.find_or_create_by! photo: 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