Merge branch 'dev' into Style/SoleNestedConditional

.devcontainer/.env

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

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:0-3.2-bullseye
 
 # Install Rails
 RUN gem install rails:7.0.8
@@ -29,5 +29,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # 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/"
+RUN su root -c "chmod -R 777 /usr/local/rvm/gems/"

.github/dependabot.yml

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

.github/workflows/ci.yml

@@ -72,8 +72,6 @@ jobs:
       #
       # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
       #
-      - name: Enable Corepack
-        run: corepack enable
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"

.rubocop.yml

@@ -11,7 +11,7 @@ AllCops:
   Exclude:
     - 'db/schema.rb'
     - 'vendor/**/*'
-  TargetRailsVersion: 7.1
+  TargetRailsVersion: 7.0
 
 Rails:
   Enabled: true

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
+# on 2024-07-13 05:22:30 UTC using RuboCop version 1.65.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
@@ -12,6 +12,13 @@
 Capybara/ClickLinkOrButtonStyle:
   Enabled: false
 
+# Offense count: 84
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_no, not_to
+Capybara/NegationMatcher:
+  Enabled: false
+
 # Offense count: 39
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: DefaultSelector.
@@ -81,14 +88,125 @@ FactoryBot/ExcessiveCreateList:
 FactoryBot/SyntaxMethods:
   Enabled: false
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'spec/factories/activity.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment.
+Layout/CommentIndentation:
+  Exclude:
+    - 'config/environments/production.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'config/initializers/application_controller_renderer.rb'
+    - 'config/initializers/backtrace_silencers.rb'
+    - 'config/initializers/content_security_policy.rb'
+    - 'config/initializers/mime_types.rb'
+    - 'config/initializers/new_framework_defaults_5_2.rb'
+    - 'db/migrate/20240218053122_add_slug_to_activity.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'db/migrate/20171129041341_create_photographings.rb'
+    - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLines:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'lib/tasks/gardens.rake'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/models/concerns/search_activities.rb'
+    - 'app/models/concerns/search_plantings.rb'
+
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/LineContinuationSpacing:
+  Exclude:
+    - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/seed.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/features/rss/plantings_spec.rb'
+    - 'spec/features/rss/posts_spec.rb'
+    - 'spec/features/rss/seeds_spec.rb'
+    - 'spec/models/seed_spec.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/LineEndStringConcatenationIndentation:
+  Exclude:
+    - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/seed.rb'
+    - 'lib/tasks/growstuff.rake'
+    - 'spec/features/rss/plantings_spec.rb'
+    - 'spec/features/rss/posts_spec.rb'
+    - 'spec/features/rss/seeds_spec.rb'
+
+# Offense count: 3
+# 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'
+    - 'spec/requests/plantings_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'spec/features/admin/newsletter_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'spec/factories/activity.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'db/seeds.rb'
+    - 'spec/helpers/gardens_helper_spec.rb'
+    - 'spec/helpers/seeds_helper_spec.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -605,6 +723,14 @@ Style/ClassAndModuleChildren:
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Keywords, RequireColon.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
+Style/CommentAnnotation:
+  Exclude:
+    - 'spec/features/seeds/adding_seeds_spec.rb'
+
 # Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CommentedKeyword:
@@ -614,6 +740,12 @@ Style/CommentedKeyword:
     - 'spec/models/photo_spec.rb'
     - 'spec/models/planting_spec.rb'
 
+# Offense count: 37
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars.
+Style/FetchEnvVar:
+  Enabled: false
+
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -632,6 +764,33 @@ Style/GlobalStdStream:
     - 'lib/tasks/gbif.rake'
     - 'lib/tasks/openfarm.rake'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
+Style/GuardClause:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
+Style/HashSyntax:
+  Exclude:
+    - 'app/models/csv_importer.rb'
+    - 'spec/requests/api/v1/gardens_request_spec.rb'
+    - 'spec/requests/api/v1/plantings_request_spec.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'bin/setup'
+    - 'spec/features/shared_examples/crop_suggest.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
@@ -660,13 +819,18 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 5
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/NegatedIfElseCondition:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
     - 'app/models/concerns/predict_planting.rb'
@@ -683,6 +847,15 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'app/models/concerns/member_newsletter.rb'
 
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: same_as_string_literals, single_quotes, double_quotes
+Style/QuotedSymbols:
+  Exclude:
+    - 'app/models/seed.rb'
+    - 'spec/controllers/crops_controller_spec.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
@@ -690,6 +863,12 @@ Style/RedundantArgument:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantConstantBase:
+  Exclude:
+    - 'config.ru'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SafeForConstants.
@@ -697,12 +876,17 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'db/migrate/20191119030244_cms_tags.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
   Exclude:
-    - 'app/controllers/application_controller.rb'
     - 'app/controllers/messages_controller.rb'
 
 # Offense count: 24
@@ -716,6 +900,13 @@ Style/StringConcatenation:
     - 'spec/helpers/gardens_helper_spec.rb'
     - 'spec/helpers/seeds_helper_spec.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
+  Exclude:
+    - 'app/controllers/omniauth_callbacks_controller.rb'
+    - 'lib/haml/filters/escaped_markdown.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.

.ruby-version

@@ -1 +1 @@
-3.3.4
+3.2.2

.yarnrc.yml

@@ -1,3 +0,0 @@
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-4.5.0.cjs

Gemfile

@@ -5,13 +5,13 @@ source 'https://rubygems.org'
 # Match ruby version in .ruby-version
 ruby File.read('.ruby-version')
 
-gem 'rails', '~> 7.2.0'
+gem 'rails', '~> 7.1.0'
 
 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
 gem "sprockets", "<4"
 
-gem 'bundler', '>= 2.4.22'
+gem 'bundler', '>= 2.3.10'
 
 gem 'coffee-rails'
 gem 'haml'

Gemfile.lock

@@ -33,46 +33,51 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
-      mail (>= 2.8.0)
-    actionmailer (7.2.1)
-      actionpack (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activesupport (= 7.2.1)
-      mail (>= 2.8.0)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.1)
-      actionview (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (7.2.1)
-      actionpack (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.1)
-      activesupport (= 7.2.1)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -87,45 +92,44 @@ GEM
     active_utils (3.4.1)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.1)
-      activesupport (= 7.2.1)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.2.1)
-      activesupport (= 7.2.1)
-    activerecord (7.2.1)
-      activemodel (= 7.2.1)
-      activesupport (= 7.2.1)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activesupport (= 7.2.1)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.2.1)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.10.0)
+    axe-core-api (4.9.1)
       dumb_delegator
       virtus
-    axe-core-capybara (4.10.0)
-      axe-core-api (= 4.10.0)
+    axe-core-capybara (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
-    axe-core-rspec (4.10.0)
-      axe-core-api (= 4.10.0)
+    axe-core-rspec (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
       virtus
     axiom-types (0.1.1)
@@ -152,7 +156,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (7.2.0)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -179,7 +183,7 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.1.0)
+    chartkick (5.0.7)
     childprocess (5.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
@@ -195,7 +199,7 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     csv (3.3.0)
@@ -204,7 +208,7 @@ GEM
     dalli (3.2.8)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -221,9 +225,9 @@ GEM
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
     docile (1.1.5)
-    dotenv (3.1.4)
-    dotenv-rails (3.1.4)
-      dotenv (= 3.1.4)
+    dotenv (3.1.2)
+    dotenv-rails (3.1.2)
+      dotenv (= 3.1.2)
       railties (>= 6.1)
     drb (2.2.1)
     dumb_delegator (1.0.0)
@@ -244,18 +248,17 @@ GEM
     erubis (2.7.0)
     excon (0.110.0)
     execjs (2.9.1)
-    factory_bot (6.4.6)
+    factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faker (3.4.2)
+    faker (3.4.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
-      json
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
       logger
-    faraday-net_http (3.3.0)
+    faraday-net_http (3.1.0)
       net-http
     ffi (1.16.3)
     flickraw (0.9.10)
@@ -304,11 +307,10 @@ GEM
       multi_json (>= 1.9.2)
       webrick
     highline (3.0.1)
-    httparty (0.22.0)
-      csv
+    httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.6)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -320,16 +322,15 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    icalendar (2.10.3)
+    icalendar (2.10.1)
       ice_cube (~> 0.16)
-      ostruct
-    ice_cube (0.17.0)
+    ice_cube (0.16.4)
     ice_nine (0.11.2)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jquery-rails (4.6.0)
@@ -337,7 +338,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.7.2)
-    json-schema (4.3.1)
+    json-schema (4.1.1)
       addressable (>= 2.8)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
@@ -348,10 +349,10 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    launchy (3.0.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    leaflet-rails (1.9.5)
+    leaflet-rails (1.9.4)
       actionpack (>= 4.2.0)
       railties (>= 4.2.0)
     letter_opener (1.10.0)
@@ -359,7 +360,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -386,15 +387,15 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    minitest (5.24.1)
     moneta (1.0.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
+    multi_xml (0.6.0)
+    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.14)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
@@ -404,15 +405,14 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.6)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
-      ostruct (>= 0.2)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -426,14 +426,13 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    ostruct (0.6.0)
-    parallel (1.26.3)
-    parser (3.3.5.0)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.5.8)
+    pg (1.5.6)
     platform-api (3.7.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
@@ -444,11 +443,11 @@ GEM
       method_source (~> 1.0)
     psych (5.1.2)
       stringio
-    public_suffix (6.0.1)
-    puma (6.4.3)
+    public_suffix (5.0.5)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    query_diet (0.7.2)
-    racc (1.8.1)
+    query_diet (0.7.1)
+    racc (1.8.0)
     rack (2.2.9)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
@@ -462,20 +461,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.2.1)
-      actioncable (= 7.2.1)
-      actionmailbox (= 7.2.1)
-      actionmailer (= 7.2.1)
-      actionpack (= 7.2.1)
-      actiontext (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activemodel (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.2.1)
+      railties (= 7.1.3.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -495,16 +494,16 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
-      irb (~> 1.13)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    raindrops (0.20.1)
+    raindrops (0.20.0)
     rake (13.2.1)
     rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
@@ -516,12 +515,13 @@ GEM
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.10)
+    reline (0.5.9)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.7)
+    rexml (3.3.1)
+      strscan
     rouge (4.1.2)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -531,18 +531,18 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.0.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
+    rspec-rails (6.1.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
@@ -551,47 +551,48 @@ GEM
     rspectre (0.1.0)
       parser (>= 3.2.2.1)
       rspec (~> 3.9)
-    rswag-api (2.14.0)
-      activesupport (>= 5.2, < 8.0)
-      railties (>= 5.2, < 8.0)
-    rswag-specs (2.14.0)
-      activesupport (>= 5.2, < 8.0)
+    rswag-api (2.13.0)
+      activesupport (>= 3.1, < 7.2)
+      railties (>= 3.1, < 7.2)
+    rswag-specs (2.13.0)
+      activesupport (>= 3.1, < 7.2)
       json-schema (>= 2.2, < 5.0)
-      railties (>= 5.2, < 8.0)
+      railties (>= 3.1, < 7.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.14.0)
-      actionpack (>= 5.2, < 8.0)
-      railties (>= 5.2, < 8.0)
-    rubocop (1.66.1)
+    rswag-ui (2.13.0)
+      actionpack (>= 3.1, < 7.2)
+      railties (>= 3.1, < 7.2)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.0.5)
+    rubocop-rspec (3.0.2)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    ruby-units (4.1.0)
+    ruby-units (4.0.3)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
     rubyzip (2.3.2)
@@ -608,19 +609,18 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.4.0)
+    scout_apm (5.3.8)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
-    securerandom (0.3.1)
-    selenium-webdriver (4.25.0)
+    selenium-webdriver (4.22.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (7.3.2)
+    sidekiq (7.3.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       logger
@@ -631,7 +631,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.5)
+    sprockets (3.7.3)
       base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -641,32 +641,31 @@ GEM
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
     stringio (3.1.1)
+    strscan (3.1.0)
     sysexits (1.2.0)
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.2.3)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
+    thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.4.0)
+    tilt (2.3.0)
     timecop (0.9.10)
     timeout (0.4.1)
     trollop (1.16.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (2.5.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.16.0)
-    uri (0.13.1)
-    useragent (0.16.10)
+    uri (0.13.0)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.3.1)
-      base64
+    vcr (6.2.0)
     virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -677,8 +676,8 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    webrick (1.8.2)
-    websocket (1.2.11)
+    webrick (1.8.1)
+    websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -689,7 +688,7 @@ GEM
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby
@@ -708,7 +707,7 @@ DEPENDENCIES
   bootstrap-datepicker-rails
   bootstrap_form (>= 4.5.0)
   bullet
-  bundler (>= 2.4.22)
+  bundler (>= 2.3.10)
   byebug
   cancancan
   capybara
@@ -767,7 +766,7 @@ DEPENDENCIES
   query_diet
   rack-cors
   rack-protection (>= 2.0.1)
-  rails (~> 7.2.0)
+  rails (~> 7.1.0)
   rails-assets-leaflet.markercluster!
   rails-controller-testing
   rails_12factor
@@ -805,7 +804,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.4.22

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/stylesheets/overrides.scss

@@ -8,9 +8,6 @@ body {
   font-family: $default-font;
 }
 
-.navbar {
-  flex-wrap: nowrap;
-}
 .navbar-brand {
   .site-name {
     font-family: "Modak", cursive;
@@ -19,7 +16,7 @@ body {
   }
 
   img {
-    height: 100%;
+    height: 60px;
   }
 }
 

app/controllers/activities_controller.rb

@@ -81,8 +81,8 @@ class ActivitiesController < DataController
   end
 
   def specifics
-    return if @owner.blank?
-
-    "#{@owner.to_param}-"
+    if @owner.present?
+      "#{@owner.to_param}-"
+    end
   end
 end

app/controllers/application_controller.rb

@@ -3,7 +3,9 @@
 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']
+  if Rails.env.development? && ENV['CODESPACE_NAME']
+    skip_before_action :verify_authenticity_token
+  end
 
   include ApplicationHelper
 
@@ -12,13 +14,13 @@ class ApplicationController < ActionController::Base
   rescue_from ActiveRecord::RecordNotFound, with: :not_found
 
   def store_location
-    unless request.path.in?(["/members/sign_in",
-                             "/members/sign_up",
-                             "/members/password/new",
-                             "/members/password/edit",
-                             "/members/confirmation",
-                             "/members/sign_out"]) || request.xhr?
-      store_location_for(:member, request.fullpath) if request.format == :html
+    if !(request.path.in?(["/members/sign_in",
+                           "/members/sign_up",
+                           "/members/password/new",
+                           "/members/password/edit",
+                           "/members/confirmation",
+                           "/members/sign_out"]) || request.xhr?) && (request.format == :html)
+      store_location_for(:member, request.fullpath)
     end
   end
 

app/controllers/crops_controller.rb

@@ -113,12 +113,7 @@ 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

app/controllers/members_controller.rb

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

@@ -8,11 +8,9 @@ class MessagesController < ApplicationController
   end
 
   def show
-    if (@message = Message.find_by(id: params[:id])) && (@conversation = @message.conversation)
-      if @conversation.is_participant?(current_member)
-        redirect_to conversation_path(@conversation, box: @box, anchor: "message_" + @message.id.to_s)
-        return
-      end
+    if (@message = Message.find_by(id: params[:id])) && (@conversation = @message.conversation) && @conversation.is_participant?(current_member)
+      redirect_to conversation_path(@conversation, box: @box, anchor: "message_" + @message.id.to_s)
+      return
     end
     redirect_to conversations_path(box: @box)
   end
@@ -21,7 +19,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

@@ -41,7 +41,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/helpers/crops_helper.rb

@@ -7,14 +7,14 @@ module CropsHelper
 
     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/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/activity.rb

@@ -5,7 +5,6 @@ class Activity < ApplicationRecord
   include Ownable
   include Finishable
   include SearchActivities
-  include Likeable
 
   belongs_to :garden, optional: true
   belongs_to :planting, optional: true

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

app/models/concerns/search_activities.rb

@@ -44,7 +44,7 @@ module SearchActivities
       1..limit.times do
         where = {
           # photos_count: { gt: 0 },
-          owner_id: { not: owners }
+          owner_id:     { not: owners }
         }
         one_record = search('*',
                             limit:    1,

app/models/concerns/search_plantings.rb

@@ -30,7 +30,7 @@ module SearchPlantings
         quantity:,
         sunniness:,
         garden_id:,
-        garden_name:                garden&.name,
+        garden_name: garden&.name,
         description:,
 
         first_harvest_predicted_at:,

app/models/csv_importer.rb

@@ -59,7 +59,7 @@ class CsvImporter
 
     alternate_names.split(/,\s*/).each do |name|
       altname = AlternateName.find_by(name:, crop: @crop)
-      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
+      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/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/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)
 

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

app/views/activities/_actions.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, activity)
-  %span.dropdown.activity-actions
+  .dropdown.activity-actions
     %a#activity-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
       = activity_edit_button(activity, classes: 'dropdown-item')

app/views/activities/show.html.haml

@@ -22,17 +22,19 @@
             %small.text-muted= @activity.category
           %tt
             = @activity.due_date
-        - if @activity.description.present?
-          :markdown
-            #{strip_tags markdownify(@activity.description)}
-      = render 'likes/likes', object: @activity
-      = render 'activities/actions', activity: @activity
 
     .col-md-4.col-xs-12
       = render 'activities/owner', planting: @activity
 
     .col-md-8.col-xs-12
-
+      - if @activity.description.present?
+        = cute_icon
+        .card
+          .card-header
+            %h2 Description
+          .card-body
+            :markdown
+              #{strip_tags markdownify(@activity.description)}
 
       - if @activity.garden
         %section.gardens
@@ -46,3 +48,4 @@
 
 
     .col-md-4.col-xs-12
+      = render 'activities/actions', activity: @activity

app/views/crops/_form.html.haml

@@ -26,7 +26,7 @@
       %h2 Basic information
 
       .form-group#new_crop
-      = f.text_field :name, required: true
+      = f.text_field :name
       %span.help-block
         The common name for the crop, in English (required).
         - if can? :wrangle, @crop
@@ -43,7 +43,7 @@
 
       - unless @crop.approved?
         = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
-      = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
+      = f.text_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
       %span.help-block
         Link to the crop's page on the English language Wikipedia (required).
 

app/views/harvests/_actions.html.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, harvest)
-  %span.dropdown.harvest-actions
+  .dropdown.harvest-actions
     %a#harvest-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
       = harvest_edit_button(harvest, classes: 'dropdown-item')

app/views/harvests/show.html.haml

@@ -15,26 +15,13 @@
 .harvest
   .row
     .col-md-8.col-xs-12
-      .jumbotron
-        .d-flex.justify-content-between
-          %h1.display-3
-            = harvest_icon
-            %strong= @harvest.crop
-            %small.text-muted
-              harvested by
-              = @harvest.owner
-
-        - if @harvest.description.present?
-          :markdown
-            #{strip_tags markdownify(@harvest.description)}
-
-      = render partial: 'planting'
-      = render 'likes/likes', object: @harvest
-      = render 'harvests/actions', harvest: @harvest
-
+      %h1
+        = harvest_icon
+        #{@harvest.crop} harvested by #{@harvest.owner}
     .col-md-4.col-xs-12
-      = render 'harvests/owner', harvest: @harvest
+      = render 'harvests/actions', harvest: @harvest
     .col-md-8.col-xs-12
+      = render partial: 'planting'
       .index-cards.facts
         - if @harvest.plant_part
           .card
@@ -66,5 +53,14 @@
           Havested from
           = link_to @harvest.planting, @harvest.planting
 
+      - if @harvest.description.present?
+        .card
+          .card-header
+            %h2 Notes
+          .card-body
+            :markdown
+              #{strip_tags markdownify(@harvest.description)}
+
     .col-md-4.col-xs-12
+      = render 'harvests/owner', harvest: @harvest
       = render @harvest.crop

app/views/likes/_count.haml

@@ -1,4 +1,4 @@
 %span.badge.like-badge{class: liked ? 'liked' : ''}
   = like_icon
    
-  %span.like-count{title: t('buttons.total_likes')}= likeable.likes_count
+  %span.like-count= likeable.likes_count

app/views/likes/_likes.html.haml

@@ -1,18 +0,0 @@
-%span.likes
-  - if member_signed_in? && can?(:new, Like)
-    - if !object.liked_by?(current_member)
-      = link_to likes_path(type: object.class.name, id: object.id, format: :json),
-                title: t('buttons.like'),
-                method: :post,
-                remote: true,
-                class: "#{object.class.name.downcase}-#{object.id} #{object.class.name.downcase}-like like-btn btn" do
-        = render 'likes/count', likeable: object, liked: false
-    - else
-      = link_to likes_path(type: object.class.name, id: object.id, format: :json),
-                title: t('buttons.unlike'),
-                method: :delete,
-                remote: true,
-                class: "#{object.class.name.downcase}-#{object.id} #{object.class.name.downcase}-like like-btn btn" do
-        = render 'likes/count', likeable: object, liked: true
-  - else
-    = render 'likes/count', likeable: object, liked: member_signed_in? && object.liked_by?(current_member)

app/views/photos/_actions.html.haml

@@ -1,7 +1,7 @@
 - if can?(:edit, @photo) && can?(:destroy, @photo)
   .dropdown.float-right.photo-actions
-    %a#photo-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
-    .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "photo-actions-button"}
+    %a#harvest-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
+    .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
       = edit_button(edit_photo_path(@photo), classes: 'dropdown-item')
       .dropdown-divider
       = delete_button(@photo, classes: 'dropdown-item text-danger')

app/views/photos/_associations.html.haml

@@ -30,9 +30,3 @@
           = seed_icon
           = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
           = render "association_delete_button", photo: @photo, type: 'seed', thing: seed
-
-      - @photo.crops.each do |crop|
-        %li
-          = crop_icon(crop)
-          = link_to t('photos.show.crop', crop: crop.to_s), crop_path(crop)
-          = render "association_delete_button", photo: @photo, type: 'crop', thing: crop

app/views/photos/show.html.haml

@@ -28,12 +28,12 @@
           = render 'crops/thumbnail', crop: crop
   .col-md-3
     %p
-      %span.btn= render 'photos/likes', photo: @photo
       = render 'photos/actions', photo: @photo
       = link_to @photo.link_url, class: 'btn btn-info' do
         - if @photo.source == 'flickr'
           = icon 'fab', 'flickr'
         View on #{@photo.source.titleize}
+      %span.btn= render 'photos/likes', photo: @photo
       - if @photo.date_taken.present?
         %h3 Taken on #{I18n.l @photo.date_taken.to_date}
 

app/views/plantings/_actions.html.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, planting)
-  %span.dropdown.planting-actions
+  .dropdown.planting-actions
     %a#planting-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
       = planting_edit_button(planting, classes: 'dropdown-item')

app/views/plantings/show.html.haml

@@ -43,8 +43,6 @@
                   %strong #{@planting.age_in_days}/#{@planting.expected_lifespan} days
 
         = render 'timeline', planting: @planting
-      = render 'likes/likes', object: @planting
-      = render 'plantings/actions', planting: @planting
 
     .col-md-4.col-xs-12
       = render 'plantings/owner', planting: @planting
@@ -81,6 +79,8 @@
 
 
     .col-md-4.col-xs-12
+      = render 'plantings/actions', planting: @planting
+      %hr/
       = render @planting.crop
 
       - if @planting.location

app/views/posts/_likes.html.haml

@@ -0,0 +1,10 @@
+
+- if member_signed_in? && can?(:new, Like)
+  - if !post.liked_by?(current_member)
+    = link_to 'Like', likes_path(type: 'Post', id: post.id, format: :json),
+              method: :post, remote: true, class: 'post-like btn like-btn'
+  - else
+    = link_to 'Unlike', likes_path(type: 'Post', id: post.id, format: :json),
+              method: :delete, remote: true, class: 'post-like btn like-btn'
+
+= render 'likes/count', likeable: post, liked: member_signed_in? && post.liked_by?(current_member)

app/views/posts/show.html.haml

@@ -45,7 +45,7 @@
             = render 'photos/thumbnail', photo: photo
 
       .card-footer
-        = render 'likes/likes', object: @post
+        = render 'posts/likes', post: @post
         .float-right
           - if can? :create, Comment
             = link_to new_comment_path(post_id: @post.id), class: 'btn' do

app/views/timeline/_photos.html.haml

@@ -24,9 +24,4 @@
         - photo.seeds.each do |seed|
           %li
             = seed_icon
-            = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
-
-        - photo.crops.each do |crop|
-          %li
-            = crop_icon(crop)
-            = link_to t('photos.show.crop', crop: crop.to_s), crop_path(crop)
+            = link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)

bin/setup

@@ -23,8 +23,12 @@ FileUtils.chdir APP_ROOT do
   system('bin/yarn')
 
   puts "\n== Copying sample files =="
-  FileUtils.cp 'config/database.yml.example', 'config/database.yml' unless File.exist?('config/database.yml')
-  FileUtils.cp 'env-example', '.env' unless File.exist?('.env')
+  unless File.exist?('config/database.yml')
+    FileUtils.cp 'config/database.yml.example', 'config/database.yml'
+  end
+  unless File.exist?('.env')
+    FileUtils.cp 'env-example', '.env'
+  end
 
   puts "\n== Checking for elastic search =="
   system! 'script/check_elasticsearch.sh'

config.ru

@@ -2,5 +2,5 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require File.expand_path('config/environment', __dir__)
+require ::File.expand_path('config/environment', __dir__)
 run Rails.application

config/application.rb

@@ -62,7 +62,7 @@ module Growstuff
 
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
-    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
+    config.bot_email = ENV['GROWSTUFF_EMAIL']
     config.user_agent = 'Growstuff'
     config.user_agent_email = "info@growstuff.org"
 
@@ -70,7 +70,7 @@ module Growstuff
     # API key can't be blank or tests fail
     Gibbon::API.timeout = 10
     Gibbon::API.throws_exceptions = false
-    config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)
+    config.newsletter_list_id = ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']
 
     # config.active_record.raise_in_transactional_callbacks = true
     config.middleware.insert_before 0, Rack::Cors do

config/environments/production.rb

@@ -27,7 +27,7 @@ Rails.application.configure do
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :terser
-  # config.assets.css_compressor = :sass
+# config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
@@ -59,8 +59,8 @@ Rails.application.configure do
   # Use a different cache store in production.
   config.cache_store = :mem_cache_store,
                        (ENV["MEMCACHIER_SERVERS"] || "").split(","),
-                       { username:             ENV.fetch("MEMCACHIER_USERNAME", nil),
-                         password:             ENV.fetch("MEMCACHIER_PASSWORD", nil),
+                       { username:             ENV["MEMCACHIER_USERNAME"],
+                         password:             ENV["MEMCACHIER_PASSWORD"],
                          failover:             true,
                          socket_timeout:       1.5,
                          socket_failure_delay: 0.2,
@@ -89,20 +89,20 @@ Rails.application.configure do
   config.active_record.dump_schema_after_migration = false
 
   # Growstuff configuration
-  config.action_mailer.default_url_options = { host: ENV.fetch('HOST', nil) }
+  config.action_mailer.default_url_options = { host: ENV['HOST'] }
 
   config.action_mailer.smtp_settings = {
-    user_name:            ENV.fetch('MAILGUN_SMTP_LOGIN', nil),
-    password:             ENV.fetch('MAILGUN_SMTP_PASSWORD', nil),
-    domain:               ENV.fetch('GROWSTUFF_EMAIL_DOMAIN', nil),
-    address:              ENV.fetch('MAILGUN_SMTP_SERVER', nil),
+    user_name:            ENV['MAILGUN_SMTP_LOGIN'],
+    password:             ENV['MAILGUN_SMTP_PASSWORD'],
+    domain:               ENV['GROWSTUFF_EMAIL_DOMAIN'],
+    address:              ENV['MAILGUN_SMTP_SERVER'],
     port:                 587,
     authentication:       :plain,
     enable_starttls_auto: true
   }
   ActionMailer::Base.delivery_method = :smtp
 
-  config.host = ENV.fetch('HOST', nil)
+  config.host = ENV['HOST']
   config.analytics_code = <<-GET_CLICKY_SCRIPT
     <script src="//static.getclicky.com/js" type="text/javascript"></script>
     <script type="text/javascript">try{ clicky.init(100594260); }catch(e){}</script>

config/factory_bot.rb

@@ -2,7 +2,7 @@
 
 ActionDispatch::Callbacks.after do
   # Reload the factories
-  return unless Rails.env.local?
+  return unless Rails.env.development? || Rails.env.test?
 
   if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
     FactoryBot.factories.clear

config/initializers/application_controller_renderer.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do

config/initializers/backtrace_silencers.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

config/initializers/content_security_policy.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy

config/initializers/devise.rb

@@ -6,9 +6,9 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  config.mailer_sender = "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
 
-  config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)
+  config.secret_key = ENV['RAILS_SECRET_TOKEN']
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"

config/initializers/mime_types.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

config/initializers/new_framework_defaults_5_2.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.2 upgrade.

config/initializers/omniauth.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :twitter, ENV.fetch('GROWSTUFF_TWITTER_KEY', nil), ENV.fetch('GROWSTUFF_TWITTER_SECRET', nil)
-  provider :flickr, ENV.fetch('GROWSTUFF_FLICKR_KEY', nil), ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil), scope: 'read'
+  provider :twitter, ENV['GROWSTUFF_TWITTER_KEY'], ENV['GROWSTUFF_TWITTER_SECRET']
+  provider :flickr, ENV['GROWSTUFF_FLICKR_KEY'], ENV['GROWSTUFF_FLICKR_SECRET'], scope: 'read'
 end

config/locales/en.yml

@@ -92,9 +92,6 @@ en:
     save_seeds: Save seeds
     timeline: Timeline
     write_blog_post: Write blog post
-    like: Like
-    unlike: Remove like
-    total_likes: Total likes
   crops:
     search: Search crops
     index:
@@ -270,7 +267,6 @@ en:
       planting: "%{planting}"
       seed: "%{seed}"
       thing_by: A %{thing} by %{owner}
-      crop: "%{crop}"
   places:
     index:
       title: "%{site_name} Community Map"

db/migrate/20171129041341_create_photographings.rb

@@ -37,22 +37,18 @@ class CreatePhotographings < ActiveRecord::Migration[4.2]
       Photographing.create! photo_id: s.photo_id, photographable_id: s.seed_id, photographable_type: 'Seed'
     end
   end
-
   class GardensPhoto < ApplicationRecord
     belongs_to :photo
     belongs_to :garden
   end
-
   class PhotosPlanting < ApplicationRecord
     belongs_to :photo
     belongs_to :planting
   end
-
   class HarvestsPhoto < ApplicationRecord
     belongs_to :photo
     belongs_to :harvest
   end
-
   class PhotosSeed < ApplicationRecord
     belongs_to :photo
     belongs_to :seed

db/migrate/20190130090437_add_crop_to_photographings.rb

@@ -9,7 +9,6 @@ class AddCropToPhotographings < ActiveRecord::Migration[5.2]
       p.set_crop && p.save!
     end
   end
-
   class Photographing < ApplicationRecord
     belongs_to :photo, inverse_of: :photo_associations
     belongs_to :photographable, polymorphic: true

db/migrate/20191119030244_cms_tags.rb

@@ -28,10 +28,10 @@ class CmsTags < ActiveRecord::Migration[5.2]
         layout.content = layout.content.gsub(%r{\{\{ ?cms:(\w+):([\w/-]+):([\w/-]+):([\w/-]+) ?\}\}}, '{{ cms:\1 \2 \3 \4}}')
       end
       layout.content = layout.content.gsub(/\{\{ ?cms:(\w+):(\w+):([^:]*) ?}}/, '{{ cms:\1 \2, "\3" }}') if layout.content.is_a? String
-      layout.content = layout.content.gsub("cms:rich_text", 'cms:wysiwyg') if layout.content.is_a? String
-      layout.content = layout.content.gsub("cms:integer", 'cms:number') if layout.content.is_a? String
+      layout.content = layout.content.gsub(/cms:rich_text/, 'cms:wysiwyg') if layout.content.is_a? String
+      layout.content = layout.content.gsub(/cms:integer/, 'cms:number') if layout.content.is_a? String
       if layout.content.is_a? String
-        layout.content = layout.content.gsub("cms: string", 'cms:text')
+        layout.content = layout.content.gsub(/cms: string/, 'cms:text')
       end # probably a result of goofing one of the more general regexps
       if layout.content.is_a? String
         layout.content = layout.content.gsub(%r{\{\{ ?cms:page_file ([\w/]+) ?\}\}}, '{{ cms:file \1, render: false }}')

db/migrate/20240218053122_add_slug_to_activity.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class AddSlugToActivity < ActiveRecord::Migration[7.1]
   def change
     add_column :activities, :slug, :string

db/migrate/20240714024918_like_everything.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class LikeEverything < ActiveRecord::Migration[7.1]
-  def change
-    change_table :activities do |t|
-      t.integer :likes_count, default: 0
-    end
-
-    change_table :plantings do |t|
-      t.integer :likes_count, default: 0
-    end
-
-    change_table :harvests do |t|
-      t.integer :likes_count, default: 0
-    end
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
+ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -54,14 +54,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "slug"
-    t.integer "cached_votes_total", default: 0
-    t.integer "cached_votes_score", default: 0
-    t.integer "cached_votes_up", default: 0
-    t.integer "cached_votes_down", default: 0
-    t.integer "cached_weighted_score", default: 0
-    t.integer "cached_weighted_total", default: 0
-    t.float "cached_weighted_average", default: 0.0
-    t.integer "likes_count", default: 0
     t.index ["garden_id"], name: "index_activities_on_garden_id"
     t.index ["owner_id"], name: "index_activities_on_owner_id"
     t.index ["planting_id"], name: "index_activities_on_planting_id"
@@ -214,13 +206,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.text "body", null: false
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.integer "cached_votes_total", default: 0
-    t.integer "cached_votes_score", default: 0
-    t.integer "cached_votes_up", default: 0
-    t.integer "cached_votes_down", default: 0
-    t.integer "cached_weighted_score", default: 0
-    t.integer "cached_weighted_total", default: 0
-    t.float "cached_weighted_average", default: 0.0
   end
 
   create_table "crop_companions", force: :cascade do |t|
@@ -329,7 +314,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.integer "plant_part_id"
     t.float "si_weight"
     t.integer "planting_id"
-    t.integer "likes_count", default: 0
     t.index ["planting_id"], name: "index_harvests_on_planting_id"
   end
 
@@ -504,13 +488,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.datetime "date_taken", precision: nil
     t.integer "likes_count", default: 0
     t.string "source"
-    t.integer "cached_votes_total", default: 0
-    t.integer "cached_votes_score", default: 0
-    t.integer "cached_votes_up", default: 0
-    t.integer "cached_votes_down", default: 0
-    t.integer "cached_weighted_score", default: 0
-    t.integer "cached_weighted_total", default: 0
-    t.float "cached_weighted_average", default: 0.0
     t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
     t.index ["thumbnail_url"], name: "index_photos_on_thumbnail_url", unique: true
   end
@@ -553,14 +530,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.integer "days_to_last_harvest"
     t.integer "parent_seed_id"
     t.integer "harvests_count", default: 0
-    t.integer "cached_votes_total", default: 0
-    t.integer "cached_votes_score", default: 0
-    t.integer "cached_votes_up", default: 0
-    t.integer "cached_votes_down", default: 0
-    t.integer "cached_weighted_score", default: 0
-    t.integer "cached_weighted_total", default: 0
-    t.float "cached_weighted_average", default: 0.0
-    t.integer "likes_count", default: 0
     t.index ["slug"], name: "index_plantings_on_slug", unique: true
   end
 
@@ -574,13 +543,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.integer "forum_id"
     t.integer "likes_count", default: 0
     t.integer "comments_count", default: 0
-    t.integer "cached_votes_total", default: 0
-    t.integer "cached_votes_score", default: 0
-    t.integer "cached_votes_up", default: 0
-    t.integer "cached_votes_down", default: 0
-    t.integer "cached_weighted_score", default: 0
-    t.integer "cached_weighted_total", default: 0
-    t.float "cached_weighted_average", default: 0.0
     t.index ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id"
     t.index ["slug"], name: "index_posts_on_slug", unique: true
   end
@@ -628,22 +590,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
     t.index ["slug"], name: "index_seeds_on_slug", unique: true
   end
 
-  create_table "votes", force: :cascade do |t|
-    t.string "votable_type"
-    t.bigint "votable_id"
-    t.string "voter_type"
-    t.bigint "voter_id"
-    t.boolean "vote_flag"
-    t.string "vote_scope"
-    t.integer "vote_weight"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["votable_id", "votable_type", "vote_scope"], name: "index_votes_on_votable_id_and_votable_type_and_vote_scope"
-    t.index ["votable_type", "votable_id"], name: "index_votes_on_votable"
-    t.index ["voter_id", "voter_type", "vote_scope"], name: "index_votes_on_voter_id_and_voter_type_and_vote_scope"
-    t.index ["voter_type", "voter_id"], name: "index_votes_on_voter"
-  end
-
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "harvests", "plantings"

db/seeds.rb

@@ -86,7 +86,7 @@ def load_test_users
         owner_id:     @user.id,
         garden_id:    @user.gardens.first.id,
         planted_at:   (n * 7).days.ago,
-        crop_id:      Crop.find(((i + n) % Crop.all.size) + 1).id,
+        crop_id:      Crop.find((i + n) % Crop.all.size + 1).id,
         sunniness:    select_random_item(Planting::SUNNINESS_VALUES),
         planted_from: select_random_item(Planting::PLANTED_FROM_VALUES)
       )

lib/haml/filters/escaped_markdown.rb

@@ -6,7 +6,7 @@ require 'haml/filters/growstuff_markdown'
 class Haml::Filters
   class EscapedMarkdown < Haml::Filters::Markdown
     def compile(node)
-      [:escape, true, super]
+      [:escape, true, super(node)]
     end
   end
 

lib/tasks/gardens.rake

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 namespace :gardens do
+
   desc "Mark old gardens inactive"
   task archive: :environment do
     Planting.archive!

lib/tasks/growstuff.rake

@@ -5,20 +5,20 @@ namespace :growstuff do
   # usage: rake growstuff:admin_user name=skud
 
   task admin_user: :environment do
-    add_role_to_member! ENV.fetch('name', nil), 'Admin'
+    add_role_to_member! ENV['name'], 'Admin'
   end
 
   desc "Add a crop wrangler user, by name"
   # usage: rake growstuff:cropwrangler_user name=skud
 
   task cropwrangler_user: :environment do
-    add_role_to_member! ENV.fetch('name', nil), 'Crop Wrangler'
+    add_role_to_member! ENV['name'], 'Crop Wrangler'
   end
 
   def add_role_to_member!(login_name, role_name)
     unless login_name && role_name
-      raise "Usage: rake growstuff:[rolename] name=[username] " \
-            "\n (login name is case-sensitive)\n"
+      raise "Usage: rake growstuff:[rolename] name=[username] "\
+        "\n (login name is case-sensitive)\n"
     end
     member = Member.find_by!(login_name:)
     role = Role.find_by!(name: role_name)
@@ -31,7 +31,7 @@ namespace :growstuff do
   task import_crops: :environment do
     require 'csv'
 
-    (@file = ENV.fetch('file', nil)) || raise("Usage: rake growstuff:import_crops file=file.csv")
+    (@file = ENV['file']) || raise("Usage: rake growstuff:import_crops file=file.csv")
 
     puts "Loading crops from #{@file}..."
     CSV.foreach(@file) do |row|

package.json

@@ -27,6 +27,5 @@
   "bugs": {
     "url": "https://github.com/growstuff/growstuff/issues"
   },
-  "homepage": "https://github.com/growstuff/growstuff#readme",
-  "packageManager": "yarn@4.5.0"
+  "homepage": "https://github.com/growstuff/growstuff#readme"
 }

script/check_contributors_md.rb

@@ -5,12 +5,12 @@ require "English"
 
 if ENV['CI']
   if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
-    author = ENV.fetch('GITHUB_ACTOR', nil)
+    author = ENV['GITHUB_ACTOR']
     exit 1 unless author
 
   elsif ENV['TRAVIS_PULL_REQUEST']
     require 'httparty'
-    repo = ENV.fetch('TRAVIS_REPO_SLUG', nil)
+    repo = ENV['TRAVIS_REPO_SLUG']
     pr = ENV['TRAVIS_PULL_REQUEST']
     url = "https://api.github.com/repos/#{repo}/pulls/#{pr}"
     response = HTTParty.get(url).parsed_response

script/heroku_maintenance.rb

@@ -4,8 +4,8 @@
 require 'platform-api'
 require 'yaml'
 
-heroku = PlatformAPI.connect(ENV.fetch('HEROKU_API_KEY', nil))
-branch = ENV.fetch('TRAVIS_BRANCH', nil)
+heroku = PlatformAPI.connect(ENV['HEROKU_API_KEY'])
+branch = ENV['TRAVIS_BRANCH']
 travis_config = YAML.load_file('.travis.yml')
 if travis_config['deploy']['app'].key? branch
   app = travis_config['deploy']['app'][branch]

spec/controllers/crops_controller_spec.rb

@@ -82,8 +82,8 @@ describe CropsController do
           name:             'aubergine',
           en_wikipedia_url: "https://en.wikipedia.org/wiki/Eggplant"
         },
-        alt_name: { '1': "egg plant", '2': "purple apple" },
-        sci_name: { '1': "fancy sci name", '2': "" }
+        alt_name: { "1": "egg plant", "2": "purple apple" },
+        sci_name: { "1": "fancy sci name", "2": "" }
       }
     end
 

spec/factories/activity.rb

@@ -3,23 +3,24 @@
 # Read about factories at https://github.com/thoughtbot/factory_bot
 
 FactoryBot.define do
-  factory :activity do
-    name { "Admire" }
-    description { "Spend 10 minutes admiring your hard work" }
-    category { "General" }
-    owner
+    factory :activity do
+      name { "Admire" }
+      description { "Spend 10 minutes admiring your hard work" }
+      category { "General" }
+      owner
+  
+      trait :garden do
+        category { "Soil Cultivation" }
+        description { "Apply compost from winter" }
+        due_date { 3.months.from_now }
+        garden
+      end
 
-    trait :garden do
-      category { "Soil Cultivation" }
-      description { "Apply compost from winter" }
-      due_date { 3.months.from_now }
-      garden
-    end
-
-    trait :planting do
-      category { "Pruning" }
-      description { "Stake tomato" }
-      planting
+      trait :planting do
+        category { "Pruning" }
+        description { "Stake tomato" }
+        planting
+      end
     end
   end
-end
+  

spec/features/admin/newsletter_spec.rb

@@ -19,4 +19,4 @@ describe "newsletter subscribers", :js do
     it { expect(page).to have_current_path admin_newsletter_path, ignore_query: true }
     it { expect(page).to have_content @subscriber.email }
   end
-end
+end

spec/features/conversations/index_spec.rb

@@ -37,7 +37,7 @@ describe "Conversations", :js do
         describe 'restore conversation' do
           before { click_link class: 'restore' }
 
-          it { expect(page).to have_no_content 'something i want to say' }
+          it { expect(page).not_to have_content 'something i want to say' }
 
           describe 'conversation was restored' do
             before { click_link 'inbox' }
@@ -61,8 +61,8 @@ describe "Conversations", :js do
       all('input[type=checkbox]').each(&:click)
       click_button 'Delete'
 
-      expect(page).to have_no_content 'this is a message'
-      expect(page).to have_no_content 'this is another message'
+      expect(page).not_to have_content 'this is a message'
+      expect(page).not_to have_content 'this is another message'
     end
 
     it 'deletes multiple conversations from the sentbox' do
@@ -81,8 +81,8 @@ describe "Conversations", :js do
 
       expect(page).to have_selector('.sent')
       find('.sent').click
-      expect(page).to have_no_content 'this is a message'
-      expect(page).to have_no_content 'this is another message'
+      expect(page).not_to have_content 'this is a message'
+      expect(page).not_to have_content 'this is another message'
     end
   end
 end

spec/features/crops/alternate_name_spec.rb

@@ -46,7 +46,7 @@ describe "Alternate names", :js do
       accept_confirm do
         click_link 'Delete'
       end
-      expect(page).to have_no_content alternate_eggplant.name
+      expect(page).not_to have_content alternate_eggplant.name
       expect(page).to have_content 'Alternate name was successfully deleted'
     end
 

spec/features/crops/browse_crops_spec.rb

@@ -19,11 +19,11 @@ describe "browse crops", :search do
     end
 
     it "pending crops are not listed" do
-      expect(page).to have_no_content pending_crop.name
+      expect(page).not_to have_content pending_crop.name
     end
 
     it "rejected crops are not listed" do
-      expect(page).to have_no_content rejected_crop.name
+      expect(page).not_to have_content rejected_crop.name
     end
   end
 
@@ -35,7 +35,7 @@ describe "browse crops", :search do
 
   context 'anon' do
     include_examples 'shows crops'
-    it { expect(page).to have_no_link "Add New Crop" }
+    it { expect(page).not_to have_link "Add New Crop" }
   end
 
   context 'member' do

spec/features/crops/crop_detail_page_spec.rb

@@ -22,7 +22,7 @@ describe "crop detail page", :js do
   context "varieties" do
     it "The crop DOES NOT have varieties" do
       visit crop_path(crop)
-      expect(page).to have_no_text 'Varieties'
+      expect(page).not_to have_text 'Varieties'
     end
   end
 
@@ -92,7 +92,7 @@ describe "crop detail page", :js do
 
     it "User not signed in" do
       visit crop_path(seed.crop)
-      expect(page).to have_no_content "You have 20 seeds"
+      expect(page).not_to have_content "You have 20 seeds"
     end
 
     context 'signed in' do
@@ -194,7 +194,7 @@ describe "crop detail page", :js do
 
       it { expect(page).to have_text 'Annual' }
       it { expect(page).to have_text 'living and reproducing in a single year or less' }
-      it { expect(page).to have_no_text 'Perennial' }
+      it { expect(page).not_to have_text 'Perennial' }
     end
 
     context 'crop is Perennial' do
@@ -202,14 +202,14 @@ describe "crop detail page", :js do
 
       it { expect(page).to have_text 'Perennial' }
       it { expect(page).to have_text 'living more than two years' }
-      it { expect(page).to have_no_text 'Annual' }
+      it { expect(page).not_to have_text 'Annual' }
     end
 
     context 'crop Perennial value is null' do
       let(:crop) { FactoryBot.create(:crop, perennial: nil) }
 
-      it { expect(page).to have_no_text 'Perennial' }
-      it { expect(page).to have_no_text 'Annual' }
+      it { expect(page).not_to have_text 'Perennial' }
+      it { expect(page).not_to have_text 'Annual' }
     end
   end
 end

spec/features/crops/crop_wranglers_spec.rb

@@ -75,11 +75,11 @@ context "signed in non-wrangler" do
 
   it "can't see wrangling page without js", js: false do
     visit root_path
-    expect(page).to have_no_link "Crop Wrangling"
+    expect(page).not_to have_link "Crop Wrangling"
   end
 
   it "can't see wrangling page with js" do
     visit member_path(member)
-    expect(page).to have_no_link "Crop Wrangling"
+    expect(page).not_to have_link "Crop Wrangling"
   end
 end

spec/features/crops/crop_wrangling_button_spec.rb

@@ -6,14 +6,14 @@ describe "crop wrangling button" do
   context 'not signed in' do
     before { visit crops_path }
 
-    it { expect(page).to have_no_link "Wrangle Crops", href: wrangle_crops_path }
+    it { expect(page).not_to have_link "Wrangle Crops", href: wrangle_crops_path }
   end
 
   context "signed in, but not a crop wrangler" do
     include_context 'signed in member'
     before { visit crops_path }
 
-    it { expect(page).to have_no_link "Wrangle Crops", href: wrangle_crops_path }
+    it { expect(page).not_to have_link "Wrangle Crops", href: wrangle_crops_path }
   end
 
   context "signed in crop wrangler" do

spec/features/crops/scientific_name_spec.rb

@@ -49,7 +49,7 @@ describe "Scientific names", :js do
         end
       end
       # expect(page.status_code).to equal 200
-      expect(page).to have_no_content zea_mays.name
+      expect(page).not_to have_content zea_mays.name
       expect(page).to have_content 'Scientific name was successfully deleted.'
     end
 

spec/features/gardens/actions_spec.rb

@@ -51,7 +51,7 @@ describe "Gardens" do
 
         include_examples "has buttons bar at top"
         describe 'does not show actions on other member garden' do
-          it { is_expected.to have_no_link 'Actions' }
+          it { is_expected.not_to have_link 'Actions' }
         end
       end
     end
@@ -73,7 +73,7 @@ describe "Gardens" do
       describe "someone else's garden" do
         before { visit garden_path(other_member_garden) }
 
-        it { is_expected.to have_no_link 'Actions' }
+        it { is_expected.not_to have_link 'Actions' }
       end
     end
   end

spec/features/gardens/adding_gardens_spec.rb

@@ -33,7 +33,7 @@ describe "Gardens", :js do
       fill_in "Name", with: "Negative Garden"
       fill_in "Area", with: -5
       click_button "Save"
-      expect(page).to have_no_content "Garden was successfully created"
+      expect(page).not_to have_content "Garden was successfully created"
       expect(page).to have_content "Area must be greater than or equal to 0"
     end
   end

spec/features/gardens/gardens_spec.rb

@@ -31,7 +31,7 @@ describe "Planting a crop", :js do
 
       click_link 'Actions'
       expect(page).to have_content "Mark as active"
-      expect(page).to have_no_content "Mark as inactive"
+      expect(page).not_to have_content "Mark as inactive"
     end
 
     it "List only active gardens" do
@@ -41,7 +41,7 @@ describe "Planting a crop", :js do
         click_link "Mark as inactive"
       end
       visit gardens_path
-      expect(page).to have_no_link garden_path(garden)
+      expect(page).not_to have_link garden_path(garden)
     end
 
     it "Create new garden" do
@@ -57,7 +57,7 @@ describe "Planting a crop", :js do
       fill_in "Name", with: "Negative Garden"
       fill_in "Area", with: -5
       click_button "Save"
-      expect(page).to have_no_content "Garden was successfully created"
+      expect(page).not_to have_content "Garden was successfully created"
       expect(page).to have_content "Area must be greater than or equal to 0"
     end
 
@@ -124,7 +124,7 @@ describe "Planting a crop", :js do
 
     it "List only active plantings on a garden" do
       visit gardens_path
-      expect(page).to have_no_content finished_planting.crop_name
+      expect(page).not_to have_content finished_planting.crop_name
     end
   end
 

spec/features/gardens/index_spec.rb

@@ -40,7 +40,7 @@ describe "Gardens#index", :js do
       end
 
       it "does not show inactive garden" do
-        expect(page).to have_no_text inactive_garden.name
+        expect(page).not_to have_text inactive_garden.name
       end
 
       it "links to active garden" do
@@ -48,7 +48,7 @@ describe "Gardens#index", :js do
       end
 
       it "does not link to inactive gardens" do
-        expect(page).to have_no_link(inactive_garden.name, href: garden_path(inactive_garden))
+        expect(page).not_to have_link(inactive_garden.name, href: garden_path(inactive_garden))
       end
     end
 
@@ -72,7 +72,7 @@ describe "Gardens#index", :js do
       end
 
       it "does not show finished planting" do
-        expect(page).to have_no_text(finished_planting.crop.name)
+        expect(page).not_to have_text(finished_planting.crop.name)
       end
     end
   end
@@ -113,7 +113,7 @@ describe "Gardens#index", :js do
       it { expect(page).to have_link href: planting_path(planting) }
       it { expect(page).to have_link href: garden_path(planting.garden) }
       it { expect(page).to have_text '7 weeks' }
-      it { expect(page).to have_no_text 'harvesting now' }
+      it { expect(page).not_to have_text 'harvesting now' }
     end
 
     describe 'harvesting now' do
@@ -128,7 +128,7 @@ describe "Gardens#index", :js do
       it { expect(crop.median_lifespan).to eq 90 }
 
       it { expect(page).to have_text 'harvesting now' }
-      it { expect(page).to have_no_text 'Predicted weeks until harvest' }
+      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
     end
 
     describe 'super late' do
@@ -139,9 +139,9 @@ describe "Gardens#index", :js do
       end
 
       it { expect(page).to have_text 'super late' }
-      it { expect(page).to have_no_text 'harvesting now' }
-      it { expect(page).to have_no_text 'Predicted weeks until harvest' }
-      it { expect(page).to have_no_text 'Predicted weeks until planting is finished' }
+      it { expect(page).not_to have_text 'harvesting now' }
+      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
+      it { expect(page).not_to have_text 'Predicted weeks until planting is finished' }
     end
   end
 end

spec/features/harvests/browse_harvests_spec.rb

@@ -19,7 +19,7 @@ describe "browse harvests", :search do
       end
 
       it 'read more' do
-        expect(subject).to have_no_link "Read more"
+        expect(subject).not_to have_link "Read more"
       end
     end
 

spec/features/home/home_spec.rb

@@ -104,7 +104,7 @@ describe "home page", :search do
     describe 'should say welcome' do
       before { visit root_path }
 
-      it { expect(page).to have_content "Welcome to #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}, #{member.login_name}" }
+      it { expect(page).to have_content "Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, #{member.login_name}" }
     end
   end
 end

spec/features/likeable_spec.rb

@@ -5,10 +5,7 @@ require 'rails_helper'
 describe 'Likeable', :js, :search do
   let(:another_member) { FactoryBot.create(:london_member) }
   let!(:post)           { FactoryBot.create(:post, :reindex, author: member) }
-  let!(:activity)       { FactoryBot.create(:activity, :reindex, owner: member) }
   let!(:photo)          { FactoryBot.create(:photo, :reindex, owner: member) }
-  let!(:harvest)        { FactoryBot.create(:harvest, :reindex, owner: member) }
-  let!(:planting)       { FactoryBot.create(:planting, :reindex, owner: member) }
 
   before do
     Photo.reindex
@@ -16,55 +13,55 @@ describe 'Likeable', :js, :search do
 
   include_context 'signed in member'
 
-  shared_examples 'object can be liked' do
-    it 'can be liked' do
-      visit path
-      expect(page).to have_css(like_count_class, text: "0")
-      click_link '0', class: 'like-btn'
-      expect(page).to have_css(like_count_class, text: "1")
-
-      # Reload page
-      visit path
-      expect(page).to have_css(like_count_class, text: "1")
-      expect(page).to have_link '1'
-
-      click_link '1', class: 'like-btn'
-      expect(page).to have_css(like_count_class, text: "0")
-    end
-
-    it 'displays correct number of likes' do
-      visit path
-      expect(page).to have_css(like_count_class, text: "0")
-      expect(page).to have_link '0'
-      click_link '0', class: 'like-btn'
-      expect(page).to have_css(like_count_class, text: "1")
-
-      logout(member)
-      login_as(another_member)
-      visit path
-
-      expect(page).to have_css(like_count_class, text: "1")
-      click_link '1', class: 'like-btn'
-      expect(page).to have_css(like_count_class, text: "2")
-      logout(another_member)
-    end
-  end
-
   describe 'photos' do
     def like_count_class
       "#photo-#{photo.id} .like-count"
     end
 
+    shared_examples 'photo can be liked' do
+      it 'can be liked' do
+        visit path
+        expect(page).to have_css(like_count_class, text: "0")
+        click_link '0', class: 'like-btn'
+        expect(page).to have_css(like_count_class, text: "1")
+
+        # Reload page
+        visit path
+        expect(page).to have_css(like_count_class, text: "1")
+        expect(page).to have_link '1'
+
+        click_link '1', class: 'like-btn'
+        expect(page).to have_css(like_count_class, text: "0")
+      end
+
+      it 'displays correct number of likes' do
+        visit path
+        expect(page).to have_css(like_count_class, text: "0")
+        expect(page).to have_link '0'
+        click_link '0', class: 'like-btn'
+        expect(page).to have_css(like_count_class, text: "1")
+
+        logout(member)
+        login_as(another_member)
+        visit path
+
+        expect(page).to have_css(like_count_class, text: "1")
+        click_link '1', class: 'like-btn'
+        expect(page).to have_css(like_count_class, text: "2")
+        logout(another_member)
+      end
+    end
+
     describe 'photos#index' do
       let(:path) { photos_path }
 
-      include_examples 'object can be liked'
+      include_examples 'photo can be liked'
     end
 
     describe 'photos#show' do
       let(:path) { photo_path(photo) }
 
-      include_examples 'object can be liked'
+      include_examples 'photo can be liked'
     end
 
     describe 'crops#show' do
@@ -74,35 +71,43 @@ describe 'Likeable', :js, :search do
 
       before { planting.photos << photo }
 
-      include_examples 'object can be liked'
+      include_examples 'photo can be liked'
     end
   end
 
   describe 'posts' do
-    let(:like_count_class) { ".post-#{post.id} .like-count" }
-    let(:path) { post_path(post) }
+    let(:like_count_class) { "#post-#{post.id} .like-count" }
 
-    include_examples 'object can be liked'
-  end
+    before { visit post_path(post) }
 
-  describe 'activities' do
-    let(:like_count_class) { ".activity-#{activity.id} .like-count" }
-    let(:path) { activity_path(activity) }
+    it 'can be liked' do
+      expect(page).to have_css(like_count_class, text: "0")
+      expect(page).to have_link 'Like'
+      click_link 'Like', class: 'like-btn'
+      expect(page).to have_css(like_count_class, text: "1")
 
-    include_examples 'object can be liked'
-  end
+      # Reload page
+      visit post_path(post)
+      expect(page).to have_css(like_count_class, text: "1")
+      expect(page).to have_link 'Unlike'
 
-  describe 'plantings' do
-    let(:like_count_class) { ".planting-#{planting.id} .like-count" }
-    let(:path) { planting_path(planting) }
+      click_link 'Unlike', class: 'like-btn'
+      expect(page).to have_css(like_count_class, text: "0")
+    end
 
-    include_examples 'object can be liked'
-  end
+    it 'displays correct number of likes' do
+      expect(page).to have_link 'Like'
+      click_link 'Like', class: 'like-btn'
+      expect(page).to have_css(like_count_class, text: "1")
 
-  describe 'harvests' do
-    let(:like_count_class) { ".harvest-#{harvest.id} .like-count" }
-    let(:path) { harvest_path(harvest) }
+      logout(member)
+      login_as(another_member)
+      visit post_path(post)
 
-    include_examples 'object can be liked'
+      expect(page).to have_link 'Like'
+      click_link 'Like', class: 'like-btn'
+      expect(page).to have_css(like_count_class, text: "2")
+      logout(another_member)
+    end
   end
 end

spec/features/members/ban_spec.rb

@@ -18,7 +18,7 @@ describe "members list" do
       end
 
       it { expect(page).to have_link admin.login_name }
-      it { expect(page).to have_no_link spammer.login_name }
+      it { expect(page).not_to have_link spammer.login_name }
     end
   end
 end

spec/features/members/deletion_spec.rb

@@ -117,9 +117,9 @@ describe "member deletion" do
 
       it "removes members from following" do
         visit member_follows_path(other_member)
-        expect(page).to have_no_content member.login_name.to_s
+        expect(page).not_to have_content member.login_name.to_s
         visit member_followers_path(other_member)
-        expect(page).to have_no_content member.login_name.to_s
+        expect(page).not_to have_content member.login_name.to_s
       end
 
       it "replaces posts with deletion note" do
@@ -131,7 +131,7 @@ describe "member deletion" do
         FactoryBot.create(:comment, post: othermemberpost, author: member, body: 'i am deleting my account')
 
         visit post_path(othermemberpost)
-        expect(page).to have_no_content member.login_name
+        expect(page).not_to have_content member.login_name
         expect(page).to have_content other_member.login_name
         expect(page).to have_content "Member Deleted"
       end
@@ -166,7 +166,7 @@ describe "member deletion" do
       login_as(otherwrangler)
       visit edit_crop_path(crop)
       expect(page).to have_content member.login_name
-      expect(page).to have_no_content "cropbot"
+      expect(page).not_to have_content "cropbot"
       logout
       login_as(member)
       visit member_path(member)
@@ -176,7 +176,7 @@ describe "member deletion" do
       click_button "Delete"
       login_as(otherwrangler)
       visit edit_crop_path(crop)
-      expect(page).to have_no_content member.login_name
+      expect(page).not_to have_content member.login_name
     end
   end
 end

spec/features/members/following_spec.rb

@@ -8,8 +8,8 @@ describe "follows", :js do
 
     it "follow buttons on member profile page" do
       visit member_path(member)
-      expect(page).to have_no_link "Follow"
-      expect(page).to have_no_link "Unfollow"
+      expect(page).not_to have_link "Follow"
+      expect(page).not_to have_link "Unfollow"
     end
   end
 
@@ -19,8 +19,8 @@ describe "follows", :js do
 
     it "your profile doesn't have a follow button" do
       visit member_path(member)
-      expect(page).to have_no_link "Follow"
-      expect(page).to have_no_link "Unfollow"
+      expect(page).not_to have_link "Follow"
+      expect(page).not_to have_link "Unfollow"
     end
 
     context "following another member" do
@@ -66,7 +66,7 @@ describe "follows", :js do
         click_link 'Follow'
         click_link 'Unfollow'
         visit member_follows_path(member)
-        expect(page).to have_no_content other_member.login_name
+        expect(page).not_to have_content other_member.login_name
         visit member_followers_path(other_member)
         expect(page).to have_content member.login_name
       end

spec/features/members/profile_spec.rb

@@ -32,9 +32,9 @@ describe "member profile", :js do
 
       it "member has not set location" do
         visit member_path(member)
-        expect(page).to have_no_css("h1>small")
-        expect(page).to have_no_css("#membermap")
-        expect(page).to have_no_content "See other members"
+        expect(page).not_to have_css("h1>small")
+        expect(page).not_to have_css("#membermap")
+        expect(page).not_to have_content "See other members"
       end
     end
 
@@ -47,7 +47,7 @@ describe "member profile", :js do
 
       it "private email address" do
         visit member_path(member)
-        expect(page).to have_no_content member.email
+        expect(page).not_to have_content member.email
       end
     end
 
@@ -55,10 +55,10 @@ describe "member profile", :js do
       it "with no activity" do
         visit member_path(member)
         expect(page).to have_content "Stats"
-        expect(page).to have_no_content "0 plantings"
-        expect(page).to have_no_content "0 harvests"
-        expect(page).to have_no_content "0 seeds"
-        expect(page).to have_no_content "0 posts"
+        expect(page).not_to have_content "0 plantings"
+        expect(page).not_to have_content "0 harvests"
+        expect(page).not_to have_content "0 seeds"
+        expect(page).not_to have_content "0 posts"
       end
 
       context "with some activity" do
@@ -102,8 +102,8 @@ describe "member profile", :js do
 
       it "ordinary user's page" do
         visit member_path(other_member)
-        expect(page).to have_no_text "Crop Wrangler"
-        expect(page).to have_no_text "Admin"
+        expect(page).not_to have_text "Crop Wrangler"
+        expect(page).not_to have_text "Admin"
       end
     end
   end
@@ -120,7 +120,7 @@ describe "member profile", :js do
       it { expect(page).to have_link href: planting_path(new_planting) }
       it { expect(page).to have_link href: planting_path(old_planting) }
       it { expect(page).to have_link href: planting_path(finished_planting) }
-      it { expect(page).to have_no_link href: planting_path(no_planted_at_planting) }
+      it { expect(page).not_to have_link href: planting_path(no_planted_at_planting) }
     end
 
     context 'member has activities' do
@@ -257,7 +257,7 @@ describe "member profile", :js do
         expect(page).to have_link "Send message", href: new_message_path(recipient_id: other_member.id)
       end
 
-      it { expect(page).to have_no_link "Edit profile", href: edit_member_registration_path }
+      it { expect(page).not_to have_link "Edit profile", href: edit_member_registration_path }
     end
   end
 end

spec/features/places/searching_a_place_spec.rb

@@ -18,7 +18,7 @@ describe "User searches" do
     it { expect(page).to have_content "community near Philippines" }
     it { expect(page).to have_button "search_button" }
     it { expect(page).to have_content "Nearby members" }
-    it { expect(page).to have_no_content "No results found" }
+    it { expect(page).not_to have_content "No results found" }
   end
 
   it "with a blank search string" do

spec/features/planting_reminder_spec.rb

@@ -23,7 +23,7 @@ describe "Planting reminder email", :js do
     end
 
     it "doesn't list plantings" do
-      expect(mail).to have_no_content "Progress report"
+      expect(mail).not_to have_content "Progress report"
     end
   end
 
@@ -43,7 +43,7 @@ describe "Planting reminder email", :js do
 
   context "when member has no harvests" do
     it "doesn't list plantings" do
-      expect(mail).to have_no_content "Ready to harvest"
+      expect(mail).not_to have_content "Ready to harvest"
     end
   end
 

spec/features/plantings/planting_a_crop_spec.rb

@@ -102,8 +102,8 @@ describe "Planting a crop", :js, :search do
         end
 
         expect(page).to have_content "planting was successfully created"
-        expect(page).to have_no_content "Finished"
-        expect(page).to have_no_content "Finishes"
+        expect(page).not_to have_content "Finished"
+        expect(page).not_to have_content "Finishes"
       end
 
       it "shows that planting is in progress" do
@@ -122,9 +122,9 @@ describe "Planting a crop", :js, :search do
         end
 
         expect(page).to have_content "planting was successfully created"
-        expect(page).to have_no_content "0%"
-        expect(page).to have_no_content "Finish expected"
-        expect(page).to have_no_content "Finishes"
+        expect(page).not_to have_content "0%"
+        expect(page).not_to have_content "Finish expected"
+        expect(page).not_to have_content "Finishes"
       end
 
       it "shows that planting is 100% complete (no date specified)" do
@@ -184,7 +184,7 @@ describe "Planting a crop", :js, :search do
 
     it "Editing a planting to fill in the finished date" do
       visit planting_path(planting)
-      expect(page).to have_no_content "Finishes"
+      expect(page).not_to have_content "Finishes"
       # click_link(id: 'planting-actions-button')
       click_link 'Actions'
       click_link "Edit"
@@ -230,7 +230,7 @@ describe "Planting a crop", :js, :search do
 
       # shouldn't be on the page
       visit plantings_path
-      expect(page).to have_no_content "maize"
+      expect(page).not_to have_content "maize"
 
       # show all plantings to see this finished planting
       visit plantings_path(all: 1)

spec/features/plantings/show_spec.rb

@@ -22,7 +22,7 @@ describe "Display a planting", :js do
     context 'Annual no predictions' do
       let(:planting) { FactoryBot.create(:annual_planting) }
 
-      it { expect(page).to have_no_text 'Finish expected' }
+      it { expect(page).not_to have_text 'Finish expected' }
     end
 
     context 'Annual with predicted finish' do

spec/features/rss/comments_spec.rb

@@ -10,6 +10,6 @@ describe 'Comments RSS feed' do
 
   it 'The index title is what we expect' do
     visit comments_path(format: 'rss')
-    expect(page).to have_content "Recent comments on all posts (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
+    expect(page).to have_content "Recent comments on all posts (#{ENV['GROWSTUFF_SITE_NAME']})"
   end
 end

spec/features/rss/crops_spec.rb

@@ -12,6 +12,6 @@ describe 'Crops RSS feed' do
   it 'The index title is what we expect' do
     Crop.reindex
     visit crops_path(format: 'rss')
-    expect(page).to have_content "Recently added crops (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
+    expect(page).to have_content "Recently added crops (#{ENV['GROWSTUFF_SITE_NAME']})"
   end
 end

spec/features/rss/members_spec.rb

@@ -8,6 +8,6 @@ describe 'Members RSS feed' do
   before { visit member_path(member, format: 'rss') }
 
   it 'The show action title is what we expect' do
-    expect(page).to have_content "#{member.login_name}'s recent posts (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
+    expect(page).to have_content "#{member.login_name}'s recent posts (#{ENV['GROWSTUFF_SITE_NAME']})"
   end
 end