From 5306b1bbc91dbe0fa4a659aef304833a2f576e17 Mon Sep 17 00:00:00 2001 From: Tomasz Subik Date: Wed, 18 Sep 2024 16:46:57 +0200 Subject: [PATCH 1/2] update dependencies --- Gemfile.lock | 367 +++++++++++++++++++++++++++------------------------ 1 file changed, 197 insertions(+), 170 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 82bd22a64..f026ae94e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,35 +54,35 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionmailbox (7.1.4) + actionpack (= 7.1.4) + activejob (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.4) - actionpack (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionmailer (7.1.4) + actionpack (= 7.1.4) + actionview (= 7.1.4) + activejob (= 7.1.4) + activesupport (= 7.1.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.1.4) + actionview (= 7.1.4) + activesupport (= 7.1.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -90,22 +90,22 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.4) - actionpack (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + actiontext (7.1.4) + actionpack (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.1.4) + activesupport (= 7.1.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_material (1.5.2) + active_material (2.1.2) active_skin (0.0.13) - activeadmin (3.2.2) + activeadmin (3.2.5) arbre (~> 1.2, >= 1.2.1) csv formtastic (>= 3.1) @@ -125,27 +125,27 @@ GEM xdan-datetimepicker-rails (~> 2.5.1) activeadmin_quill_editor (1.2.0) activeadmin (>= 2.9, < 4) - activejob (7.1.3.4) - activesupport (= 7.1.3.4) + activejob (7.1.4) + activesupport (= 7.1.4) globalid (>= 0.3.6) - activemodel (7.1.3.4) - activesupport (= 7.1.3.4) - activerecord (7.1.3.4) - activemodel (= 7.1.3.4) - activesupport (= 7.1.3.4) + activemodel (7.1.4) + activesupport (= 7.1.4) + activerecord (7.1.4) + activemodel (= 7.1.4) + activesupport (= 7.1.4) timeout (>= 0.4.0) - activerecord-import (1.7.0) + activerecord-import (1.8.1) activerecord (>= 4.2) activerecord-postgis-adapter (9.0.2) activerecord (~> 7.1.0) rgeo-activerecord (~> 7.0.0) - activestorage (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activesupport (= 7.1.3.4) + activestorage (7.1.4) + actionpack (= 7.1.4) + activejob (= 7.1.4) + activerecord (= 7.1.4) + activesupport (= 7.1.4) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -155,12 +155,12 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - acts_as_list (1.2.1) + acts_as_list (1.2.2) activerecord (>= 6.1) activesupport (>= 6.1) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.5.2) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + airbrussh (1.5.3) sshkit (>= 1.6.1, != 1.7.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) @@ -174,15 +174,15 @@ GEM bcrypt (3.1.20) bigdecimal (3.1.8) bindex (0.8.1) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (6.1.2) + brakeman (6.2.1) racc builder (3.3.0) - bullet (7.1.6) + bullet (7.2.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - bundler-audit (0.9.1) + bundler-audit (0.9.2) bundler (>= 1.2.0, < 3) thor (~> 1.0) cancancan (3.6.1) @@ -191,7 +191,7 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.1.0) + capistrano-bundler (2.1.1) capistrano (~> 3.1) capistrano-db-tasks (0.6) capistrano (>= 3.0.0) @@ -226,14 +226,16 @@ GEM image_processing (~> 1.1) marcel (~> 1.0.0) ssrf_filter (~> 1.0) - carrierwave-base64 (2.10.0) + carrierwave-base64 (2.11.0) carrierwave (>= 2.2.1) marcel (~> 1.0.0) mime-types (~> 3.0) - chartkick (5.0.7) + chartkick (5.1.0) + childprocess (5.1.0) + logger (~> 1.5) choice (0.2.0) chronic (0.10.2) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) countries (6.0.1) unaccent (~> 0.3) @@ -242,12 +244,12 @@ GEM rexml crass (1.0.6) csv (3.3.0) - cuprite (0.15) + cuprite (0.15.1) capybara (~> 3.0) - ferrum (~> 0.14.0) + ferrum (~> 0.15.0) 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) @@ -262,37 +264,39 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) domain_name (0.6.20240107) dotenv (2.8.1) dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) drb (2.2.1) - email_spec (2.2.2) + email_spec (2.3.0) htmlentities (~> 4.3.3) - launchy (~> 2.1) + launchy (>= 2.1, < 4.0) mail (~> 2.7) - erubi (1.12.0) + erubi (1.13.0) execjs (2.9.1) - factory_bot (6.4.6) + factory_bot (6.5.0) activesupport (>= 5.0.0) factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faker (3.4.1) + faker (3.4.2) i18n (>= 1.8.11, < 2) - faraday (2.9.1) - 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 faraday-retry (2.2.1) faraday (~> 2.0) - ferrum (0.14) + ferrum (0.15) addressable (~> 2.5) concurrent-ruby (~> 1.1) webrick (~> 1.7) - websocket-driver (>= 0.6, < 0.8) + websocket-driver (~> 0.7) ffi (1.17.0) ffi (1.17.0-x86_64-linux-gnu) ffi-compiler (1.3.2) @@ -301,47 +305,60 @@ GEM formtastic (5.0.0) actionpack (>= 6.0.0) formtastic_i18n (0.7.0) - gapic-common (0.21.1) + gapic-common (0.22.0) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) - google-protobuf (~> 3.18) - googleapis-common-protos (>= 1.4.0, < 2.a) - googleapis-common-protos-types (>= 1.11.0, < 2.a) - googleauth (~> 1.9) - grpc (~> 1.59) + google-protobuf (>= 3.25, < 5.a) + googleapis-common-protos (~> 1.6) + googleapis-common-protos-types (~> 1.15) + googleauth (~> 1.11) + grpc (~> 1.65) globalid (1.2.1) activesupport (>= 6.1) globalize (6.3.0) activemodel (>= 4.2, < 7.2) activerecord (>= 4.2, < 7.2) request_store (~> 1.0) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-translate (3.6.0) + google-cloud-location (0.8.1) + gapic-common (>= 0.21.1, < 2.a) + google-cloud-errors (~> 1.0) + google-cloud-translate (3.6.1) google-cloud-core (~> 1.6) google-cloud-translate-v2 (>= 0.0, < 2.a) google-cloud-translate-v3 (>= 0.11, < 2.a) - google-cloud-translate-v2 (0.5.1) + google-cloud-translate-v2 (1.0.0) faraday (>= 1.0, < 3.a) google-cloud-core (~> 1.6) googleapis-common-protos (>= 1.3.10, < 2.a) googleapis-common-protos-types (>= 1.0.5, < 2.a) googleauth (>= 0.16.2, < 2.a) - google-cloud-translate-v3 (0.12.0) + google-cloud-translate-v3 (1.1.1) gapic-common (>= 0.21.1, < 2.a) google-cloud-errors (~> 1.0) - google-protobuf (3.25.3) - google-protobuf (3.25.3-x86_64-linux) - googleapis-common-protos (1.5.0) - google-protobuf (~> 3.18) + google-cloud-location (>= 0.7, < 2.a) + google-iam-v1 (>= 0.7, < 2.a) + google-iam-v1 (1.0.1) + gapic-common (>= 0.21.1, < 2.a) + google-cloud-errors (~> 1.0) + grpc-google-iam-v1 (~> 1.1) + google-protobuf (4.28.1) + bigdecimal + rake (>= 13) + google-protobuf (4.28.1-x86_64-linux) + bigdecimal + rake (>= 13) + googleapis-common-protos (1.6.0) + google-protobuf (>= 3.18, < 5.a) googleapis-common-protos-types (~> 1.7) grpc (~> 1.41) - googleapis-common-protos-types (1.14.0) - google-protobuf (~> 3.18) + googleapis-common-protos-types (1.16.0) + google-protobuf (>= 3.18, < 5.a) googleauth (1.11.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) @@ -351,16 +368,20 @@ GEM signet (>= 0.16, < 2.a) groupdate (6.4.0) activesupport (>= 6.1) - grpc (1.64.0) - google-protobuf (~> 3.25) + grpc (1.66.0) + google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) - grpc (1.64.0-x86_64-linux) - google-protobuf (~> 3.25) + grpc (1.66.0-x86_64-linux) + google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) + grpc-google-iam-v1 (1.8.0) + google-protobuf (>= 3.18, < 5.a) + googleapis-common-protos (~> 1.4) + grpc (~> 1.41) has_scope (0.8.2) actionpack (>= 5.2) activesupport (>= 5.2) - hashdiff (1.1.0) + hashdiff (1.1.1) htmlentities (4.3.4) http (5.2.0) addressable (~> 2.8) @@ -368,15 +389,15 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) i18n_generators (2.2.2) activerecord (>= 3.0.0) railties (>= 3.0.0) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) inherited_resources (1.14.0) @@ -386,7 +407,7 @@ GEM responders (>= 2) interactor (3.1.2) io-console (0.7.2) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jquery-rails (4.6.0) @@ -398,7 +419,7 @@ GEM activerecord (>= 4.1) concurrent-ruby railties (>= 4.1) - jwt (2.8.1) + jwt (2.9.0) base64 kaminari (1.2.2) activesupport (>= 4.1.0) @@ -413,8 +434,9 @@ GEM kaminari-core (= 1.2.2) kaminari-core (1.2.2) language_server-protocol (3.17.0.3) - launchy (2.5.2) + launchy (3.0.1) addressable (~> 2.8) + childprocess (~> 5.0) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -426,6 +448,7 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -438,19 +461,19 @@ GEM matrix (0.4.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0604) - mini_magick (4.12.0) + mime-types-data (3.2024.0903) + mini_magick (4.13.2) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.23.1) - mjml-rails (4.11.0) + minitest (5.25.1) + mjml-rails (4.12.1) msgpack (1.7.2) multi_json (1.15.0) mustache (1.1.1) mutex_m (0.2.0) net-http (0.4.1) uri - net-imap (0.4.12) + net-imap (0.4.16) date net-protocol net-pop (0.1.2) @@ -465,35 +488,37 @@ GEM net-protocol net-ssh (7.2.3) nio4r (2.7.3) - nokogiri (1.16.5) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - oj (3.16.4) + oj (3.16.6) bigdecimal (>= 3.0) + ostruct (>= 0.2) oj_mimic_json (1.0.1) optimist (3.1.0) orm_adapter (0.5.0) os (1.1.4) - paper_trail (15.1.0) + ostruct (0.6.0) + paper_trail (15.2.0) activerecord (>= 6.1) request_store (~> 1.4) - parallel (1.25.1) - paranoia (2.6.3) - activerecord (>= 5.1, < 7.2) - parser (3.3.2.0) + parallel (1.26.3) + paranoia (3.0.0) + activerecord (>= 6, < 8.1) + parser (3.3.5.0) ast (~> 2.4.1) racc patience_diff (1.2.0) optimist (~> 3.0) - pg (1.5.6) + pg (1.5.8) psych (5.1.2) stringio - public_suffix (5.0.5) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.8.0) + racc (1.8.1) rack (3.0.11) rack-cors (2.0.0) rack (>= 2.0.0) @@ -506,20 +531,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3.4) - actioncable (= 7.1.3.4) - actionmailbox (= 7.1.3.4) - actionmailer (= 7.1.3.4) - actionpack (= 7.1.3.4) - actiontext (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activemodel (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + rails (7.1.4) + actioncable (= 7.1.4) + actionmailbox (= 7.1.4) + actionmailer (= 7.1.4) + actionpack (= 7.1.4) + actiontext (= 7.1.4) + actionview (= 7.1.4) + activejob (= 7.1.4) + activemodel (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.1.4) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -532,9 +557,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + railties (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -542,14 +567,14 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - ransack (4.1.1) + ransack (4.2.1) activerecord (>= 6.1.5) activesupport (>= 6.1.5) i18n rdoc (6.7.0) psych (>= 4.0.0) redcarpet (3.6.0) - redis (5.2.0) + redis (5.3.0) redis-client (>= 0.22.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) @@ -567,10 +592,10 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.10.0) + redis-store (1.11.0) redis (>= 4, < 6) regexp_parser (2.9.2) - reline (0.5.8) + reline (0.5.10) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) @@ -578,13 +603,13 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.6) - strscan + rexml (3.3.7) rgeo (3.0.1) rgeo-activerecord (7.0.1) activerecord (>= 5.0) rgeo (>= 1.0.0) - rgeo-geojson (2.1.1) + rgeo-geojson (2.2.0) + multi_json (~> 1.15) rgeo (>= 1.0.0) rspec (3.13.0) rspec-core (~> 3.13.0) @@ -595,55 +620,56 @@ GEM rspec-mocks rspec-collection_matchers (1.2.1) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.13.0) + rspec-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (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) rspec-support (~> 3.13) rspec-support (3.13.1) - rswag-api (2.13.0) - activesupport (>= 3.1, < 7.2) - railties (>= 3.1, < 7.2) - rswag-ui (2.13.0) - actionpack (>= 3.1, < 7.2) - railties (>= 3.1, < 7.2) - rubocop (1.63.5) + rswag-api (2.14.0) + activesupport (>= 5.2, < 8.0) + railties (>= 5.2, < 8.0) + rswag-ui (2.14.0) + actionpack (>= 5.2, < 8.0) + railties (>= 5.2, < 8.0) + rubocop (1.65.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) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.26.1) 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) ruby-graphviz (1.2.5) rexml ruby-progressbar (1.13.0) - ruby-vips (2.2.1) + ruby-vips (2.2.2) ffi (~> 1.12) + logger ruby2_keywords (0.0.5) ruby_http_client (3.5.5) rubyzip (2.3.2) @@ -662,19 +688,20 @@ GEM sendgrid-ruby (~> 6.4) sendgrid-ruby (6.7.0) ruby_http_client (~> 3.4) - sentry-rails (5.17.3) + sentry-rails (5.19.0) railties (>= 5.0) - sentry-ruby (~> 5.17.3) - sentry-ruby (5.17.3) + sentry-ruby (~> 5.19.0) + sentry-ruby (5.19.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (7.2.4) + 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) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) @@ -684,25 +711,26 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.5.1) + sprockets-rails (3.5.2) actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - sshkit (1.23.0) + sshkit (1.23.1) base64 net-scp (>= 1.1.2) net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) + ostruct ssrf_filter (1.1.2) - standard (1.36.0) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -711,25 +739,24 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - stringio (3.1.0) - strscan (3.1.0) + stringio (3.1.1) super_diff (0.12.1) attr_extras (>= 6.2.4) diff-lcs patience_diff - thor (1.3.1) - tilt (2.3.0) + thor (1.3.2) + tilt (2.4.0) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unaccent (0.4.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) uniform_notifier (1.16.0) - uri (0.13.0) + uri (0.13.1) valid_url (0.0.4) addressable rails @@ -755,7 +782,7 @@ GEM rails (>= 3.2.16) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.15) + zeitwerk (2.6.18) PLATFORMS ruby From 037bc2dfa4ceb629b2d6525f1e017135c3a99cbe Mon Sep 17 00:00:00 2001 From: Tomasz Subik Date: Wed, 18 Sep 2024 17:23:31 +0200 Subject: [PATCH 2/2] fix linter --- app/admin/observation_report.rb | 2 +- app/models/category.rb | 2 +- app/models/fmu.rb | 2 +- app/models/gov_document.rb | 4 ++-- app/models/observation.rb | 8 ++++---- app/models/observation_document.rb | 2 +- app/models/observation_history.rb | 8 ++++---- app/models/observation_statistic.rb | 6 +++--- app/models/operator_document.rb | 6 +++--- app/models/operator_document_annex.rb | 4 ++-- app/models/operator_document_history.rb | 6 +++--- app/models/operator_document_statistic.rb | 2 +- app/models/required_gov_document.rb | 2 +- app/models/subcategory.rb | 2 +- app/models/user.rb | 2 +- app/models/user_permission.rb | 4 ++-- app/resources/v1/law_resource.rb | 2 +- app/resources/v1/observation_resource.rb | 2 +- app/resources/v1/operator_resource.rb | 2 +- 19 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/admin/observation_report.rb b/app/admin/observation_report.rb index e4c4e13dc..2f69e9781 100644 --- a/app/admin/observation_report.rb +++ b/app/admin/observation_report.rb @@ -19,7 +19,7 @@ def scoped_collection end def apply_filtering(chain) - super(chain).distinct + super.distinct end end diff --git a/app/models/category.rb b/app/models/category.rb index 778feb0f2..93858ed41 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -13,7 +13,7 @@ class Category < ApplicationRecord include Translatable - enum category_type: {operator: 0, government: 1} + enum :category_type, {operator: 0, government: 1} translates :name, touch: true active_admin_translates :name do diff --git a/app/models/fmu.rb b/app/models/fmu.rb index 16b5683c5..9d5d3cfd6 100644 --- a/app/models/fmu.rb +++ b/app/models/fmu.rb @@ -29,7 +29,7 @@ class Fmu < ApplicationRecord include EsriShapefileUpload include ValidationHelper - enum forest_type: ForestType::TYPES_WITH_CODE + enum :forest_type, ForestType::TYPES_WITH_CODE belongs_to :country, inverse_of: :fmus has_many :observations, inverse_of: :fmu, dependent: :destroy diff --git a/app/models/gov_document.rb b/app/models/gov_document.rb index 437786936..90e3944b7 100644 --- a/app/models/gov_document.rb +++ b/app/models/gov_document.rb @@ -25,8 +25,8 @@ class GovDocument < ApplicationRecord has_paper_trail acts_as_paranoid - enum status: {doc_not_provided: 0, doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4} - enum uploaded_by: {government: 1, admin: 2} + enum :status, {doc_not_provided: 0, doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4} + enum :uploaded_by, {government: 1, admin: 2} belongs_to :user, optional: true belongs_to :country diff --git a/app/models/observation.rb b/app/models/observation.rb index c38b8deb9..5b2f64222 100644 --- a/app/models/observation.rb +++ b/app/models/observation.rb @@ -57,9 +57,9 @@ class Observation < ApplicationRecord WrongStateError = Class.new(StandardError) - enum evidence_type: {"No evidence" => 0, "Uploaded documents" => 1, "Evidence presented in the report" => 2} - enum observation_type: {"operator" => 0, "government" => 1} - enum validation_status: { + enum :evidence_type, {"No evidence" => 0, "Uploaded documents" => 1, "Evidence presented in the report" => 2} + enum :observation_type, {"operator" => 0, "government" => 1} + enum :validation_status, { "Created" => 0, "Ready for QC1" => 10, "QC1 in progress" => 11, @@ -73,7 +73,7 @@ class Observation < ApplicationRecord "Published (not modified)" => 8, "Published (modified)" => 9 } - enum location_accuracy: { + enum :location_accuracy, { "Estimated location" => 0, "GPS coordinates extracted from photo" => 1, "Accurate GPS coordinates" => 2 } diff --git a/app/models/observation_document.rb b/app/models/observation_document.rb index 2aa51c135..f23c1bea7 100644 --- a/app/models/observation_document.rb +++ b/app/models/observation_document.rb @@ -20,7 +20,7 @@ class ObservationDocument < ApplicationRecord mount_base64_uploader :attachment, ObservationDocumentUploader include MoveableAttachment - enum document_type: { + enum :document_type, { "Government Documents" => 0, "Company Documents" => 1, "Photos" => 2, "Testimony from local communities" => 3, "Other" => 4, "Maps" => 5 } diff --git a/app/models/observation_history.rb b/app/models/observation_history.rb index e5edf1d2a..6a3ce880d 100644 --- a/app/models/observation_history.rb +++ b/app/models/observation_history.rb @@ -27,8 +27,8 @@ class ObservationHistory < ApplicationRecord acts_as_paranoid - enum observation_type: {"operator" => 0, "government" => 1} - enum validation_status: { + enum :observation_type, {"operator" => 0, "government" => 1} + enum :validation_status, { "Created" => 0, "Ready for QC1" => 10, "QC1 in progress" => 11, @@ -42,9 +42,9 @@ class ObservationHistory < ApplicationRecord "Published (not modified)" => 8, "Published (modified)" => 9 } - enum location_accuracy: {"Estimated location" => 0, "GPS coordinates extracted from photo" => 1, + enum :location_accuracy, {"Estimated location" => 0, "GPS coordinates extracted from photo" => 1, "Accurate GPS coordinates" => 2} - enum fmu_forest_type: ForestType::TYPES_WITH_CODE + enum :fmu_forest_type, ForestType::TYPES_WITH_CODE belongs_to :observation belongs_to :country diff --git a/app/models/observation_statistic.rb b/app/models/observation_statistic.rb index 048024369..05e9b6195 100644 --- a/app/models/observation_statistic.rb +++ b/app/models/observation_statistic.rb @@ -30,7 +30,7 @@ class ObservationStatistic < ApplicationRecord belongs_to :subcategory, optional: true belongs_to :operator, optional: true - enum validation_status: { + enum :validation_status, { "Created" => 0, "Ready for QC" => 1, "QC in progress" => 2, @@ -43,8 +43,8 @@ class ObservationStatistic < ApplicationRecord "Published (modified)" => 9, "Published (all)" => 789 # extra state for looking for all published } - enum observation_type: {"operator" => 0, "government" => 1} - enum fmu_forest_type: ForestType::TYPES_WITH_CODE + enum :observation_type, {"operator" => 0, "government" => 1} + enum :fmu_forest_type, ForestType::TYPES_WITH_CODE validates :date, presence: true diff --git a/app/models/operator_document.rb b/app/models/operator_document.rb index 4dc5d787b..c316da01a 100644 --- a/app/models/operator_document.rb +++ b/app/models/operator_document.rb @@ -91,9 +91,9 @@ class OperatorDocument < ApplicationRecord .where(required_operator_documents: {contract_signature: false}) } - enum status: {doc_not_provided: 0, doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4, doc_not_required: 5} - enum uploaded_by: {operator: 1, monitor: 2, admin: 3, other: 4} - enum source: {company: 1, forest_atlas: 2, other_source: 3} + enum :status, {doc_not_provided: 0, doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4, doc_not_required: 5} + enum :uploaded_by, {operator: 1, monitor: 2, admin: 3, other: 4} + enum :source, {company: 1, forest_atlas: 2, other_source: 3} NON_HISTORICAL_ATTRIBUTES = %w[id attachment updated_at created_at].freeze EXPIRABLE_STATUSES = %w[doc_valid doc_not_required] diff --git a/app/models/operator_document_annex.rb b/app/models/operator_document_annex.rb index e5dbdbbf5..7c8de42df 100644 --- a/app/models/operator_document_annex.rb +++ b/app/models/operator_document_annex.rb @@ -37,8 +37,8 @@ class OperatorDocumentAnnex < ApplicationRecord validates :name, :start_date, :status, presence: true - enum status: {doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4} - enum uploaded_by: {operator: 1, monitor: 2, admin: 3, other: 4} + enum :status, {doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4} + enum :uploaded_by, {operator: 1, monitor: 2, admin: 3, other: 4} scope :valid, -> { where(status: OperatorDocumentAnnex.statuses[:doc_valid]) } scope :from_user, ->(operator_id) { joins(:operator_document).where(operator_documents: {operator_id: operator_id}) } diff --git a/app/models/operator_document_history.rb b/app/models/operator_document_history.rb index c270fbb04..a53d0aafc 100644 --- a/app/models/operator_document_history.rb +++ b/app/models/operator_document_history.rb @@ -49,9 +49,9 @@ class OperatorDocumentHistory < ApplicationRecord scope :non_signature, -> { joins(:required_operator_document).where(required_operator_documents: {contract_signature: false}) } # non signature scope :valid, -> { joins(:operator_document).where(operator_documents: {status: OperatorDocument.statuses[:doc_valid]}) } # valid doc - enum status: {doc_not_provided: 0, doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4, doc_not_required: 5} - enum uploaded_by: {operator: 1, monitor: 2, admin: 3, other: 4} - enum source: {company: 1, forest_atlas: 2, other_source: 3} + enum :status, {doc_not_provided: 0, doc_pending: 1, doc_invalid: 2, doc_valid: 3, doc_expired: 4, doc_not_required: 5} + enum :uploaded_by, {operator: 1, monitor: 2, admin: 3, other: 4} + enum :source, {company: 1, forest_atlas: 2, other_source: 3} # Returns the collection of OperatorDocumentHistory for a given operator at a point in time # diff --git a/app/models/operator_document_statistic.rb b/app/models/operator_document_statistic.rb index b59f4f14c..d009625c5 100644 --- a/app/models/operator_document_statistic.rb +++ b/app/models/operator_document_statistic.rb @@ -23,7 +23,7 @@ class OperatorDocumentStatistic < ApplicationRecord belongs_to :country, optional: true belongs_to :required_operator_document_group, optional: true - enum fmu_forest_type: ForestType::TYPES_WITH_CODE + enum :fmu_forest_type, ForestType::TYPES_WITH_CODE validates :date, presence: true validates :date, uniqueness: {scope: [:country_id, :required_operator_document_group_id, :fmu_forest_type, :document_type]} diff --git a/app/models/required_gov_document.rb b/app/models/required_gov_document.rb index 7d68d8732..62f0c0d0b 100644 --- a/app/models/required_gov_document.rb +++ b/app/models/required_gov_document.rb @@ -33,7 +33,7 @@ class RequiredGovDocument < ApplicationRecord belongs_to :country has_many :gov_documents, dependent: :destroy - enum document_type: {file: 1, link: 2, stats: 3} + enum :document_type, {file: 1, link: 2, stats: 3} validates :document_type, inclusion: {in: RequiredGovDocument.document_types.keys} validates :valid_period, numericality: {greater_than: 0}, if: :valid_period? diff --git a/app/models/subcategory.rb b/app/models/subcategory.rb index 7e174c1eb..7a5d7b685 100644 --- a/app/models/subcategory.rb +++ b/app/models/subcategory.rb @@ -16,7 +16,7 @@ class Subcategory < ApplicationRecord include Translatable - enum subcategory_type: {operator: 0, government: 1} + enum :subcategory_type, {operator: 0, government: 1} translates :name, :details, touch: true # rubocop:disable Standard/BlockSingleLineBraces diff --git a/app/models/user.rb b/app/models/user.rb index 07c2b5a73..15fd73c50 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -42,7 +42,7 @@ class User < ApplicationRecord normalizes :first_name, :last_name, :name, with: -> { _1.strip } - enum permissions_request: {operator: 1, ngo: 2, ngo_manager: 4, government: 6, holding: 7} + enum :permissions_request, {operator: 1, ngo: 2, ngo_manager: 4, government: 6, holding: 7} belongs_to :country, inverse_of: :users, optional: true diff --git a/app/models/user_permission.rb b/app/models/user_permission.rb index 5b737d610..f83a53480 100644 --- a/app/models/user_permission.rb +++ b/app/models/user_permission.rb @@ -13,8 +13,8 @@ # class UserPermission < ApplicationRecord - enum user_role: {user: 0, operator: 1, ngo: 2, ngo_manager: 4, - bo_manager: 5, admin: 3, government: 6, holding: 7}.freeze + enum :user_role, {user: 0, operator: 1, ngo: 2, ngo_manager: 4, + bo_manager: 5, admin: 3, government: 6, holding: 7}.freeze belongs_to :user diff --git a/app/resources/v1/law_resource.rb b/app/resources/v1/law_resource.rb index 7e8a74bb6..d720563a6 100644 --- a/app/resources/v1/law_resource.rb +++ b/app/resources/v1/law_resource.rb @@ -44,7 +44,7 @@ def self.apply_sort(records, order_options, context = {}) if order_options["country.name"].present? || order_options["subcategory.name"].present? order_options["id"] = "DESC" end - super(records, order_options, context) + super end def complete diff --git a/app/resources/v1/observation_resource.rb b/app/resources/v1/observation_resource.rb index f66d64a4a..8870a7cb0 100644 --- a/app/resources/v1/observation_resource.rb +++ b/app/resources/v1/observation_resource.rb @@ -90,7 +90,7 @@ def self.apply_sort(records, order_options, context = {}) records = records.order_by_category(order_options["subcategory.category.name"]) order_options.except!("subcategory.category.name") end - super(records, order_options, context) + super end def self.apply_includes(records, directives) diff --git a/app/resources/v1/operator_resource.rb b/app/resources/v1/operator_resource.rb index ea337775d..e55990707 100644 --- a/app/resources/v1/operator_resource.rb +++ b/app/resources/v1/operator_resource.rb @@ -121,7 +121,7 @@ def self.records(options = {}) # not great to filter by controller here, but not sure how to do it in observation resource only if (app == "observations-tool" && user.present?) || controller == "v1/observations" - super(options) + super else Operator.active end