mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-25 09:19:15 -04:00
Compare commits
262 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
092920b5f8 | ||
|
|
b3c0df3bb8 | ||
|
|
1113fc7c97 | ||
|
|
5e8c1f92d1 | ||
|
|
cd0e692c59 | ||
|
|
a07c012051 | ||
|
|
aec87270a7 | ||
|
|
e634fe76ea | ||
|
|
3a5afb10af | ||
|
|
d514109bd6 | ||
|
|
953981f51c | ||
|
|
524b741933 | ||
|
|
497cde22ee | ||
|
|
075b3d8eec | ||
|
|
605605c8e3 | ||
|
|
8a260ca171 | ||
|
|
373794214b | ||
|
|
702787b484 | ||
|
|
d9234e847b | ||
|
|
a56645a4b6 | ||
|
|
79d65c15c6 | ||
|
|
5356185eb9 | ||
|
|
05a89911f4 | ||
|
|
8348a8f544 | ||
|
|
4adcaabf57 | ||
|
|
ff07054b01 | ||
|
|
37aa88790c | ||
|
|
1de98fa0ca | ||
|
|
15dc687134 | ||
|
|
7e40eb1053 | ||
|
|
8c3f6cb7b3 | ||
|
|
3914f28e8e | ||
|
|
84edfd2903 | ||
|
|
3ad059d593 | ||
|
|
2f0e3adad9 | ||
|
|
14b282fb93 | ||
|
|
9a23b3a6bf | ||
|
|
8384381eea | ||
|
|
7c329a4427 | ||
|
|
9d9926af5c | ||
|
|
049dd67968 | ||
|
|
2767384589 | ||
|
|
81ca9dc964 | ||
|
|
2f7bd378d4 | ||
|
|
4473059cb1 | ||
|
|
20a3153dcc | ||
|
|
2058f3d739 | ||
|
|
162fb57ed6 | ||
|
|
3e6953093e | ||
|
|
a5c5de414e | ||
|
|
5c206896af | ||
|
|
afdb9720b7 | ||
|
|
7d203de54d | ||
|
|
5f26d86267 | ||
|
|
0046953f73 | ||
|
|
db406fa6c7 | ||
|
|
cc2b723cd4 | ||
|
|
ed8d62110e | ||
|
|
1d07fd8b6e | ||
|
|
a0b73ca9d5 | ||
|
|
64efea0a8a | ||
|
|
08ce307c3c | ||
|
|
b10054caeb | ||
|
|
e2c4facfe3 | ||
|
|
3469ebf44e | ||
|
|
9953921941 | ||
|
|
159f4558c3 | ||
|
|
c6522ddc20 | ||
|
|
9b44c649e7 | ||
|
|
00184c183d | ||
|
|
f47765642b | ||
|
|
a6e264eea9 | ||
|
|
4c8cc09fd5 | ||
|
|
fd815e843c | ||
|
|
dae4355487 | ||
|
|
5ca687c298 | ||
|
|
6452e67cd7 | ||
|
|
6ee4f91418 | ||
|
|
c24b8b3470 | ||
|
|
44a56a25c7 | ||
|
|
ba3e3afe52 | ||
|
|
cf1c67f266 | ||
|
|
a92f8a358b | ||
|
|
0bb3ac952c | ||
|
|
e8bc72dc90 | ||
|
|
bab87682c5 | ||
|
|
ce52dfdd87 | ||
|
|
1e623f657d | ||
|
|
7fb1459740 | ||
|
|
4de547c243 | ||
|
|
c28b2c0c38 | ||
|
|
83f2cf4a3c | ||
|
|
d03f1e171d | ||
|
|
ef9fd8c82b | ||
|
|
cb9afd00c6 | ||
|
|
946b780b4e | ||
|
|
82be16b8f8 | ||
|
|
becd846022 | ||
|
|
e7a0d0276f | ||
|
|
7b5d8c0236 | ||
|
|
d45b51f85c | ||
|
|
d041382195 | ||
|
|
8f0dff1e96 | ||
|
|
5b42174baf | ||
|
|
8ba7eef6be | ||
|
|
aba09679e0 | ||
|
|
9eff9150f6 | ||
|
|
10a32686c6 | ||
|
|
8fe65768d0 | ||
|
|
470e2d554e | ||
|
|
e952ca6c4c | ||
|
|
ee1c4fc79c | ||
|
|
c80c1c4758 | ||
|
|
3d3f97f0bf | ||
|
|
961d36c57d | ||
|
|
6a2d21d80b | ||
|
|
93b63284b7 | ||
|
|
7cd1f503f2 | ||
|
|
25f63a7708 | ||
|
|
e46b3f8d19 | ||
|
|
f04f8a9201 | ||
|
|
10e456a18d | ||
|
|
7e2be8efd9 | ||
|
|
5ba25b8e76 | ||
|
|
826f92691a | ||
|
|
81060cccf7 | ||
|
|
8b4f0771c5 | ||
|
|
4f5c47ba58 | ||
|
|
d542326047 | ||
|
|
e69467f056 | ||
|
|
1176d18918 | ||
|
|
78fee52f17 | ||
|
|
000f4979db | ||
|
|
f76258dcab | ||
|
|
c3b79d1d3f | ||
|
|
fa78997d8c | ||
|
|
b05efe8e8f | ||
|
|
8906454323 | ||
|
|
dfa81aeaf2 | ||
|
|
436c2305b3 | ||
|
|
57f1fd34c9 | ||
|
|
c1dc3cc4c0 | ||
|
|
067fb1671b | ||
|
|
fa6df64221 | ||
|
|
25e98f1d7f | ||
|
|
dc473108d0 | ||
|
|
adef9f9622 | ||
|
|
b908777a86 | ||
|
|
fda04a6367 | ||
|
|
3d524bb105 | ||
|
|
92cb0c32ab | ||
|
|
6bde403f17 | ||
|
|
ff2f2014fc | ||
|
|
8e5d8002ff | ||
|
|
a8954d2e12 | ||
|
|
892d850f6a | ||
|
|
b5b5222960 | ||
|
|
a6821d689d | ||
|
|
6ac5dc5ac9 | ||
|
|
82855883ca | ||
|
|
c7b0e036c4 | ||
|
|
ec3a9ab32f | ||
|
|
6f22a7ffb7 | ||
|
|
3246773cd8 | ||
|
|
1270dc91f6 | ||
|
|
c9f3105e89 | ||
|
|
54f340380d | ||
|
|
661930f99e | ||
|
|
b29f2cabe6 | ||
|
|
88a60ca3cf | ||
|
|
4f7098c0f6 | ||
|
|
9de957f39b | ||
|
|
480430af37 | ||
|
|
1c66b8b554 | ||
|
|
405946370b | ||
|
|
f04ad801ba | ||
|
|
08efbb5a54 | ||
|
|
619022c61a | ||
|
|
2528ed3e8b | ||
|
|
b88290c953 | ||
|
|
4f12d6af17 | ||
|
|
b92170ec24 | ||
|
|
e854442563 | ||
|
|
411152bc31 | ||
|
|
e73bb02559 | ||
|
|
7eb1265251 | ||
|
|
9f003ac225 | ||
|
|
a751633132 | ||
|
|
b6d77c3737 | ||
|
|
1b07c364f1 | ||
|
|
abd29abd74 | ||
|
|
dbdebf5acb | ||
|
|
e403d6c0c5 | ||
|
|
5577b3a55d | ||
|
|
66f78347e6 | ||
|
|
198a4b1d27 | ||
|
|
d7e5da9577 | ||
|
|
e044a883d2 | ||
|
|
d5028d5ac3 | ||
|
|
4e8b877176 | ||
|
|
b06607c1cf | ||
|
|
929987eb06 | ||
|
|
008854bf56 | ||
|
|
fb311300e7 | ||
|
|
4233dc7c7c | ||
|
|
70d678ebbf | ||
|
|
381ccfb830 | ||
|
|
96018f8671 | ||
|
|
c257bcb564 | ||
|
|
98584d2fa9 | ||
|
|
b197077c40 | ||
|
|
00a36fd747 | ||
|
|
af14088c13 | ||
|
|
a0c12b9e02 | ||
|
|
2a900d6263 | ||
|
|
a41cb404f2 | ||
|
|
2936bc06b9 | ||
|
|
ffb573b1dc | ||
|
|
7cce6cc1c4 | ||
|
|
93e0123bea | ||
|
|
31cc28a34c | ||
|
|
298f02a3a4 | ||
|
|
985d15b117 | ||
|
|
c7a90bdb7e | ||
|
|
1723f3cad9 | ||
|
|
3c6ee787fd | ||
|
|
ed645f2566 | ||
|
|
7faae41c14 | ||
|
|
f9c1741290 | ||
|
|
88ad6d8de9 | ||
|
|
c5df760ce4 | ||
|
|
d9500eff16 | ||
|
|
31fafe6a74 | ||
|
|
f87b83bdd1 | ||
|
|
88e458077b | ||
|
|
a7cc576ef2 | ||
|
|
a713d2936c | ||
|
|
751c2e1a89 | ||
|
|
9fd7e145b5 | ||
|
|
728aa51c2f | ||
|
|
d6799da48d | ||
|
|
df01e0d1aa | ||
|
|
666e2cf13f | ||
|
|
00f7931ee6 | ||
|
|
7aed900e79 | ||
|
|
02137acda2 | ||
|
|
7325f22c02 | ||
|
|
f45a37fece | ||
|
|
f276b19613 | ||
|
|
2ead00eb0c | ||
|
|
bdd403daff | ||
|
|
3027cb155f | ||
|
|
e435d21bd9 | ||
|
|
559e272347 | ||
|
|
6970f4c915 | ||
|
|
9a0a5935d2 | ||
|
|
41446f281e | ||
|
|
d149e25aec | ||
|
|
637aba85bf | ||
|
|
dea254c658 | ||
|
|
c408687e36 | ||
|
|
2a421cf882 |
@@ -1,2 +1,2 @@
|
||||
# Ruby version
|
||||
VARIANT=3.1.4
|
||||
VARIANT=3.3.4
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM mcr.microsoft.com/devcontainers/ruby:0-3.1-bullseye
|
||||
FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
|
||||
|
||||
# Install Rails
|
||||
RUN gem install rails:7.0.8
|
||||
@@ -24,3 +24,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||
|
||||
# [Optional] Uncomment this line to install global node packages.
|
||||
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
|
||||
|
||||
# We run as the vscode user.
|
||||
# Make sure this is writable as https://github.com/rubygems/rubygems/issues/6272 was removed
|
||||
RUN su root -c "mkdir -p /usr/local/rvm/gems/default/cache/bundler/"
|
||||
RUN su root -c "mkdir -p /usr/local/rvm/gems/default/bundler/gems/"
|
||||
RUN su root -c "chown -R vscode:rvm /usr/local/rvm/gems/"
|
||||
RUN su root -c "chmod -R 0755 /usr/local/rvm/gems/"
|
||||
|
||||
45
.github/dependabot.yml
vendored
45
.github/dependabot.yml
vendored
@@ -7,53 +7,10 @@ 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:
|
||||
interval: daily
|
||||
time: "07:00"
|
||||
open-pull-requests-limit: 10
|
||||
|
||||
|
||||
40
.github/workflows/brakeman-analysis.yml
vendored
40
.github/workflows/brakeman-analysis.yml
vendored
@@ -1,40 +0,0 @@
|
||||
# This workflow integrates Brakeman with GitHub's Code Scanning feature
|
||||
# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
|
||||
|
||||
name: Brakeman Scan
|
||||
|
||||
# This section configures the trigger for the workflow. Feel free to customize depending on your convention
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ dev ]
|
||||
|
||||
jobs:
|
||||
brakeman-scan:
|
||||
name: Brakeman Scan
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
# Checkout the repository to the GitHub Actions runner
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Customize the ruby version depending on your needs
|
||||
- name: Setup Ruby
|
||||
uses: ruby/setup-ruby@v1
|
||||
|
||||
- name: Setup Brakeman
|
||||
env:
|
||||
BRAKEMAN_VERSION: '5.1.1' # SARIF support is provided in Brakeman version 4.10+
|
||||
run: |
|
||||
gem install brakeman --version $BRAKEMAN_VERSION
|
||||
|
||||
# Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
|
||||
- name: Scan
|
||||
continue-on-error: true
|
||||
run: |
|
||||
brakeman -f sarif -o output.sarif.json .
|
||||
|
||||
# Upload the SARIF file generated in the previous step
|
||||
- name: Upload SARIF
|
||||
uses: github/codeql-action/upload-sarif@v3
|
||||
with:
|
||||
sarif_file: output.sarif.json
|
||||
@@ -1,13 +1,17 @@
|
||||
inherit_from: .rubocop_todo.yml
|
||||
require:
|
||||
- rubocop-factory_bot
|
||||
- rubocop-capybara
|
||||
- rubocop-rails
|
||||
- rubocop-rspec
|
||||
- rubocop-rspec_rails
|
||||
- rubocop-rake
|
||||
AllCops:
|
||||
NewCops: enable
|
||||
Exclude:
|
||||
- 'db/schema.rb'
|
||||
- 'vendor/**/*'
|
||||
TargetRailsVersion: 7.0
|
||||
TargetRailsVersion: 7.1
|
||||
|
||||
Rails:
|
||||
Enabled: true
|
||||
|
||||
@@ -1,15 +1,37 @@
|
||||
# This configuration was generated by
|
||||
# `rubocop --auto-gen-config`
|
||||
# on 2023-09-16 07:51:19 UTC using RuboCop version 1.56.3.
|
||||
# on 2024-07-13 05:47:38 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
|
||||
# versions of RuboCop, may require this file to be generated again.
|
||||
|
||||
# Offense count: 15
|
||||
# Offense count: 231
|
||||
# Configuration parameters: EnforcedStyle.
|
||||
# SupportedStyles: link_or_button, strict
|
||||
Capybara/ClickLinkOrButtonStyle:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 39
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: DefaultSelector.
|
||||
Capybara/RSpec/HaveSelector:
|
||||
Exclude:
|
||||
- 'spec/features/conversations/index_spec.rb'
|
||||
- 'spec/features/footer_spec.rb'
|
||||
- 'spec/features/gardens/adding_gardens_spec.rb'
|
||||
- 'spec/features/harvests/harvesting_a_crop_spec.rb'
|
||||
- 'spec/features/members/list_spec.rb'
|
||||
- 'spec/features/plantings/planting_a_crop_spec.rb'
|
||||
- 'spec/features/seeds/adding_seeds_spec.rb'
|
||||
- 'spec/features/shared_examples/crop_suggest.rb'
|
||||
- 'spec/helpers/application_helper_spec.rb'
|
||||
- 'spec/support/feature_helpers.rb'
|
||||
- 'spec/views/posts/show.html.haml_spec.rb'
|
||||
|
||||
# Offense count: 14
|
||||
Capybara/SpecificMatcher:
|
||||
Exclude:
|
||||
- 'spec/features/crops/browse_crops_spec.rb'
|
||||
- 'spec/features/footer_spec.rb'
|
||||
- 'spec/features/gardens/adding_gardens_spec.rb'
|
||||
- 'spec/features/harvests/harvesting_a_crop_spec.rb'
|
||||
@@ -23,8 +45,7 @@ Capybara/VisibilityMatcher:
|
||||
|
||||
# Offense count: 6
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Include, EnforcedStyle, NonImplicitAssociationMethodNames.
|
||||
# Include: spec/factories.rb, spec/factories/**/*.rb, features/support/factories/**/*.rb
|
||||
# Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
|
||||
# SupportedStyles: explicit, implicit
|
||||
FactoryBot/AssociationStyle:
|
||||
Exclude:
|
||||
@@ -33,81 +54,48 @@ FactoryBot/AssociationStyle:
|
||||
- 'spec/factories/like.rb'
|
||||
- 'spec/factories/scientific_name.rb'
|
||||
|
||||
# Offense count: 8
|
||||
# Offense count: 3
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Include, EnforcedStyle, ExplicitOnly.
|
||||
# Include: **/*_spec.rb, **/spec/**/*, spec/factories.rb, spec/factories/**/*.rb, features/support/factories/**/*.rb
|
||||
# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
|
||||
# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
|
||||
# SupportedStyles: create_list, n_times
|
||||
FactoryBot/CreateList:
|
||||
Exclude:
|
||||
- 'spec/factories/member.rb'
|
||||
- 'spec/helpers/gardens_helper_spec.rb'
|
||||
- 'spec/views/comments/index.rss.haml_spec.rb'
|
||||
- 'spec/views/home/index_spec.rb'
|
||||
- 'spec/views/photos/index.html.haml_spec.rb'
|
||||
- 'spec/views/places/show.html.haml_spec.rb'
|
||||
- 'spec/views/posts/index.html.haml_spec.rb'
|
||||
|
||||
# Offense count: 1135
|
||||
# Offense count: 4
|
||||
# Configuration parameters: Include, MaxAmount.
|
||||
# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
|
||||
FactoryBot/ExcessiveCreateList:
|
||||
Exclude:
|
||||
- 'spec/controllers/posts_controller_spec.rb'
|
||||
- 'spec/features/crops/show_spec.rb'
|
||||
- 'spec/features/percy/percy_spec.rb'
|
||||
|
||||
# Offense count: 1127
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Include.
|
||||
# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
|
||||
FactoryBot/SyntaxMethods:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 5
|
||||
# Offense count: 2
|
||||
# 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: 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: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
|
||||
# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
|
||||
# URISchemes: http, https
|
||||
Layout/LineLength:
|
||||
Max: 304
|
||||
Exclude:
|
||||
- 'app/helpers/crops_helper.rb'
|
||||
- 'db/seeds.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: 2
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: RequireParenthesesForMethodChains.
|
||||
Lint/AmbiguousRange:
|
||||
Exclude:
|
||||
- 'app/models/concerns/search_activities.rb'
|
||||
- 'app/models/concerns/search_harvests.rb'
|
||||
- 'app/models/concerns/search_plantings.rb'
|
||||
|
||||
@@ -130,6 +118,12 @@ Lint/EmptyBlock:
|
||||
- 'spec/features/crops/crop_detail_page_spec.rb'
|
||||
- 'spec/requests/authentications_spec.rb'
|
||||
|
||||
# Offense count: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
Lint/RedundantCopDisableDirective:
|
||||
Exclude:
|
||||
- 'db/migrate/20230313015323_create_active_storage_tables.active_storage.rb'
|
||||
|
||||
# Offense count: 2
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
Lint/RedundantDirGlobSort:
|
||||
@@ -142,48 +136,46 @@ Lint/SuppressedException:
|
||||
Exclude:
|
||||
- 'lib/tasks/testing.rake'
|
||||
|
||||
# Offense count: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: EnforcedStyle.
|
||||
# SupportedStyles: strict, consistent
|
||||
Lint/SymbolConversion:
|
||||
Exclude:
|
||||
- 'app/controllers/likes_controller.rb'
|
||||
|
||||
# Offense count: 7
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: AutoCorrect.
|
||||
Lint/UselessAssignment:
|
||||
Exclude:
|
||||
- 'config.rb'
|
||||
- 'config/compass.rb'
|
||||
|
||||
# Offense count: 45
|
||||
# Offense count: 52
|
||||
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
|
||||
Metrics/AbcSize:
|
||||
Max: 151
|
||||
|
||||
# Offense count: 10
|
||||
# Offense count: 14
|
||||
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
|
||||
# AllowedMethods: refine
|
||||
Metrics/BlockLength:
|
||||
Max: 61
|
||||
Max: 115
|
||||
|
||||
# Offense count: 6
|
||||
# Offense count: 7
|
||||
# Configuration parameters: CountComments, CountAsOne.
|
||||
Metrics/ClassLength:
|
||||
Max: 171
|
||||
Max: 183
|
||||
|
||||
# Offense count: 4
|
||||
# Offense count: 6
|
||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
||||
Metrics/CyclomaticComplexity:
|
||||
Max: 32
|
||||
|
||||
# Offense count: 61
|
||||
# Offense count: 71
|
||||
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
|
||||
Metrics/MethodLength:
|
||||
Max: 59
|
||||
Max: 127
|
||||
|
||||
# Offense count: 3
|
||||
# Offense count: 2
|
||||
# Configuration parameters: CountComments, CountAsOne.
|
||||
Metrics/ModuleLength:
|
||||
Max: 125
|
||||
|
||||
# Offense count: 5
|
||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
||||
Metrics/PerceivedComplexity:
|
||||
Max: 32
|
||||
@@ -202,7 +194,7 @@ RSpec/ContextWording:
|
||||
|
||||
# Offense count: 36
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: SkipBlocks, EnforcedStyle.
|
||||
# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
|
||||
# SupportedStyles: described_class, explicit
|
||||
RSpec/DescribedClass:
|
||||
Exclude:
|
||||
@@ -212,6 +204,7 @@ RSpec/DescribedClass:
|
||||
|
||||
# Offense count: 13
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: AutoCorrect.
|
||||
RSpec/EmptyExampleGroup:
|
||||
Exclude:
|
||||
- 'spec/controllers/authentications_controller_spec.rb'
|
||||
@@ -227,24 +220,26 @@ RSpec/EmptyExampleGroup:
|
||||
- 'spec/views/photos/edit.html.haml_spec.rb'
|
||||
- 'spec/views/posts/_single.html.haml_spec.rb'
|
||||
|
||||
# Offense count: 134
|
||||
# Offense count: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: AllowConsecutiveOneLiners.
|
||||
RSpec/EmptyLineAfterExample:
|
||||
Exclude:
|
||||
- 'spec/models/ability_spec.rb'
|
||||
|
||||
# Offense count: 140
|
||||
# Configuration parameters: CountAsOne.
|
||||
RSpec/ExampleLength:
|
||||
Max: 25
|
||||
|
||||
# Offense count: 2
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
RSpec/ExcessiveDocstringSpacing:
|
||||
Exclude:
|
||||
- 'spec/controllers/crops_controller_spec.rb'
|
||||
- 'spec/features/crops/crop_photos_spec.rb'
|
||||
|
||||
# Offense count: 30
|
||||
# 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'
|
||||
@@ -260,11 +255,12 @@ RSpec/HookArgument:
|
||||
|
||||
# Offense count: 2
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: AutoCorrect.
|
||||
RSpec/HooksBeforeExamples:
|
||||
Exclude:
|
||||
- 'spec/features/crops/creating_a_crop_spec.rb'
|
||||
|
||||
# Offense count: 35
|
||||
# Offense count: 37
|
||||
# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
|
||||
RSpec/IndexedLet:
|
||||
Exclude:
|
||||
@@ -272,6 +268,7 @@ RSpec/IndexedLet:
|
||||
- 'spec/controllers/plantings_controller_spec.rb'
|
||||
- 'spec/features/crops/crop_photos_spec.rb'
|
||||
- 'spec/features/members/list_spec.rb'
|
||||
- 'spec/features/members/profile_spec.rb'
|
||||
- 'spec/features/percy/percy_spec.rb'
|
||||
- 'spec/features/planting_reminder_spec.rb'
|
||||
- 'spec/features/timeline/index_spec.rb'
|
||||
@@ -279,7 +276,7 @@ RSpec/IndexedLet:
|
||||
- 'spec/models/member_spec.rb'
|
||||
- 'spec/views/forums/index.html.haml_spec.rb'
|
||||
|
||||
# Offense count: 710
|
||||
# Offense count: 720
|
||||
# Configuration parameters: AssignmentOnly.
|
||||
RSpec/InstanceVariable:
|
||||
Enabled: false
|
||||
@@ -288,6 +285,12 @@ RSpec/InstanceVariable:
|
||||
RSpec/LetSetup:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
RSpec/MatchArray:
|
||||
Exclude:
|
||||
- 'spec/models/post_spec.rb'
|
||||
|
||||
# Offense count: 2
|
||||
RSpec/MessageChain:
|
||||
Exclude:
|
||||
@@ -304,16 +307,16 @@ RSpec/MultipleDescribes:
|
||||
Exclude:
|
||||
- 'spec/features/crops/crop_wranglers_spec.rb'
|
||||
|
||||
# Offense count: 147
|
||||
# Offense count: 152
|
||||
RSpec/MultipleExpectations:
|
||||
Max: 19
|
||||
|
||||
# Offense count: 137
|
||||
# Offense count: 138
|
||||
# Configuration parameters: AllowSubject.
|
||||
RSpec/MultipleMemoizedHelpers:
|
||||
Max: 14
|
||||
|
||||
# Offense count: 132
|
||||
# Offense count: 133
|
||||
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
|
||||
# SupportedStyles: always, named_only
|
||||
RSpec/NamedSubject:
|
||||
@@ -324,7 +327,7 @@ RSpec/NamedSubject:
|
||||
RSpec/NestedGroups:
|
||||
Max: 6
|
||||
|
||||
# Offense count: 407
|
||||
# Offense count: 403
|
||||
# Configuration parameters: AllowedPatterns.
|
||||
# AllowedPatterns: ^expect_, ^assert_
|
||||
RSpec/NoExpectationExample:
|
||||
@@ -336,21 +339,6 @@ RSpec/PendingWithoutReason:
|
||||
- 'spec/features/seeds/misc_seeds_spec.rb'
|
||||
- 'spec/features/unsubscribing_spec.rb'
|
||||
|
||||
# Offense count: 7
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
RSpec/Rails/HaveHttpStatus:
|
||||
Exclude:
|
||||
- 'spec/controllers/api/v1/plantings_controller_spec.rb'
|
||||
- 'spec/controllers/harvests_controller_spec.rb'
|
||||
- 'spec/controllers/likes_controller_spec.rb'
|
||||
- 'spec/requests/harvests_spec.rb'
|
||||
|
||||
# Offense count: 16
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Inferences.
|
||||
RSpec/Rails/InferredSpecType:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 2
|
||||
RSpec/RepeatedDescription:
|
||||
Exclude:
|
||||
@@ -370,6 +358,7 @@ RSpec/RepeatedExampleGroupBody:
|
||||
|
||||
# Offense count: 6
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: AutoCorrect.
|
||||
RSpec/ScatteredSetup:
|
||||
Exclude:
|
||||
- 'spec/features/percy/percy_spec.rb'
|
||||
@@ -382,14 +371,6 @@ RSpec/SpecFilePathFormat:
|
||||
Exclude:
|
||||
- 'spec/controllers/member_controller_spec.rb'
|
||||
|
||||
# Offense count: 2
|
||||
# Configuration parameters: Include.
|
||||
# Include: **/*_spec*rb*, **/spec/**/*
|
||||
RSpec/SpecFilePathSuffix:
|
||||
Exclude:
|
||||
- 'spec/features/seeds/seed_photos.rb'
|
||||
- 'spec/models/garden_type.rb'
|
||||
|
||||
# Offense count: 3
|
||||
RSpec/StubbedMock:
|
||||
Exclude:
|
||||
@@ -413,7 +394,24 @@ RSpec/VerifiedDoubles:
|
||||
- 'spec/controllers/gardens_controller_spec.rb'
|
||||
- 'spec/views/devise/shared/_links_spec.rb'
|
||||
|
||||
# Offense count: 26
|
||||
# Offense count: 7
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: ResponseMethods.
|
||||
# ResponseMethods: response, last_response
|
||||
RSpecRails/HaveHttpStatus:
|
||||
Exclude:
|
||||
- 'spec/controllers/api/v1/plantings_controller_spec.rb'
|
||||
- 'spec/controllers/harvests_controller_spec.rb'
|
||||
- 'spec/controllers/likes_controller_spec.rb'
|
||||
- 'spec/requests/harvests_spec.rb'
|
||||
|
||||
# Offense count: 16
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Inferences.
|
||||
RSpecRails/InferredSpecType:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 28
|
||||
# Configuration parameters: Database, Include.
|
||||
# SupportedDatabases: mysql, postgresql
|
||||
# Include: db/**/*.rb
|
||||
@@ -436,17 +434,6 @@ Rails/Date:
|
||||
Exclude:
|
||||
- 'app/mailers/notifier_mailer.rb'
|
||||
|
||||
# Offense count: 5
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: EnforcedStyle.
|
||||
# SupportedStyles: slashes, arguments
|
||||
Rails/FilePath:
|
||||
Exclude:
|
||||
- 'app/controllers/crops_controller.rb'
|
||||
- 'config/application.rb'
|
||||
- 'config/environments/development.rb'
|
||||
- 'db/seeds.rb'
|
||||
|
||||
# Offense count: 11
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
||||
@@ -485,12 +472,13 @@ Rails/I18nLocaleAssignment:
|
||||
Rails/I18nLocaleTexts:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 2
|
||||
# Offense count: 3
|
||||
# Configuration parameters: Include.
|
||||
# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
|
||||
Rails/LexicallyScopedActionFilter:
|
||||
Exclude:
|
||||
- 'app/controllers/data_controller.rb'
|
||||
- 'app/controllers/registrations_controller.rb'
|
||||
|
||||
# Offense count: 2
|
||||
Rails/OutputSafety:
|
||||
@@ -498,6 +486,12 @@ Rails/OutputSafety:
|
||||
- 'app/helpers/auto_suggest_helper.rb'
|
||||
- 'app/helpers/gardens_helper.rb'
|
||||
|
||||
# Offense count: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
Rails/PluralizationGrammar:
|
||||
Exclude:
|
||||
- 'spec/requests/plantings_spec.rb'
|
||||
|
||||
# Offense count: 4
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Include.
|
||||
@@ -508,8 +502,10 @@ Rails/RakeEnvironment:
|
||||
- 'lib/tasks/i18n.rake'
|
||||
- 'lib/tasks/testing.rake'
|
||||
|
||||
# Offense count: 10
|
||||
# Offense count: 9
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: AllowedReceivers.
|
||||
# AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
|
||||
Rails/RedundantActiveRecordAllMethod:
|
||||
Exclude:
|
||||
- 'app/controllers/admin/roles_controller.rb'
|
||||
@@ -518,7 +514,6 @@ Rails/RedundantActiveRecordAllMethod:
|
||||
- 'app/controllers/plant_parts_controller.rb'
|
||||
- 'app/controllers/scientific_names_controller.rb'
|
||||
- 'app/services/openfarm_service.rb'
|
||||
- 'spec/features/members/deletion_spec.rb'
|
||||
- 'spec/features/percy/percy_spec.rb'
|
||||
- 'spec/models/harvest_spec.rb'
|
||||
|
||||
@@ -541,8 +536,8 @@ Rails/ResponseParsedBody:
|
||||
- 'spec/controllers/likes_controller_spec.rb'
|
||||
- 'spec/requests/api/v1/crop_request_spec.rb'
|
||||
- 'spec/requests/api/v1/gardens_request_spec.rb'
|
||||
- 'spec/requests/api/v1/harvest_request_spec.rb'
|
||||
- 'spec/requests/api/v1/member_request_spec.rb'
|
||||
- 'spec/requests/api/v1/harvests_request_spec.rb'
|
||||
- 'spec/requests/api/v1/members_request_spec.rb'
|
||||
- 'spec/requests/api/v1/photos_request_spec.rb'
|
||||
- 'spec/requests/api/v1/plantings_request_spec.rb'
|
||||
- 'spec/requests/api/v1/seeds_request_spec.rb'
|
||||
@@ -562,26 +557,11 @@ Rails/RootPathnameMethods:
|
||||
- 'app/controllers/crops_controller.rb'
|
||||
- 'app/helpers/icons_helper.rb'
|
||||
|
||||
# Offense count: 20
|
||||
# Offense count: 21
|
||||
# Configuration parameters: Include.
|
||||
# Include: db/**/*.rb
|
||||
Rails/ThreeStateBooleanColumn:
|
||||
Exclude:
|
||||
- 'db/migrate/20121203034745_add_tos_agreement_to_users.rb'
|
||||
- 'db/migrate/20130206051328_add_show_email_to_member.rb'
|
||||
- 'db/migrate/20130212123628_create_notifications.rb'
|
||||
- 'db/migrate/20130327120024_add_send_email_to_member.rb'
|
||||
- 'db/migrate/20130517051922_create_account_types.rb'
|
||||
- 'db/migrate/20130718011247_add_trading_to_seeds.rb'
|
||||
- 'db/migrate/20130722050836_remove_tradable_from_seeds.rb'
|
||||
- 'db/migrate/20130827105823_add_newsletter_to_member.rb'
|
||||
- 'db/migrate/20131025104228_add_fields_to_gardens.rb'
|
||||
- 'db/migrate/20140829230600_add_finished_to_planting.rb'
|
||||
- 'db/migrate/20140928085713_add_send_planting_reminder_to_member.rb'
|
||||
- 'db/migrate/20171022032108_all_the_predictions.rb'
|
||||
- 'db/migrate/20180213005731_seed_usage.rb'
|
||||
- 'db/migrate/20190720000555_create_mailboxer.mailboxer_engine.rb'
|
||||
- 'db/migrate/20190720000558_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb'
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 6
|
||||
# Configuration parameters: Include.
|
||||
@@ -603,6 +583,18 @@ Rails/WhereEquals:
|
||||
- 'app/models/harvest.rb'
|
||||
- 'app/models/planting.rb'
|
||||
|
||||
# Offense count: 2
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
Rails/WhereRange:
|
||||
Exclude:
|
||||
- 'app/models/concerns/predict_planting.rb'
|
||||
- 'app/models/garden.rb'
|
||||
|
||||
# Offense count: 1
|
||||
Rake/MethodDefinitionInTask:
|
||||
Exclude:
|
||||
- 'lib/tasks/growstuff.rake'
|
||||
|
||||
# Offense count: 3
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: EnforcedStyle.
|
||||
@@ -622,13 +614,7 @@ 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: 4
|
||||
# Offense count: 3
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: EnforcedStyle.
|
||||
# SupportedStyles: always, always_true, never
|
||||
@@ -636,33 +622,16 @@ Style/FrozenStringLiteralComment:
|
||||
Exclude:
|
||||
- 'config/initializers/new_framework_defaults_6_0.rb'
|
||||
- 'db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb'
|
||||
- 'db/migrate/20200815012538_remove_median_function.rb'
|
||||
- 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
|
||||
|
||||
# Offense count: 2
|
||||
# Offense count: 3
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
Style/GlobalStdStream:
|
||||
Exclude:
|
||||
- 'config/environments/production.rb'
|
||||
- 'lib/tasks/gbif.rake'
|
||||
- 'lib/tasks/openfarm.rake'
|
||||
|
||||
# Offense count: 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
|
||||
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: 2
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
Style/IfUnlessModifier:
|
||||
Exclude:
|
||||
- 'bin/setup'
|
||||
|
||||
# Offense count: 1
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: AllowedMethods.
|
||||
@@ -684,19 +653,23 @@ Style/MixinUsage:
|
||||
- 'spec/rails_helper.rb'
|
||||
|
||||
# Offense count: 1
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
Style/NegatedIfElseCondition:
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: EnforcedStyle.
|
||||
# SupportedStyles: literals, strict
|
||||
Style/MutableConstant:
|
||||
Exclude:
|
||||
- 'app/helpers/crops_helper.rb'
|
||||
- 'app/models/activity.rb'
|
||||
|
||||
# Offense count: 3
|
||||
# Offense count: 5
|
||||
# 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'
|
||||
|
||||
# Offense count: 6
|
||||
Style/OpenStructUse:
|
||||
@@ -710,15 +683,6 @@ 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.
|
||||
@@ -726,12 +690,6 @@ 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.
|
||||
@@ -739,19 +697,6 @@ Style/RedundantFetchBlock:
|
||||
Exclude:
|
||||
- 'config/puma.rb'
|
||||
|
||||
# Offense count: 3
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
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/messages_controller.rb'
|
||||
|
||||
# Offense count: 2
|
||||
# This cop supports safe autocorrection (--autocorrect).
|
||||
# Configuration parameters: AllowModifier.
|
||||
@@ -760,7 +705,7 @@ Style/SoleNestedConditional:
|
||||
- 'app/controllers/application_controller.rb'
|
||||
- 'app/controllers/messages_controller.rb'
|
||||
|
||||
# Offense count: 20
|
||||
# Offense count: 24
|
||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||
# Configuration parameters: Mode.
|
||||
Style/StringConcatenation:
|
||||
|
||||
@@ -1 +1 @@
|
||||
3.1.4
|
||||
3.3.4
|
||||
|
||||
@@ -94,6 +94,7 @@ submit the change with your pull request.
|
||||
- Rowan Crawford / [wombleton](https://github.com/wombleton)
|
||||
- Ítalo Pires / [italopires](https://github.com/italopires)
|
||||
- Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
|
||||
- Dominick Thornton / [domthor](https://github.com/domthor)
|
||||
|
||||
## Bots
|
||||
|
||||
|
||||
8
Gemfile
8
Gemfile
@@ -5,13 +5,13 @@ source 'https://rubygems.org'
|
||||
# Match ruby version in .ruby-version
|
||||
ruby File.read('.ruby-version')
|
||||
|
||||
gem 'rails', '~> 7.1.0'
|
||||
gem 'rails', '~> 7.2.0'
|
||||
|
||||
# Keeping old sprockets
|
||||
# https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
|
||||
gem "sprockets", "<4"
|
||||
|
||||
gem 'bundler', '>= 2.3.10'
|
||||
gem 'bundler', '>= 2.4.22'
|
||||
|
||||
gem 'coffee-rails'
|
||||
gem 'haml'
|
||||
@@ -167,8 +167,12 @@ group :development, :test do
|
||||
gem 'rspec-activemodel-mocks'
|
||||
gem 'rspec-rails' # unit testing framework
|
||||
gem 'rswag-specs'
|
||||
gem 'rubocop-capybara'
|
||||
gem 'rubocop-factory_bot'
|
||||
gem 'rubocop-rails'
|
||||
gem 'rubocop-rake'
|
||||
gem 'rubocop-rspec'
|
||||
gem 'rubocop-rspec_rails'
|
||||
gem 'webrat' # provides HTML matchers for view tests
|
||||
|
||||
gem 'dotenv-rails'
|
||||
|
||||
397
Gemfile.lock
397
Gemfile.lock
@@ -33,51 +33,46 @@ GEM
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
actioncable (7.2.1)
|
||||
actionpack (= 7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
zeitwerk (~> 2.6)
|
||||
actionmailbox (7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
activejob (= 7.1.3.2)
|
||||
activerecord (= 7.1.3.2)
|
||||
activestorage (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
mail (>= 2.7.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
actionmailer (7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
actionview (= 7.1.3.2)
|
||||
activejob (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
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)
|
||||
rails-dom-testing (~> 2.2)
|
||||
actionpack (7.1.3.2)
|
||||
actionview (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
actionpack (7.2.1)
|
||||
actionview (= 7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
nokogiri (>= 1.8.5)
|
||||
racc
|
||||
rack (>= 2.2.4)
|
||||
rack (>= 2.2.4, < 3.2)
|
||||
rack-session (>= 1.0.1)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.2)
|
||||
rails-html-sanitizer (~> 1.6)
|
||||
actiontext (7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
activerecord (= 7.1.3.2)
|
||||
activestorage (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
useragent (~> 0.16)
|
||||
actiontext (7.2.1)
|
||||
actionpack (= 7.2.1)
|
||||
activerecord (= 7.2.1)
|
||||
activestorage (= 7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
actionview (7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.11)
|
||||
rails-dom-testing (~> 2.2)
|
||||
@@ -92,44 +87,45 @@ GEM
|
||||
active_utils (3.4.1)
|
||||
activesupport (>= 4.2)
|
||||
i18n
|
||||
activejob (7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
activejob (7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
activerecord (7.1.3.2)
|
||||
activemodel (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
activemodel (7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
activerecord (7.2.1)
|
||||
activemodel (= 7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
timeout (>= 0.4.0)
|
||||
activestorage (7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
activejob (= 7.1.3.2)
|
||||
activerecord (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
activestorage (7.2.1)
|
||||
actionpack (= 7.2.1)
|
||||
activejob (= 7.2.1)
|
||||
activerecord (= 7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
marcel (~> 1.0)
|
||||
activesupport (7.1.3.2)
|
||||
activesupport (7.2.1)
|
||||
base64
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.3.1)
|
||||
connection_pool (>= 2.2.5)
|
||||
drb
|
||||
i18n (>= 1.6, < 2)
|
||||
logger (>= 1.4.2)
|
||||
minitest (>= 5.1)
|
||||
mutex_m
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.6)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
securerandom (>= 0.3)
|
||||
tzinfo (~> 2.0, >= 2.0.5)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
ast (2.4.2)
|
||||
autoprefixer-rails (10.4.16.0)
|
||||
execjs (~> 2)
|
||||
axe-core-api (4.9.0)
|
||||
axe-core-api (4.10.0)
|
||||
dumb_delegator
|
||||
virtus
|
||||
axe-core-capybara (4.9.0)
|
||||
axe-core-api
|
||||
axe-core-capybara (4.10.0)
|
||||
axe-core-api (= 4.10.0)
|
||||
dumb_delegator
|
||||
axe-core-rspec (4.9.0)
|
||||
axe-core-api
|
||||
axe-core-rspec (4.10.0)
|
||||
axe-core-api (= 4.10.0)
|
||||
dumb_delegator
|
||||
virtus
|
||||
axiom-types (0.1.1)
|
||||
@@ -137,19 +133,12 @@ GEM
|
||||
ice_nine (~> 0.11.0)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
base64 (0.2.0)
|
||||
bcrypt (3.1.19)
|
||||
bcrypt (3.1.20)
|
||||
better_errors (2.10.1)
|
||||
erubi (>= 1.0.0)
|
||||
rack (>= 0.9.0)
|
||||
rouge (>= 1.0.0)
|
||||
better_html (2.0.2)
|
||||
actionview (>= 6.0)
|
||||
activesupport (>= 6.0)
|
||||
ast (~> 2.0)
|
||||
erubi (~> 1.4)
|
||||
parser (>= 2.4)
|
||||
smart_properties
|
||||
bigdecimal (3.1.7)
|
||||
bigdecimal (3.1.8)
|
||||
bluecloth (2.2.0)
|
||||
bonsai-elasticsearch-rails (7.0.1)
|
||||
elasticsearch-model (< 8)
|
||||
@@ -162,12 +151,12 @@ GEM
|
||||
bootstrap_form (5.4.0)
|
||||
actionpack (>= 6.1)
|
||||
activemodel (>= 6.1)
|
||||
builder (3.2.4)
|
||||
bullet (7.1.6)
|
||||
builder (3.3.0)
|
||||
bullet (7.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
byebug (11.1.3)
|
||||
cancancan (3.5.0)
|
||||
cancancan (3.6.1)
|
||||
capybara (3.40.0)
|
||||
addressable
|
||||
matrix
|
||||
@@ -190,7 +179,7 @@ GEM
|
||||
image_processing (~> 1.1)
|
||||
marcel (~> 1.0.0)
|
||||
ssrf_filter (~> 1.0)
|
||||
chartkick (5.0.6)
|
||||
chartkick (5.1.0)
|
||||
childprocess (5.0.0)
|
||||
codeclimate-test-reporter (1.0.9)
|
||||
simplecov (<= 0.13)
|
||||
@@ -206,22 +195,23 @@ GEM
|
||||
coffee-script-source (1.12.2)
|
||||
comfy_bootstrap_form (4.0.9)
|
||||
rails (>= 5.0.0)
|
||||
concurrent-ruby (1.2.3)
|
||||
concurrent-ruby (1.3.4)
|
||||
connection_pool (2.4.1)
|
||||
crass (1.0.6)
|
||||
csv (3.3.0)
|
||||
csv_shaper (1.3.2)
|
||||
activesupport (>= 3.0.0)
|
||||
dalli (3.2.8)
|
||||
database_cleaner (2.0.2)
|
||||
database_cleaner-active_record (>= 2, < 3)
|
||||
database_cleaner-active_record (2.1.0)
|
||||
database_cleaner-active_record (2.2.0)
|
||||
activerecord (>= 5.a)
|
||||
database_cleaner-core (~> 2.0.0)
|
||||
database_cleaner-core (2.0.1)
|
||||
date (3.3.4)
|
||||
descendants_tracker (0.0.4)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
devise (4.9.3)
|
||||
devise (4.9.4)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0)
|
||||
@@ -231,9 +221,9 @@ GEM
|
||||
discard (1.3.0)
|
||||
activerecord (>= 4.2, < 8)
|
||||
docile (1.1.5)
|
||||
dotenv (3.1.0)
|
||||
dotenv-rails (3.1.0)
|
||||
dotenv (= 3.1.0)
|
||||
dotenv (3.1.4)
|
||||
dotenv-rails (3.1.4)
|
||||
dotenv (= 3.1.4)
|
||||
railties (>= 6.1)
|
||||
drb (2.2.1)
|
||||
dumb_delegator (1.0.0)
|
||||
@@ -250,20 +240,22 @@ GEM
|
||||
elasticsearch-transport (7.0.0)
|
||||
faraday
|
||||
multi_json
|
||||
erubi (1.12.0)
|
||||
erubi (1.13.0)
|
||||
erubis (2.7.0)
|
||||
excon (0.109.0)
|
||||
excon (0.110.0)
|
||||
execjs (2.9.1)
|
||||
factory_bot (6.4.5)
|
||||
factory_bot (6.4.6)
|
||||
activesupport (>= 5.0.0)
|
||||
factory_bot_rails (6.4.3)
|
||||
factory_bot (~> 6.4)
|
||||
railties (>= 5.0.0)
|
||||
faker (3.3.1)
|
||||
faker (3.4.2)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
faraday (2.9.0)
|
||||
faraday-net_http (>= 2.0, < 3.2)
|
||||
faraday-net_http (3.1.0)
|
||||
faraday (2.12.0)
|
||||
faraday-net_http (>= 2.0, < 3.4)
|
||||
json
|
||||
logger
|
||||
faraday-net_http (3.3.0)
|
||||
net-http
|
||||
ffi (1.16.3)
|
||||
flickraw (0.9.10)
|
||||
@@ -272,7 +264,9 @@ GEM
|
||||
friendly_id (5.5.1)
|
||||
activerecord (>= 4.0.0)
|
||||
gbifrb (0.2.0)
|
||||
geocoder (1.8.2)
|
||||
geocoder (1.8.3)
|
||||
base64 (>= 0.1.0)
|
||||
csv (>= 3.0.0)
|
||||
gibbon (1.2.1)
|
||||
httparty
|
||||
multi_json (>= 1.9.0)
|
||||
@@ -296,7 +290,7 @@ GEM
|
||||
activesupport (>= 5.1)
|
||||
haml (>= 4.0.6)
|
||||
railties (>= 5.1)
|
||||
haml_lint (0.57.0)
|
||||
haml_lint (0.58.0)
|
||||
haml (>= 5.0)
|
||||
parallel (~> 1.10)
|
||||
rainbow
|
||||
@@ -309,16 +303,16 @@ GEM
|
||||
moneta
|
||||
multi_json (>= 1.9.2)
|
||||
webrick
|
||||
highline (2.1.0)
|
||||
httparty (0.21.0)
|
||||
highline (3.0.1)
|
||||
httparty (0.22.0)
|
||||
csv
|
||||
mini_mime (>= 1.0.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (1.14.4)
|
||||
i18n (1.14.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
i18n-tasks (1.0.13)
|
||||
i18n-tasks (1.0.14)
|
||||
activesupport (>= 4.0.2)
|
||||
ast (>= 2.1.0)
|
||||
better_html (>= 1.0, < 3.0)
|
||||
erubi
|
||||
highline (>= 2.0.0)
|
||||
i18n
|
||||
@@ -326,23 +320,24 @@ GEM
|
||||
rails-i18n
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
terminal-table (>= 1.5.1)
|
||||
icalendar (2.10.1)
|
||||
icalendar (2.10.3)
|
||||
ice_cube (~> 0.16)
|
||||
ice_cube (0.16.4)
|
||||
ostruct
|
||||
ice_cube (0.17.0)
|
||||
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.12.0)
|
||||
rdoc
|
||||
irb (1.14.0)
|
||||
rdoc (>= 4.0.0)
|
||||
reline (>= 0.4.2)
|
||||
jquery-rails (4.6.0)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (2.7.2)
|
||||
json-schema (4.1.1)
|
||||
json-schema (4.3.1)
|
||||
addressable (>= 2.8)
|
||||
jsonapi-resources (0.10.7)
|
||||
activerecord (>= 4.1)
|
||||
@@ -353,10 +348,10 @@ GEM
|
||||
kramdown (2.4.0)
|
||||
rexml
|
||||
language_server-protocol (3.17.0.3)
|
||||
launchy (3.0.0)
|
||||
launchy (3.0.1)
|
||||
addressable (~> 2.8)
|
||||
childprocess (~> 5.0)
|
||||
leaflet-rails (1.9.4)
|
||||
leaflet-rails (1.9.5)
|
||||
actionpack (>= 4.2.0)
|
||||
railties (>= 4.2.0)
|
||||
letter_opener (1.10.0)
|
||||
@@ -364,6 +359,7 @@ GEM
|
||||
listen (3.9.0)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
logger (1.6.1)
|
||||
loofah (2.22.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
@@ -389,33 +385,34 @@ GEM
|
||||
rake
|
||||
mini_magick (4.12.0)
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.5)
|
||||
minitest (5.22.3)
|
||||
mini_portile2 (2.8.7)
|
||||
minitest (5.25.1)
|
||||
moneta (1.0.0)
|
||||
msgpack (1.7.2)
|
||||
multi_json (1.15.0)
|
||||
multi_xml (0.6.0)
|
||||
mutex_m (0.2.0)
|
||||
multi_xml (0.7.1)
|
||||
bigdecimal (~> 3.1)
|
||||
net-http (0.4.1)
|
||||
uri
|
||||
net-imap (0.4.10)
|
||||
net-imap (0.4.14)
|
||||
date
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
net-protocol
|
||||
net-protocol (0.2.2)
|
||||
timeout
|
||||
net-smtp (0.4.0.1)
|
||||
net-smtp (0.5.0)
|
||||
net-protocol
|
||||
nio4r (2.7.0)
|
||||
nokogiri (1.16.3)
|
||||
nio4r (2.7.3)
|
||||
nokogiri (1.16.7)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.16.3-x86_64-linux)
|
||||
nokogiri (1.16.7-x86_64-linux)
|
||||
racc (~> 1.4)
|
||||
oauth (0.5.6)
|
||||
oj (3.16.3)
|
||||
oj (3.16.6)
|
||||
bigdecimal (>= 3.0)
|
||||
ostruct (>= 0.2)
|
||||
omniauth (1.9.2)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 1.6.2, < 3)
|
||||
@@ -429,14 +426,15 @@ GEM
|
||||
omniauth-oauth (~> 1.1)
|
||||
rack
|
||||
orm_adapter (0.5.0)
|
||||
parallel (1.24.0)
|
||||
parser (3.3.0.5)
|
||||
ostruct (0.6.0)
|
||||
parallel (1.26.3)
|
||||
parser (3.3.5.0)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
percy-capybara (5.0.0)
|
||||
capybara (>= 3)
|
||||
pg (1.5.6)
|
||||
platform-api (3.6.0)
|
||||
pg (1.5.8)
|
||||
platform-api (3.7.0)
|
||||
heroics (~> 0.1.1)
|
||||
moneta (~> 1.0.0)
|
||||
rate_throttle_client (~> 0.1.0)
|
||||
@@ -446,11 +444,11 @@ GEM
|
||||
method_source (~> 1.0)
|
||||
psych (5.1.2)
|
||||
stringio
|
||||
public_suffix (5.0.5)
|
||||
puma (6.4.2)
|
||||
public_suffix (6.0.1)
|
||||
puma (6.4.3)
|
||||
nio4r (~> 2.0)
|
||||
query_diet (0.7.1)
|
||||
racc (1.7.3)
|
||||
query_diet (0.7.2)
|
||||
racc (1.8.1)
|
||||
rack (2.2.9)
|
||||
rack-cors (2.0.2)
|
||||
rack (>= 2.0.0)
|
||||
@@ -464,20 +462,20 @@ GEM
|
||||
rackup (1.0.0)
|
||||
rack (< 3)
|
||||
webrick
|
||||
rails (7.1.3.2)
|
||||
actioncable (= 7.1.3.2)
|
||||
actionmailbox (= 7.1.3.2)
|
||||
actionmailer (= 7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
actiontext (= 7.1.3.2)
|
||||
actionview (= 7.1.3.2)
|
||||
activejob (= 7.1.3.2)
|
||||
activemodel (= 7.1.3.2)
|
||||
activerecord (= 7.1.3.2)
|
||||
activestorage (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
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)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 7.1.3.2)
|
||||
railties (= 7.2.1)
|
||||
rails-controller-testing (1.0.5)
|
||||
actionpack (>= 5.0.1.rc1)
|
||||
actionview (>= 5.0.1.rc1)
|
||||
@@ -489,7 +487,7 @@ GEM
|
||||
rails-html-sanitizer (1.6.0)
|
||||
loofah (~> 2.21)
|
||||
nokogiri (~> 1.14)
|
||||
rails-i18n (7.0.8)
|
||||
rails-i18n (7.0.9)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 6.0.0, < 8)
|
||||
rails_12factor (0.0.3)
|
||||
@@ -497,33 +495,33 @@ GEM
|
||||
rails_stdout_logging
|
||||
rails_serve_static_assets (0.0.5)
|
||||
rails_stdout_logging (0.0.5)
|
||||
railties (7.1.3.2)
|
||||
actionpack (= 7.1.3.2)
|
||||
activesupport (= 7.1.3.2)
|
||||
irb
|
||||
railties (7.2.1)
|
||||
actionpack (= 7.2.1)
|
||||
activesupport (= 7.2.1)
|
||||
irb (~> 1.13)
|
||||
rackup (>= 1.0.0)
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0, >= 1.2.2)
|
||||
zeitwerk (~> 2.6)
|
||||
rainbow (3.1.1)
|
||||
raindrops (0.20.0)
|
||||
raindrops (0.20.1)
|
||||
rake (13.2.1)
|
||||
rate_throttle_client (0.1.2)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rdoc (6.6.3.1)
|
||||
rdoc (6.7.0)
|
||||
psych (>= 4.0.0)
|
||||
recaptcha (5.16.0)
|
||||
redis-client (0.20.0)
|
||||
recaptcha (5.17.0)
|
||||
redis-client (0.22.2)
|
||||
connection_pool
|
||||
regexp_parser (2.9.0)
|
||||
reline (0.4.3)
|
||||
regexp_parser (2.9.2)
|
||||
reline (0.5.10)
|
||||
io-console (~> 0.5)
|
||||
responders (3.1.1)
|
||||
actionpack (>= 5.2)
|
||||
railties (>= 5.2)
|
||||
rexml (3.2.6)
|
||||
rexml (3.3.7)
|
||||
rouge (4.1.2)
|
||||
rspec (3.13.0)
|
||||
rspec-core (~> 3.13.0)
|
||||
@@ -533,18 +531,18 @@ GEM
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
rspec-mocks (>= 2.99, < 4.0)
|
||||
rspec-core (3.13.0)
|
||||
rspec-core (3.13.1)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-expectations (3.13.0)
|
||||
rspec-expectations (3.13.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-mocks (3.13.0)
|
||||
rspec-mocks (3.13.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-rails (6.1.2)
|
||||
actionpack (>= 6.1)
|
||||
activesupport (>= 6.1)
|
||||
railties (>= 6.1)
|
||||
rspec-rails (7.0.1)
|
||||
actionpack (>= 7.0)
|
||||
activesupport (>= 7.0)
|
||||
railties (>= 7.0)
|
||||
rspec-core (~> 3.13)
|
||||
rspec-expectations (~> 3.13)
|
||||
rspec-mocks (~> 3.13)
|
||||
@@ -553,48 +551,47 @@ GEM
|
||||
rspectre (0.1.0)
|
||||
parser (>= 3.2.2.1)
|
||||
rspec (~> 3.9)
|
||||
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)
|
||||
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)
|
||||
json-schema (>= 2.2, < 5.0)
|
||||
railties (>= 3.1, < 7.2)
|
||||
railties (>= 5.2, < 8.0)
|
||||
rspec-core (>= 2.14)
|
||||
rswag-ui (2.13.0)
|
||||
actionpack (>= 3.1, < 7.2)
|
||||
railties (>= 3.1, < 7.2)
|
||||
rubocop (1.63.0)
|
||||
rswag-ui (2.14.0)
|
||||
actionpack (>= 5.2, < 8.0)
|
||||
railties (>= 5.2, < 8.0)
|
||||
rubocop (1.66.1)
|
||||
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 (>= 1.8, < 3.0)
|
||||
rexml (>= 3.2.5, < 4.0)
|
||||
rubocop-ast (>= 1.31.1, < 2.0)
|
||||
regexp_parser (>= 2.4, < 3.0)
|
||||
rubocop-ast (>= 1.32.2, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 3.0)
|
||||
rubocop-ast (1.31.2)
|
||||
parser (>= 3.3.0.4)
|
||||
rubocop-capybara (2.20.0)
|
||||
rubocop-ast (1.32.3)
|
||||
parser (>= 3.3.1.0)
|
||||
rubocop-capybara (2.21.0)
|
||||
rubocop (~> 1.41)
|
||||
rubocop-factory_bot (2.25.1)
|
||||
rubocop (~> 1.41)
|
||||
rubocop-rails (2.24.1)
|
||||
rubocop-factory_bot (2.26.1)
|
||||
rubocop (~> 1.61)
|
||||
rubocop-rails (2.26.2)
|
||||
activesupport (>= 4.2.0)
|
||||
rack (>= 1.1)
|
||||
rubocop (>= 1.33.0, < 2.0)
|
||||
rubocop (>= 1.52.0, < 2.0)
|
||||
rubocop-ast (>= 1.31.1, < 2.0)
|
||||
rubocop-rspec (2.29.1)
|
||||
rubocop (~> 1.40)
|
||||
rubocop-capybara (~> 2.17)
|
||||
rubocop-factory_bot (~> 2.22)
|
||||
rubocop-rspec_rails (~> 2.28)
|
||||
rubocop-rspec_rails (2.28.2)
|
||||
rubocop (~> 1.40)
|
||||
rubocop-rake (0.6.0)
|
||||
rubocop (~> 1.0)
|
||||
rubocop-rspec (3.0.5)
|
||||
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.0.3)
|
||||
ruby-units (4.1.0)
|
||||
ruby-vips (2.2.1)
|
||||
ffi (~> 1.12)
|
||||
rubyzip (2.3.2)
|
||||
@@ -611,28 +608,30 @@ GEM
|
||||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
scout_apm (5.3.8)
|
||||
scout_apm (5.4.0)
|
||||
parser
|
||||
searchkick (5.3.1)
|
||||
activemodel (>= 6.1)
|
||||
hashie
|
||||
selenium-webdriver (4.19.0)
|
||||
securerandom (0.3.1)
|
||||
selenium-webdriver (4.25.0)
|
||||
base64 (~> 0.2)
|
||||
logger (~> 1.4)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
rubyzip (>= 1.2.2, < 3.0)
|
||||
websocket (~> 1.0)
|
||||
sidekiq (7.2.2)
|
||||
sidekiq (7.3.2)
|
||||
concurrent-ruby (< 2)
|
||||
connection_pool (>= 2.3.0)
|
||||
logger
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.19.0)
|
||||
redis-client (>= 0.22.2)
|
||||
simplecov (0.13.0)
|
||||
docile (~> 1.1.0)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.2)
|
||||
smart_properties (1.17.0)
|
||||
sprockets (3.7.3)
|
||||
sprockets (3.7.5)
|
||||
base64
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
@@ -641,31 +640,33 @@ GEM
|
||||
activesupport (>= 5.2)
|
||||
sprockets (>= 3.0.0)
|
||||
ssrf_filter (1.1.2)
|
||||
stringio (3.1.0)
|
||||
stringio (3.1.1)
|
||||
sysexits (1.2.0)
|
||||
temple (0.10.3)
|
||||
terminal-table (3.0.2)
|
||||
unicode-display_width (>= 1.1.1, < 3)
|
||||
terser (1.2.2)
|
||||
terser (1.2.3)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
thor (1.3.1)
|
||||
thor (1.3.2)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.3.0)
|
||||
timecop (0.9.8)
|
||||
tilt (2.4.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.5.0)
|
||||
unicode-display_width (2.6.0)
|
||||
unicorn (6.1.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
uniform_notifier (1.16.0)
|
||||
uri (0.13.0)
|
||||
uri (0.13.1)
|
||||
useragent (0.16.10)
|
||||
validate_url (1.0.15)
|
||||
activemodel (>= 3.0.0)
|
||||
public_suffix
|
||||
vcr (6.2.0)
|
||||
vcr (6.3.1)
|
||||
base64
|
||||
virtus (2.0.0)
|
||||
axiom-types (~> 0.1)
|
||||
coercible (~> 1.0)
|
||||
@@ -676,19 +677,19 @@ GEM
|
||||
nokogiri (>= 1.2.0)
|
||||
rack (>= 1.0)
|
||||
rack-test (>= 0.5.3)
|
||||
webrick (1.8.1)
|
||||
websocket (1.2.10)
|
||||
webrick (1.8.2)
|
||||
websocket (1.2.11)
|
||||
websocket-driver (0.7.6)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
will_paginate (4.0.0)
|
||||
will_paginate (4.0.1)
|
||||
will_paginate-bootstrap-style (0.3.0)
|
||||
will_paginate (~> 4.0, >= 4.0.0)
|
||||
xmlrpc (0.3.3)
|
||||
webrick
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
zeitwerk (2.6.13)
|
||||
zeitwerk (2.6.18)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@@ -707,7 +708,7 @@ DEPENDENCIES
|
||||
bootstrap-datepicker-rails
|
||||
bootstrap_form (>= 4.5.0)
|
||||
bullet
|
||||
bundler (>= 2.3.10)
|
||||
bundler (>= 2.4.22)
|
||||
byebug
|
||||
cancancan
|
||||
capybara
|
||||
@@ -766,7 +767,7 @@ DEPENDENCIES
|
||||
query_diet
|
||||
rack-cors
|
||||
rack-protection (>= 2.0.1)
|
||||
rails (~> 7.1.0)
|
||||
rails (~> 7.2.0)
|
||||
rails-assets-leaflet.markercluster!
|
||||
rails-controller-testing
|
||||
rails_12factor
|
||||
@@ -780,8 +781,12 @@ DEPENDENCIES
|
||||
rswag-specs
|
||||
rswag-ui
|
||||
rubocop
|
||||
rubocop-capybara
|
||||
rubocop-factory_bot
|
||||
rubocop-rails
|
||||
rubocop-rake
|
||||
rubocop-rspec
|
||||
rubocop-rspec_rails
|
||||
ruby-units
|
||||
sassc-rails
|
||||
scout_apm
|
||||
@@ -800,7 +805,7 @@ DEPENDENCIES
|
||||
xmlrpc
|
||||
|
||||
RUBY VERSION
|
||||
ruby 3.1.4p223
|
||||
ruby 3.3.4p94
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.11
|
||||
2.4.22
|
||||
|
||||
@@ -15,6 +15,11 @@ Growstuff was founded in 2012 and has been built by dozens of
|
||||
[contributors](CONTRIBUTORS.md). We are an inclusive, welcoming project, and
|
||||
encourage participation from people of all backgrounds and skill levels.
|
||||
|
||||
## Want to contribute?
|
||||
|
||||
Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
|
||||
Dive on in and submit your PRs.
|
||||
|
||||
## Important links
|
||||
|
||||
* [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
$(document).ready(function() {
|
||||
$('.like-btn').show();
|
||||
|
||||
$('.post-like').on('ajax:success', function(event, data) {
|
||||
var likeButton = $('#post-' + data.id + ' .post-like');
|
||||
var likeBadge = $('#post-'+ data.id + ' .like-badge');
|
||||
/**
|
||||
* 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-' + data.id + ' .like-count').text(data.like_count);
|
||||
$(target + ' .like-count').text(data.like_count);
|
||||
if (data.liked_by_member) {
|
||||
likeBadge.addClass('liked');
|
||||
likeButton.data('method', 'delete');
|
||||
@@ -14,11 +22,26 @@ $(document).ready(function() {
|
||||
} else {
|
||||
likeBadge.removeClass('liked');
|
||||
likeButton.data('method', 'post');
|
||||
likeButton.attr('href', '/likes.json?type=Post&id=' + data.id);
|
||||
likeButton.attr('href', '/likes.json?type=' + objectClass + '&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');
|
||||
|
||||
22
app/assets/javascripts/tab_navigation.js
Normal file
22
app/assets/javascripts/tab_navigation.js
Normal file
@@ -0,0 +1,22 @@
|
||||
$(document).ready(function() {
|
||||
var url = location.href.replace(/\/$/, '');
|
||||
|
||||
if (location.hash) {
|
||||
var hash = url.split('#');
|
||||
var triggerEl = document.querySelector('#myTab a[href="#' + hash[1] + '"]');
|
||||
var tab = new bootstrap.Tab(triggerEl);
|
||||
tab.show();
|
||||
url = location.href.replace(/\/#/, '#');
|
||||
history.replaceState(null, null, url);
|
||||
setTimeout(function() {
|
||||
$(window).scrollTop(0);
|
||||
}, 20);
|
||||
}
|
||||
|
||||
$('a[data-bs-toggle="tab"]').on('click', function() {
|
||||
var newUrl;
|
||||
var hash = $(this).attr('href');
|
||||
newUrl = url.split('#')[0] + hash;
|
||||
history.replaceState(null, null, newUrl);
|
||||
});
|
||||
});
|
||||
@@ -8,6 +8,9 @@ body {
|
||||
font-family: $default-font;
|
||||
}
|
||||
|
||||
.navbar {
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
.navbar-brand {
|
||||
.site-name {
|
||||
font-family: "Modak", cursive;
|
||||
@@ -16,7 +19,7 @@ body {
|
||||
}
|
||||
|
||||
img {
|
||||
height: 60px;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -81,8 +81,8 @@ class ActivitiesController < DataController
|
||||
end
|
||||
|
||||
def specifics
|
||||
if @owner.present?
|
||||
"#{@owner.to_param}-"
|
||||
end
|
||||
return if @owner.blank?
|
||||
|
||||
"#{@owner.to_param}-"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
class ApplicationController < ActionController::Base
|
||||
protect_from_forgery
|
||||
# Working from codespaces, we want to turn off validation
|
||||
if Rails.env.development? && ENV['CODESPACE_NAME']
|
||||
skip_before_action :verify_authenticity_token
|
||||
end
|
||||
skip_before_action :verify_authenticity_token if Rails.env.development? && ENV['CODESPACE_NAME']
|
||||
|
||||
include ApplicationHelper
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ class CropsController < ApplicationController
|
||||
@companions = @crop.companions.approved
|
||||
end
|
||||
format.svg do
|
||||
icon_data = @crop.svg_icon.presence || File.read(Rails.root.join('app', 'assets', 'images', 'icons', 'sprout.svg'))
|
||||
icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
|
||||
send_data(icon_data, type: "image/svg+xml", disposition: "inline")
|
||||
end
|
||||
format.json do
|
||||
@@ -113,7 +113,12 @@ class CropsController < ApplicationController
|
||||
@crop.approval_status = "pending"
|
||||
end
|
||||
|
||||
notify_wranglers if Crop.transaction { @crop.save && save_crop_names }
|
||||
if Crop.transaction { @crop.save && save_crop_names }
|
||||
notify_wranglers
|
||||
else
|
||||
@crop.alternate_names.build
|
||||
@crop.scientific_names.build
|
||||
end
|
||||
|
||||
respond_with @crop
|
||||
end
|
||||
|
||||
@@ -58,7 +58,7 @@ class LikesController < ApplicationController
|
||||
|
||||
def failed(like, message)
|
||||
respond_to do |format|
|
||||
format.json { render(json: { 'error': message }, status: :forbidden) }
|
||||
format.json { render(json: { error: message }, status: :forbidden) }
|
||||
format.html do
|
||||
flash[:error] = message
|
||||
if like&.likeable
|
||||
|
||||
@@ -61,7 +61,7 @@ class MembersController < ApplicationController
|
||||
end
|
||||
|
||||
def unsubscribe
|
||||
verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
|
||||
verifier = ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
|
||||
decrypted_message = verifier.verify(params[:message])
|
||||
|
||||
@member = Member.find(decrypted_message[:member_id])
|
||||
|
||||
@@ -21,7 +21,7 @@ class MessagesController < ApplicationController
|
||||
return if params[:recipient_id].blank?
|
||||
|
||||
@recipient = Member.find_by(id: params[:recipient_id])
|
||||
return if @recipient.nil?
|
||||
nil if @recipient.nil?
|
||||
end
|
||||
|
||||
def create
|
||||
|
||||
@@ -41,7 +41,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
||||
|
||||
def after_sign_in_path_for(resource)
|
||||
if resource.tos_agreement
|
||||
super(resource)
|
||||
super
|
||||
else
|
||||
finish_signup_path(resource)
|
||||
end
|
||||
|
||||
@@ -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 #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
|
||||
else
|
||||
if total_quantity == 0
|
||||
"You have an unknown quantity of seeds of this crop."
|
||||
else
|
||||
"You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
|
||||
end
|
||||
end
|
||||
|
||||
def crop_ebay_seeds_url(crop)
|
||||
"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"
|
||||
"https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
|
||||
class NotifierMailer < ApplicationMailer
|
||||
# include NotificationsHelper
|
||||
default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
|
||||
default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
|
||||
|
||||
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['RAILS_SECRET_TOKEN'])
|
||||
ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
|
||||
end
|
||||
|
||||
def notify(notification)
|
||||
@@ -27,7 +27,7 @@ class NotifierMailer < ApplicationMailer
|
||||
|
||||
def planting_reminder(member)
|
||||
@member = member
|
||||
@sitename = ENV['GROWSTUFF_SITE_NAME']
|
||||
@sitename = ENV.fetch('GROWSTUFF_SITE_NAME', nil)
|
||||
|
||||
@late = []
|
||||
@super_late = []
|
||||
|
||||
@@ -5,6 +5,7 @@ class Activity < ApplicationRecord
|
||||
include Ownable
|
||||
include Finishable
|
||||
include SearchActivities
|
||||
include Likeable
|
||||
|
||||
belongs_to :garden, optional: true
|
||||
belongs_to :planting, optional: true
|
||||
|
||||
@@ -9,8 +9,8 @@ module MemberFlickr
|
||||
if @flickr.nil?
|
||||
flickr_auth = auth('flickr')
|
||||
if flickr_auth
|
||||
FlickRaw.api_key = ENV['GROWSTUFF_FLICKR_KEY']
|
||||
FlickRaw.shared_secret = ENV['GROWSTUFF_FLICKR_SECRET']
|
||||
FlickRaw.api_key = ENV.fetch('GROWSTUFF_FLICKR_KEY', nil)
|
||||
FlickRaw.shared_secret = ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil)
|
||||
@flickr = FlickRaw::Flickr.new
|
||||
@flickr.access_token = flickr_auth.token
|
||||
@flickr.access_secret = flickr_auth.secret
|
||||
|
||||
@@ -78,7 +78,7 @@ module PredictPlanting
|
||||
end
|
||||
|
||||
# Deactivate any plantings over time_limit that are super late in small batches.
|
||||
def self.archive!(time_limit: 3.years.ago, limit: 100)
|
||||
def self.archive!(time_limit: 3.years.ago, limit: 1000)
|
||||
active_plantings = Planting.annual.active.where("planted_at < ?", time_limit).order(planted_at: :asc).limit(limit)
|
||||
active_plantings.each do |planting|
|
||||
if planting.finish_is_predicatable? && planting.super_late?
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -30,7 +30,7 @@ module SearchPlantings
|
||||
quantity:,
|
||||
sunniness:,
|
||||
garden_id:,
|
||||
garden_name: garden&.name,
|
||||
garden_name: garden&.name,
|
||||
description:,
|
||||
|
||||
first_harvest_predicted_at:,
|
||||
|
||||
@@ -59,7 +59,7 @@ class CsvImporter
|
||||
|
||||
alternate_names.split(/,\s*/).each do |name|
|
||||
altname = AlternateName.find_by(name:, crop: @crop)
|
||||
altname ||= AlternateName.create! name: name, crop: @crop, creator: cropbot
|
||||
altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
|
||||
@crop.alternate_names << altname
|
||||
end
|
||||
end
|
||||
|
||||
@@ -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['GROWSTUFF_SITE_NAME']}. "
|
||||
body: "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -80,11 +80,11 @@ class Garden < ApplicationRecord
|
||||
def reindex(refresh: false); end
|
||||
|
||||
# Deactivate any gardens with no active plantings
|
||||
def self.archive!(time_limit: 3.years.ago, limit: 100)
|
||||
Garden.active.where("updated_at < ?", time_limit).order(updated_at: :asc).limit(limit).each do |active_garden|
|
||||
def self.archive!(time_limit: 3.years.ago, limit: 1000)
|
||||
Garden.active.where("gardens.updated_at < ?", time_limit).order(updated_at: :asc).limit(limit).each do |active_garden|
|
||||
unless active_garden.plantings.active.any?
|
||||
garden.active = false
|
||||
garden.save
|
||||
active_garden.active = false
|
||||
active_garden.save
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -6,6 +6,7 @@ class Harvest < ApplicationRecord
|
||||
include PhotoCapable
|
||||
include Ownable
|
||||
include SearchHarvests
|
||||
include Likeable
|
||||
|
||||
friendly_id :harvest_slug, use: %i(slugged finders)
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ class Planting < ApplicationRecord
|
||||
include PredictPlanting
|
||||
include PredictHarvest
|
||||
include SearchPlantings
|
||||
include Likeable
|
||||
|
||||
friendly_id :planting_slug, use: %i(slugged finders)
|
||||
|
||||
|
||||
@@ -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) }
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
- if can?(:edit, activity)
|
||||
.dropdown.activity-actions
|
||||
%span.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')
|
||||
|
||||
@@ -22,19 +22,17 @@
|
||||
%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
|
||||
@@ -48,4 +46,3 @@
|
||||
|
||||
|
||||
.col-md-4.col-xs-12
|
||||
= render 'activities/actions', activity: @activity
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
%h2 Basic information
|
||||
|
||||
.form-group#new_crop
|
||||
= f.text_field :name
|
||||
= f.text_field :name, required: true
|
||||
%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.text_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
|
||||
= f.url_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).
|
||||
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :delete, class: 'form-horizontal' }) do |f|
|
||||
= form_for(resource, as: resource_name,
|
||||
url: registration_path(resource_name) + '#delete',
|
||||
html: { method: :delete, class: 'form-horizontal' }) do |f|
|
||||
%br/
|
||||
= render 'devise/shared/error_messages', resource: resource
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
= form_for(resource, as: resource_name,
|
||||
url: registration_path(resource_name),
|
||||
url: registration_path(resource_name) + '#apps',
|
||||
html: { method: :put, class: 'form-horizontal' }) do |_f|
|
||||
%br/
|
||||
= render 'devise/shared/error_messages', resource: resource
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
= form_for(resource, as: resource_name,
|
||||
url: registration_path(resource_name),
|
||||
url: registration_path(resource_name) + '#email',
|
||||
html: { method: :put, class: 'form-horizontal' }) do |f|
|
||||
%br/
|
||||
= render 'devise/shared/error_messages', resource: resource
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
= form_for(resource, as: resource_name,
|
||||
url: registration_path(resource_name),
|
||||
url: registration_path(resource_name) + '#password',
|
||||
html: { method: :put, class: 'form-horizontal' }) do |f|
|
||||
%br/
|
||||
= render 'devise/shared/error_messages', resource: resource
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
= form_for(resource, as: resource_name,
|
||||
url: registration_path(resource_name),
|
||||
url: registration_path(resource_name) + '#profile',
|
||||
html: { method: :put, class: 'form-horizontal' }) do |f|
|
||||
%br/
|
||||
= render 'devise/shared/error_messages', resource: resource
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
- if can?(:edit, harvest)
|
||||
.dropdown.harvest-actions
|
||||
%span.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')
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
%section
|
||||
%h2= title('harvests', @owner, @crop, @planting)
|
||||
= will_paginate @harvests
|
||||
- if @harvests.blank?
|
||||
%p No harvests recorded yet
|
||||
.index-cards
|
||||
- @harvests.each do |h|
|
||||
= render 'harvests/card', harvest: h
|
||||
|
||||
@@ -15,13 +15,26 @@
|
||||
.harvest
|
||||
.row
|
||||
.col-md-8.col-xs-12
|
||||
%h1
|
||||
= harvest_icon
|
||||
#{@harvest.crop} harvested by #{@harvest.owner}
|
||||
.col-md-4.col-xs-12
|
||||
= render 'harvests/actions', harvest: @harvest
|
||||
.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
|
||||
|
||||
.col-md-4.col-xs-12
|
||||
= render 'harvests/owner', harvest: @harvest
|
||||
.col-md-8.col-xs-12
|
||||
.index-cards.facts
|
||||
- if @harvest.plant_part
|
||||
.card
|
||||
@@ -53,14 +66,5 @@
|
||||
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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
%span.badge.like-badge{class: liked ? 'liked' : ''}
|
||||
= like_icon
|
||||
|
||||
%span.like-count= likeable.likes_count
|
||||
%span.like-count{title: t('buttons.total_likes')}= likeable.likes_count
|
||||
|
||||
18
app/views/likes/_likes.html.haml
Normal file
18
app/views/likes/_likes.html.haml
Normal file
@@ -0,0 +1,18 @@
|
||||
%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)
|
||||
@@ -35,7 +35,7 @@
|
||||
- if @member.last_sign_in_at
|
||||
%p
|
||||
%strong Last Login
|
||||
= @member.last_sign_in_at
|
||||
= @member.last_sign_in_at&.to_fs(:default)
|
||||
|
||||
- if can? :update, @member
|
||||
= link_to edit_member_registration_path, class: 'btn btn-block' do
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
- if can?(:edit, @photo) && can?(:destroy, @photo)
|
||||
.dropdown.float-right.photo-actions
|
||||
%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"}
|
||||
%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"}
|
||||
= edit_button(edit_photo_path(@photo), classes: 'dropdown-item')
|
||||
.dropdown-divider
|
||||
= delete_button(@photo, classes: 'dropdown-item text-danger')
|
||||
|
||||
@@ -30,3 +30,9 @@
|
||||
= 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
|
||||
@@ -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}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
- if can?(:edit, planting)
|
||||
.dropdown.planting-actions
|
||||
%span.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')
|
||||
|
||||
@@ -39,6 +39,8 @@
|
||||
%section
|
||||
%h2= title('plantings', @owner, @crop, @planting)
|
||||
= will_paginate @plantings
|
||||
- if @plantings.blank?
|
||||
%p No plantings recorded yet
|
||||
.index-cards
|
||||
- @plantings.each do |p|
|
||||
= render 'plantings/card', planting: p
|
||||
|
||||
@@ -43,6 +43,8 @@
|
||||
%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
|
||||
@@ -79,8 +81,6 @@
|
||||
|
||||
|
||||
.col-md-4.col-xs-12
|
||||
= render 'plantings/actions', planting: @planting
|
||||
%hr/
|
||||
= render @planting.crop
|
||||
|
||||
- if @planting.location
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
|
||||
- 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)
|
||||
@@ -8,10 +8,10 @@
|
||||
in
|
||||
= link_to @post.forum, @post.forum
|
||||
on
|
||||
= @post.created_at
|
||||
= @post.created_at.to_fs(:default)
|
||||
- if @post.updated_at > @post.created_at
|
||||
and edited at
|
||||
= @post.updated_at
|
||||
= @post.updated_at.to_fs(:default)
|
||||
|
||||
= link_to "Permalink", post
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
= render 'photos/thumbnail', photo: photo
|
||||
|
||||
.card-footer
|
||||
= render 'posts/likes', post: @post
|
||||
= render 'likes/likes', object: @post
|
||||
.float-right
|
||||
- if can? :create, Comment
|
||||
= link_to new_comment_path(post_id: @post.id), class: 'btn' do
|
||||
|
||||
@@ -35,7 +35,8 @@
|
||||
%section
|
||||
%h2= title('seeds', @owner, @crop, @planting)
|
||||
= will_paginate @seeds
|
||||
|
||||
- if @seeds.blank?
|
||||
%p No seeds recorded yet
|
||||
.index-cards
|
||||
- @seeds.each do |s|
|
||||
= render 'seeds/card', seed: s
|
||||
|
||||
@@ -24,4 +24,9 @@
|
||||
- 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)
|
||||
= 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)
|
||||
@@ -23,12 +23,8 @@ FileUtils.chdir APP_ROOT do
|
||||
system('bin/yarn')
|
||||
|
||||
puts "\n== Copying sample files =="
|
||||
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
|
||||
FileUtils.cp 'config/database.yml.example', 'config/database.yml' unless File.exist?('config/database.yml')
|
||||
FileUtils.cp 'env-example', '.env' unless File.exist?('.env')
|
||||
|
||||
puts "\n== Checking for elastic search =="
|
||||
system! 'script/check_elasticsearch.sh'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -26,7 +26,7 @@ module Growstuff
|
||||
config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone]
|
||||
|
||||
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
|
||||
I18n.load_path += Dir[Rails.root.join('config', 'locales', '*.{rb,yml}')]
|
||||
I18n.load_path += Dir[Rails.root.join("config/locales/*.{rb,yml}")]
|
||||
I18n.default_locale = :en
|
||||
# rails will fallback to config.i18n.default_locale translation
|
||||
config.i18n.fallbacks = true
|
||||
@@ -62,7 +62,7 @@ module Growstuff
|
||||
|
||||
# Growstuff-specific configuration variables
|
||||
config.currency = 'AUD'
|
||||
config.bot_email = ENV['GROWSTUFF_EMAIL']
|
||||
config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
|
||||
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['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']
|
||||
config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)
|
||||
|
||||
# config.active_record.raise_in_transactional_callbacks = true
|
||||
config.middleware.insert_before 0, Rack::Cors do
|
||||
|
||||
@@ -16,7 +16,7 @@ Rails.application.configure do
|
||||
|
||||
# Enable/disable caching. By default caching is disabled.
|
||||
# Run rails dev:cache to toggle caching.
|
||||
if Rails.root.join('tmp', 'caching-dev.txt').exist?
|
||||
if Rails.root.join("tmp/caching-dev.txt").exist?
|
||||
config.action_controller.perform_caching = true
|
||||
|
||||
config.cache_store = :memory_store
|
||||
|
||||
@@ -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["MEMCACHIER_USERNAME"],
|
||||
password: ENV["MEMCACHIER_PASSWORD"],
|
||||
{ username: ENV.fetch("MEMCACHIER_USERNAME", nil),
|
||||
password: ENV.fetch("MEMCACHIER_PASSWORD", nil),
|
||||
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['HOST'] }
|
||||
config.action_mailer.default_url_options = { host: ENV.fetch('HOST', nil) }
|
||||
|
||||
config.action_mailer.smtp_settings = {
|
||||
user_name: ENV['MAILGUN_SMTP_LOGIN'],
|
||||
password: ENV['MAILGUN_SMTP_PASSWORD'],
|
||||
domain: ENV['GROWSTUFF_EMAIL_DOMAIN'],
|
||||
address: ENV['MAILGUN_SMTP_SERVER'],
|
||||
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),
|
||||
port: 587,
|
||||
authentication: :plain,
|
||||
enable_starttls_auto: true
|
||||
}
|
||||
ActionMailer::Base.delivery_method = :smtp
|
||||
|
||||
config.host = ENV['HOST']
|
||||
config.host = ENV.fetch('HOST', nil)
|
||||
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>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
ActionDispatch::Callbacks.after do
|
||||
# Reload the factories
|
||||
return unless Rails.env.development? || Rails.env.test?
|
||||
return unless Rails.env.local?
|
||||
|
||||
if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
|
||||
FactoryBot.factories.clear
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
# Be sure to restart your server when you modify this file.
|
||||
|
||||
# ActiveSupport::Reloader.to_prepare do
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# 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.
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
# Be sure to restart your server when you modify this file.
|
||||
|
||||
# Define an application-wide content security policy
|
||||
|
||||
@@ -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['GROWSTUFF_EMAIL']}>"
|
||||
config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
|
||||
|
||||
config.secret_key = ENV['RAILS_SECRET_TOKEN']
|
||||
config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)
|
||||
|
||||
# Configure the class responsible to send e-mails.
|
||||
# config.mailer = "Devise::Mailer"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# 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:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# 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.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
Rails.application.config.middleware.use OmniAuth::Builder do
|
||||
provider :twitter, ENV['GROWSTUFF_TWITTER_KEY'], ENV['GROWSTUFF_TWITTER_SECRET']
|
||||
provider :flickr, ENV['GROWSTUFF_FLICKR_KEY'], ENV['GROWSTUFF_FLICKR_SECRET'], scope: 'read'
|
||||
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'
|
||||
end
|
||||
|
||||
@@ -92,6 +92,9 @@ 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:
|
||||
@@ -267,6 +270,7 @@ en:
|
||||
planting: "%{planting}"
|
||||
seed: "%{seed}"
|
||||
thing_by: A %{thing} by %{owner}
|
||||
crop: "%{crop}"
|
||||
places:
|
||||
index:
|
||||
title: "%{site_name} Community Map"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class CreateCms < ActiveRecord::Migration[4.2]
|
||||
def self.up # rubocop:disable Metrics/MethodLength
|
||||
def self.up
|
||||
# -- Sites --------------------------------------------------------------
|
||||
create_table :comfy_cms_sites do |t|
|
||||
t.string :label, null: false
|
||||
|
||||
@@ -37,18 +37,22 @@ 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
|
||||
|
||||
@@ -9,6 +9,7 @@ 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
|
||||
|
||||
@@ -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 }}')
|
||||
|
||||
@@ -39,7 +39,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
|
||||
t.foreign_key :active_storage_blobs, column: :blob_id
|
||||
end
|
||||
|
||||
create_table :active_storage_variant_records, id: primary_key_type do |t|
|
||||
create_table :active_storage_variant_records, id: primary_key_type do |t| # rubocop:disable Rails/CreateTableWithTimestamps
|
||||
t.belongs_to :blob, null: false, index: false, type: foreign_key_type
|
||||
t.string :variation_digest, null: false
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class AddSlugToActivity < ActiveRecord::Migration[7.1]
|
||||
def change
|
||||
add_column :activities, :slug, :string
|
||||
|
||||
17
db/migrate/20240714024918_like_everything.rb
Normal file
17
db/migrate/20240714024918_like_everything.rb
Normal file
@@ -0,0 +1,17 @@
|
||||
# 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
|
||||
56
db/schema.rb
56
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_02_18_053122) do
|
||||
ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
||||
@@ -54,6 +54,14 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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"
|
||||
@@ -206,6 +214,13 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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|
|
||||
@@ -314,6 +329,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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
|
||||
|
||||
@@ -488,6 +504,13 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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
|
||||
@@ -530,6 +553,14 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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
|
||||
|
||||
@@ -543,6 +574,13 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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
|
||||
@@ -590,6 +628,22 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) 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"
|
||||
|
||||
@@ -26,7 +26,7 @@ def load_data
|
||||
end
|
||||
|
||||
def load_crops
|
||||
source_path = Rails.root.join('db', 'seeds')
|
||||
source_path = Rails.root.join("db/seeds")
|
||||
Dir.glob("#{source_path}/crops*.csv").each do |crop_file|
|
||||
puts "Loading crops from #{crop_file}..."
|
||||
CSV.foreach(crop_file) do |row|
|
||||
@@ -48,7 +48,7 @@ def load_test_users
|
||||
puts "Loading test users..."
|
||||
|
||||
# Open suburb csv
|
||||
source_path = Rails.root.join('db', 'seeds')
|
||||
source_path = Rails.root.join("db/seeds")
|
||||
begin
|
||||
suburb_file = File.open("#{source_path}/suburbs.csv")
|
||||
rescue StandardError
|
||||
@@ -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)
|
||||
)
|
||||
|
||||
@@ -6,7 +6,7 @@ require 'haml/filters/growstuff_markdown'
|
||||
class Haml::Filters
|
||||
class EscapedMarkdown < Haml::Filters::Markdown
|
||||
def compile(node)
|
||||
[:escape, true, super(node)]
|
||||
[:escape, true, super]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
namespace :gardens do
|
||||
|
||||
desc "Mark old gardens inactive"
|
||||
task archive: :environment do
|
||||
Planting.archive!
|
||||
|
||||
@@ -5,20 +5,20 @@ namespace :growstuff do
|
||||
# usage: rake growstuff:admin_user name=skud
|
||||
|
||||
task admin_user: :environment do
|
||||
add_role_to_member! ENV['name'], 'Admin'
|
||||
add_role_to_member! ENV.fetch('name', nil), '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['name'], 'Crop Wrangler'
|
||||
add_role_to_member! ENV.fetch('name', nil), '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['file']) || raise("Usage: rake growstuff:import_crops file=file.csv")
|
||||
(@file = ENV.fetch('file', nil)) || raise("Usage: rake growstuff:import_crops file=file.csv")
|
||||
|
||||
puts "Loading crops from #{@file}..."
|
||||
CSV.foreach(@file) do |row|
|
||||
|
||||
@@ -5,12 +5,12 @@ require "English"
|
||||
|
||||
if ENV['CI']
|
||||
if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
|
||||
author = ENV['GITHUB_ACTOR']
|
||||
author = ENV.fetch('GITHUB_ACTOR', nil)
|
||||
exit 1 unless author
|
||||
|
||||
elsif ENV['TRAVIS_PULL_REQUEST']
|
||||
require 'httparty'
|
||||
repo = ENV['TRAVIS_REPO_SLUG']
|
||||
repo = ENV.fetch('TRAVIS_REPO_SLUG', nil)
|
||||
pr = ENV['TRAVIS_PULL_REQUEST']
|
||||
url = "https://api.github.com/repos/#{repo}/pulls/#{pr}"
|
||||
response = HTTParty.get(url).parsed_response
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
require 'platform-api'
|
||||
require 'yaml'
|
||||
|
||||
heroku = PlatformAPI.connect(ENV['HEROKU_API_KEY'])
|
||||
branch = ENV['TRAVIS_BRANCH']
|
||||
heroku = PlatformAPI.connect(ENV.fetch('HEROKU_API_KEY', nil))
|
||||
branch = ENV.fetch('TRAVIS_BRANCH', nil)
|
||||
travis_config = YAML.load_file('.travis.yml')
|
||||
if travis_config['deploy']['app'].key? branch
|
||||
app = travis_config['deploy']['app'][branch]
|
||||
|
||||
@@ -28,7 +28,7 @@ describe CropsController do
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET crop hierarchy " do
|
||||
describe "GET crop hierarchy" do
|
||||
describe 'fetches the crop hierarchy page' do
|
||||
context 'wrangler' do
|
||||
include_context 'login as wrangler'
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -3,24 +3,23 @@
|
||||
# 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
|
||||
|
||||
trait :garden do
|
||||
category { "Soil Cultivation" }
|
||||
description { "Apply compost from winter" }
|
||||
due_date { 3.months.from_now }
|
||||
garden
|
||||
end
|
||||
factory :activity do
|
||||
name { "Admire" }
|
||||
description { "Spend 10 minutes admiring your hard work" }
|
||||
category { "General" }
|
||||
owner
|
||||
|
||||
trait :planting do
|
||||
category { "Pruning" }
|
||||
description { "Stake tomato" }
|
||||
planting
|
||||
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
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -37,7 +37,7 @@ describe "Conversations", :js do
|
||||
describe 'restore conversation' do
|
||||
before { click_link class: 'restore' }
|
||||
|
||||
it { expect(page).not_to have_content 'something i want to say' }
|
||||
it { expect(page).to have_no_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).not_to have_content 'this is a message'
|
||||
expect(page).not_to have_content 'this is another message'
|
||||
expect(page).to have_no_content 'this is a message'
|
||||
expect(page).to have_no_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).not_to have_content 'this is a message'
|
||||
expect(page).not_to have_content 'this is another message'
|
||||
expect(page).to have_no_content 'this is a message'
|
||||
expect(page).to have_no_content 'this is another message'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -46,7 +46,7 @@ describe "Alternate names", :js do
|
||||
accept_confirm do
|
||||
click_link 'Delete'
|
||||
end
|
||||
expect(page).not_to have_content alternate_eggplant.name
|
||||
expect(page).to have_no_content alternate_eggplant.name
|
||||
expect(page).to have_content 'Alternate name was successfully deleted'
|
||||
end
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@ describe "browse crops", :search do
|
||||
end
|
||||
|
||||
it "pending crops are not listed" do
|
||||
expect(page).not_to have_content pending_crop.name
|
||||
expect(page).to have_no_content pending_crop.name
|
||||
end
|
||||
|
||||
it "rejected crops are not listed" do
|
||||
expect(page).not_to have_content rejected_crop.name
|
||||
expect(page).to have_no_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).not_to have_link "Add New Crop" }
|
||||
it { expect(page).to have_no_link "Add New Crop" }
|
||||
end
|
||||
|
||||
context 'member' do
|
||||
|
||||
@@ -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).not_to have_text 'Varieties'
|
||||
expect(page).to have_no_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).not_to have_content "You have 20 seeds"
|
||||
expect(page).to have_no_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).not_to have_text 'Perennial' }
|
||||
it { expect(page).to have_no_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).not_to have_text 'Annual' }
|
||||
it { expect(page).to have_no_text 'Annual' }
|
||||
end
|
||||
|
||||
context 'crop Perennial value is null' do
|
||||
let(:crop) { FactoryBot.create(:crop, perennial: nil) }
|
||||
|
||||
it { expect(page).not_to have_text 'Perennial' }
|
||||
it { expect(page).not_to have_text 'Annual' }
|
||||
it { expect(page).to have_no_text 'Perennial' }
|
||||
it { expect(page).to have_no_text 'Annual' }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -69,7 +69,7 @@ describe "crop detail page", :js, :search do
|
||||
include_examples "shows photos"
|
||||
end
|
||||
|
||||
context "when not signed in " do
|
||||
context "when not signed in" do
|
||||
include_examples "shows photos"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -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).not_to have_link "Crop Wrangling"
|
||||
expect(page).to have_no_link "Crop Wrangling"
|
||||
end
|
||||
|
||||
it "can't see wrangling page with js" do
|
||||
visit member_path(member)
|
||||
expect(page).not_to have_link "Crop Wrangling"
|
||||
expect(page).to have_no_link "Crop Wrangling"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -6,14 +6,14 @@ describe "crop wrangling button" do
|
||||
context 'not signed in' do
|
||||
before { visit crops_path }
|
||||
|
||||
it { expect(page).not_to have_link "Wrangle Crops", href: wrangle_crops_path }
|
||||
it { expect(page).to have_no_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).not_to have_link "Wrangle Crops", href: wrangle_crops_path }
|
||||
it { expect(page).to have_no_link "Wrangle Crops", href: wrangle_crops_path }
|
||||
end
|
||||
|
||||
context "signed in crop wrangler" do
|
||||
|
||||
@@ -49,7 +49,7 @@ describe "Scientific names", :js do
|
||||
end
|
||||
end
|
||||
# expect(page.status_code).to equal 200
|
||||
expect(page).not_to have_content zea_mays.name
|
||||
expect(page).to have_no_content zea_mays.name
|
||||
expect(page).to have_content 'Scientific name was successfully deleted.'
|
||||
end
|
||||
|
||||
|
||||
@@ -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.not_to have_link 'Actions' }
|
||||
it { is_expected.to have_no_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.not_to have_link 'Actions' }
|
||||
it { is_expected.to have_no_link 'Actions' }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -33,7 +33,7 @@ describe "Gardens", :js do
|
||||
fill_in "Name", with: "Negative Garden"
|
||||
fill_in "Area", with: -5
|
||||
click_button "Save"
|
||||
expect(page).not_to have_content "Garden was successfully created"
|
||||
expect(page).to have_no_content "Garden was successfully created"
|
||||
expect(page).to have_content "Area must be greater than or equal to 0"
|
||||
end
|
||||
end
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user