From c40462f8cf88a9dad363ee0dca7fcfc863cd4fe1 Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Thu, 23 Jan 2025 15:27:20 +0100 Subject: [PATCH 1/3] Upgrade to Decidim v0.29 --- .ruby-version | 2 +- Gemfile | 4 +- Gemfile.lock | 738 +++++++++++++------------ lib/decidim/term_customizer/version.rb | 4 +- 4 files changed, 397 insertions(+), 351 deletions(-) diff --git a/.ruby-version b/.ruby-version index 94ff29c..be94e6f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.1 +3.2.2 diff --git a/Gemfile b/Gemfile index a897592..968e1cc 100644 --- a/Gemfile +++ b/Gemfile @@ -24,14 +24,12 @@ group :development, :test do gem "byebug", "~> 11.0", platform: :mri gem "dalli", "~> 2.7", ">= 2.7.10" # For testing MemCacheStore gem "decidim-dev", DECIDIM_VERSION - gem "rubocop-performance", "~> 1.6.0" + gem "rubocop-performance", "~> 1.23.1" end group :development do gem "letter_opener_web", "~> 2.0" gem "listen", "~> 3.1" gem "rubocop-faker" - gem "spring", "~> 2.0" - gem "spring-watcher-listen", "~> 2.0" gem "web-console", "~> 4.2" end diff --git a/Gemfile.lock b/Gemfile.lock index 437b644..e1751b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,47 +1,54 @@ PATH remote: . specs: - decidim-term_customizer (0.28.0) - decidim-admin (~> 0.28.0) - decidim-core (~> 0.28.0) + decidim-term_customizer (0.29.0) + decidim-admin (~> 0.29.0) + decidim-core (~> 0.29.0) GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + actioncable (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailbox (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) + net-imap + net-pop + net-smtp + actionmailer (7.0.8.7) + actionpack (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.8.7) + actionview (= 7.0.8.7) + activesupport (= 7.0.8.7) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actiontext (7.0.8.7) + actionpack (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (7.0.8.7) + activesupport (= 7.0.8.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -49,150 +56,145 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + activejob (7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activemodel (7.0.8.7) + activesupport (= 7.0.8.7) + activerecord (7.0.8.7) + activemodel (= 7.0.8.7) + activesupport (= 7.0.8.7) + activestorage (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activesupport (= 7.0.8.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.6) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - acts_as_list (1.1.0) - activerecord (>= 4.2) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + acts_as_list (1.2.4) + activerecord (>= 6.1) + activesupport (>= 6.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) base64 (0.2.0) batch-loader (1.5.0) bcrypt (3.1.20) - better_html (2.0.2) + better_html (2.1.1) actionview (>= 6.0) activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) parser (>= 2.4) smart_properties + bigdecimal (3.1.9) bindex (0.8.1) - bootsnap (1.16.0) + bootsnap (1.18.4) msgpack (~> 1.2) browser (2.7.1) - builder (3.2.4) - bullet (7.1.4) + builder (3.3.0) + bullet (7.1.6) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.5) - activemodel (>= 5.0.0) - activesupport (>= 5.0.0) - addressable (~> 2.6) - image_processing (~> 1.1) - marcel (~> 1.0.0) - mini_mime (>= 0.1.3) - ssrf_filter (~> 1.0) - cells (4.1.7) - declarative-builder (< 0.2.0) + cells (4.1.8) + declarative-builder (~> 0.2.0) declarative-option (< 0.2.0) tilt (>= 1.4, < 3) uber (< 0.2.0) cells-erb (0.1.0) cells (~> 4.0) erbse (>= 0.1.1) - cells-rails (0.1.5) + cells-rails (0.1.6) actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) - charlock_holmes (0.7.7) - commonmarker (0.23.10) - concurrent-ruby (1.2.2) - crack (0.4.5) + charlock_holmes (0.7.9) + childprocess (5.1.0) + logger (~> 1.5) + commonmarker (0.23.11) + concurrent-ruby (1.3.5) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.16.0) + css_parser (1.21.0) addressable + csv (3.3.2) dalli (2.7.11) - date (3.3.4) + dartsass (1.49.8) + date (3.4.1) date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) - decidim (0.28.0) - decidim-accountability (= 0.28.0) - decidim-admin (= 0.28.0) - decidim-api (= 0.28.0) - decidim-assemblies (= 0.28.0) - decidim-blogs (= 0.28.0) - decidim-budgets (= 0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - decidim-debates (= 0.28.0) - decidim-forms (= 0.28.0) - decidim-generators (= 0.28.0) - decidim-meetings (= 0.28.0) - decidim-pages (= 0.28.0) - decidim-participatory_processes (= 0.28.0) - decidim-proposals (= 0.28.0) - decidim-sortitions (= 0.28.0) - decidim-surveys (= 0.28.0) - decidim-system (= 0.28.0) - decidim-templates (= 0.28.0) - decidim-verifications (= 0.28.0) - decidim-accountability (0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - decidim-admin (0.28.0) + decidim (0.29.1) + decidim-accountability (= 0.29.1) + decidim-admin (= 0.29.1) + decidim-api (= 0.29.1) + decidim-assemblies (= 0.29.1) + decidim-blogs (= 0.29.1) + decidim-budgets (= 0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-debates (= 0.29.1) + decidim-forms (= 0.29.1) + decidim-generators (= 0.29.1) + decidim-meetings (= 0.29.1) + decidim-pages (= 0.29.1) + decidim-participatory_processes (= 0.29.1) + decidim-proposals (= 0.29.1) + decidim-sortitions (= 0.29.1) + decidim-surveys (= 0.29.1) + decidim-system (= 0.29.1) + decidim-verifications (= 0.29.1) + decidim-accountability (0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-admin (0.29.1) active_link_to (~> 1.0) - decidim-core (= 0.28.0) + decidim-core (= 0.29.1) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 2.0, >= 2.0.9) - decidim-api (0.28.0) - commonmarker (~> 0.23.0, >= 0.23.9) - graphql (~> 2.0.0) - graphql-docs (~> 3.0.1) + decidim-api (0.29.1) + decidim-core (= 0.29.1) + graphql (~> 2.2.6) + graphql-docs (~> 4.0) rack-cors (~> 1.0) - decidim-assemblies (0.28.0) - decidim-core (= 0.28.0) - decidim-blogs (0.28.0) - decidim-admin (= 0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - decidim-budgets (0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - decidim-comments (0.28.0) - decidim-core (= 0.28.0) + decidim-assemblies (0.29.1) + decidim-core (= 0.29.1) + decidim-blogs (0.29.1) + decidim-admin (= 0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-budgets (0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-comments (0.29.1) + decidim-core (= 0.29.1) redcarpet (~> 3.5, >= 3.5.1) - decidim-core (0.28.0) + decidim-core (0.29.1) active_link_to (~> 1.0) acts_as_list (~> 1.0) batch-loader (~> 1.2) browser (~> 2.7) - carrierwave (~> 2.2.5, >= 2.2.5) cells-erb (~> 0.1.0) cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) date_validator (~> 0.12.0) - decidim-api (= 0.28.0) devise (~> 4.7) devise-i18n (~> 1.2, < 1.11.1) diffy (~> 3.3) @@ -203,13 +205,14 @@ GEM foundation_rails_helper (~> 4.0) geocoder (~> 1.8) hashdiff (>= 0.4.0, < 2.0.0) + image_processing (~> 1.2) invisible_captcha (~> 0.12) kaminari (~> 1.2, >= 1.2.1) loofah (~> 2.19, >= 2.19.1) mime-types (>= 1.16, < 4.0) mini_magick (~> 4.9) - mustache (~> 1.1.0) net-smtp (~> 0.3.1) + nokogiri (~> 1.16, >= 1.16.2) omniauth (~> 2.0) omniauth-facebook (~> 5.0) omniauth-google-oauth2 (~> 1.0) @@ -220,33 +223,32 @@ GEM pg_search (~> 2.2) premailer-rails (~> 1.10) psych (~> 4.0) - rack (~> 2.2, >= 2.2.6.4) + rack (~> 2.2, >= 2.2.8.1) rack-attack (~> 6.0) - rails (~> 6.1.7, >= 6.1.7.4) - rails-i18n (~> 6.0) + rails (~> 7.0.8) + rails-i18n (~> 7.0) ransack (~> 3.2.1) redis (~> 4.1) request_store (~> 1.5.0) rubyXL (~> 3.4) rubyzip (~> 2.0) - seven_zip_ruby (~> 1.3) shakapacker (~> 7.1.0) valid_email2 (~> 4.0) web-push (~> 3.0) wisper (~> 2.0) - decidim-debates (0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - decidim-dev (0.28.0) - bullet (~> 7.0) + decidim-debates (0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-dev (0.29.1) + bullet (~> 7.1.6) byebug (~> 11.0) capybara (~> 3.39) - decidim (= 0.28.0) + decidim (= 0.29.1) erb_lint (~> 0.4.0) factory_bot_rails (~> 6.2) faker (~> 3.2) i18n-tasks (~> 1.0) - nokogiri (~> 1.14, >= 1.14.3) + nokogiri (~> 1.16, >= 1.16.2) parallel_tests (~> 4.2) puma (~> 6.2, >= 6.3.1) rails-controller-testing (~> 1.0) @@ -256,59 +258,62 @@ GEM rspec-rails (~> 6.0) rspec-retry (~> 0.6.2) rspec_junit_formatter (~> 0.6.0) - rubocop (~> 1.50.0) + rubocop (~> 1.65.0) + rubocop-capybara (~> 2.21) + rubocop-factory_bot (~> 2.26) rubocop-faker (~> 1.1) - rubocop-rails (~> 2.19) - rubocop-rspec (~> 2.20) + rubocop-performance (~> 1.21) + rubocop-rails (~> 2.25) + rubocop-rspec (~> 3.0) + rubocop-rspec_rails (~> 2.30) + rubocop-rubycw (~> 0.1) selenium-webdriver (~> 4.9) simplecov (~> 0.22.0) simplecov-cobertura (~> 2.1.0) + spring (~> 4.0) + spring-watcher-listen (~> 2.0) w3c_rspec_validators (~> 0.3.0) webmock (~> 3.18) wisper-rspec (~> 1.0) - decidim-forms (0.28.0) - decidim-core (= 0.28.0) + decidim-forms (0.29.1) + decidim-core (= 0.29.1) wicked_pdf (~> 2.1) - wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.28.0) - decidim-core (= 0.28.0) - decidim-meetings (0.28.0) - decidim-core (= 0.28.0) - decidim-forms (= 0.28.0) + wkhtmltopdf-binary (= 0.12.6.6) + decidim-generators (0.29.1) + decidim-core (= 0.29.1) + decidim-meetings (0.29.1) + decidim-core (= 0.29.1) + decidim-forms (= 0.29.1) icalendar (~> 2.5) - decidim-pages (0.28.0) - decidim-core (= 0.28.0) - decidim-participatory_processes (0.28.0) - decidim-core (= 0.28.0) - decidim-proposals (0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - doc2text (~> 0.4.6) + decidim-pages (0.29.1) + decidim-core (= 0.29.1) + decidim-participatory_processes (0.29.1) + decidim-core (= 0.29.1) + decidim-proposals (0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + doc2text (~> 0.4.7) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.28.0) - decidim-admin (= 0.28.0) - decidim-comments (= 0.28.0) - decidim-core (= 0.28.0) - decidim-proposals (= 0.28.0) - decidim-surveys (0.28.0) - decidim-core (= 0.28.0) - decidim-forms (= 0.28.0) - decidim-templates (= 0.28.0) - decidim-system (0.28.0) + decidim-sortitions (0.29.1) + decidim-admin (= 0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-proposals (= 0.29.1) + decidim-surveys (0.29.1) + decidim-core (= 0.29.1) + decidim-forms (= 0.29.1) + decidim-system (0.29.1) active_link_to (~> 1.0) - decidim-core (= 0.28.0) + decidim-core (= 0.29.1) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 2.0, >= 2.0.9) - decidim-templates (0.28.0) - decidim-core (= 0.28.0) - decidim-forms (= 0.28.0) - decidim-verifications (0.28.0) - decidim-core (= 0.28.0) - declarative-builder (0.1.0) - declarative-option (< 0.2.0) + decidim-verifications (0.29.1) + decidim-core (= 0.29.1) + declarative-builder (0.2.0) + trailblazer-option (~> 0.1.0) declarative-option (0.1.0) - devise (4.9.3) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -319,13 +324,13 @@ GEM devise_invitable (2.0.9) actionmailer (>= 5.0) devise (>= 4.6) - diff-lcs (1.5.0) - diffy (3.4.2) - doc2text (0.4.6) - nokogiri (>= 1.13.2, < 1.15.0) + diff-lcs (1.5.1) + diffy (3.4.3) + doc2text (0.4.7) + nokogiri (>= 1.13.2, < 1.17.0) rubyzip (~> 2.3.0) - docile (1.4.0) - doorkeeper (5.6.8) + docile (1.4.1) + doorkeeper (5.8.1) railties (>= 5) doorkeeper-i18n (4.0.1) erb_lint (0.4.0) @@ -337,30 +342,40 @@ GEM smart_properties erbse (0.1.4) temple - erubi (1.12.0) - escape_utils (1.2.2) - excon (0.108.0) + erubi (1.13.1) + escape_utils (1.3.0) + excon (1.2.3) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) - factory_bot (6.4.5) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faker (3.2.2) + faker (3.5.1) i18n (>= 1.8.11, < 2) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - ffi (1.16.3) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86-linux-gnu) + ffi (1.17.1-x86-linux-musl) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-core (2.3.0) + fog-core (2.6.0) builder - excon (~> 0.71) + excon (~> 1.0) formatador (>= 0.2, < 2.0) mime-types fog-local (0.8.0) @@ -372,31 +387,34 @@ GEM activesupport (>= 4.1, < 7.1) railties (>= 4.1, < 7.1) gemoji (3.0.1) - geocoder (1.8.2) + geocoder (1.8.5) + base64 (>= 0.1.0) + csv (>= 3.0.0) globalid (1.2.1) activesupport (>= 6.1) - graphql (2.0.27) - graphql-docs (3.0.1) - commonmarker (~> 0.16) - escape_utils (~> 1.2.2) + graphql (2.2.16) + base64 + graphql-docs (4.0.0) + commonmarker (~> 0.23, >= 0.23.6) + dartsass (~> 1.49) + escape_utils (~> 1.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) graphql (~> 2.0) - html-pipeline (~> 2.9) - sass (~> 3.4) - hashdiff (1.1.0) + html-pipeline (~> 2.14, >= 2.14.3) + hashdiff (1.1.2) hashie (5.0.0) - highline (2.1.0) + highline (3.1.2) + reline html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.7) 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 @@ -404,16 +422,19 @@ 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) - image_processing (1.12.2) + ostruct + ice_cube (0.17.0) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) - json (2.7.1) - jwt (2.7.1) + io-console (0.8.0) + json (2.9.1) + jwt (2.10.1) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -426,19 +447,22 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - launchy (2.5.2) + language_server-protocol (3.17.0.3) + launchy (3.0.1) addressable (~> 2.8) - letter_opener (1.8.1) - launchy (>= 2.2, < 3) + childprocess (~> 5.0) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) letter_opener_web (2.0.0) actionmailer (>= 5.2) letter_opener (~> 1.7) railties (>= 5.2) rexml - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.22.0) + logger (1.6.5) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -446,29 +470,42 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) - mime-types (3.5.2) + method_source (1.1.0) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2023.1205) - mini_magick (4.12.0) + mime-types-data (3.2025.0107) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.20.0) - msgpack (1.7.2) - multi_xml (0.6.0) - mustache (1.1.1) - net-imap (0.4.9) + minitest (5.25.4) + msgpack (1.7.5) + multi_xml (0.7.1) + bigdecimal (~> 3.1) + net-http (0.6.0) + uri + net-imap (0.5.5) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.3.4) net-protocol - nio4r (2.7.0) - nokogiri (1.14.5-x86_64-linux) + nio4r (2.7.4) + nokogiri (1.16.8-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.8-arm-linux) + racc (~> 1.4) + nokogiri (1.16.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.8-x86-linux) + racc (~> 1.4) + nokogiri (1.16.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.8-x86_64-linux) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -489,41 +526,43 @@ GEM rack-protection omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (1.1.1) - jwt (>= 2.0) - oauth2 (~> 2.0.6) + omniauth-google-oauth2 (1.2.1) + jwt (>= 2.9.2) + oauth2 (~> 2.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8.0) - omniauth-oauth (1.2.0) + omniauth-oauth2 (~> 1.8) + omniauth-oauth (1.2.1) oauth omniauth (>= 1.0, < 3) + rack (>= 1.6.2, < 4) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) - omniauth-rails_csrf_protection (1.0.1) + omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.2.0) + openssl (3.3.0) orm_adapter (0.5.0) + ostruct (0.6.1) paper_trail (12.3.0) activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.24.0) - parallel_tests (4.4.0) + parallel (1.26.3) + parallel_tests (4.9.0) parallel - parser (3.3.0.2) + parser (3.3.7.0) ast (~> 2.4.1) racc pg (1.4.6) - pg_search (2.3.6) - activerecord (>= 5.2) - activesupport (>= 5.2) - premailer (1.22.0) + pg_search (2.3.7) + activerecord (>= 6.1) + activesupport (>= 6.1) + premailer (1.27.0) addressable - css_parser (>= 1.12.0) + css_parser (>= 1.19.0) htmlentities (>= 4.0.0) premailer-rails (1.12.0) actionmailer (>= 3) @@ -531,11 +570,11 @@ GEM premailer (~> 1.7, >= 1.7.9) psych (4.0.6) stringio - public_suffix (5.0.4) - puma (6.4.1) + public_suffix (6.0.1) + puma (6.5.0) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.1) + rack (2.2.10) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (1.1.1) @@ -545,23 +584,22 @@ GEM rack (~> 2.2, >= 2.2.4) rack-proxy (0.7.7) rack - rack-test (2.1.0) + rack-test (2.2.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails (7.0.8.7) + actioncable (= 7.0.8.7) + actionmailbox (= 7.0.8.7) + actionmailer (= 7.0.8.7) + actionpack (= 7.0.8.7) + actiontext (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activemodel (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) bundler (>= 1.15.0) - railties (= 6.1.7.6) - sprockets-rails (>= 2.0.0) + railties (= 7.0.8.7) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -570,116 +608,120 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) - rails-i18n (6.0.0) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + rails-i18n (7.0.10) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (>= 6.0.0, < 8) + railties (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) ransack (3.2.1) activerecord (>= 6.1.5) activesupport (>= 6.1.5) i18n rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.0) redis (4.8.1) - regexp_parser (2.9.0) + regexp_parser (2.10.0) + reline (0.6.0) + io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-cells (0.3.9) + rexml (3.4.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-cells (0.3.10) cells (>= 4.0.0, < 6.0.0) - rspec-rails (>= 3.0.0, < 6.2.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-rails (>= 3.0.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.1.0) + rspec-support (~> 3.13.0) + rspec-rails (6.1.5) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.1) + rspec-support (3.13.2) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.50.2) + rubocop (1.65.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + 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.28.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.20.0) + rubocop-ast (1.37.0) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-faker (1.1.0) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-faker (1.2.0) faker (>= 2.12.0) - rubocop (>= 0.82.0) - rubocop-performance (1.6.1) - rubocop (>= 0.71.0) - rubocop-rails (2.23.1) + rubocop (>= 1.13.0) + rubocop-performance (1.23.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.29.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rspec (2.25.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) + rubocop (>= 1.52.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (3.4.0) + rubocop (~> 1.61) + rubocop-rspec_rails (2.30.0) + rubocop (~> 1.61) + rubocop-rspec (~> 3, >= 3.0.1) + rubocop-rubycw (0.1.6) + rubocop (~> 1.0) ruby-progressbar (1.13.0) - ruby-vips (2.2.0) + ruby-vips (2.2.2) ffi (~> 1.12) - ruby2_keywords (0.0.5) - rubyXL (3.4.25) + logger + rubyXL (3.4.33) nokogiri (>= 1.10.8) rubyzip (>= 1.3.0) rubyzip (2.3.2) - 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) - selenium-webdriver (4.16.0) + selenium-webdriver (4.28.0) + base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.0.0) - seven_zip_ruby (1.3.0) + semantic_range (3.1.0) shakapacker (7.1.0) activesupport (>= 5.2) rack-proxy (>= 0.6.1) @@ -692,40 +734,34 @@ GEM simplecov-cobertura (2.1.0) rexml simplecov (~> 0.19) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) smart_properties (1.17.0) snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - spring (2.1.1) - spring-watcher-listen (2.0.1) + spring (4.2.1) + spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) - spring (>= 1.2, < 3.0) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - ssrf_filter (1.1.2) - stringio (3.1.0) + spring (>= 4) + stringio (3.1.2) temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) - tilt (2.3.0) - timeout (0.4.1) + thor (1.3.2) + tilt (2.6.0) + timeout (0.4.3) + trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) uniform_notifier (1.16.0) + uri (1.0.2) valid_email2 (4.0.6) activemodel (>= 3.2) mail (~> 2.5) - version_gem (1.1.3) + version_gem (1.1.4) w3c_rspec_validators (0.3.0) rails rspec @@ -736,7 +772,7 @@ GEM rexml (~> 3.2) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.0) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) @@ -744,45 +780,57 @@ GEM web-push (3.0.1) jwt (~> 2.0) openssl (~> 3.0) - webmock (3.19.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket (1.2.10) - websocket-driver (0.7.6) + websocket (1.2.11) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked_pdf (2.7.0) + wicked_pdf (2.8.2) activesupport + ostruct wisper (2.0.1) wisper-rspec (1.1.0) wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.12) + zeitwerk (2.7.1) PLATFORMS - x86_64-linux + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86-linux + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES bootsnap (~> 1.4) byebug (~> 11.0) dalli (~> 2.7, >= 2.7.10) - decidim (~> 0.28.0) - decidim-dev (~> 0.28.0) + decidim (~> 0.29.0) + decidim-dev (~> 0.29.0) decidim-term_customizer! faker (~> 3.2) letter_opener_web (~> 2.0) listen (~> 3.1) puma (>= 5.6.2) rubocop-faker - rubocop-performance (~> 1.6.0) - spring (~> 2.0) - spring-watcher-listen (~> 2.0) + rubocop-performance web-console (~> 4.2) RUBY VERSION - ruby 3.1.1p18 + ruby 3.2.2p53 BUNDLED WITH - 2.4.6 + 2.5.4 diff --git a/lib/decidim/term_customizer/version.rb b/lib/decidim/term_customizer/version.rb index 0e21659..63aa626 100644 --- a/lib/decidim/term_customizer/version.rb +++ b/lib/decidim/term_customizer/version.rb @@ -2,7 +2,7 @@ module Decidim module TermCustomizer - VERSION = "0.28.0" - DECIDIM_VERSION = "~> 0.28.0" + VERSION = "0.29.0" + DECIDIM_VERSION = "~> 0.29.0" end end From 10ebe940c4b1cd76a1660f7c2d40c63338d35d7f Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Thu, 23 Jan 2025 15:29:29 +0100 Subject: [PATCH 2/3] Rubocopify --- Gemfile | 3 +++ Gemfile.lock | 4 +++- .../term_customizer/admin/translation_key_import_form.rb | 2 +- .../admin/translation_set_constraint_form.rb | 2 +- .../decidim/term_customizer/admin/translation_set_form.rb | 2 +- .../term_customizer/admin/translation_set_subject_form.rb | 2 +- .../decidim/term_customizer/admin/permissions.rb | 6 +++--- decidim-term_customizer.gemspec | 6 +----- .../decidim/term_customizer/translation_parser_spec.rb | 8 ++++---- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 968e1cc..b1e402c 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,9 @@ group :development, :test do gem "byebug", "~> 11.0", platform: :mri gem "dalli", "~> 2.7", ">= 2.7.10" # For testing MemCacheStore gem "decidim-dev", DECIDIM_VERSION + gem "decidim-participatory_processes", DECIDIM_VERSION + gem "decidim-proposals", DECIDIM_VERSION + gem "rubocop-performance", "~> 1.23.1" end diff --git a/Gemfile.lock b/Gemfile.lock index e1751b8..10e8c88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -820,13 +820,15 @@ DEPENDENCIES dalli (~> 2.7, >= 2.7.10) decidim (~> 0.29.0) decidim-dev (~> 0.29.0) + decidim-participatory_processes (~> 0.29.0) + decidim-proposals (~> 0.29.0) decidim-term_customizer! faker (~> 3.2) letter_opener_web (~> 2.0) listen (~> 3.1) puma (>= 5.6.2) rubocop-faker - rubocop-performance + rubocop-performance (~> 1.23.1) web-console (~> 4.2) RUBY VERSION diff --git a/app/forms/decidim/term_customizer/admin/translation_key_import_form.rb b/app/forms/decidim/term_customizer/admin/translation_key_import_form.rb index f2f9bb6..2685d6d 100644 --- a/app/forms/decidim/term_customizer/admin/translation_key_import_form.rb +++ b/app/forms/decidim/term_customizer/admin/translation_key_import_form.rb @@ -8,7 +8,7 @@ class TranslationKeyImportForm < Decidim::Form delegate :translation_set, to: :context, prefix: false, allow_nil: true - attribute :keys, Array[String] + attribute :keys, [String] end end end diff --git a/app/forms/decidim/term_customizer/admin/translation_set_constraint_form.rb b/app/forms/decidim/term_customizer/admin/translation_set_constraint_form.rb index 95e3733..2cd3106 100644 --- a/app/forms/decidim/term_customizer/admin/translation_set_constraint_form.rb +++ b/app/forms/decidim/term_customizer/admin/translation_set_constraint_form.rb @@ -7,7 +7,7 @@ class TranslationSetConstraintForm < Decidim::Form mimic :constraint attribute :subject_manifest, String - attribute :subject_model, Array[TermCustomizer::Admin::TranslationSetSubjectForm] + attribute :subject_model, [TermCustomizer::Admin::TranslationSetSubjectForm] attribute :deleted, Boolean, default: false def to_param diff --git a/app/forms/decidim/term_customizer/admin/translation_set_form.rb b/app/forms/decidim/term_customizer/admin/translation_set_form.rb index 14aad33..8d729c5 100644 --- a/app/forms/decidim/term_customizer/admin/translation_set_form.rb +++ b/app/forms/decidim/term_customizer/admin/translation_set_form.rb @@ -9,7 +9,7 @@ class TranslationSetForm < Decidim::Form mimic :translation_set translatable_attribute :name, String - attribute :constraints, Array[TermCustomizer::Admin::TranslationSetConstraintForm] + attribute :constraints, [TermCustomizer::Admin::TranslationSetConstraintForm] validates :name, translatable_presence: true end diff --git a/app/forms/decidim/term_customizer/admin/translation_set_subject_form.rb b/app/forms/decidim/term_customizer/admin/translation_set_subject_form.rb index 49b97bc..f85f216 100644 --- a/app/forms/decidim/term_customizer/admin/translation_set_subject_form.rb +++ b/app/forms/decidim/term_customizer/admin/translation_set_subject_form.rb @@ -6,7 +6,7 @@ module Admin class TranslationSetSubjectForm < Decidim::Form attribute :subject_manifest, String attribute :subject_id, Integer - attribute :component_model, Array[TermCustomizer::Admin::TranslationSetSubjectComponentForm] + attribute :component_model, [TermCustomizer::Admin::TranslationSetSubjectComponentForm] def map_model(model) component = model if model.is_a?(Decidim::Component) diff --git a/app/permissions/decidim/term_customizer/admin/permissions.rb b/app/permissions/decidim/term_customizer/admin/permissions.rb index d795294..46dbedb 100644 --- a/app/permissions/decidim/term_customizer/admin/permissions.rb +++ b/app/permissions/decidim/term_customizer/admin/permissions.rb @@ -36,7 +36,7 @@ def translation end def allowed_translation_set_action? - return unless permission_action.subject == :translation_set + return false unless permission_action.subject == :translation_set case permission_action.action when :create, :read @@ -47,7 +47,7 @@ def allowed_translation_set_action? end def allowed_translation_action? - return unless permission_action.subject == :translation + return false unless permission_action.subject == :translation case permission_action.action when :create, :read @@ -58,7 +58,7 @@ def allowed_translation_action? end def allowed_translation_bulk_action? - return unless permission_action.subject == :translations + return false unless permission_action.subject == :translations case permission_action.action when :destroy diff --git a/decidim-term_customizer.gemspec b/decidim-term_customizer.gemspec index c6d68e3..de66076 100644 --- a/decidim-term_customizer.gemspec +++ b/decidim-term_customizer.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.description = "Adds a UI to customize the terms and limit the customizations to specific places." spec.homepage = "https://github.com/mainio/decidim-module-term_customizer" spec.license = "AGPL-3.0" - spec.required_ruby_version = ">= 3.1" + spec.required_ruby_version = ">= 3.2" spec.files = Dir[ "{app,config,db,lib}/**/*", @@ -28,9 +28,5 @@ Gem::Specification.new do |spec| spec.add_dependency "decidim-admin", Decidim::TermCustomizer::DECIDIM_VERSION spec.add_dependency "decidim-core", Decidim::TermCustomizer::DECIDIM_VERSION - spec.add_development_dependency "dalli", "~> 2.7", ">= 2.7.10" # For testing MemCacheStore - spec.add_development_dependency "decidim-dev", Decidim::TermCustomizer::DECIDIM_VERSION - spec.add_development_dependency "decidim-participatory_processes", Decidim::TermCustomizer::DECIDIM_VERSION - spec.add_development_dependency "decidim-proposals", Decidim::TermCustomizer::DECIDIM_VERSION spec.metadata["rubygems_mfa_required"] = "true" end diff --git a/spec/lib/decidim/term_customizer/translation_parser_spec.rb b/spec/lib/decidim/term_customizer/translation_parser_spec.rb index cbe7f36..060713f 100644 --- a/spec/lib/decidim/term_customizer/translation_parser_spec.rb +++ b/spec/lib/decidim/term_customizer/translation_parser_spec.rb @@ -7,11 +7,11 @@ let(:data) do { - id: 123, + :id => 123, "id" => 456, - locale: "en", - key: "translation.key", - value: "Term" + :locale => "en", + :key => "translation.key", + :value => "Term" } end From e369bc933f06fd1e47d6987fa6e408f0a2549e73 Mon Sep 17 00:00:00 2001 From: Laura Jaime Date: Thu, 23 Jan 2025 15:44:02 +0100 Subject: [PATCH 3/3] Add concurrent-ruby gem to fix logger error --- Gemfile | 3 +++ Gemfile.lock | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b1e402c..e3f7a8d 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,9 @@ gem "puma", ">= 5.6.2" gem "faker", "~> 3.2" +# concurrent-ruby v1.3.5 has removed the dependency on logger +gem "concurrent-ruby", "1.3.4" + group :development, :test do gem "byebug", "~> 11.0", platform: :mri gem "dalli", "~> 2.7", ">= 2.7.10" # For testing MemCacheStore diff --git a/Gemfile.lock b/Gemfile.lock index 10e8c88..23f4dda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,7 @@ GEM childprocess (5.1.0) logger (~> 1.5) commonmarker (0.23.11) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.4) crack (1.0.0) bigdecimal rexml @@ -817,6 +817,7 @@ PLATFORMS DEPENDENCIES bootsnap (~> 1.4) byebug (~> 11.0) + concurrent-ruby (= 1.3.4) dalli (~> 2.7, >= 2.7.10) decidim (~> 0.29.0) decidim-dev (~> 0.29.0)