Compare commits

..

1 Commits

Author SHA1 Message Date
Daniel O'Connor
bc968ca381 Node 26 2026-04-23 10:37:54 +00:00
252 changed files with 3013 additions and 2806 deletions

View File

@@ -1,31 +0,0 @@
.git
.github
.devcontainer
log/*
tmp/*
!tmp/keep
node_modules
public/assets
.env
.ruby-version
.ruby-gemset
.editorconfig
.esignore
.eslintrc.json
.haml-lint.yml
.overcommit.yml
.rspec
.rubocop.yml
.rubocop_todo.yml
.scss-lint.yml
.travis.yml
.yamllint
CODE_OF_CONDUCT.md
CONTRIBUTING.md
CONTRIBUTORS.md
LICENSE.txt
README.md
TECH.md
docker-compose.yml
Dockerfile
.dockerignore

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -76,7 +76,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
@@ -112,7 +112,7 @@ jobs:
- name: Upload screenshots
if: failure()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v5
with:
name: screenshots
path: tmp/screenshots

View File

@@ -91,7 +91,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1

View File

@@ -1,43 +0,0 @@
name: Docker Build and Push
on:
push:
branches:
- mainline
jobs:
build-and-push:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

View File

@@ -1,11 +1,26 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
Bundler/OrderedGems:
Exclude:
- 'Gemfile'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: have_no, not_to
Capybara/NegationMatcher:
Exclude:
- 'spec/features/admin/reverting_crops_spec.rb'
# Offense count: 19
Capybara/NegationMatcherAfterVisit:
Exclude:
@@ -18,6 +33,22 @@ Capybara/NegationMatcherAfterVisit:
- 'spec/features/members/profile_spec.rb'
- 'spec/features/plantings/planting_a_crop_spec.rb'
# Offense count: 34
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: DefaultSelector.
Capybara/RSpec/HaveSelector:
Exclude:
- 'spec/features/conversations/index_spec.rb'
- 'spec/features/footer_spec.rb'
- 'spec/features/gardens/adding_gardens_spec.rb'
- 'spec/features/harvests/harvesting_a_crop_spec.rb'
- 'spec/features/members/list_spec.rb'
- 'spec/features/plantings/planting_a_crop_spec.rb'
- 'spec/features/seeds/adding_seeds_spec.rb'
- 'spec/features/shared_examples/crop_suggest.rb'
- 'spec/support/feature_helpers.rb'
- 'spec/views/posts/show.html.haml_spec.rb'
# Offense count: 14
Capybara/SpecificMatcher:
Exclude:
@@ -63,6 +94,19 @@ FactoryBot/ExcessiveCreateList:
- 'spec/features/crops/show_spec.rb'
- 'spec/features/percy/percy_spec.rb'
# Offense count: 1158
# This cop supports unsafe autocorrection (--autocorrect-all).
FactoryBot/SyntaxMethods:
Enabled: false
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
Layout/EmptyLinesAroundClassBody:
Exclude:
- 'db/migrate/20251130035700_create_versions.rb'
# Offense count: 312
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -81,7 +125,26 @@ Layout/HashAlignment:
- 'spec/requests/api/v1/activities_request_spec.rb'
- 'spec/requests/api/v1/members_request_spec.rb'
# Offense count: 5
# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
Layout/HeredocIndentation:
Exclude:
- 'db/migrate/20190712003735_add_like_counter_caches.rb'
- 'db/migrate/20191226024813_crop_harvest_counter_cache.rb'
- 'db/migrate/20191226024957_crop_photo_counter_cache.rb'
- 'db/migrate/20191226025124_plant_part_harvest_counter_cache.rb'
- 'db/migrate/20191226025225_post_comment_counter_cache.rb'
- 'db/migrate/20250824085224_add_photos_comment_count.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
# SupportedStylesAlignWith: start_of_line, relative_to_receiver
Layout/IndentationWidth:
Exclude:
- 'spec/requests/api/v1/activities_request_spec.rb'
# Offense count: 6
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
# URISchemes: http, https
@@ -92,6 +155,15 @@ Layout/LineLength:
- 'app/models/concerns/predict_planting.rb'
- 'app/models/crop.rb'
- 'db/seeds.rb'
- 'spec/requests/api/v1/activities_request_spec.rb'
# Offense count: 2
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowInHeredoc.
Layout/TrailingWhitespace:
Exclude:
- 'Gemfile'
- 'app/helpers/crops_helper.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
@@ -135,6 +207,18 @@ Lint/DuplicateMethods:
Exclude:
- 'app/models/planting.rb'
# Offense count: 8
# Configuration parameters: AllowComments, AllowEmptyLambdas.
Lint/EmptyBlock:
Exclude:
- 'db/migrate/20171022032108_all_the_predictions.rb'
- 'spec/controllers/home_controller_spec.rb'
- 'spec/controllers/likes_controller_spec.rb'
- 'spec/controllers/plant_parts_controller_spec.rb'
- 'spec/factories/crop_companions.rb'
- 'spec/features/crops/crop_detail_page_spec.rb'
- 'spec/requests/authentications_spec.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Lint/RedundantCopDisableDirective:
@@ -153,6 +237,21 @@ Lint/SuppressedException:
Exclude:
- 'lib/tasks/testing.rake'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: strict, consistent
Lint/SymbolConversion:
Exclude:
- 'app/helpers/crops_helper.rb'
# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
Lint/UselessAssignment:
Exclude:
- 'config.rb'
- 'config/compass.rb'
# Offense count: 1
Lint/UselessConstantScoping:
Exclude:
@@ -226,12 +325,24 @@ RSpec/BeforeAfterAll:
Exclude:
- 'spec/tasks/import_spec.rb'
# Offense count: 298
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
RSpec/ContextMethod:
Exclude:
- 'spec/requests/api/v1/activities_request_spec.rb'
# Offense count: 299
# Configuration parameters: Prefixes, AllowedPatterns.
# Prefixes: when, with, without
RSpec/ContextWording:
Enabled: false
# Offense count: 1
# Configuration parameters: IgnoredMetadata.
RSpec/DescribeClass:
Exclude:
- 'spec/tasks/import_spec.rb'
# Offense count: 36
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -242,12 +353,55 @@ RSpec/DescribedClass:
- 'spec/models/member_spec.rb'
- 'spec/services/timeline_service_spec.rb'
# Offense count: 13
# This cop supports unsafe autocorrection (--autocorrect-all).
RSpec/EmptyExampleGroup:
Exclude:
- 'spec/controllers/authentications_controller_spec.rb'
- 'spec/controllers/forums_controller_spec.rb'
- 'spec/controllers/home_controller_spec.rb'
- 'spec/controllers/likes_controller_spec.rb'
- 'spec/controllers/plant_parts_controller_spec.rb'
- 'spec/controllers/seeds_controller_spec.rb'
- 'spec/features/crops/crop_detail_page_spec.rb'
- 'spec/features/plantings/planting_a_crop_spec.rb'
- 'spec/requests/authentications_spec.rb'
- 'spec/views/home/index_spec.rb'
- 'spec/views/photos/edit.html.haml_spec.rb'
- 'spec/views/posts/_single.html.haml_spec.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowConsecutiveOneLiners.
RSpec/EmptyLineAfterExample:
Exclude:
- 'spec/models/ability_spec.rb'
# Offense count: 146
# Configuration parameters: CountAsOne.
RSpec/ExampleLength:
Max: 27
# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: method_call, block
RSpec/ExpectChange:
Exclude:
- 'spec/models/crop_spec.rb'
# Offense count: 32
RSpec/ExpectInHook:
Exclude:
- 'spec/controllers/garden_types_controller_spec.rb'
- 'spec/controllers/gardens_controller_spec.rb'
- 'spec/features/admin/forums_spec.rb'
- 'spec/features/admin/plant_parts_spec.rb'
- 'spec/features/admin/roles_spec.rb'
- 'spec/features/crops/crop_photos_spec.rb'
- 'spec/features/members/list_spec.rb'
- 'spec/features/plantings/planting_a_crop_spec.rb'
- 'spec/features/shared_examples/append_date.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
@@ -295,6 +449,7 @@ RSpec/IndexedLet:
- 'spec/features/percy/percy_spec.rb'
- 'spec/features/planting_reminder_spec.rb'
- 'spec/features/timeline/index_spec.rb'
- 'spec/models/crop_spec.rb'
- 'spec/models/member_spec.rb'
- 'spec/views/forums/index.html.haml_spec.rb'
@@ -329,7 +484,7 @@ RSpec/MultipleDescribes:
Exclude:
- 'spec/features/crops/crop_wranglers_spec.rb'
# Offense count: 191
# Offense count: 189
RSpec/MultipleExpectations:
Max: 19
@@ -344,7 +499,7 @@ RSpec/MultipleMemoizedHelpers:
RSpec/NamedSubject:
Enabled: false
# Offense count: 109
# Offense count: 111
# Configuration parameters: AllowedGroups.
RSpec/NestedGroups:
Max: 6
@@ -414,6 +569,23 @@ RSpec/VerifiedDoubles:
- 'spec/controllers/gardens_controller_spec.rb'
- 'spec/views/devise/shared/_links_spec.rb'
# Offense count: 7
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: ResponseMethods.
# ResponseMethods: response, last_response
RSpecRails/HaveHttpStatus:
Exclude:
- 'spec/controllers/api/v1/plantings_controller_spec.rb'
- 'spec/controllers/harvests_controller_spec.rb'
- 'spec/controllers/likes_controller_spec.rb'
- 'spec/requests/harvests_spec.rb'
# Offense count: 17
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Inferences.
RSpecRails/InferredSpecType:
Enabled: false
# Offense count: 30
# Configuration parameters: Database.
# SupportedDatabases: mysql, postgresql
@@ -475,6 +647,10 @@ Rails/I18nLocaleAssignment:
Exclude:
- 'spec/features/locale_spec.rb'
# Offense count: 40
Rails/I18nLocaleTexts:
Enabled: false
# Offense count: 1
# Configuration parameters: IgnoreScopes.
Rails/InverseOf:
@@ -516,7 +692,13 @@ Rails/RakeEnvironment:
- 'lib/tasks/i18n.rake'
- 'lib/tasks/testing.rake'
# Offense count: 8
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Rails/RedirectBackOrTo:
Exclude:
- 'app/controllers/follows_controller.rb'
# Offense count: 9
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AllowedReceivers.
# AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -529,6 +711,7 @@ Rails/RedundantActiveRecordAllMethod:
- 'app/controllers/scientific_names_controller.rb'
- 'spec/features/members/deletion_spec.rb'
- 'spec/features/percy/percy_spec.rb'
- 'spec/models/harvest_spec.rb'
# Offense count: 5
# This cop supports unsafe autocorrection (--autocorrect-all).
@@ -570,6 +753,15 @@ Rails/RootPathnameMethods:
- 'lib/tasks/import.rake'
- 'spec/rails_helper.rb'
# Offense count: 4
# Configuration parameters: ForbiddenMethods, AllowedMethods.
# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
Rails/SkipsModelValidations:
Exclude:
- 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
- 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
- 'db/migrate/20251128200506_add_description_to_crops.rb'
# Offense count: 21
Rails/ThreeStateBooleanColumn:
Enabled: false
@@ -601,6 +793,12 @@ Rails/WhereEquals:
- 'app/models/harvest.rb'
- 'app/models/planting.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Rails/WhereMissing:
Exclude:
- 'app/controllers/crops_controller.rb'
# Offense count: 3
# This cop supports unsafe autocorrection (--autocorrect-all).
Rails/WhereRange:
@@ -657,13 +855,12 @@ Style/FloatDivision:
Exclude:
- 'app/models/concerns/predict_planting.rb'
# Offense count: 1
# Offense count: 22
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Style/FrozenStringLiteralComment:
Exclude:
- 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
Enabled: false
# Offense count: 2
# This cop supports unsafe autocorrection (--autocorrect-all).
@@ -729,6 +926,13 @@ Style/OptionalBooleanParameter:
- 'app/helpers/application_helper.rb'
- 'app/models/concerns/member_newsletter.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: PreferredDelimiters.
Style/PercentLiteralDelimiters:
Exclude:
- 'db/migrate/20251130035700_create_versions.rb'
# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Methods.

View File

@@ -248,3 +248,6 @@ linters:
ZeroUnit:
enabled: true
Compass::*:
enabled: false

View File

@@ -1,52 +0,0 @@
FROM ruby:3.4.8-trixie
# Install system dependencies
RUN apt-get update -qq && \
apt-get install -y --no-install-recommends \
build-essential \
libpq-dev \
git \
curl \
gnupg2 \
shared-mime-info \
libvips \
&& curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
&& apt-get install -y --no-install-recommends nodejs \
&& npm install -g yarn \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# Set production environment
ENV RAILS_ENV=production \
BUNDLE_WITHOUT="development test" \
RAILS_SERVE_STATIC_FILES=true \
RAILS_LOG_TO_STDOUT=true
WORKDIR /app
# Install gems
COPY Gemfile Gemfile.lock ./
RUN bundle config set --local deployment 'true' && \
bundle config set --local without 'development test' && \
bundle install --jobs 4 --retry 3
# Install JavaScript dependencies
COPY package.json yarn.lock ./
RUN yarn install --check-files
# Copy the application code
COPY . .
# Precompile assets
# Secret key base is needed for asset compilation but doesn't need to be the real one
RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile
# Add a script to be executed every time the container starts.
COPY entrypoint.sh /usr/bin/
RUN chmod +x /usr/bin/entrypoint.sh
ENTRYPOINT ["entrypoint.sh"]
EXPOSE 3000
# Start the main process.
CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]

View File

@@ -139,7 +139,7 @@ gem "msgpack"
# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
gem "connection_pool", "< 3"
gem "connection_pool", "< 3"
group :production do
gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
@@ -204,5 +204,5 @@ gem "i18n_data", "~> 1.1"
gem "paper_trail", "~> 17.0"
gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
gem 'sitemap_generator'
gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'

View File

@@ -498,7 +498,7 @@ GEM
date
stringio
public_suffix (7.0.5)
puma (8.0.0)
puma (7.2.0)
nio4r (~> 2.0)
query_diet (0.7.3)
racc (1.8.1)

View File

@@ -15,7 +15,7 @@ module Admin
def create
@crop_companion = @crop.crop_companions.new(crop_companion_params)
if @crop_companion.save
redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.created')
redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
else
render :new
end
@@ -24,7 +24,7 @@ module Admin
def destroy
@crop_companion = @crop.crop_companions.find(params[:id])
@crop_companion.destroy
redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.deleted')
redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
end
private

View File

@@ -9,9 +9,9 @@ module Admin
@version = PaperTrail::Version.find(params[:id])
@object = @version.reify
if @object.save
redirect_to admin_crops_path, notice: t('messages.revert_success', date: @version.created_at.strftime('%B %d, %Y'))
redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
else
redirect_to admin_crops_path, alert: t('messages.revert_error', date: @version.created_at.strftime('%B %d, %Y'), errors: @object.errors.full_messages.to_sentence)
redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
end
end

View File

@@ -30,7 +30,7 @@ class AlternateNamesController < ApplicationController
@alternate_name = AlternateName.new(alternate_name_params)
if @alternate_name.save
redirect_to @alternate_name.crop, notice: t('alternate_names.created')
redirect_to @alternate_name.crop, notice: 'Alternate name was successfully created.'
else
render action: "new"
end
@@ -40,7 +40,7 @@ class AlternateNamesController < ApplicationController
# PUT /alternate_names/1.json
def update
if @alternate_name.update(alternate_name_params)
redirect_to @alternate_name.crop, notice: t('alternate_names.updated')
redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.'
else
render action: "edit"
end
@@ -51,7 +51,7 @@ class AlternateNamesController < ApplicationController
def destroy
@crop = @alternate_name.crop
@alternate_name.destroy
redirect_to @crop, notice: t('alternate_names.deleted')
redirect_to @crop, notice: 'Alternate name was successfully deleted.'
end
private

View File

@@ -24,9 +24,9 @@ class AuthenticationsController < ApplicationController
name:
)
flash[:notice] = t('messages.auth_success')
flash[:notice] = "Authentication successful."
else
flash[:notice] = t('messages.auth_failed')
flash[:notice] = "Authentication failed."
end
redirect_to request.env['omniauth.origin'] || edit_member_registration_path
end

View File

@@ -160,7 +160,7 @@ class CropsController < ApplicationController
when 'youtube'
Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
when 'alternate_names'
Crop.approved.where.missing(:alternate_names).order(plantings_count: :desc)
Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
when 'wikidata'
crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)

View File

@@ -13,11 +13,11 @@ class FollowsController < ApplicationController
@follow = current_member.follows.build(followed: Member.find(params[:followed]))
if @follow.save
flash[:notice] = t('messages.followed', name: @follow.followed.login_name)
flash[:notice] = "Followed #{@follow.followed.login_name}"
else
flash[:error] = t('messages.follow_error')
flash[:error] = "Already following or error while following."
end
redirect_back_or_to(root_path)
redirect_back fallback_location: root_path
end
def destroy
@@ -25,7 +25,7 @@ class FollowsController < ApplicationController
@unfollowed = @follow.followed
@follow.destroy
flash[:notice] = t('messages.unfollowed', name: @unfollowed.login_name)
flash[:notice] = "Unfollowed #{@unfollowed.login_name}"
redirect_to @unfollowed
end

View File

@@ -32,14 +32,14 @@ class ForumsController < ApplicationController
# POST /forums.json
def create
@forum = Forum.new(forum_params)
flash[:notice] = t('forums.created') if @forum.save
flash[:notice] = 'Forum was successfully created.' if @forum.save
respond_with(@forum)
end
# PUT /forums/1
# PUT /forums/1.json
def update
flash[:notice] = t('forums.updated') if @forum.update(forum_params)
flash[:notice] = 'Forum was successfully updated.' if @forum.update(forum_params)
respond_with(@forum)
end
@@ -47,7 +47,7 @@ class ForumsController < ApplicationController
# DELETE /forums/1.json
def destroy
@forum.destroy
flash[:notice] = t('forums.deleted')
flash[:notice] = 'Forum was successfully deleted'
redirect_to forums_url
end

View File

@@ -14,7 +14,7 @@ class LikesController < ApplicationController
@like.likeable.reindex(refresh: true)
success(@like, liked_by_member: true, status_code: :created)
else
failed(@like, message: t('messages.unable_to_like'))
failed(@like, message: 'Unable to like')
end
end
@@ -29,7 +29,7 @@ class LikesController < ApplicationController
@like.likeable.reindex(refresh: true)
success(@like, liked_by_member: false, status_code: :ok)
else
failed(@like, message: t('messages.unable_to_unlike'))
failed(@like, message: 'Unable to unlike')
end
end

View File

@@ -10,7 +10,7 @@ require './lib/actions/oauth_signup_action'
#
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def failure
flash[:alert] = t('messages.auth_failed')
flash[:alert] = "Authentication failed."
redirect_to request.env['omniauth.origin'] || "/"
end

View File

@@ -33,7 +33,7 @@ class PlacesController < ApplicationController
def search
if params[:new_place].empty?
redirect_to places_path, alert: t('messages.invalid_location')
redirect_to places_path, alert: 'Please enter a valid location'
else
redirect_to place_path(params[:new_place])
end

View File

@@ -116,11 +116,11 @@ class PlantingsController < DataController
new_planting.finished_at = nil
if new_planting.save
redirect_to edit_planting_path(new_planting), notice: t('messages.transplant_success')
redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
else
# if the save fails, we should probably roll back the finishing of the original planting
@planting.update(finished: false, finished_at: nil)
redirect_to @planting, alert: t('messages.transplant_error', errors: new_planting.errors.full_messages.to_sentence)
redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
end
end

View File

@@ -29,17 +29,17 @@ class PostsController < ApplicationController
def create
params[:post][:author_id] = current_member.id
@post = Post.new(post_params)
flash[:notice] = t('posts.created') if @post.save
flash[:notice] = 'Post was successfully created.' if @post.save
respond_with(@post)
end
def update
flash[:notice] = t('posts.updated') if @post.update(post_params)
flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
respond_with(@post)
end
def destroy
flash[:notice] = t('posts.deleted') if @post.destroy
flash[:notice] = 'Post was deleted.' if @post.destroy
respond_with(@post)
end

View File

@@ -54,7 +54,7 @@ class ScientificNamesController < ApplicationController
def destroy
@crop = @scientific_name.crop
@scientific_name.destroy
flash[:notice] = t('scientific_names.deleted')
flash[:notice] = 'Scientific name was successfully deleted.'
respond_with(@crop)
end

View File

@@ -61,7 +61,7 @@ class SeedsController < DataController
@seed.finished ||= false
@seed.owner = current_member
@seed.crop = @seed.parent_planting.crop if @seed.parent_planting
flash[:notice] = t('seeds.added_to_stash', crop: @seed.crop) if @seed.save
flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
if params[:return] == 'planting'
respond_with(@seed, location: @seed.parent_planting)
else
@@ -70,7 +70,7 @@ class SeedsController < DataController
end
def update
flash[:notice] = t('seeds.updated') if @seed.update(seed_params)
flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
respond_with(@seed)
end

View File

@@ -5,7 +5,7 @@ class SessionsController < Devise::SessionsController
def create
super do |_resource|
flash[:alert] = t('messages.crops_waiting') if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
flash[:alert] = "There are crops waiting to be wrangled." if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
end
end
end

View File

@@ -62,7 +62,7 @@ module CropsHelper
'@type': 'Person',
name: post.author.login_name
},
datePublished: post.created_at
'datePublished': post.created_at
}
end

View File

@@ -79,6 +79,7 @@ class Ability
can :manage, CropCompanion
can :manage, ScientificName
can :manage, AlternateName
can :openfarm, Crop
can :gbif, Crop
end

View File

@@ -4,6 +4,7 @@ class Crop < ApplicationRecord
has_paper_trail
extend FriendlyId
include PhotoCapable
include OpenFarmData
include GbifData
include SearchCrops
@@ -56,13 +57,13 @@ class Crop < ApplicationRecord
validates :en_wikipedia_url,
format: {
with: %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
message: :not_a_valid_wikipedia_url
message: 'is not a valid English Wikipedia URL'
},
if: :approved?
validates :en_youtube_url,
format: {
with: %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
message: :not_a_valid_youtube_url
message: 'is not a valid YouTube URL'
},
allow_blank: true
validates :name, uniqueness: { scope: :approval_status }, if: :pending?
@@ -189,12 +190,12 @@ class Crop < ApplicationRecord
return if rejected?
return unless reason_for_rejection.present? || rejection_notes.present?
errors.add(:approval_status, :rejection_reason_required)
errors.add(:approval_status, "must be rejected if a reason for rejection is present")
end
def must_have_meaningful_reason_for_rejection
return unless reason_for_rejection == "other" && rejection_notes.blank?
errors.add(:rejection_notes, :rejection_notes_required)
errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
end
end

View File

@@ -32,7 +32,7 @@ class Garden < ApplicationRecord
validates :name, uniqueness: { scope: :owner_id }
validates :name,
format: { without: /\n/, message: :no_newlines },
format: { without: /\n/, message: "must contain no newlines" },
allow_blank: false, presence: true,
length: { maximum: 255 }
@@ -53,7 +53,7 @@ class Garden < ApplicationRecord
"acres" => "acre"
}.freeze
validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
message: :not_a_valid_area_unit },
message: "%<value>s is not a valid area unit" },
allow_blank: true
def cleanup_area

View File

@@ -11,7 +11,7 @@ class GardenCollaborator < ApplicationRecord
return unless member
return unless garden
errors.add(:member_id, :cannot_be_garden_owner) if garden.owner == member
errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
end
def member_slug

View File

@@ -58,18 +58,18 @@ class Harvest < ApplicationRecord
##
## Validations
validates :crop, approved: true
validates :crop, presence: { message: :crop_not_found }
validates :plant_part, presence: { message: :crop_not_found }
validates :crop, presence: { message: "must be present and exist in our database" }
validates :plant_part, presence: { message: "must be present and exist in our database" }
validates :harvested_at, presence: true
validates :quantity, allow_nil: true, numericality: {
only_integer: false, greater_than_or_equal_to: 0
}
validates :unit, allow_blank: true, inclusion: {
in: UNITS_VALUES.values, message: :not_a_valid_unit
in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
}
validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
validates :weight_unit, allow_blank: true, inclusion: {
in: WEIGHT_UNITS_VALUES.values, message: :not_a_valid_unit
in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
}
validate :crop_must_match_planting
validate :owner_must_match_planting
@@ -147,7 +147,7 @@ class Harvest < ApplicationRecord
def crop_must_match_planting
return if planting.blank? # only check if we are linked to a planting
errors.add(:planting, :same_crop_required) unless crop == planting.crop
errors.add(:planting, "must be the same crop") unless crop == planting.crop
end
def owner_must_match_planting
@@ -155,13 +155,14 @@ class Harvest < ApplicationRecord
return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
errors.add(:owner, :same_owner_required)
errors.add(:owner,
"of harvest must be the same as planting, or a collaborator on that garden")
end
def harvest_must_be_after_planting
# only check if we are linked to a planting
return unless harvested_at.present? && planting.present? && planting.planted_at.present?
errors.add(:planting, :harvest_after_planted) unless harvested_at > planting.planted_at
errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
end
end

View File

@@ -96,21 +96,21 @@ class Member < ApplicationRecord
validates :tos_agreement, acceptance: { allow_nil: true, accept: true }
validates :login_name,
length: {
minimum: 2, maximum: 25, message: :login_name_length
minimum: 2, maximum: 25, message: "should be between 2 and 25 characters long"
},
exclusion: {
in: %w(growstuff admin moderator staff nearby), message: :login_name_reserved
in: %w(growstuff admin moderator staff nearby), message: "name is reserved"
},
format: {
with: /\A\w+\z/, message: :login_name_format
with: /\A\w+\z/, message: "may only include letters, numbers, or underscores"
},
uniqueness: {
case_sensitive: false
}
validates :website_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
validates :other_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
validates :instagram_handle, :facebook_handle, :bluesky_handle,
format: { without: %r{\Ahttps?://|/}, message: :handle_format }, allow_blank: true
format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true
#
# Triggers

View File

@@ -29,12 +29,12 @@ class PhotoAssociation < ApplicationRecord
def photo_and_item_have_same_owner
return if photographable_type == 'Crop'
errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
end
def crop_present
return unless %w(Planting Seed Harvest).include?(photographable_type)
errors.add(:crop_id, :calculate_crop_failed) if crop_id.blank?
errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
end
end

View File

@@ -72,7 +72,7 @@ class Planting < ApplicationRecord
##
## Validations
validates :garden, presence: true
validates :crop, presence: true, approved: { message: :crop_must_be_approved }
validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
validate :finished_must_be_after_planted
validate :owner_must_match_garden_owner
validate :cannot_be_finished_and_failed
@@ -80,10 +80,10 @@ class Planting < ApplicationRecord
only_integer: true, greater_than_or_equal_to: 0
}
validates :sunniness, allow_blank: true, inclusion: {
in: SUNNINESS_VALUES, message: :not_a_valid_sunniness
in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
}
validates :planted_from, allow_blank: true, inclusion: {
in: PLANTED_FROM_VALUES, message: :not_a_valid_planting_method
in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
}
validates :overall_rating, allow_blank: true, numericality: {
only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
@@ -132,19 +132,20 @@ class Planting < ApplicationRecord
private
def cannot_be_finished_and_failed
errors.add(:failed, :failed_and_finished) if finished && failed
errors.add(:failed, "can't be true if planting is also finished") if finished && failed
end
# check that any finished_at date occurs after planted_at
def finished_must_be_after_planted
return unless planted_at && finished_at # only check if we have both
errors.add(:finished_at, :finished_after_planted) unless planted_at < finished_at
errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
end
def owner_must_match_garden_owner
return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?
errors.add(:owner, :same_owner_required)
errors.add(:owner,
"must be the same as garden, or a collaborator on that garden")
end
end

View File

@@ -28,7 +28,7 @@ class Seed < ApplicationRecord
#
# Validations
validates :crop, approved: true
validates :crop, presence: { message: :crop_not_found }
validates :crop, presence: { message: "must be present and exist in our database" }
validates :quantity, allow_nil: true,
numericality: { only_integer: true, greater_than_or_equal_to: 0 }
validates :days_until_maturity_min, allow_nil: true,
@@ -36,15 +36,20 @@ 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: :tradable_to_inclusion }
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: :organic_inclusion }
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: :gmo_inclusion }
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: :heirloom_inclusion }
inclusion: { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
"are heirloom, hybrid, or unknown" }
validates :source, allow_blank: true,
inclusion: { in: SOURCE_VALUES, message: :source_inclusion }
inclusion: { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
"or that you don't know" }
#
# Delegations

View File

@@ -126,9 +126,12 @@ class GbifService
gbif_record = fetch(gbif_usage_key)
if gbif_record.present?
# crop.update! openfarm_data: gbif_record.fetch('data', false)
# save_companions(crop, gbif_record)
save_photos(crop, gbif_usage_key)
else
Rails.logger.debug "\tcrop not found on GBIF"
# crop.update!(openfarm_data: false)
end
end

View File

@@ -16,7 +16,7 @@
%p
%span.help-block
For detailed crop wrangling guidelines, please consult the
= link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
= link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
on the Growstuff wiki.
.form-group

View File

@@ -11,7 +11,7 @@
%p
%span.help-block
For detailed crop wrangling guidelines, please consult the
= link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
= link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
on the Growstuff wiki.
.form-group

24
config.rb Normal file
View File

@@ -0,0 +1,24 @@
# frozen_string_literal: true
# Require any additional compass plugins here.
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "app/assets/stylesheets"
sass_dir = "app/assets/stylesheets"
javascripts_dir = "app/assets/javascripts"
images_dir = "app/assets/images"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false
# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

4
config/compass.rb Normal file
View File

@@ -0,0 +1,4 @@
# frozen_string_literal: true
# Require any additional compass plugins here.
project_type = :rails

View File

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

View File

@@ -63,56 +63,6 @@ en:
seed:
one: seed
other: seeds
errors:
messages:
crop_not_found: must be present and exist in our database
crop_must_be_approved: must be present and exist in our database
failed_and_finished: "can't be true if planting is also finished"
finished_after_planted: must be after the planting date
rejection_reason_required: must be rejected if a reason for rejection is present
rejection_notes_required: "must be added if the reason for rejection is \"other\""
same_crop_required: must be the same crop
harvest_after_planted: cannot be harvested before planting
cannot_be_garden_owner: cannot be the garden owner
same_owner_required: "of harvest must be the same as planting, or a collaborator on that garden"
photo_owner_mismatch: must have same owner as item it links to
calculate_crop_failed: failed to calculate crop
not_a_valid_wikipedia_url: is not a valid English Wikipedia URL
not_a_valid_youtube_url: is not a valid YouTube URL
not_a_valid_sunniness: "%{value} is not a valid sunniness value"
not_a_valid_planting_method: "%{value} is not a valid planting method"
not_a_valid_unit: "%{value} is not a valid unit"
not_a_valid_area_unit: "%{value} is not a valid area unit"
no_newlines: must contain no newlines
models:
member:
attributes:
login_name:
login_name_length: should be between 2 and 25 characters long
login_name_reserved: name is reserved
login_name_format: may only include letters, numbers, or underscores
website_url:
url_format: "must start with http:// or https://"
other_url:
url_format: "must start with http:// or https://"
instagram_handle:
handle_format: should be a handle, not a URL
facebook_handle:
handle_format: should be a handle, not a URL
bluesky_handle:
handle_format: should be a handle, not a URL
seed:
attributes:
tradable_to:
tradable_to_inclusion: "You may only trade seed nowhere, locally, nationally, or internationally"
organic:
organic_inclusion: "You must say whether the seeds are organic or not, or that you don't know"
gmo:
gmo_inclusion: "You must say whether the seeds are genetically modified or not, or that you don't know"
heirloom:
heirloom_inclusion: "You must say whether the seeds are heirloom, hybrid, or unknown"
source:
source_inclusion: "You must say where the seeds are from, or that you don't know"
application_helper:
title:
title:
@@ -162,9 +112,6 @@ en:
forums:
index:
title: Forums
created: Forum was successfully created.
updated: Forum was successfully updated.
deleted: Forum was successfully deleted.
gardens:
created: Garden was successfully created.
deleted: Garden was successfully deleted.
@@ -261,8 +208,6 @@ en:
trade_to: Will trade to
unspecified: unspecified
view_all: View all seeds
added_to_stash: Successfully added %{crop} seed to your stash.
updated: Seed was successfully updated.
stats:
member_linktext: "%{count} members"
message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}; and %{contributors} people have contributed to our code on %{github}!
@@ -330,21 +275,6 @@ en:
links:
my_gardens: My gardens
messages:
auth_success: Authentication successful.
auth_failed: Authentication failed.
crops_waiting: There are crops waiting to be wrangled.
followed: "Followed %{name}"
unfollowed: "Unfollowed %{name}"
follow_error: Already following or error while following.
transplant_success: Planting was successfully transplanted.
transplant_error: "There was an error transplanting the planting: %{errors}"
revert_success: "Reverted to version from %{date}"
revert_error: "Could not revert to version from %{date}. Errors: %{errors}"
invalid_location: Please enter a valid location
unable_to_like: Unable to like
unable_to_unlike: Unable to unlike
members:
edit_profile: Edit profile
index:
@@ -412,22 +342,10 @@ en:
progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
posts:
write_blog_post: Write blog post
created: Post was successfully created.
updated: Post was successfully updated.
deleted: Post was deleted.
index:
title:
author_posts: "%{author} posts"
default: Everyone's posts
scientific_names:
deleted: Scientific name was successfully deleted.
alternate_names:
created: Alternate name was successfully created.
updated: Alternate name was successfully updated.
deleted: Alternate name was successfully deleted.
crop_companions:
created: Companion was successfully created.
deleted: Companion was successfully destroyed.
seeds:
form:
trade_help: >
@@ -443,7 +361,6 @@ en:
owner_seeds: "%{owner} seeds"
save_seeds: Save seeds
string: "%{crop} seeds belonging to %{owner}"
added_to_stash: Successfully added %{crop} seed to your stash.
unauthorized:
create:
all: Please sign in or sign up to create a %{subject}.

View File

@@ -18,6 +18,7 @@ class AllThePredictions < ActiveRecord::Migration[4.2]
remove_column :plantings, :days_before_maturity, :integer
create_table :median_functions
create_table :median_functions do |t|
end
end
end

View File

@@ -14,23 +14,23 @@ class AddLikeCounterCaches < ActiveRecord::Migration[5.2]
end
def data
execute <<~SQL.squish
UPDATE photos
SET likes_count = (
SELECT count(1)
FROM likes
WHERE likes.likeable_id = photos.id
AND likeable_type = 'Photo'
)
execute <<-SQL.squish
UPDATE photos
SET likes_count = (
SELECT count(1)
FROM likes
WHERE likes.likeable_id = photos.id
AND likeable_type = 'Photo'
)
SQL
execute <<~SQL.squish
UPDATE posts
SET likes_count = (
SELECT count(1)
FROM likes
WHERE likes.likeable_id = posts.id
AND likeable_type = 'Post'
)
execute <<-SQL.squish
UPDATE posts
SET likes_count = (
SELECT count(1)
FROM likes
WHERE likes.likeable_id = posts.id
AND likeable_type = 'Post'
)
SQL
end
end

View File

@@ -11,13 +11,13 @@ class CropHarvestCounterCache < ActiveRecord::Migration[5.2]
end
def set_counter_value
execute <<~SQL.squish
UPDATE crops
SET harvests_count = (
SELECT count(1)
FROM harvests
WHERE harvests.crop_id = crops.id
)
execute <<-SQL.squish
UPDATE crops
SET harvests_count = (
SELECT count(1)
FROM harvests
WHERE harvests.crop_id = crops.id
)
SQL
end
end

View File

@@ -11,13 +11,13 @@ class CropPhotoCounterCache < ActiveRecord::Migration[5.2]
end
def set_counter_value
execute <<~SQL.squish
UPDATE crops
SET photo_associations_count = (
SELECT count(1)
FROM photo_associations
WHERE photo_associations.crop_id = crops.id
)
execute <<-SQL.squish
UPDATE crops
SET photo_associations_count = (
SELECT count(1)
FROM photo_associations
WHERE photo_associations.crop_id = crops.id
)
SQL
end
end

View File

@@ -11,13 +11,13 @@ class PlantPartHarvestCounterCache < ActiveRecord::Migration[5.2]
end
def set_counter_value
execute <<~SQL.squish
UPDATE plant_parts
SET harvests_count = (
SELECT count(1)
FROM harvests
WHERE harvests.plant_part_id = plant_parts.id
)
execute <<-SQL.squish
UPDATE plant_parts
SET harvests_count = (
SELECT count(1)
FROM harvests
WHERE harvests.plant_part_id = plant_parts.id
)
SQL
end
end

View File

@@ -11,7 +11,7 @@ class PostCommentCounterCache < ActiveRecord::Migration[5.2]
end
def set_counter_value
execute <<~SQL.squish
execute <<-SQL.squish
UPDATE posts
SET comments_count = (
SELECT count(1)

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
# This migration comes from active_storage (originally 20180723000244)
class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
def up

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddFieldsToCrops < ActiveRecord::Migration[5.2]
def change
add_column :crops, :row_spacing, :integer

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
def up
Crop.find_each do |crop|

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddSocialMediaToMembers < ActiveRecord::Migration[6.0]
def change
add_column :members, :website_url, :string

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class RenameOtherHandleToOtherUrlInMembers < ActiveRecord::Migration[6.0]
def change
rename_column :members, :other_handle, :other_url

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
def change
create_table :garden_collaborators do |t|

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
def change
create_table :australian_food_classification_data do |t|

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class MakeNotificationsPolymorphic < ActiveRecord::Migration[6.1]
def change
add_column :notifications, :notifiable_type, :string

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class ChangeCommentsPolymorphic < ActiveRecord::Migration[7.2]
def change
add_column :comments, :commentable_type, :string

View File

@@ -11,7 +11,7 @@ class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
end
def set_counter_value
execute <<~SQL.squish
execute <<-SQL.squish
UPDATE photos
SET comments_count = (
SELECT count(1)

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddSourceToSeeds < ActiveRecord::Migration[7.2]
def change
add_column :seeds, :source, :string

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddIndexesCrops < ActiveRecord::Migration[7.2]
def change
add_index :alternate_names, :crop_id

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
def change
add_column :plantings, :overall_rating, :integer

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
def change
add_column :crops, :en_youtube_url, :string

View File

@@ -1,8 +1,7 @@
# frozen_string_literal: true
# This migration creates the `versions` table for the Version class.
# All other migrations PT provides are optional.
class CreateVersions < ActiveRecord::Migration[7.2]
# The largest text column available in all supported RDBMS is
# 1024^3 - 1 bytes, roughly one gibibyte. We specify a size
# so that MySQL will use `longtext` instead of `text`. Otherwise,
@@ -37,6 +36,6 @@ class CreateVersions < ActiveRecord::Migration[7.2]
t.string :event, null: false
t.text :object, limit: TEXT_BYTES
end
add_index :versions, %i(item_type item_id)
add_index :versions, %i[item_type item_id]
end
end

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
# This migration adds the optional `object_changes` column, in which PaperTrail
# will store the `changes` diff for each update event. See the readme for
# details.

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
def change
add_column :crops, :public_food_key, :string

View File

@@ -1,76 +0,0 @@
version: '3.8'
services:
web:
build: .
ports:
- "3000:3000"
depends_on:
db:
condition: service_healthy
elasticsearch:
condition: service_healthy
environment:
DATABASE_URL: postgresql://postgres:postgres@db:5432/growstuff_prod
ELASTICSEARCH_URL: http://elasticsearch:9200/
RAILS_ENV: production
RAILS_LOG_TO_STDOUT: "true"
RAILS_SERVE_STATIC_FILES: "true"
APP_DOMAIN_NAME: localhost:3000
APP_PROTOCOL: http
DEVISE_SECRET_KEY: secret
GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
GROWSTUFF_FLICKR_KEY: secretkey
GROWSTUFF_FLICKR_SECRET: secretsecret
GROWSTUFF_SITE_NAME: "Growstuff (local)"
RAILS_SECRET_TOKEN: supersecret
SECRET_KEY_BASE: supersecretbase
db:
image: postgres:17
restart: unless-stopped
volumes:
- postgres-data:/var/lib/postgresql/data
- .devcontainer/create-db-user.sql:/docker-entrypoint-initdb.d/create-db-user.sql
environment:
POSTGRES_USER: postgres
POSTGRES_DB: growstuff_prod
POSTGRES_PASSWORD: postgres
ports:
- "5432:5432"
healthcheck:
test: ["CMD-SHELL", "pg_isready"]
interval: 10s
timeout: 5s
retries: 5
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
container_name: elasticsearch
restart: unless-stopped
environment:
- xpack.security.enabled=false
- discovery.type=single-node
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
cap_add:
- IPC_LOCK
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:9200 | grep tagline"]
interval: 10s
timeout: 10s
retries: 120
volumes:
- esdata01:/usr/share/elasticsearch/data
ports:
- 9200:9200
- 9300:9300
volumes:
postgres-data:
esdata01:

View File

@@ -1,8 +0,0 @@
#!/bin/bash
set -e
# Remove a potentially pre-existing server.pid for Rails.
rm -f /app/tmp/pids/server.pid
# Then exec the container's main process (what's set as CMD in the Dockerfile).
exec "$@"

View File

@@ -1,5 +1,3 @@
# frozen_string_literal: true
require 'csv'
namespace :import do

View File

@@ -14,8 +14,9 @@
"@coffeelint/cli": "^3.0.0",
"@percy/cli": "^1.0.0-beta.76",
"csslint": "^1.0.5",
"eslint": "^10.0.0",
"eslint-config-google": "^0.9.1"
"eslint": "^5.0.0",
"eslint-config-google": "^0.9.1",
"jshint": "^2.9.4"
},
"repository": {
"type": "git",

View File

@@ -14,7 +14,7 @@ describe AdminController do
end
describe 'assigns @members' do
let!(:m) { create(:newsletter_recipient_member) }
let!(:m) { FactoryBot.create(:newsletter_recipient_member) }
it { expect(assigns(:members)).to eq [m] }
end

View File

@@ -2,17 +2,17 @@
require 'rails_helper'
RSpec.describe Api::V1::PlantingsController do
RSpec.describe Api::V1::PlantingsController, type: :controller do
subject { JSON.parse response.body }
let!(:member) { create(:member) }
let!(:member) { FactoryBot.create(:member) }
describe '#index' do
let(:matching_planting) { subject['data'].select { |planting| planting['id'] == my_planting.id.to_s }.first }
describe 'GET #index' do
context 'basic planting' do
let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
let(:expected_attributes) do
{
'crop-name' => my_planting.crop.name,
@@ -42,11 +42,11 @@ RSpec.describe Api::V1::PlantingsController do
it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
it { expect(matching_planting['attributes']).to eq expected_attributes }
it { expect(response).to have_http_status :ok }
it { expect(response.status).to eq 200 }
end
context 'with photo' do
let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
let(:expected_attributes) do
{
@@ -72,7 +72,7 @@ RSpec.describe Api::V1::PlantingsController do
'thumbnail' => photo.thumbnail_url
}
end
let(:photo) { create(:photo, owner: my_planting.owner) }
let(:photo) { FactoryBot.create(:photo, owner: my_planting.owner) }
before do
my_planting.photos << photo
@@ -81,7 +81,7 @@ RSpec.describe Api::V1::PlantingsController do
it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
it { expect(matching_planting['attributes']).to eq expected_attributes }
it { expect(response).to have_http_status :ok }
it { expect(response.status).to eq 200 }
end
end
end

View File

@@ -0,0 +1,18 @@
# frozen_string_literal: true
require 'rails_helper'
describe AuthenticationsController do
before do
@member = FactoryBot.create(:member)
sign_in @member
controller.stub(:current_member) { @member }
@auth = FactoryBot.create(:authentication, member: @member)
request.env['omniauth.auth'] = {
'provider' => 'foo',
'uid' => 'bar',
'info' => { 'nickname' => 'blah' },
'credentials' => { 'token' => 'blah', 'secret' => 'blah' }
}
end
end

View File

@@ -4,7 +4,7 @@ require 'rails_helper'
describe Charts::CropsController do
describe 'GET charts' do
let(:crop) { create(:crop) }
let(:crop) { FactoryBot.create(:crop) }
describe 'sunniness' do
before { get :sunniness, params: { crop_slug: crop.to_param } }

View File

@@ -5,7 +5,7 @@ require 'rails_helper'
describe Charts::GardensController do
include Devise::Test::ControllerHelpers
let(:garden) { create(:garden) }
let(:garden) { FactoryBot.create(:garden) }
context "when not signed in" do
describe 'GET timeline' do
@@ -18,7 +18,7 @@ describe Charts::GardensController do
context "when signed in" do
before { sign_in member }
let!(:member) { create(:member) }
let!(:member) { FactoryBot.create(:member) }
describe 'GET timeline' do
before { get :timeline, params: { garden_slug: garden.to_param } }

View File

@@ -5,7 +5,7 @@ require 'rails_helper'
describe CommentsController do
subject { response }
let(:member) { create(:member) }
let(:member) { FactoryBot.create(:member) }
before do
sign_in member
@@ -13,13 +13,13 @@ describe CommentsController do
end
def valid_attributes
@post = create(:post)
@post = FactoryBot.create(:post)
{ post_id: @post.id, body: "some text" }
end
describe "GET RSS feed" do
let!(:first_comment) { create(:comment, created_at: 10.days.ago) }
let!(:last_comment) { create(:comment, created_at: 4.minutes.ago) }
let!(:first_comment) { FactoryBot.create(:comment, created_at: 10.days.ago) }
let!(:last_comment) { FactoryBot.create(:comment, created_at: 4.minutes.ago) }
describe "returns an RSS feed" do
before { get :index, format: "rss" }
@@ -32,7 +32,7 @@ describe CommentsController do
end
describe "GET new" do
let(:post) { create(:post) }
let(:post) { FactoryBot.create(:post) }
describe "with valid params" do
before do
@@ -41,7 +41,7 @@ describe CommentsController do
}
end
let(:old_comment) { create(:comment, commentable: post) }
let(:old_comment) { FactoryBot.create(:comment, commentable: post) }
it "picks up post from params" do
expect(assigns(:commentable)).to eq(post)
@@ -59,13 +59,13 @@ describe CommentsController do
end
describe "GET edit" do
let(:post) { create(:post) }
let(:post) { FactoryBot.create(:post) }
before { get :edit, params: { id: comment.to_param } }
describe "my comment" do
let!(:comment) { create(:comment, author: member, commentable: post) }
let!(:old_comment) { create(:comment, commentable: post, created_at: Time.zone.yesterday) }
let!(:comment) { FactoryBot.create(:comment, author: member, commentable: post) }
let!(:old_comment) { FactoryBot.create(:comment, commentable: post, created_at: Time.zone.yesterday) }
it "assigns previous comments as @comments" do
expect(assigns(:comments)).to eq([comment, old_comment])
@@ -73,7 +73,7 @@ describe CommentsController do
end
describe "not my comment" do
let(:comment) { create(:comment, commentable: post) }
let(:comment) { FactoryBot.create(:comment, commentable: post) }
it { expect(response).not_to be_successful }
end
@@ -83,7 +83,7 @@ describe CommentsController do
before { put :update, params: { id: comment.to_param, comment: valid_attributes } }
describe "my comment" do
let(:comment) { create(:comment, author: member) }
let(:comment) { FactoryBot.create(:comment, author: member) }
it "redirects to the comment's post" do
expect(response).to redirect_to(comment.commentable)
@@ -91,16 +91,16 @@ describe CommentsController do
end
describe "not my comment" do
let(:comment) { create(:comment) }
let(:comment) { FactoryBot.create(:comment) }
it { expect(response).not_to be_successful }
end
describe "attempting to change post_id" do
let(:post) { create(:post, subject: 'our post') }
let(:other_post) { create(:post, subject: 'the other post') }
let(:post) { FactoryBot.create(:post, subject: 'our post') }
let(:other_post) { FactoryBot.create(:post, subject: 'the other post') }
let(:valid_attributes) { { commentable_type: "Post", commentable_id: other_post.id, body: "kōrero" } }
let(:comment) { create(:comment, author: member, commentable: post) }
let(:comment) { FactoryBot.create(:comment, author: member, commentable: post) }
it "does not change post_id" do
comment.reload
@@ -113,7 +113,7 @@ describe CommentsController do
before { delete :destroy, params: { id: comment.to_param } }
describe "my comment" do
let(:comment) { create(:comment, author: member) }
let(:comment) { FactoryBot.create(:comment, author: member) }
it "redirects to the post the comment was on" do
expect(response).to redirect_to(comment.commentable)
@@ -121,7 +121,7 @@ describe CommentsController do
end
describe "not my comment" do
let(:comment) { create(:comment) }
let(:comment) { FactoryBot.create(:comment) }
it { expect(response).not_to be_successful }
end

View File

@@ -42,8 +42,8 @@ describe CropsController do
describe "GET crop search" do
describe 'fetches the crop search page' do
let!(:tomato) { create(:tomato) }
let!(:maize) { create(:maize) }
let!(:tomato) { FactoryBot.create(:tomato) }
let!(:maize) { FactoryBot.create(:maize) }
before { Crop.reindex }
@@ -140,7 +140,7 @@ describe CropsController do
describe 'DELETE destroy' do
subject { delete :destroy, params: { slug: crop.to_param } }
let!(:crop) { create(:crop) }
let!(:crop) { FactoryBot.create(:crop) }
context 'not logged in' do
it { expect { subject }.not_to change(Crop, :count) }

View File

@@ -0,0 +1,19 @@
# frozen_string_literal: true
require 'rails_helper'
describe ForumsController do
login_member(:admin_member)
def valid_attributes
{
"name" => "MyString",
"description" => "Something",
"owner_id" => 1
}
end
def valid_session
{}
end
end

View File

@@ -2,11 +2,11 @@
require 'rails_helper'
RSpec.describe GardenTypesController do
RSpec.describe GardenTypesController, type: :controller do
include Devise::Test::ControllerHelpers
let(:valid_params) { { name: 'My second GardenType' } }
let(:garden_type) { create(:garden_type) }
let(:garden_type) { FactoryBot.create(:garden_type) }
context "when not signed in" do
describe 'GET new' do
@@ -24,42 +24,29 @@ RSpec.describe GardenTypesController do
describe 'changing existing records' do
before do
allow(GardenType).to receive(:find).and_return(:garden_type)
expect(garden_type).not_to receive(:save)
expect(garden_type).not_to receive(:save!)
expect(garden_type).not_to receive(:update)
expect(garden_type).not_to receive(:update!)
expect(garden_type).not_to receive(:destroy)
end
describe 'GET edit' do
it "redirects to root" do
expect(garden_type).not_to receive(:save)
expect(garden_type).not_to receive(:save!)
expect(garden_type).not_to receive(:update)
expect(garden_type).not_to receive(:update!)
expect(garden_type).not_to receive(:destroy)
get :edit, params: { id: garden_type.to_param }
expect(response).to redirect_to(root_path)
end
before { get :edit, params: { id: garden_type.to_param } }
it { expect(response).to redirect_to(root_path) }
end
describe 'POST update' do
it "redirects to root" do
expect(garden_type).not_to receive(:save)
expect(garden_type).not_to receive(:save!)
expect(garden_type).not_to receive(:update)
expect(garden_type).not_to receive(:update!)
expect(garden_type).not_to receive(:destroy)
post :update, params: { id: garden_type.to_param, garden_type: valid_params }
expect(response).to redirect_to(root_path)
end
before { post :update, params: { id: garden_type.to_param, garden_type: valid_params } }
it { expect(response).to redirect_to(root_path) }
end
describe 'DELETE' do
it "redirects to root" do
expect(garden_type).not_to receive(:save)
expect(garden_type).not_to receive(:save!)
expect(garden_type).not_to receive(:update)
expect(garden_type).not_to receive(:update!)
expect(garden_type).not_to receive(:destroy)
delete :destroy, params: { id: garden_type.to_param, params: { garden_type: valid_params } }
expect(response).to redirect_to(root_path)
end
before { delete :destroy, params: { id: garden_type.to_param, params: { garden_type: valid_params } } }
it { expect(response).to redirect_to(root_path) }
end
end
end
@@ -67,49 +54,36 @@ RSpec.describe GardenTypesController do
context "when signed in as a member" do
before { sign_in member }
let!(:member) { create(:member) }
let!(:member) { FactoryBot.create(:member) }
describe "for any garden_type" do
let(:any_garden_type) { double('garden_type') }
before do
allow(GardenType).to receive(:find).and_return(:any_garden_type)
expect(GardenType).to receive(:find).and_return(:any_garden_type)
expect(any_garden_type).not_to receive(:save)
expect(any_garden_type).not_to receive(:save!)
expect(any_garden_type).not_to receive(:update)
expect(any_garden_type).not_to receive(:update!)
expect(any_garden_type).not_to receive(:destroy)
end
describe 'GET edit' do
it "redirects to root" do
expect(any_garden_type).not_to receive(:save)
expect(any_garden_type).not_to receive(:save!)
expect(any_garden_type).not_to receive(:update)
expect(any_garden_type).not_to receive(:update!)
expect(any_garden_type).not_to receive(:destroy)
get :edit, params: { id: any_garden_type.to_param }
expect(response).to redirect_to(root_path)
end
before { get :edit, params: { id: any_garden_type.to_param } }
it { expect(response).to redirect_to(root_path) }
end
describe 'POST update' do
it "redirects to root" do
expect(any_garden_type).not_to receive(:save)
expect(any_garden_type).not_to receive(:save!)
expect(any_garden_type).not_to receive(:update)
expect(any_garden_type).not_to receive(:update!)
expect(any_garden_type).not_to receive(:destroy)
post :update, params: { id: any_garden_type.to_param, garden_type: valid_params }
expect(response).to redirect_to(root_path)
end
before { post :update, params: { id: any_garden_type.to_param, garden_type: valid_params } }
it { expect(response).to redirect_to(root_path) }
end
describe 'DELETE' do
it "redirects to root" do
expect(any_garden_type).not_to receive(:save)
expect(any_garden_type).not_to receive(:save!)
expect(any_garden_type).not_to receive(:update)
expect(any_garden_type).not_to receive(:update!)
expect(any_garden_type).not_to receive(:destroy)
delete :destroy, params: { id: any_garden_type.to_param, params: { garden_type: valid_params } }
expect(response).to redirect_to(root_path)
end
before { delete :destroy, params: { id: any_garden_type.to_param, params: { garden_type: valid_params } } }
it { expect(response).to redirect_to(root_path) }
end
end
end

View File

@@ -2,12 +2,12 @@
require 'rails_helper'
RSpec.describe GardensController do
RSpec.describe GardensController, type: :controller do
include Devise::Test::ControllerHelpers
let(:valid_params) { { name: 'My second Garden' } }
let(:garden) { create(:garden) }
let(:garden) { FactoryBot.create(:garden) }
context "when not signed in" do
describe 'GET new' do
@@ -25,42 +25,29 @@ RSpec.describe GardensController do
describe 'changing existing records' do
before do
allow(Garden).to receive(:find).and_return(:garden)
expect(garden).not_to receive(:save)
expect(garden).not_to receive(:save!)
expect(garden).not_to receive(:update)
expect(garden).not_to receive(:update!)
expect(garden).not_to receive(:destroy)
end
describe 'GET edit' do
it "redirects to login" do
expect(garden).not_to receive(:save)
expect(garden).not_to receive(:save!)
expect(garden).not_to receive(:update)
expect(garden).not_to receive(:update!)
expect(garden).not_to receive(:destroy)
get :edit, params: { slug: garden.to_param }
expect(response).to redirect_to(new_member_session_path)
end
before { get :edit, params: { slug: garden.to_param } }
it { expect(response).to redirect_to(new_member_session_path) }
end
describe 'POST update' do
it "redirects to login" do
expect(garden).not_to receive(:save)
expect(garden).not_to receive(:save!)
expect(garden).not_to receive(:update)
expect(garden).not_to receive(:update!)
expect(garden).not_to receive(:destroy)
post :update, params: { slug: garden.to_param, garden: valid_params }
expect(response).to redirect_to(new_member_session_path)
end
before { post :update, params: { slug: garden.to_param, garden: valid_params } }
it { expect(response).to redirect_to(new_member_session_path) }
end
describe 'DELETE' do
it "redirects to login" do
expect(garden).not_to receive(:save)
expect(garden).not_to receive(:save!)
expect(garden).not_to receive(:update)
expect(garden).not_to receive(:update!)
expect(garden).not_to receive(:destroy)
delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } }
expect(response).to redirect_to(new_member_session_path)
end
before { delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } } }
it { expect(response).to redirect_to(new_member_session_path) }
end
end
end
@@ -68,49 +55,36 @@ RSpec.describe GardensController do
context "when signed in" do
before { sign_in member }
let!(:member) { create(:member) }
let!(:member) { FactoryBot.create(:member) }
describe "for another member's garden" do
let(:not_my_garden) { double('garden') }
before do
allow(Garden).to receive(:find).and_return(:not_my_garden)
expect(Garden).to receive(:find).and_return(:not_my_garden)
expect(not_my_garden).not_to receive(:save)
expect(not_my_garden).not_to receive(:save!)
expect(not_my_garden).not_to receive(:update)
expect(not_my_garden).not_to receive(:update!)
expect(not_my_garden).not_to receive(:destroy)
end
describe 'GET edit' do
it "redirects to root" do
expect(not_my_garden).not_to receive(:save)
expect(not_my_garden).not_to receive(:save!)
expect(not_my_garden).not_to receive(:update)
expect(not_my_garden).not_to receive(:update!)
expect(not_my_garden).not_to receive(:destroy)
get :edit, params: { slug: not_my_garden.to_param }
expect(response).to redirect_to(root_path)
end
before { get :edit, params: { slug: not_my_garden.to_param } }
it { expect(response).to redirect_to(root_path) }
end
describe 'POST update' do
it "redirects to root" do
expect(not_my_garden).not_to receive(:save)
expect(not_my_garden).not_to receive(:save!)
expect(not_my_garden).not_to receive(:update)
expect(not_my_garden).not_to receive(:update!)
expect(not_my_garden).not_to receive(:destroy)
post :update, params: { slug: not_my_garden.to_param, garden: valid_params }
expect(response).to redirect_to(root_path)
end
before { post :update, params: { slug: not_my_garden.to_param, garden: valid_params } }
it { expect(response).to redirect_to(root_path) }
end
describe 'DELETE' do
it "redirects to root" do
expect(not_my_garden).not_to receive(:save)
expect(not_my_garden).not_to receive(:save!)
expect(not_my_garden).not_to receive(:update)
expect(not_my_garden).not_to receive(:update!)
expect(not_my_garden).not_to receive(:destroy)
delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } }
expect(response).to redirect_to(root_path)
end
before { delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } } }
it { expect(response).to redirect_to(root_path) }
end
end
end

View File

@@ -8,19 +8,19 @@ describe HarvestsController, :search do
def valid_attributes
{
owner_id: subject.current_member.id,
crop_id: create(:crop).id,
plant_part_id: create(:plant_part).id,
crop_id: FactoryBot.create(:crop).id,
plant_part_id: FactoryBot.create(:plant_part).id,
harvested_at: '2017-01-01'
}
end
describe "GET index" do
let!(:first_member) { create(:member) }
let(:second_member) { create(:member) }
let(:tomato) { create(:tomato) }
let(:maize) { create(:maize) }
let!(:tomato_harvest) { create(:harvest, owner_id: first_member.id, crop_id: tomato.id) }
let!(:maize_harvest) { create(:harvest, owner_id: second_member.id, crop_id: maize.id) }
let!(:member1) { FactoryBot.create(:member) }
let(:member2) { FactoryBot.create(:member) }
let(:tomato) { FactoryBot.create(:tomato) }
let(:maize) { FactoryBot.create(:maize) }
let!(:harvest1) { FactoryBot.create(:harvest, owner_id: member1.id, crop_id: tomato.id) }
let!(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id) }
before { Harvest.reindex }
@@ -28,16 +28,16 @@ describe HarvestsController, :search do
before { get :index, params: {} }
it { expect(assigns(:harvests).size).to eq 2 }
it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
it { expect(assigns(:harvests)[1].slug).to eq maize_harvest.slug }
it { expect(assigns(:harvests)[0].slug).to eq harvest1.slug }
it { expect(assigns(:harvests)[1].slug).to eq harvest2.slug }
end
describe "picks up owner from params and shows owner's harvests only" do
before { get :index, params: { member_slug: first_member.slug } }
before { get :index, params: { member_slug: member1.slug } }
it { expect(assigns(:owner)).to eq first_member }
it { expect(assigns(:owner)).to eq member1 }
it { expect(assigns(:harvests).size).to eq 1 }
it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
it { expect(assigns(:harvests)[0].slug).to eq harvest1.slug }
end
describe "picks up crop from params and shows the harvests for the crop only" do
@@ -45,13 +45,13 @@ describe HarvestsController, :search do
it { expect(assigns(:crop)).to eq maize }
it { expect(assigns(:harvests).size).to eq 1 }
it { expect(assigns(:harvests)[0].slug).to eq maize_harvest.slug }
it { expect(assigns(:harvests)[0].slug).to eq harvest2.slug }
end
describe "generates a csv" do
before { get :index, format: "csv" }
it { expect(response).to have_http_status :ok }
it { expect(response.status).to eq 200 }
end
end
@@ -109,7 +109,7 @@ describe HarvestsController, :search do
end
describe "links to planting" do
let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
let(:planting) { FactoryBot.create(:planting, owner_id: member.id, garden: member.gardens.first) }
before { post :create, params: { harvest: valid_attributes.merge(planting_id: planting.id) } }
@@ -134,8 +134,8 @@ describe HarvestsController, :search do
end
describe "not my planting" do
let(:not_my_planting) { create(:planting) }
let(:harvest) { create(:harvest) }
let(:not_my_planting) { FactoryBot.create(:planting) }
let(:harvest) { FactoryBot.create(:harvest) }
describe "does not save planting_id" do
before do
@@ -153,7 +153,7 @@ describe HarvestsController, :search do
let(:harvest) { Harvest.create! valid_attributes }
it "updates the requested harvest" do
new_crop = create(:crop)
new_crop = FactoryBot.create(:crop)
expect do
put :update, params: { slug: harvest.to_param, harvest: { crop_id: new_crop.id } }
harvest.reload
@@ -190,8 +190,8 @@ describe HarvestsController, :search do
end
describe "not my planting" do
let(:not_my_planting) { create(:planting) }
let(:harvest) { create(:harvest) }
let(:not_my_planting) { FactoryBot.create(:planting) }
let(:harvest) { FactoryBot.create(:harvest) }
describe "does not save planting_id" do
before do

View File

@@ -0,0 +1,8 @@
# frozen_string_literal: true
require 'rails_helper'
describe HomeController do
describe "GET index" do
end
end

View File

@@ -3,9 +3,9 @@
require 'rails_helper'
describe LikesController do
let(:like) { create(:like, member:) }
let(:member) { create(:member) }
let(:blogpost) { create(:post) }
let(:like) { FactoryBot.create(:like, member:) }
let(:member) { FactoryBot.create(:member) }
let(:blogpost) { FactoryBot.create(:post) }
before { sign_in member }
@@ -19,7 +19,10 @@ describe LikesController do
it { JSON.parse(response.body)["description"] == "1 like" }
describe "Liking someone else's post" do
it { expect(response).to have_http_status(:created) }
it { expect(response.code).to eq('201') }
end
describe "Liking your own post" do
end
end
@@ -29,14 +32,14 @@ describe LikesController do
it { expect(response.content_type).to eq "application/json; charset=utf-8" }
describe "un-liking something i liked before" do
it { expect(response).to have_http_status(:ok) }
it { expect(response.code).to eq('200') }
it { JSON.parse(response.body)["description"] == "0 likes" }
end
describe "Deleting someone else's like" do
let(:like) { create(:like) }
let(:like) { FactoryBot.create(:like) }
it { expect(response).to have_http_status(:forbidden) }
it { expect(response.code).to eq('403') }
it { JSON.parse(response.body)["error"] == "Unable to like" }
end
end

View File

@@ -4,8 +4,8 @@ require 'rails_helper'
describe MembersController do
before do
@member = create(:member)
@flickr_auth = create(:flickr_authentication, member: @member)
@member = FactoryBot.create(:member)
@flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
end
describe "GET index" do
@@ -39,7 +39,7 @@ describe MembersController do
end
it "doesn't show unconfirmed members" do
@member2 = create(:unconfirmed_member)
@member2 = FactoryBot.create(:unconfirmed_member)
get :show, params: { slug: @member2.id }
expect(response).to have_http_status(:not_found)
end

View File

@@ -17,8 +17,8 @@ describe PhotoAssociationsController do
before { photo.harvests << harvest }
describe "my harvest my photo" do
let(:harvest) { create(:harvest, owner: member) }
let(:photo) { create(:photo, owner: member) }
let(:harvest) { FactoryBot.create(:harvest, owner: member) }
let(:photo) { FactoryBot.create(:photo, owner: member) }
it "removes link" do
expect { delete :destroy, params: valid_params }.to change { photo.harvests.count }.by(-1)
@@ -26,8 +26,8 @@ describe PhotoAssociationsController do
end
describe "another member's harvest from another member's photo" do
let(:harvest) { create(:harvest, owner: photo.owner) }
let(:photo) { create(:photo) }
let(:harvest) { FactoryBot.create(:harvest, owner: photo.owner) }
let(:photo) { FactoryBot.create(:photo) }
it do
expect do

View File

@@ -7,7 +7,7 @@ describe PhotosController, :search do
describe 'GET index' do
describe 'all photos' do
let!(:photo) { create(:photo, :reindex) }
let!(:photo) { FactoryBot.create(:photo, :reindex) }
before do
Photo.reindex
@@ -21,10 +21,10 @@ describe PhotosController, :search do
end
describe '#index crop photos' do
let!(:photo) { create(:photo, :reindex, owner: member, title: 'no assocations photo') }
let!(:crop_photo) { create(:photo, :reindex, owner: member, title: 'photos of planting') }
let!(:planting) { create(:planting, :reindex, crop:, owner: member) }
let!(:crop) { create(:crop, :reindex) }
let!(:photo) { FactoryBot.create(:photo, :reindex, owner: member, title: 'no assocations photo') }
let!(:crop_photo) { FactoryBot.create(:photo, :reindex, owner: member, title: 'photos of planting') }
let!(:planting) { FactoryBot.create(:planting, :reindex, crop:, owner: member) }
let!(:crop) { FactoryBot.create(:crop, :reindex) }
before do
planting.photos << crop_photo
@@ -49,12 +49,12 @@ describe PhotosController, :search do
end
describe "GET new" do
let(:tomato) { create(:tomato) }
let(:planting) { create(:planting, crop: tomato, owner: member) }
let(:garden) { create(:garden, owner: member) }
let(:harvest) { create(:harvest, owner: member) }
let(:member) { create(:member) }
let!(:auth) { create(:flickr_authentication, member:) }
let(:tomato) { FactoryBot.create(:tomato) }
let(:planting) { FactoryBot.create(:planting, crop: tomato, owner: member) }
let(:garden) { FactoryBot.create(:garden, owner: member) }
let(:harvest) { FactoryBot.create(:harvest, owner: member) }
let(:member) { FactoryBot.create(:member) }
let!(:auth) { FactoryBot.create(:flickr_authentication, member:) }
before do
sign_in member
@@ -97,11 +97,11 @@ describe PhotosController, :search do
link_url: "http://example.com")
end
let(:member) { create(:member) }
let(:garden) { create(:garden, owner: member) }
let(:planting) { create(:planting, garden:, owner: member) }
let(:harvest) { create(:harvest, owner: member) }
let(:photo) { create(:photo, owner: member) }
let(:member) { FactoryBot.create(:member) }
let(:garden) { FactoryBot.create(:garden, owner: member) }
let(:planting) { FactoryBot.create(:planting, garden:, owner: member) }
let(:harvest) { FactoryBot.create(:harvest, owner: member) }
let(:photo) { FactoryBot.create(:photo, owner: member) }
describe "with valid params" do
before { controller.stub(:current_member) { member } }
@@ -153,7 +153,7 @@ describe PhotosController, :search do
end
it "doesn't attach photo to a comment" do
comment = create(:comment)
comment = FactoryBot.create(:comment)
expect do
post :create, params: {
photo: { source_id: photo.source_id, source: 'flickr' }, type: "comment", id: comment.id
@@ -163,7 +163,7 @@ describe PhotosController, :search do
end
describe "for the second time" do
let(:planting) { create(:planting, owner: member) }
let(:planting) { FactoryBot.create(:planting, owner: member) }
let(:valid_params) { { photo: { source_id: 1 }, id: planting.id, type: 'planting' } }
it "does not add a photo twice" do
@@ -176,8 +176,8 @@ describe PhotosController, :search do
before { controller.stub(:current_member) { member } }
describe "creates the planting/photo link" do
let(:planting) { create(:planting, garden:, owner: member) }
let(:photo) { create(:photo, owner: member) }
let(:planting) { FactoryBot.create(:planting, garden:, owner: member) }
let(:photo) { FactoryBot.create(:photo, owner: member) }
before { post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id } }
@@ -196,11 +196,11 @@ describe PhotosController, :search do
end
describe "with mismatched owners" do
let(:photo) { create(:photo) }
let(:photo) { FactoryBot.create(:photo) }
it "does not create the planting/photo link" do
# members will be auto-created, and different
another_planting = create(:planting)
another_planting = FactoryBot.create(:planting)
expect do
post :create, params: {
photo: { source_id: photo.source_id, source: 'flickr' },
@@ -212,7 +212,7 @@ describe PhotosController, :search do
it "does not create the harvest/photo link" do
# members will be auto-created, and different
another_harvest = create(:harvest)
another_harvest = FactoryBot.create(:harvest)
expect do
post :create, params: {
photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: another_harvest.id

View File

@@ -9,8 +9,8 @@ describe PlacesController do
describe "GET show" do
before do
@member_london = create(:london_member)
@member_south_pole = create(:south_pole_member)
@member_london = FactoryBot.create(:london_member)
@member_south_pole = FactoryBot.create(:south_pole_member)
end
it "assigns place name" do

View File

@@ -0,0 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
describe PlantPartsController do
end

View File

@@ -7,18 +7,18 @@ describe PlantingsController, :search do
def valid_attributes
{
garden_id: create(:garden, owner: subject.current_member).id,
crop_id: create(:crop).id
garden_id: FactoryBot.create(:garden, owner: subject.current_member).id,
crop_id: FactoryBot.create(:crop).id
}
end
describe "GET index", :search do
let!(:first_member) { create(:member) }
let!(:second_member) { create(:member) }
let!(:tomato) { create(:tomato) }
let!(:maize) { create(:maize) }
let!(:tomato_planting) { create(:planting, crop: tomato, owner: first_member, created_at: 1.day.ago) }
let!(:maize_planting) { create(:planting, crop: maize, owner: second_member, created_at: 5.days.ago) }
let!(:member1) { FactoryBot.create(:member) }
let!(:member2) { FactoryBot.create(:member) }
let!(:tomato) { FactoryBot.create(:tomato) }
let!(:maize) { FactoryBot.create(:maize) }
let!(:planting1) { FactoryBot.create(:planting, crop: tomato, owner: member1, created_at: 1.day.ago) }
let!(:planting2) { FactoryBot.create(:planting, crop: maize, owner: member2, created_at: 5.days.ago) }
before do
Planting.reindex
@@ -28,29 +28,29 @@ describe PlantingsController, :search do
before { get :index }
it { expect(assigns(:plantings).size).to eq 2 }
it { expect(assigns(:plantings)[0]['slug']).to eq tomato_planting.slug }
it { expect(assigns(:plantings)[1]['slug']).to eq maize_planting.slug }
it { expect(assigns(:plantings)[0]['slug']).to eq planting1.slug }
it { expect(assigns(:plantings)[1]['slug']).to eq planting2.slug }
end
describe "picks up owner from params and shows owner's plantings only" do
before { get :index, params: { member_slug: first_member.slug } }
before { get :index, params: { member_slug: member1.slug } }
it { expect(assigns(:owner)).to eq first_member }
it { expect(assigns(:owner)).to eq member1 }
it { expect(assigns(:plantings).size).to eq 1 }
it { expect(assigns(:plantings).first['slug']).to eq tomato_planting.slug }
it { expect(assigns(:plantings).first['slug']).to eq planting1.slug }
end
describe "picks up crop from params and shows the plantings for the crop only" do
before { get :index, params: { crop_slug: maize.slug } }
it { expect(assigns(:crop)).to eq maize }
it { expect(assigns(:plantings).first['slug']).to eq maize_planting.slug }
it { expect(assigns(:plantings).first['slug']).to eq planting2.slug }
end
end
describe "GET new" do
describe "picks up crop from params" do
let(:crop) { create(:crop) }
let(:crop) { FactoryBot.create(:crop) }
before { get :new, params: { crop_id: crop.id } }
@@ -64,7 +64,7 @@ describe PlantingsController, :search do
end
describe "picks up member's garden from params" do
let(:garden) { create(:garden, owner: member) }
let(:garden) { FactoryBot.create(:garden, owner: member) }
before { get :new, params: { garden_id: garden.id } }
@@ -72,8 +72,8 @@ describe PlantingsController, :search do
end
describe "Doesn't display another member's garden on planting form" do
let(:another_member) { create(:member) } # over-riding member from login_member()
let(:garden) { create(:garden, owner: another_member) }
let(:another_member) { FactoryBot.create(:member) } # over-riding member from login_member()
let(:garden) { FactoryBot.create(:garden, owner: another_member) }
before { get :new, params: { garden_id: garden.id } }
@@ -81,8 +81,8 @@ describe PlantingsController, :search do
end
describe "Doesn't display un-approved crops on planting form" do
let(:crop) { create(:crop, approval_status: 'pending') }
let!(:garden) { create(:garden, owner: member) }
let(:crop) { FactoryBot.create(:crop, approval_status: 'pending') }
let!(:garden) { FactoryBot.create(:garden, owner: member) }
before { get :new, params: { crop_id: crop.id } }
@@ -90,8 +90,8 @@ describe PlantingsController, :search do
end
describe "Doesn't display rejected crops on planting form" do
let(:crop) { create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope') }
let!(:garden) { create(:garden, owner: member) }
let(:crop) { FactoryBot.create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope') }
let!(:garden) { FactoryBot.create(:garden, owner: member) }
before { get :new, params: { crop_id: crop.id } }
@@ -111,7 +111,7 @@ describe PlantingsController, :search do
end
context 'with parent seed' do
let(:seed) { create(:seed, owner: member) }
let(:seed) { FactoryBot.create(:seed, owner: member) }
before { get :new, params: { seed_id: seed.to_param } }
@@ -128,8 +128,8 @@ describe PlantingsController, :search do
end
describe 'GET :edit' do
let(:my_planting) { create(:planting, owner: member) }
let(:not_my_planting) { create(:planting) }
let(:my_planting) { FactoryBot.create(:planting, owner: member) }
let(:not_my_planting) { FactoryBot.create(:planting) }
context 'my planting' do
before { get :edit, params: { slug: my_planting } }

Some files were not shown because too many files have changed in this diff Show More