Update 2023

This commit is contained in:
Joerg Reichert 2023-03-29 21:02:52 +02:00
parent 857ff4f164
commit cbf986c477
5 changed files with 251 additions and 188 deletions

3
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"i18n-ally.localesPaths": "config/locales"
}

View file

@ -1,4 +1,4 @@
FROM ruby:2.5.7 FROM ruby:3.2.1
RUN gem install bundler RUN gem install bundler
# Add google package repository for google chrome # Add google package repository for google chrome
@ -22,6 +22,7 @@ WORKDIR /tmp
COPY Gemfile Gemfile COPY Gemfile Gemfile
COPY Gemfile.lock Gemfile.lock COPY Gemfile.lock Gemfile.lock
RUN bundle config build.nokogiri --use-system-libraries RUN bundle config build.nokogiri --use-system-libraries
RUN bundle update
RUN bundle install RUN bundle install
ADD . /app ADD . /app

11
Gemfile
View file

@ -1,13 +1,13 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~> 5.1.5' gem 'rails', '~> 7.0.4'
gem 'rails-i18n' gem 'rails-i18n'
# database and search index # database and search index
gem 'elasticsearch', '~> 6' gem 'elasticsearch', '~> 8'
gem 'elasticsearch-dsl' gem 'elasticsearch-dsl'
gem 'elasticsearch-model', '~> 6' gem 'elasticsearch-model', '~> 7'
gem 'elasticsearch-rails', '~> 6' gem 'elasticsearch-rails', '~> 7'
gem 'sqlite3' gem 'sqlite3'
# pagination # pagination
@ -19,7 +19,7 @@ gem 'omniauth'
gem 'omniauth-browserid' gem 'omniauth-browserid'
# templates, css and other frontend related # templates, css and other frontend related
gem 'foundation-rails', '~> 5.5' gem 'foundation-rails', '~> 6.5'
gem 'jquery-rails' gem 'jquery-rails'
gem 'sass-rails' gem 'sass-rails'
gem 'sassc', '~> 2.1.0' gem 'sassc', '~> 2.1.0'
@ -49,7 +49,6 @@ end
group :test do group :test do
gem 'apparition' gem 'apparition'
gem 'coveralls', require: false
gem 'database_cleaner' gem 'database_cleaner'
gem 'factory_bot_rails' gem 'factory_bot_rails'
gem 'faker' gem 'faker'

View file

@ -1,179 +1,227 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.1.7) actioncable (7.0.4.3)
actionpack (= 5.1.7) actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (~> 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.1.7) actionmailbox (7.0.4.3)
actionpack (= 5.1.7) actionpack (= 7.0.4.3)
actionview (= 5.1.7) activejob (= 7.0.4.3)
activejob (= 5.1.7) activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.1.7) actionpack (7.0.4.3)
actionview (= 5.1.7) actionview (= 7.0.4.3)
activesupport (= 5.1.7) activesupport (= 7.0.4.3)
rack (~> 2.0) rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (5.1.7) actiontext (7.0.4.3)
activesupport (= 5.1.7) actionpack (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (5.1.7) activejob (7.0.4.3)
activesupport (= 5.1.7) activesupport (= 7.0.4.3)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.1.7) activemodel (7.0.4.3)
activesupport (= 5.1.7) activesupport (= 7.0.4.3)
activerecord (5.1.7) activerecord (7.0.4.3)
activemodel (= 5.1.7) activemodel (= 7.0.4.3)
activesupport (= 5.1.7) activesupport (= 7.0.4.3)
arel (~> 8.0) activestorage (7.0.4.3)
activesupport (5.1.7) actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 1.6, < 2)
minitest (~> 5.1) minitest (>= 5.1)
tzinfo (~> 1.1) tzinfo (~> 2.0)
addressable (2.7.0) addressable (2.8.1)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 6.0)
apparition (0.6.0) apparition (0.6.0)
capybara (~> 3.13, < 4) capybara (~> 3.13, < 4)
websocket-driver (>= 0.6.5) websocket-driver (>= 0.6.5)
arel (8.0.0) ast (2.4.2)
ast (2.4.1) awesome_print (1.9.2)
awesome_print (1.8.0) babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
builder (3.2.4) builder (3.2.4)
capybara (3.33.0) capybara (3.38.0)
addressable addressable
matrix
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
rack (>= 1.6.0) rack (>= 1.6.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (~> 1.5) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
coderay (1.1.3) coderay (1.1.3)
concurrent-ruby (1.1.7) concurrent-ruby (1.2.2)
coveralls (0.7.2)
multi_json (~> 1.3)
rest-client (= 1.6.7)
simplecov (>= 0.7)
term-ansicolor (= 1.2.2)
thor (= 0.18.1)
crass (1.0.6) crass (1.0.6)
database_cleaner (1.8.5) database_cleaner (2.0.2)
diff-lcs (1.4.4) database_cleaner-active_record (>= 2, < 3)
docile (1.3.2) database_cleaner-active_record (2.1.0)
elasticsearch (6.8.2) activerecord (>= 5.a)
elasticsearch-api (= 6.8.2) database_cleaner-core (~> 2.0.0)
elasticsearch-transport (= 6.8.2) database_cleaner-core (2.0.1)
elasticsearch-api (6.8.2) date (3.3.3)
diff-lcs (1.5.0)
docile (1.4.0)
elastic-transport (8.2.1)
faraday (< 3)
multi_json multi_json
elasticsearch-dsl (0.1.9) elasticsearch (8.6.0)
elasticsearch-model (6.1.1) elastic-transport (~> 8)
elasticsearch-api (= 8.6.0)
elasticsearch-api (8.6.0)
multi_json
elasticsearch-dsl (0.1.10)
elasticsearch-model (7.1.1)
activesupport (> 3) activesupport (> 3)
elasticsearch (~> 6) elasticsearch (> 1)
hashie hashie
elasticsearch-rails (6.1.1) elasticsearch-rails (7.2.1)
elasticsearch-transport (6.8.2) erubi (1.12.0)
faraday (~> 1) execjs (2.8.1)
multi_json factory_bot (6.2.1)
erubi (1.9.0)
execjs (2.7.0)
factory_bot (6.1.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
factory_bot_rails (6.1.0) factory_bot_rails (6.2.0)
factory_bot (~> 6.1.0) factory_bot (~> 6.2.0)
railties (>= 5.0.0) railties (>= 5.0.0)
faker (2.14.0) faker (3.1.1)
i18n (>= 1.6, < 2) i18n (>= 1.8.11, < 2)
faraday (1.0.1) faraday (2.7.4)
multipart-post (>= 1.2, < 3) faraday-net_http (>= 2.0, < 3.1)
ffi (1.13.1) ruby2_keywords (>= 0.0.4)
foundation-rails (5.5.3.2) faraday-net_http (3.0.2)
ffi (1.15.5)
foundation-rails (6.6.2.0)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0)
globalid (0.4.2) sprockets-es6 (>= 0.9.0)
activesupport (>= 4.2.0) globalid (1.1.0)
hashie (4.1.0) activesupport (>= 5.0)
i18n (1.8.5) hashie (5.0.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jquery-rails (4.4.0) jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
kaminari (1.2.1) json (2.6.3)
kaminari (1.2.2)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1) kaminari-actionview (= 1.2.2)
kaminari-activerecord (= 1.2.1) kaminari-activerecord (= 1.2.2)
kaminari-core (= 1.2.1) kaminari-core (= 1.2.2)
kaminari-actionview (1.2.1) kaminari-actionview (1.2.2)
actionview actionview
kaminari-core (= 1.2.1) kaminari-core (= 1.2.2)
kaminari-activerecord (1.2.1) kaminari-activerecord (1.2.2)
activerecord activerecord
kaminari-core (= 1.2.1) kaminari-core (= 1.2.2)
kaminari-core (1.2.1) kaminari-core (1.2.2)
kaminari-i18n (0.5.0) kaminari-i18n (0.5.0)
kaminari kaminari
rails rails
launchy (2.5.0) launchy (2.5.2)
addressable (~> 2.7) addressable (~> 2.8)
leaflet-rails (1.7.0) leaflet-rails (1.9.3)
rails (>= 4.2.0) rails (>= 4.2.0)
loofah (2.7.0) loofah (2.19.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.8.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0) method_source (1.0.0)
mime-types (3.3.1) mini_mime (1.1.2)
mime-types-data (~> 3.2015) minitest (5.18.0)
mime-types-data (3.2020.0512)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.1.1) net-imap (0.3.4)
nio4r (2.5.4) date
nokogiri (1.10.10) net-protocol
mini_portile2 (~> 2.4.0) net-pop (0.1.2)
omniauth (1.9.1) net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.14.2-x86_64-linux)
racc (~> 1.4)
omniauth (1.9.2)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
omniauth-browserid (0.0.1) omniauth-browserid (0.0.1)
faraday faraday
multi_json multi_json
omniauth (~> 1.0) omniauth (~> 1.0)
parallel (1.19.2) parallel (1.22.1)
parser (2.7.1.4) parser (3.2.1.1)
ast (~> 2.4.1) ast (~> 2.4.1)
pry (0.13.1) pry (0.14.2)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
pry-rails (0.3.9) pry-rails (0.3.9)
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (4.0.6) public_suffix (5.0.1)
puma (5.0.0) puma (6.2.0)
nio4r (~> 2.0) nio4r (~> 2.0)
rack (2.2.3) racc (1.6.2)
rack-test (1.1.0) rack (2.2.6.4)
rack (>= 1.0, < 3) rack-test (2.1.0)
rails (5.1.7) rack (>= 1.3)
actioncable (= 5.1.7) rails (7.0.4.3)
actionmailer (= 5.1.7) actioncable (= 7.0.4.3)
actionpack (= 5.1.7) actionmailbox (= 7.0.4.3)
actionview (= 5.1.7) actionmailer (= 7.0.4.3)
activejob (= 5.1.7) actionpack (= 7.0.4.3)
activemodel (= 5.1.7) actiontext (= 7.0.4.3)
activerecord (= 5.1.7) actionview (= 7.0.4.3)
activesupport (= 5.1.7) activejob (= 7.0.4.3)
bundler (>= 1.3.0) activemodel (= 7.0.4.3)
railties (= 5.1.7) activerecord (= 7.0.4.3)
sprockets-rails (>= 2.0.0) activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
bundler (>= 1.15.0)
railties (= 7.0.4.3)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1)
@ -181,26 +229,28 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.5.0)
loofah (~> 2.3) loofah (~> 2.19, >= 2.19.1)
rails-i18n (5.1.3) rails-i18n (7.0.6)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 5.0, < 6) railties (>= 6.0.0, < 8)
railties (5.1.7) railties (7.0.4.3)
actionpack (= 5.1.7) actionpack (= 7.0.4.3)
activesupport (= 5.1.7) activesupport (= 7.0.4.3)
method_source method_source
rake (>= 0.8.7) rake (>= 12.2)
thor (>= 0.18.1, < 2.0) thor (~> 1.0)
rainbow (3.0.0) zeitwerk (~> 2.5)
rake (13.0.1) rainbow (3.1.1)
regexp_parser (1.8.0) rake (13.0.6)
rest-client (1.6.7) rb-fsevent (0.11.2)
mime-types (>= 1.16) rb-inotify (0.10.1)
rexml (3.2.4) ffi (~> 1.0)
rspec-core (3.9.2) regexp_parser (2.7.0)
rexml (3.2.5)
rspec-core (3.9.3)
rspec-support (~> 3.9.3) rspec-support (~> 3.9.3)
rspec-expectations (3.9.2) rspec-expectations (3.9.4)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.9.0)
rspec-mocks (3.9.1) rspec-mocks (3.9.1)
@ -214,26 +264,32 @@ GEM
rspec-expectations (~> 3.9.0) rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.9.0)
rspec-support (3.9.3) rspec-support (3.9.4)
rubocop (0.91.0) rubocop (1.48.1)
json (~> 2.3)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.1) parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.8, < 3.0)
rexml rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 0.4.0, < 1.0) rubocop-ast (>= 1.26.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (0.4.2) rubocop-ast (1.28.0)
parser (>= 2.7.1.4) parser (>= 3.2.1.0)
rubocop-faker (1.1.0) rubocop-faker (1.1.0)
faker (>= 2.12.0) faker (>= 2.12.0)
rubocop (>= 0.82.0) rubocop (>= 0.82.0)
ruby-progressbar (1.10.1) ruby-progressbar (1.13.0)
sass (3.4.25) ruby2_keywords (0.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (6.0.0) sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1) sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.1.0) sassc (2.1.0-x86_64-linux)
ffi (~> 1.9) ffi (~> 1.9)
sassc-rails (2.1.2) sassc-rails (2.1.2)
railties (>= 4.0.0) railties (>= 4.0.0)
@ -243,68 +299,71 @@ GEM
tilt tilt
shoulda-matchers (3.1.3) shoulda-matchers (3.1.3)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
simplecov (0.19.0) simplecov (0.22.0)
docile (~> 1.1) docile (~> 1.1)
simplecov-html (~> 0.11) simplecov-html (~> 0.11)
simplecov-html (0.12.2) simplecov_json_formatter (~> 0.1)
slim (4.1.0) simplecov-html (0.12.3)
temple (>= 0.7.6, < 0.9) simplecov_json_formatter (0.1.4)
tilt (>= 2.0.6, < 2.1) slim (5.1.0)
slim-rails (3.2.0) temple (~> 0.10.0)
tilt (>= 2.0.6, < 2.2)
slim-rails (3.6.2)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
slim (>= 3.0, < 5.0) slim (>= 3.0, < 6.0, != 5.0.0)
spring (2.1.1) spring (4.1.1)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (4.0.2) sprockets (4.2.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (>= 2.2.4, < 4)
sprockets-rails (3.2.2) sprockets-es6 (0.9.2)
actionpack (>= 4.0) babel-source (>= 5.8.11)
activesupport (>= 4.0) babel-transpiler
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.2) sprockets-rails (3.4.2)
temple (0.8.2) actionpack (>= 5.2)
term-ansicolor (1.2.2) activesupport (>= 5.2)
tins (~> 0.8) sprockets (>= 3.0.0)
thor (0.18.1) sqlite3 (1.6.2-x86_64-linux)
thread_safe (0.3.6) temple (0.10.0)
tilt (2.0.10) thor (1.2.1)
tins (0.13.2) tilt (2.1.0)
timeout (0.3.2)
turbolinks (5.2.1) turbolinks (5.2.1)
turbolinks-source (~> 5.2) turbolinks-source (~> 5.2)
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
tzinfo (1.2.7) tzinfo (2.0.6)
thread_safe (~> 0.1) concurrent-ruby (~> 1.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (1.7.0) unicode-display_width (2.4.2)
validate_url (1.0.11) validate_url (1.0.15)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
public_suffix public_suffix
websocket-driver (0.6.5) websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
zeitwerk (2.6.7)
PLATFORMS PLATFORMS
ruby x86_64-linux
DEPENDENCIES DEPENDENCIES
apparition apparition
awesome_print awesome_print
capybara capybara
coveralls
database_cleaner database_cleaner
elasticsearch (~> 6) elasticsearch (~> 8)
elasticsearch-dsl elasticsearch-dsl
elasticsearch-model (~> 6) elasticsearch-model (~> 7)
elasticsearch-rails (~> 6) elasticsearch-rails (~> 7)
factory_bot_rails factory_bot_rails
faker faker
foundation-rails (~> 5.5) foundation-rails (~> 6.5)
jquery-rails jquery-rails
kaminari kaminari
kaminari-i18n kaminari-i18n
@ -315,13 +374,14 @@ DEPENDENCIES
pry pry
pry-rails pry-rails
puma puma
rails (~> 5.1.5) rails (~> 7.0.4)
rails-controller-testing rails-controller-testing
rails-i18n rails-i18n
rspec-rails (~> 3.0) rspec-rails (~> 3.0)
rubocop rubocop
rubocop-faker rubocop-faker
sass-rails sass-rails
sassc (~> 2.1.0)
shoulda-matchers (~> 3.1) shoulda-matchers (~> 3.1)
simplecov simplecov
slim-rails slim-rails
@ -333,4 +393,4 @@ DEPENDENCIES
validate_url validate_url
BUNDLED WITH BUNDLED WITH
2.1.4 2.4.10

View file

@ -1,4 +1,4 @@
FROM elasticsearch:6.8.6 FROM elasticsearch:8.6.2
RUN \ RUN \
mkdir -p /usr/share/elasticsearch/config/analysis && \ mkdir -p /usr/share/elasticsearch/config/analysis && \