From 5ca830ca7b8dfe2c56db742e80efe57f37b1e164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Mon, 28 Oct 2024 16:27:46 +0100 Subject: [PATCH] update Decidim with fix on cache_classes --- Gemfile | 2 +- Gemfile.lock | 385 ++++++++++++++++++++++++++------------------------- Rakefile | 10 -- 3 files changed, 197 insertions(+), 200 deletions(-) diff --git a/Gemfile b/Gemfile index c933b73..adf3bac 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ require_relative "#{base_path}lib/decidim/term_customizer/version" # DECIDIM_VERSION = Decidim::TermCustomizer::DECIDIM_VERSION DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.29-stable" }.freeze -gem "decidim", DECIDIM_VERSION +gem "decidim", git: "https://github.com/platoniq/decidim", branch: "fix/generator_set_cache_classes_with_env" gem "decidim-term_customizer", path: "." gem "bootsnap", "~> 1.4" diff --git a/Gemfile.lock b/Gemfile.lock index e273bb2..00de685 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,105 +3,6 @@ GIT revision: 406fc0341a04344d5cc98ea98920487276b96b39 branch: release/0.29-stable specs: - 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.29.1) - devise (~> 4.7) - devise-i18n (~> 1.2) - devise_invitable (~> 2.0, >= 2.0.9) - 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.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.29.1) - active_link_to (~> 1.0) - acts_as_list (~> 1.0) - batch-loader (~> 1.2) - browser (~> 2.7) - cells-erb (~> 0.1.0) - cells-rails (~> 0.1.3) - charlock_holmes (~> 0.7) - date_validator (~> 0.12.0) - devise (~> 4.7) - devise-i18n (~> 1.2, < 1.11.1) - diffy (~> 3.3) - doorkeeper (~> 5.6, >= 5.6.6) - doorkeeper-i18n (~> 4.0) - file_validators (~> 3.0) - fog-local (~> 0.6) - 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) - net-smtp (~> 0.3.1) - nokogiri (~> 1.16, >= 1.16.2) - omniauth (~> 2.0) - omniauth-facebook (~> 5.0) - omniauth-google-oauth2 (~> 1.0) - omniauth-rails_csrf_protection (~> 1.0) - omniauth-twitter (~> 1.4) - paper_trail (~> 12.0) - pg (~> 1.4.0, < 2) - pg_search (~> 2.2) - premailer-rails (~> 1.10) - psych (~> 4.0) - rack (~> 2.2, >= 2.2.8.1) - rack-attack (~> 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) - shakapacker (~> 7.1.0) - valid_email2 (~> 4.0) - web-push (~> 3.0) - wisper (~> 2.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) @@ -138,18 +39,6 @@ GIT w3c_rspec_validators (~> 0.3.0) webmock (~> 3.18) wisper-rspec (~> 1.0) - decidim-forms (0.29.1) - decidim-core (= 0.29.1) - wicked_pdf (~> 2.1) - 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.29.1) - decidim-core (= 0.29.1) decidim-participatory_processes (0.29.1) decidim-core (= 0.29.1) decidim-proposals (0.29.1) @@ -157,22 +46,32 @@ GIT decidim-core (= 0.29.1) doc2text (~> 0.4.7) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.29.1) + +GIT + remote: https://github.com/platoniq/decidim + revision: b13a6d72c44f20bf13df89de248554d0b9794443 + branch: fix/generator_set_cache_classes_with_env + specs: + 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-proposals (= 0.29.1) - decidim-surveys (0.29.1) - decidim-core (= 0.29.1) + decidim-debates (= 0.29.1) decidim-forms (= 0.29.1) - decidim-system (0.29.1) - active_link_to (~> 1.0) - decidim-core (= 0.29.1) - devise (~> 4.7) - devise-i18n (~> 1.2) - devise_invitable (~> 2.0, >= 2.0.9) - decidim-verifications (0.29.1) - decidim-core (= 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) PATH remote: . @@ -184,47 +83,47 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailbox (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailer (7.0.8.6) + actionpack (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionpack (7.0.8.6) + actionview (= 7.0.8.6) + activesupport (= 7.0.8.6) 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 (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + actiontext (7.0.8.6) + actionpack (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.0.8.6) + activesupport (= 7.0.8.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -232,27 +131,27 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + activejob (7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.0.8.6) + activesupport (= 7.0.8.6) + activerecord (7.0.8.6) + activemodel (= 7.0.8.6) + activesupport (= 7.0.8.6) + activestorage (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activesupport (= 7.0.8.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.4) + activesupport (7.0.8.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - acts_as_list (1.2.2) + acts_as_list (1.2.3) activerecord (>= 6.1) activesupport (>= 6.1) addressable (2.8.7) @@ -307,7 +206,7 @@ GEM bigdecimal rexml crass (1.0.6) - css_parser (1.19.0) + css_parser (1.19.1) addressable csv (3.3.0) dalli (2.7.11) @@ -316,6 +215,113 @@ GEM date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) + 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.29.1) + devise (~> 4.7) + devise-i18n (~> 1.2) + devise_invitable (~> 2.0, >= 2.0.9) + 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.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.29.1) + active_link_to (~> 1.0) + acts_as_list (~> 1.0) + batch-loader (~> 1.2) + browser (~> 2.7) + cells-erb (~> 0.1.0) + cells-rails (~> 0.1.3) + charlock_holmes (~> 0.7) + date_validator (~> 0.12.0) + devise (~> 4.7) + devise-i18n (~> 1.2, < 1.11.1) + diffy (~> 3.3) + doorkeeper (~> 5.6, >= 5.6.6) + doorkeeper-i18n (~> 4.0) + file_validators (~> 3.0) + fog-local (~> 0.6) + 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) + net-smtp (~> 0.3.1) + nokogiri (~> 1.16, >= 1.16.2) + omniauth (~> 2.0) + omniauth-facebook (~> 5.0) + omniauth-google-oauth2 (~> 1.0) + omniauth-rails_csrf_protection (~> 1.0) + omniauth-twitter (~> 1.4) + paper_trail (~> 12.0) + pg (~> 1.4.0, < 2) + pg_search (~> 2.2) + premailer-rails (~> 1.10) + psych (~> 4.0) + rack (~> 2.2, >= 2.2.8.1) + rack-attack (~> 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) + shakapacker (~> 7.1.0) + valid_email2 (~> 4.0) + web-push (~> 3.0) + wisper (~> 2.0) + decidim-debates (0.29.1) + decidim-comments (= 0.29.1) + decidim-core (= 0.29.1) + decidim-forms (0.29.1) + decidim-core (= 0.29.1) + wicked_pdf (~> 2.1) + 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.29.1) + decidim-core (= 0.29.1) + 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.29.1) + devise (~> 4.7) + devise-i18n (~> 1.2) + devise_invitable (~> 2.0, >= 2.0.9) + decidim-verifications (0.29.1) + decidim-core (= 0.29.1) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -331,7 +337,7 @@ GEM actionmailer (>= 5.0) devise (>= 4.6) diff-lcs (1.5.1) - diffy (3.4.2) + diffy (3.4.3) doc2text (0.4.7) nokogiri (>= 1.13.2, < 1.17.0) rubyzip (~> 2.3.0) @@ -350,7 +356,7 @@ GEM temple erubi (1.13.0) escape_utils (1.3.0) - excon (0.112.0) + excon (1.0.0) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) factory_bot (6.5.0) @@ -371,9 +377,9 @@ GEM file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-core (2.5.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) @@ -430,7 +436,7 @@ GEM invisible_captcha (0.13.0) rails (>= 3.2.0) io-console (0.7.2) - json (2.7.2) + json (2.7.4) jwt (2.9.3) base64 kaminari (1.2.2) @@ -460,7 +466,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.1) - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -483,7 +489,7 @@ GEM bigdecimal (~> 3.1) net-http (0.4.1) uri - net-imap (0.4.16) + net-imap (0.5.0) date net-protocol net-pop (0.1.2) @@ -564,7 +570,7 @@ GEM puma (6.4.3) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-cors (1.1.1) @@ -576,20 +582,20 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails (7.0.8.6) + actioncable (= 7.0.8.6) + actionmailbox (= 7.0.8.6) + actionmailer (= 7.0.8.6) + actionpack (= 7.0.8.6) + actiontext (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activemodel (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.0.8.6) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -604,9 +610,9 @@ GEM rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + railties (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -730,7 +736,7 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - spring (4.2.1) + spring (4.1.0) spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) spring (>= 4) @@ -777,14 +783,15 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked_pdf (2.8.1) + 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.18) + zeitwerk (2.7.1) PLATFORMS arm64-darwin-23 diff --git a/Rakefile b/Rakefile index b8b28f2..d56211c 100644 --- a/Rakefile +++ b/Rakefile @@ -10,15 +10,6 @@ def install_module(path) end end -def install_initializer(path, _env) - Dir.chdir(path) do - FileUtils.cp( - "#{__dir__}/lib/generators/decidim/app_templates/#{env}/initializer.rb", - "config/initializers/decidim_term_customizer_config.rb" - ) - end -end - def seed_db(path) Dir.chdir(path) do system("bundle exec rake db:seed") @@ -28,7 +19,6 @@ end desc "Generates a dummy app for testing" task test_app: "decidim:generate_external_test_app" do ENV["RAILS_ENV"] = "test" - install_initializer("spec/decidim_dummy_app", "test") install_module("spec/decidim_dummy_app") end