From b04afed20e1ad3032b5e3c1d05bdddf953458e3d Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Tue, 16 Feb 2021 15:29:04 +0000 Subject: [PATCH 1/4] gems: update graphql --- Gemfile.lock | 2 +- app/graphql/schema.graphql | 91 ++++++++++++++++++++++++++++++++------ 2 files changed, 79 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a9e4c7d5f..bc1daeeac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - graphql (1.10.9) + graphql (1.12.4) graphql-batch (0.4.3) graphql (>= 1.3, < 2) promise.rb (~> 0.7.2) diff --git a/app/graphql/schema.graphql b/app/graphql/schema.graphql index a3ffa17ac..45fde0a8b 100644 --- a/app/graphql/schema.graphql +++ b/app/graphql/schema.graphql @@ -1181,67 +1181,132 @@ type Mutation { """ File information required to prepare a direct upload """ - createDirectUpload(input: CreateDirectUploadInput!): CreateDirectUploadPayload + createDirectUpload( + """ + Parameters for CreateDirectUpload + """ + input: CreateDirectUploadInput! + ): CreateDirectUploadPayload """ Accepter le dossier. """ - dossierAccepter(input: DossierAccepterInput!): DossierAccepterPayload + dossierAccepter( + """ + Parameters for DossierAccepter + """ + input: DossierAccepterInput! + ): DossierAccepterPayload """ Archiver le dossier. """ - dossierArchiver(input: DossierArchiverInput!): DossierArchiverPayload + dossierArchiver( + """ + Parameters for DossierArchiver + """ + input: DossierArchiverInput! + ): DossierArchiverPayload """ Changer le grope instructeur du dossier. """ - dossierChangerGroupeInstructeur(input: DossierChangerGroupeInstructeurInput!): DossierChangerGroupeInstructeurPayload + dossierChangerGroupeInstructeur( + """ + Parameters for DossierChangerGroupeInstructeur + """ + input: DossierChangerGroupeInstructeurInput! + ): DossierChangerGroupeInstructeurPayload """ Classer le dossier sans suite. """ - dossierClasserSansSuite(input: DossierClasserSansSuiteInput!): DossierClasserSansSuitePayload + dossierClasserSansSuite( + """ + Parameters for DossierClasserSansSuite + """ + input: DossierClasserSansSuiteInput! + ): DossierClasserSansSuitePayload """ Envoyer un message à l'usager du dossier. """ - dossierEnvoyerMessage(input: DossierEnvoyerMessageInput!): DossierEnvoyerMessagePayload + dossierEnvoyerMessage( + """ + Parameters for DossierEnvoyerMessage + """ + input: DossierEnvoyerMessageInput! + ): DossierEnvoyerMessagePayload """ Modifier l’annotation au format oui/non. """ - dossierModifierAnnotationCheckbox(input: DossierModifierAnnotationCheckboxInput!): DossierModifierAnnotationCheckboxPayload + dossierModifierAnnotationCheckbox( + """ + Parameters for DossierModifierAnnotationCheckbox + """ + input: DossierModifierAnnotationCheckboxInput! + ): DossierModifierAnnotationCheckboxPayload """ Modifier l’annotation au format date. """ - dossierModifierAnnotationDate(input: DossierModifierAnnotationDateInput!): DossierModifierAnnotationDatePayload + dossierModifierAnnotationDate( + """ + Parameters for DossierModifierAnnotationDate + """ + input: DossierModifierAnnotationDateInput! + ): DossierModifierAnnotationDatePayload """ Modifier l’annotation au format date et heure. """ - dossierModifierAnnotationDatetime(input: DossierModifierAnnotationDatetimeInput!): DossierModifierAnnotationDatetimePayload + dossierModifierAnnotationDatetime( + """ + Parameters for DossierModifierAnnotationDatetime + """ + input: DossierModifierAnnotationDatetimeInput! + ): DossierModifierAnnotationDatetimePayload """ Modifier l’annotation au format nombre entier. """ - dossierModifierAnnotationIntegerNumber(input: DossierModifierAnnotationIntegerNumberInput!): DossierModifierAnnotationIntegerNumberPayload + dossierModifierAnnotationIntegerNumber( + """ + Parameters for DossierModifierAnnotationIntegerNumber + """ + input: DossierModifierAnnotationIntegerNumberInput! + ): DossierModifierAnnotationIntegerNumberPayload """ Modifier l’annotation au format text. """ - dossierModifierAnnotationText(input: DossierModifierAnnotationTextInput!): DossierModifierAnnotationTextPayload + dossierModifierAnnotationText( + """ + Parameters for DossierModifierAnnotationText + """ + input: DossierModifierAnnotationTextInput! + ): DossierModifierAnnotationTextPayload """ Passer le dossier en instruction. """ - dossierPasserEnInstruction(input: DossierPasserEnInstructionInput!): DossierPasserEnInstructionPayload + dossierPasserEnInstruction( + """ + Parameters for DossierPasserEnInstruction + """ + input: DossierPasserEnInstructionInput! + ): DossierPasserEnInstructionPayload """ Refuser le dossier. """ - dossierRefuser(input: DossierRefuserInput!): DossierRefuserPayload + dossierRefuser( + """ + Parameters for DossierRefuser + """ + input: DossierRefuserInput! + ): DossierRefuserPayload } enum Order { From aae452cc67494d443f10314a9dd791b4e0a0de42 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Tue, 16 Feb 2021 11:02:53 +0000 Subject: [PATCH 2/4] gems: update chunky_png And pass it a proper IO object, to avoid "Undefined method `set_encoding`" errors. --- Gemfile.lock | 2 +- .../new_administrateur/attestation_templates_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bc1daeeac..007e02140 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM chartkick (3.4.0) childprocess (3.0.0) choice (0.2.0) - chunky_png (1.3.11) + chunky_png (1.4.0) clamav-client (3.2.0) coderay (1.1.3) coercible (1.0.0) diff --git a/app/controllers/new_administrateur/attestation_templates_controller.rb b/app/controllers/new_administrateur/attestation_templates_controller.rb index 00d5ea86b..68a06e3a8 100644 --- a/app/controllers/new_administrateur/attestation_templates_controller.rb +++ b/app/controllers/new_administrateur/attestation_templates_controller.rb @@ -60,7 +60,7 @@ module NewAdministrateur def uninterlaced_png(uploaded_file) if uploaded_file&.content_type == 'image/png' - chunky_img = ChunkyPNG::Image.from_io(uploaded_file) + chunky_img = ChunkyPNG::Image.from_io(uploaded_file.to_io) chunky_img.save(uploaded_file.tempfile.to_path, interlace: false) uploaded_file.tempfile.reopen(uploaded_file.tempfile.to_path, 'rb') end From f41c1f9ff469215ced9d0f307158ac3dca8c93c9 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Tue, 16 Feb 2021 16:04:30 +0100 Subject: [PATCH 3/4] gems: update all dependencies --- Gemfile.lock | 372 ++++++++++++++++++++++++++------------------------- 1 file changed, 190 insertions(+), 182 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 007e02140..b559be011 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,38 +22,38 @@ GEM specs: aasm (5.1.1) concurrent-ruby (~> 1.0) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.3.5) + actionpack (= 6.0.3.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.0.3.5) + actionpack (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.3.5) + actionview (= 6.0.3.5) + activesupport (= 6.0.3.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.0.3.5) + actionpack (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.3.5) + activesupport (= 6.0.3.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -61,32 +61,31 @@ GEM active_link_to (1.0.5) actionpack addressable - active_model_serializers (0.10.10) - actionpack (>= 4.1, < 6.1) - activemodel (>= 4.1, < 6.1) + active_model_serializers (0.10.12) + actionpack (>= 4.1, < 6.2) + activemodel (>= 4.1, < 6.2) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_storage_validations (0.9.0) + active_storage_validations (0.9.2) rails (>= 5.2.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.0.3.5) + activesupport (= 6.0.3.5) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) + activemodel (6.0.3.5) + activesupport (= 6.0.3.5) + activerecord (6.0.3.5) + activemodel (= 6.0.3.5) + activesupport (= 6.0.3.5) + activestorage (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) marcel (~> 0.3.1) - activestorage-openstack (1.4.1) + activestorage-openstack (1.5.1) fog-openstack (~> 1.0) marcel - mime-types rails (>= 5.2.2) - activesupport (6.0.3.4) + activesupport (6.0.3.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -111,11 +110,11 @@ GEM annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) - ast (2.4.1) + ast (2.4.2) attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.1) - autoprefixer-rails (10.0.1.0) + autoprefixer-rails (10.2.4.0) execjs axe-matchers (2.6.1) dumb_delegator (~> 0.8) @@ -124,7 +123,7 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - axlsx_styler (1.0.0) + axlsx_styler (1.1.0) activesupport (>= 3.1) caxlsx (>= 2.0.2) babel-source (5.8.35) @@ -134,22 +133,22 @@ GEM bcrypt (3.1.16) bindata (2.4.8) bindex (0.8.1) - brakeman (4.9.1) - browser (5.0.0) + brakeman (5.0.0) + browser (5.3.0) builder (3.2.4) byebug (11.1.3) - capybara (3.33.0) + capybara (3.35.3) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) capybara-email (3.0.2) capybara (>= 2.4, < 4.0) mail - capybara-screenshot (1.0.24) + capybara-screenshot (1.0.25) capybara (>= 1.0, < 4) launchy capybara-selenium (0.0.6) @@ -157,12 +156,12 @@ GEM selenium-webdriver case_transform (0.2) activesupport - caxlsx (3.0.2) + caxlsx (3.0.4) htmlentities (~> 4.3, >= 4.3.4) mimemagic (~> 0.3) nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 1.3.0, < 3) - chartkick (3.4.0) + chartkick (3.4.2) childprocess (3.0.0) choice (0.2.0) chunky_png (1.4.0) @@ -179,22 +178,28 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.8) connection_pool (2.2.3) - crack (0.4.4) + crack (0.4.5) + rexml crass (1.0.6) - css_parser (1.7.1) + css_parser (1.9.0) addressable daemons (1.3.1) - database_cleaner (1.8.5) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) datetime_picker_rails (0.0.7) momentjs-rails (>= 2.8.1) deep_cloneable (3.0.0) activerecord (>= 3.1.0, < 7) - delayed_cron_job (0.7.3) + delayed_cron_job (0.7.4) delayed_job (>= 4.1) - delayed_job (4.1.8) - activesupport (>= 3.0, < 6.1) - delayed_job_active_record (4.1.4) - activerecord (>= 3.0, < 6.1) + delayed_job (4.1.9) + activesupport (>= 3.0, < 6.2) + delayed_job_active_record (4.1.5) + activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) delayed_job_web (1.4.3) activerecord (> 3.0.0) @@ -225,9 +230,9 @@ GEM railties (>= 3.2) dry-inflector (0.2.0) dumb_delegator (0.8.1) - ecma-re-validator (0.2.1) - regexp_parser (~> 1.2) - em-websocket (0.5.1) + ecma-re-validator (0.3.0) + regexp_parser (~> 2.0) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) encryptor (3.0.0) @@ -239,28 +244,28 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) - excon (0.76.0) + excon (0.79.0) execjs (2.7.0) - factory_bot (5.1.2) - activesupport (>= 4.2.0) + factory_bot (6.1.0) + activesupport (>= 5.0.0) faraday (1.3.0) faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords faraday-net_http (1.0.1) - ffi (1.13.1) + ffi (1.14.2) ffi-geos (2.1.0) ffi (>= 1.0.0) - flipper (0.19.0) - flipper-active_record (0.19.0) + flipper (0.20.3) + flipper-active_record (0.20.3) activerecord (>= 5.0, < 7) - flipper (~> 0.19.0) - flipper-ui (0.19.0) + flipper (~> 0.20.3) + flipper-ui (0.20.3) erubi (>= 1.0.0, < 2.0.0) - flipper (~> 0.19.0) + flipper (~> 0.20.3) rack (>= 1.4, < 3) - rack-protection (>= 1.5.3, < 2.1.0) - fog-core (2.2.0) + rack-protection (>= 1.5.3, < 2.2.0) + fog-core (2.2.3) builder excon (~> 0.71) formatador (~> 0.2) @@ -268,16 +273,16 @@ GEM fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (1.0.10) + fog-openstack (1.0.11) fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) formatador (0.2.5) - fugit (1.3.4) + fugit (1.4.2) et-orbi (~> 1.1, >= 1.1.8) - raabro (~> 1.1) - geo_coord (0.1.0) - geocoder (1.6.3) + raabro (~> 1.4) + geo_coord (0.2.0) + geocoder (1.6.5) globalid (0.4.2) activesupport (>= 4.2.0) gon (6.4.0) @@ -289,7 +294,7 @@ GEM graphql-batch (0.4.3) graphql (>= 1.3, < 2) promise.rb (~> 0.7.2) - graphql-rails_logger (1.2.2) + graphql-rails_logger (1.2.3) actionpack (> 5.0) activesupport (> 5.0) railties (> 5.0) @@ -300,7 +305,7 @@ GEM thor (>= 0.19, < 2.0) graphql_playground-rails (2.1.0) rails (>= 5.1.0) - groupdate (5.2.1) + groupdate (5.2.2) activesupport (>= 5) guard (2.16.2) formatador (>= 0.2.4) @@ -321,7 +326,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.1.2) + haml (5.2.1) temple (>= 0.8.0) tilt haml-lint (0.999.999) @@ -332,8 +337,9 @@ GEM haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 5.1) - haml_lint (0.35.0) - haml (>= 4.0, < 5.2) + haml_lint (0.37.0) + haml (>= 4.0, < 5.3) + parallel (~> 1.10) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) @@ -353,7 +359,7 @@ GEM http_accept_language (2.1.1) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.8.7) + i18n (1.8.9) concurrent-ruby (~> 1.0) i18n-tasks (0.9.33) activesupport (>= 4.0.2) @@ -375,15 +381,15 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.1) + json (2.5.1) json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap bindata - json_schemer (0.2.16) - ecma-re-validator (~> 0.2) + json_schemer (0.2.17) + ecma-re-validator (~> 0.3) hana (~> 1.3) - regexp_parser (~> 1.5) + regexp_parser (~> 2.0) uri_template (~> 0.7) jsonapi-renderer (0.2.2) jwt (2.2.2) @@ -407,7 +413,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.2.1) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lograge (0.11.2) @@ -419,19 +425,19 @@ GEM loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.2.4) + lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) - mailjet (1.5.4) + mailjet (1.6.0) activesupport (>= 3.1.0) rack (>= 1.4.0) - rest-client + rest-client (>= 2.0.0) marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2021.0212) mimemagic (0.3.5) mini_magick (4.11.0) mini_mime (1.0.2) @@ -445,7 +451,7 @@ GEM ruby2_keywords (~> 0.0.1) nenv (0.3.0) netrc (0.11.0) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -453,7 +459,7 @@ GEM nenv (~> 0.1) shellany (~> 0.0) open4 (1.3.4) - openid_connect (1.1.8) + openid_connect (1.2.0) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -464,25 +470,25 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.19.2) - parser (2.7.1.5) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) - pdf-core (0.7.0) + pdf-core (0.9.0) pg (1.2.3) - phonelib (0.6.45) - prawn (2.2.2) - pdf-core (~> 0.7.0) - ttfunk (~> 1.5) + phonelib (0.6.48) + prawn (2.4.0) + pdf-core (~> 0.9.0) + ttfunk (~> 1.7) prawn-rails (1.3.0) prawn prawn-table rails (>= 3.1.0) - prawn-svg (0.30.0) + prawn-svg (0.31.0) css_parser (~> 1.6) prawn (>= 0.11.1, < 3) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - premailer (1.14.1) + premailer (1.14.2) addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) @@ -497,43 +503,43 @@ GEM byebug (~> 11.0) pry (~> 0.13.0) public_suffix (4.0.6) - puma (5.0.2) + puma (5.2.1) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) - raabro (1.1.6) + raabro (1.4.0) racc (1.5.2) rack (2.2.3) - rack-attack (6.3.1) + rack-attack (6.5.0) rack (>= 1.0, < 3) - rack-mini-profiler (2.1.0) + rack-mini-profiler (2.3.1) rack (>= 1.2.0) - rack-oauth2 (1.15.0) + rack-oauth2 (1.16.0) activesupport attr_required httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rack-proxy (0.6.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + rails (6.0.3.5) + actioncable (= 6.0.3.5) + actionmailbox (= 6.0.3.5) + actionmailer (= 6.0.3.5) + actionpack (= 6.0.3.5) + actiontext (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) + activemodel (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.3.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -552,9 +558,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.0.3.5) + actionpack (= 6.0.3.5) + activesupport (= 6.0.3.5) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -570,7 +576,7 @@ GEM execjs railties (>= 3.2) tilt - regexp_parser (1.8.0) + regexp_parser (2.0.3) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -582,7 +588,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.4) - rgeo (2.1.1) + rgeo (2.2.0) rgeo-geojson (2.1.1) rgeo (>= 1.0.0) rodf (1.1.1) @@ -591,56 +597,59 @@ GEM rubyzip (>= 1.0) rotp (4.1.0) addressable (~> 2.5) - rouge (3.17.0) - rqrcode (1.1.2) + rouge (3.26.0) + rqrcode (1.2.0) chunky_png (~> 1.0) - rqrcode_core (~> 0.1) - rqrcode_core (0.1.2) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rqrcode_core (~> 0.2) + rqrcode_core (0.2.0) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (4.0.1) + rspec-support (~> 3.10.0) + rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) - rspec-support (3.9.3) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.92.0) + rubocop (1.10.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.5.0) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.7.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) - strscan (>= 1.0.0) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) - rubocop-rails_config (0.12.6) + rubocop (>= 0.90.0, < 2.0) + rubocop-rails_config (1.3.0) railties (>= 5.0) - rubocop (~> 0.82) + rubocop (>= 1.8) + rubocop-ast (>= 1.0.1) + rubocop-packaging (~> 0.5) rubocop-performance (~> 1.3) rubocop-rails (~> 2.0) rubocop-rspec-focused (1.0.0) @@ -649,12 +658,12 @@ GEM rake (>= 0.8.1) ruby-graphviz (1.2.5) rexml - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby-saml-idp (0.3.5) ruby-vips (2.0.17) ffi (~> 1.9) ruby2_keywords (0.0.4) - ruby_parser (3.15.0) + ruby_parser (3.15.1) sexp_processor (~> 4.9) rubyzip (2.3.0) sanitize-url (0.1.4) @@ -677,7 +686,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - semantic_range (2.3.0) + semantic_range (2.3.1) sentry-delayed_job (4.2.0) sentry-ruby-core (~> 4.2.0) sentry-rails (4.2.1) @@ -690,31 +699,31 @@ GEM sentry-ruby-core (4.2.1) concurrent-ruby faraday - sexp_processor (4.15.1) + sexp_processor (4.15.2) shellany (0.0.1) - shoulda-matchers (4.4.1) + shoulda-matchers (4.5.1) activesupport (>= 4.2.0) - sib-api-v3-sdk (7.0.0) + sib-api-v3-sdk (7.4.0) json (~> 2.1, >= 2.1.0) typhoeus (~> 1.0, >= 1.0.1) simple_xlsx_reader (1.0.4) nokogiri rubyzip - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) - skylight (4.3.1) - skylight-core (= 4.3.1) - skylight-core (4.3.1) + skylight (4.3.2) + skylight-core (= 4.3.2) + skylight-core (4.3.2) activesupport (>= 4.2.0) smart_listing (1.2.3) coffee-rails jquery-rails kaminari (>= 0.17) rails (>= 3.2) - spreadsheet_architect (4.0.0) + spreadsheet_architect (4.1.0) axlsx_styler (>= 1.0.0, < 2) caxlsx (>= 2.0.2, < 4) rodf (>= 1.0.0, < 2) @@ -728,8 +737,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strscan (1.0.3) - swd (1.1.2) + swd (1.2.0) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -740,8 +748,8 @@ GEM thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - timecop (0.9.1) - ttfunk (1.6.2.1) + timecop (0.9.4) + ttfunk (1.7.0) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.9) @@ -754,7 +762,7 @@ GEM validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.11) + validate_url (1.0.13) activemodel (>= 3.0.0) public_suffix vcr (6.0.0) @@ -765,19 +773,19 @@ GEM equalizer (~> 0.0, >= 0.0.9) warden (1.2.9) rack (>= 2.0.9) - web-console (4.0.4) + web-console (4.1.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.4.1) + webdrivers (4.5.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.9.1) + webmock (3.11.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -798,7 +806,7 @@ GEM zipline (1.3.0) actionpack (>= 3.2.1, < 7.0) zip_tricks (>= 4.2.1, < 6.0) - zxcvbn-ruby (1.1.0) + zxcvbn-ruby (1.2.0) PLATFORMS ruby From 98be7e207660be56aabea71ca958e6de0a9e7727 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Tue, 16 Feb 2021 15:05:04 +0100 Subject: [PATCH 4/4] Fix new Rubocop warnings --- .rubocop.yml | 4 ++++ app/services/dossier_search_service.rb | 2 +- spec/models/procedure_presentation_spec.rb | 15 +++++++++------ spec/support/feature_helpers.rb | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0d27b6c97..ccf103e5a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1320,6 +1320,8 @@ Rails/ActiveRecordCallbacksOrder: Enabled: false Rails/AfterCommitOverride: Enabled: true +Rails/AttributeDefaultBlockValue: + Enabled: true Rails/FindById: Enabled: true Rails/Inquiry: @@ -1342,6 +1344,8 @@ Rails/ShortI18n: Enabled: true Rails/SquishedSQLHeredocs: Enabled: true +Rails/WhereEquals: + Enabled: true Rails/WhereExists: Enabled: true Rails/WhereNot: diff --git a/app/services/dossier_search_service.rb b/app/services/dossier_search_service.rb index d001772a2..93ac8993e 100644 --- a/app/services/dossier_search_service.rb +++ b/app/services/dossier_search_service.rb @@ -62,7 +62,7 @@ class DossierSearchService def self.to_tsquery(search_terms) (search_terms || "") - .gsub(/['?\\:&|!<>\(\)]/, "") # drop disallowed characters + .gsub(/['?\\:&|!<>()]/, "") # drop disallowed characters .strip .split(/\s+/) # split words .map { |x| "#{x}:*" } # enable prefix matching diff --git a/spec/models/procedure_presentation_spec.rb b/spec/models/procedure_presentation_spec.rb index 3a0c62924..8039d4a44 100644 --- a/spec/models/procedure_presentation_spec.rb +++ b/spec/models/procedure_presentation_spec.rb @@ -914,9 +914,11 @@ describe ProcedurePresentation do it 'should downcase and transform value' do procedure_presentation.add_filter("suivis", "type_de_champ/#{first_type_de_champ_id}", "Oui") - expect(procedure_presentation.filters).to eq({ "suivis" => [ - { "label" => first_type_de_champ.libelle, "table" => "type_de_champ", "column" => first_type_de_champ_id, "value" => "true" } - ] + expect(procedure_presentation.filters).to eq({ + "suivis" => + [ + { "label" => first_type_de_champ.libelle, "table" => "type_de_champ", "column" => first_type_de_champ_id, "value" => "true" } + ] }) end end @@ -927,9 +929,10 @@ describe ProcedurePresentation do it 'should passthrough value' do procedure_presentation.add_filter("suivis", "type_de_champ/#{first_type_de_champ_id}", "Oui") - expect(procedure_presentation.filters).to eq({ "suivis" => [ - { "label" => first_type_de_champ.libelle, "table" => "type_de_champ", "column" => first_type_de_champ_id, "value" => "Oui" } - ] + expect(procedure_presentation.filters).to eq({ + "suivis" => [ + { "label" => first_type_de_champ.libelle, "table" => "type_de_champ", "column" => first_type_de_champ_id, "value" => "Oui" } + ] }) end end diff --git a/spec/support/feature_helpers.rb b/spec/support/feature_helpers.rb index cb1bd6c9c..8973ba57b 100644 --- a/spec/support/feature_helpers.rb +++ b/spec/support/feature_helpers.rb @@ -27,8 +27,8 @@ module FeatureHelpers if sign_in_by_link mail = ActionMailer::Base.deliveries.last message = mail.html_part.body.raw_source - instructeur_id = message[/\".+\/connexion-par-jeton\/(.+)\?jeton=(.*)\"/, 1] - jeton = message[/\".+\/connexion-par-jeton\/(.+)\?jeton=(.*)\"/, 2] + instructeur_id = message[/".+\/connexion-par-jeton\/(.+)\?jeton=(.*)"/, 1] + jeton = message[/".+\/connexion-par-jeton\/(.+)\?jeton=(.*)"/, 2] visit sign_in_by_link_path(instructeur_id, jeton: jeton) end