decidim-generators 0.28.6 → 0.29.0.rc1

data/decidim-generators.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Generators.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
-  s.license = "AGPL-3.0-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-generators"
 

data/exe/decidim

@@ -31,8 +31,8 @@ Options:
   [name]                   creates an application based on Decidim
 
 App generation extra options (ignored if the --component flag is on):
-  --storage [provider]     Setup the Gemfile with the appropiate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure
-  --queue [provider]       Setup the Gemfile with the appropiate gem to handle a job queue backend. Only 'sidekiq' is supported as option for now.
+  --storage [provider]     Setup the Gemfile with the appropriate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure
+  --queue [provider]       Setup the Gemfile with the appropriate gem to handle a job queue backend. Only 'sidekiq' is supported as option for now.
   --force_ssl [true|false] Enables or disables mandatory redirection to HTTPS (defaults to enabled)
   --locales [locales]      Force the available locales to the ones specified. Separate with comas
                            Warning: this option disables the ENV var DECIDIM_AVAILABLE_LOCALES used to setup this configuration by default.

data/lib/decidim/generators/app_generator.rb

@@ -79,11 +79,11 @@ module Decidim
 
       class_option :storage, type: :string,
                              default: "local",
-                             desc: "Setup the Gemfile with the appropiate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure"
+                             desc: "Setup the Gemfile with the appropriate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure"
 
       class_option :queue, type: :string,
                            default: "",
-                           desc: "Setup the Gemfile with the appropiate gem to handle a queue adapter provider. Supported options are: (empty, does nothing) and sidekiq"
+                           desc: "Setup the Gemfile with the appropriate gem to handle a queue adapter provider. Supported options are: (empty, does nothing) and sidekiq"
 
       class_option :skip_webpack_install, type: :boolean,
                                           default: true,
@@ -98,6 +98,28 @@ module Decidim
         []
       end
 
+      def remove_old_assets
+        remove_file "config/initializers/assets.rb"
+        remove_dir("app/assets")
+        remove_dir("app/javascript")
+      end
+
+      def remove_sprockets_requirement
+        gsub_file "config/application.rb", %r{require ['"]rails/all['"]\R}, <<~RUBY
+          require "decidim/rails"
+
+          # Add the frameworks used by your app that are not loaded by Decidim.
+          # require "action_mailbox/engine"
+          # require "action_text/engine"
+          require "action_cable/engine"
+          require "rails/test_unit/railtie"
+        RUBY
+
+        gsub_file "config/environments/development.rb", /config\.assets.*$/, ""
+        gsub_file "config/environments/test.rb", /config\.assets.*$/, ""
+        gsub_file "config/environments/production.rb", /config\.assets.*$/, ""
+      end
+
       def database_yml
         template "database.yml.erb", "config/database.yml", force: true
       end
@@ -159,7 +181,7 @@ module Decidim
 
         gsub_file "Gemfile", /gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}"
 
-        %w(conferences design elections initiatives templates).each do |component|
+        %w(conferences design initiatives templates).each do |component|
           if options[:demo]
             gsub_file "Gemfile", /gem "decidim-#{component}".*/, "gem \"decidim-#{component}\", #{gem_modifier}"
           else
@@ -223,10 +245,10 @@ module Decidim
         end
       end
 
-      def tweak_spring
-        return unless File.exist?("config/spring.rb")
-
-        prepend_to_file "config/spring.rb", "require \"decidim/spring\"\n\n"
+      def load_defaults_rails61
+        gsub_file "config/application.rb",
+                  /config.load_defaults 7.0/,
+                  "config.load_defaults 6.1"
       end
 
       def tweak_csp_initializer
@@ -299,7 +321,7 @@ module Decidim
                   "config.log_level = %w(debug info warn error fatal).include?(ENV['RAILS_LOG_LEVEL']) ? ENV['RAILS_LOG_LEVEL'] : :info"
 
         gsub_file "config/environments/production.rb",
-                  %r{# config.asset_host = 'http://assets.example.com'},
+                  %r{# config.asset_host = "http://assets.example.com"},
                   "config.asset_host = ENV['RAILS_ASSET_HOST'] if ENV['RAILS_ASSET_HOST'].present?"
 
         if options[:force_ssl] == "false"
@@ -335,6 +357,11 @@ module Decidim
             end
           end
         CONFIG
+
+        if ENV.fetch("RAILS_BOOST_PERFORMANCE", false).to_s == "true"
+          gsub_file "Gemfile", /gem "spring".*/, "# gem \"spring\""
+          gsub_file "Gemfile", /gem "spring-watcher-listen".*/, "# gem \"spring-watcher-listen\""
+        end
       end
 
       def authorization_handler

data/lib/decidim/generators/app_templates/.ruby-version

@@ -1 +1 @@
-3.1.1
+3.2.2

data/lib/decidim/generators/app_templates/README.md.erb

@@ -9,7 +9,7 @@ This is the open-source repository for <%= app_name %>, based on [Decidim](https
 You will need to do some steps before having the app working properly once you have deployed it:
 
 1. Create a System Admin user: `bin/rails decidim_system:create_admin`
-1. Visit `<your app url>/system` and login with your system admin credentials
+1. Visit `<your app url>/system` and log in with your system admin credentials
 1. Create a new organization. Check the locales you want to use for that organization, and select a default locale.
 1. Set the correct default host for the organization, otherwise the app will not work properly. Note that you need to include any subdomain you might be using.
 1. Fill the rest of the form and submit it.

data/lib/decidim/generators/app_templates/bullet_initializer.rb

@@ -5,6 +5,8 @@ if defined?(Bullet) && !Rails.application.config.try(:boost_performance)
     Bullet.enable = true
     Bullet.bullet_logger = true
     Bullet.rails_logger = true
+    Bullet.add_footer = true
+    Bullet.skip_user_in_notification = true
     Bullet.stacktrace_includes = %w(decidim-)
   end
 end

data/lib/decidim/generators/app_templates/docker-compose-etherpad.yml

@@ -11,7 +11,7 @@ services:
       - ETHERPAD_ADMIN_PASSWORD=CHANGE_ME_ADMIN_PASSWORD
       # If the admin password is set, this defaults to "admin". Otherwise the user can set it to another username.
       - ETHERPAD_ADMIN_USER=CHANGE_ME_ADMIN_USER
-      # Type of databse to use. Defaults to mysql.
+      # Type of database to use. Defaults to mysql.
       - ETHERPAD_DB_TYPE=mysql
       # Hostname of the database to use. Defaults to mysql.
       - ETHERPAD_DB_HOST=mysql
@@ -27,7 +27,7 @@ services:
       - ETHERPAD_API_KEY=CHANGE_ME_API_KEY
       # You can skip this if you are not using any proxy to handle SSL certificates.
       - "TRUST_PROXY=true"
-      # Ensure this etherpad allows cookies while embeded in an Iframe
+      # Ensure this etherpad allows cookies while embedded in an Iframe
       - "COOKIE_SAME_SITE=None"
     # Official image is etherpad/etherpad but the latest version does not allow yet setting cookies to SameSite=None
     image: 'platoniq/etherpad:1.8.7'

data/lib/decidim/generators/app_templates/initializer.rb

@@ -54,7 +54,7 @@ Decidim.configure do |config|
   # config.maps = {
   #   provider: :here,
   #   api_key: Rails.application.secrets.maps[:api_key],
-  #   static: { url: "https://image.maps.hereapi.com/mia/v3/base/mc/overlay" }
+  #   static: { url: "https://image.maps.ls.hereapi.com/mia/1.6/mapview" }
   # }
   #
   # == OpenStreetMap (OSM) services ==
@@ -119,7 +119,7 @@ Decidim.configure do |config|
     dynamic_provider = Rails.application.secrets.maps[:dynamic_provider]
     dynamic_url = Rails.application.secrets.maps[:dynamic_url]
     static_url = Rails.application.secrets.maps[:static_url]
-    static_url = "https://image.maps.hereapi.com/mia/v3/base/mc/overlay" if static_provider == "here"
+    static_url = "https://image.maps.ls.hereapi.com/mia/1.6/mapview" if static_provider == "here" && static_url.blank?
     config.maps = {
       provider: static_provider,
       api_key: Rails.application.secrets.maps[:static_api_key],
@@ -236,7 +236,7 @@ Decidim.configure do |config|
   #
   # Provide a class to generate a timestamp for a document. The instances of
   # this class are initialized with a hash containing the :document key with
-  # the document to be timestamped as value. The istances respond to a
+  # the document to be timestamped as value. The instances respond to a
   # timestamp public method with the timestamp
   #
   # An example class would be something like:
@@ -320,7 +320,7 @@ Decidim.configure do |config|
   # to interact with third party service to translate the user content.
   #
   # If you still want to use "Decidim::Dev::DummyTranslator" as translator placeholder,
-  # add the follwing line at the beginning of this file:
+  # add the following line at the beginning of this file:
   # require "decidim/dev/dummy_translator"
   #
   # An example class would be something like:
@@ -393,8 +393,6 @@ Decidim.configure do |config|
 
   # Additional optional configurations (see decidim-core/lib/decidim/core.rb)
   config.cache_key_separator = Rails.application.secrets.decidim[:cache_key_separator] if Rails.application.secrets.decidim[:cache_key_separator].present?
-  config.cache_expiry_time = Rails.application.secrets.decidim[:cache_expiry_time].to_i.minutes if Rails.application.secrets.decidim[:cache_expiry_time].present?
-  config.stats_cache_expiry_time = Rails.application.secrets.decidim[:stats_cache_expiry_time].to_i.minutes if Rails.application.secrets.decidim[:stats_cache_expiry_time].present?
   config.expire_session_after = Rails.application.secrets.decidim[:expire_session_after].to_i.minutes if Rails.application.secrets.decidim[:expire_session_after].present?
   config.enable_remember_me = Rails.application.secrets.decidim[:enable_remember_me].present? unless Rails.application.secrets.decidim[:enable_remember_me] == "auto"
   if Rails.application.secrets.decidim[:session_timeout_interval].present?
@@ -417,8 +415,6 @@ end
 
 if Decidim.module_installed? :proposals
   Decidim::Proposals.configure do |config|
-    config.similarity_threshold = Rails.application.secrets.dig(:decidim, :proposals, :similarity_threshold).presence || 0.25
-    config.similarity_limit = Rails.application.secrets.dig(:decidim, :proposals, :similarity_limit).presence || 10
     config.participatory_space_highlighted_proposals_limit = Rails.application.secrets.dig(:decidim, :proposals, :participatory_space_highlighted_proposals_limit).presence || 4
     config.process_group_highlighted_proposals_limit = Rails.application.secrets.dig(:decidim, :proposals, :process_group_highlighted_proposals_limit).presence || 3
   end
@@ -457,8 +453,6 @@ if Decidim.module_installed? :initiatives
     unless Rails.application.secrets.dig(:decidim, :initiatives, :creation_enabled) == "auto"
       config.creation_enabled = Rails.application.secrets.dig(:decidim, :initiatives, :creation_enabled).present?
     end
-    config.similarity_threshold = Rails.application.secrets.dig(:decidim, :initiatives, :similarity_threshold).presence || 0.25
-    config.similarity_limit = Rails.application.secrets.dig(:decidim, :initiatives, :similarity_limit).presence || 5
     config.minimum_committee_members = Rails.application.secrets.dig(:decidim, :initiatives, :minimum_committee_members).presence || 2
     config.default_signature_time_period_length = Rails.application.secrets.dig(:decidim, :initiatives, :default_signature_time_period_length).presence || 120
     config.default_components = Rails.application.secrets.dig(:decidim, :initiatives, :default_components)
@@ -473,24 +467,6 @@ if Decidim.module_installed? :initiatives
   end
 end
 
-if Decidim.module_installed? :elections
-  Decidim::Elections.configure do |config|
-    config.setup_minimum_hours_before_start = Rails.application.secrets.dig(:elections, :setup_minimum_hours_before_start).presence || 1
-    config.start_vote_maximum_hours_before_start = Rails.application.secrets.dig(:elections, :start_vote_maximum_hours_before_start).presence || 6
-    config.voter_token_expiration_minutes = Rails.application.secrets.dig(:elections, :voter_token_expiration_minutes).presence || 120
-    config.document_types = Rails.application.secrets.dig(:elections, :document_types).presence || %w(identification_number passport)
-  end
-
-  Decidim::Votings.configure do |config|
-    config.check_census_max_requests = Rails.application.secrets.dig(:elections, :votings, :check_census_max_requests).presence || 5
-    config.throttling_period = Rails.application.secrets.dig(:elections, :votings, :throttling_period).to_i.minutes
-  end
-
-  Decidim::Votings::Census.configure do |config|
-    config.census_access_codes_export_expiry_time = Rails.application.secrets.dig(:elections, :votings, :census, :access_codes_export_expiry_time).to_i.days
-  end
-end
-
 Rails.application.config.i18n.available_locales = Decidim.available_locales
 Rails.application.config.i18n.default_locale = Decidim.default_locale
 

data/lib/decidim/generators/app_templates/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "decidim-development-app",
+  "private": true,
+  "dependencies": {
+    "@decidim/browserslist-config": "file:packages/browserslist-config",
+    "@decidim/core": "file:packages/core",
+    "@decidim/webpacker": "file:packages/webpacker"
+  },
+  "version": "0.1.0",
+  "devDependencies": {
+    "@decidim/dev": "file:packages/dev",
+    "@decidim/eslint-config": "file:packages/eslint-config",
+    "@decidim/prettier-config": "file:packages/prettier-config",
+    "@decidim/stylelint-config": "file:packages/stylelint-config"
+  },
+  "browserslist": [
+    "extends @decidim/browserslist-config"
+  ]
+}

data/lib/decidim/generators/app_templates/rack_profiler_initializer.rb

@@ -6,4 +6,5 @@ if Rails.env.development? && !Rails.application.config.try(:boost_performance)
   # initialization is skipped so trigger it
   Rack::MiniProfilerRails.initialize!(Rails.application)
   Rack::MiniProfiler.config.skip_paths << "/favicon.ico"
+  Rack::MiniProfiler.config.position = "bottom-left"
 end

data/lib/decidim/generators/app_templates/secrets.yml.erb

@@ -33,8 +33,6 @@ decidim_default: &decidim_default
   default_csv_col_sep: <%%= Decidim::Env.new("DECIDIM_DEFAULT_CSV_COL_SEP", ";").to_json %>
   consent_cookie_name: <%%= Decidim::Env.new("DECIDIM_CONSENT_COOKIE_NAME", "decidim-consent").to_json %>
   cache_key_separator: <%%= Decidim::Env.new("DECIDIM_CACHE_KEY_SEPARATOR", "/").to_json %>
-  cache_expiry_time: <%%= Decidim::Env.new("DECIDIM_CACHE_EXPIRATION_TIME", "1440").to_i %>
-  stats_cache_expiry_time: <%%= Decidim::Env.new("DECIDIM_STATS_CACHE_EXPIRATION_TIME", 10).to_i %>
   expire_session_after: <%%= Decidim::Env.new("DECIDIM_EXPIRE_SESSION_AFTER", "30").to_i %>
   session_timeout_interval: <%%= Decidim::Env.new("DECIDIM_SESSION_TIMEOUT_INTERVAL", "10").to_i %>
   enable_remember_me: <%%= Decidim::Env.new("DECIDIM_ENABLE_REMEMBER_ME", "auto").default_or_present_if_exists.to_s %>
@@ -56,8 +54,6 @@ decidim_default: &decidim_default
     schema_max_complexity: <%%= Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i %>
     schema_max_depth: <%%= Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i %>
   proposals:
-    similarity_threshold: <%%= Decidim::Env.new("PROPOSALS_SIMILARITY_THRESHOLD", 0.25).to_f %>
-    similarity_limit: <%%= Decidim::Env.new("PROPOSALS_SIMILARITY_LIMIT", 10).to_i %>
     participatory_space_highlighted_proposals_limit: <%%= Decidim::Env.new("PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT", 4).to_i %>
     process_group_highlighted_proposals_limit: <%%= Decidim::Env.new("PROPOSALS_PROCESS_GROUP_HIGHLIGHTED_PROPOSALS_LIMIT", 3).to_i %>
   meetings:
@@ -70,8 +66,6 @@ decidim_default: &decidim_default
     enable_proposal_linking: <%%= Decidim::Env.new("ACCOUNTABILITY_ENABLE_PROPOSAL_LINKING", "auto").default_or_present_if_exists.to_s %>
   initiatives:
     creation_enabled: <%%= Decidim::Env.new("INITIATIVES_CREATION_ENABLED", "auto").default_or_present_if_exists.to_s %>
-    similarity_threshold: <%%= Decidim::Env.new("INITIATIVES_SIMILARITY_THRESHOLD", 0.25).to_f %>
-    similarity_limit: <%%= Decidim::Env.new("INITIATIVES_SIMILARITY_LIMIT", 5).to_i %>
     minimum_committee_members: <%%= Decidim::Env.new("INITIATIVES_MINIMUM_COMMITTEE_MEMBERS", 2).to_i %>
     default_signature_time_period_length: <%%= Decidim::Env.new("INITIATIVES_DEFAULT_SIGNATURE_TIME_PERIOD_LENGTH", 120).to_i %>
     default_components: <%%= Decidim::Env.new("INITIATIVES_DEFAULT_COMPONENTS", "pages, meetings").to_array.to_json %>
@@ -84,18 +78,6 @@ decidim_default: &decidim_default
   verifications:
     document_types: <%%= Decidim::Env.new("VERIFICATIONS_DOCUMENT_TYPES", "identification_number,passport").to_array %>
 
-elections_default: &elections_default
-  bulletin_board_server: <%%= Decidim::Env.new("ELECTIONS_BULLETIN_BOARD_SERVER", 'http://bulletin-board.lvh.me:8000/api').to_s %>
-  bulletin_board_public_key: {"kty":"RSA","n":"zMXsZpYPKkDlSmezX898y7zNOaJ7ENIN4kj4UhQ95Vm4HlgTpIs2VMMsO0eqynMaOR_G1mXdqbpbaJtXijBe4V8323QwGm6WVAa71E7pDXa5g6-uo5f8GePitN0YER9y2yNQN4uTaNzJiWV2uLBUYfMdj3SIif31YwLULHAOj3B_oleFK8coE_Qr3NzATcYBmsqE8AR4NljxTO6KDmP1SLdf5GBOBhOAIFbnL_Kpj2xkm7MS3hjMVKpiRhqA1UgX5oKZ8ixBv46fNJF0pBsHi3fHNjK9oZzgdx_AI-YFpdE_40-8bh_g9sWzxacqOM2-MdQLHbvRPEVltO3E8tr6I5YWrylcP7l9VD8OJeqjq2qFYHnGYdmLoD2XuXmI9EuBvSb9H4-qcartxZSIQCimKib_fxZvgrG1FSRRhK6YpvIdGv4-G2zfCCRsC4XD80TYI2bf-oYCoy7eU3_eVHFMV2yg4p1Wnuw2Vgq0edPL_bKaV9JvGx7F-U5juxNN0WZR9LzbPl4ReejzN95lyHgbj0nTH_u3bSpZmgJrQF-PwdnPcG46deVjJgUeosrlC4lQxVrRz0GL58BuFunnz2uYDBDrcJCiG60EbdkAFHjOcXU4wrUWATin7je_aqdBXhSnkTafcJAMvL7Y2Ld7vDge8nLqjAVlAi5am3rN0kqKT6M","e":"AQAB","kid":"a8e86f02ca27e1861bfc49e2a9a4614ca9068f8efdb6d42d19d3aab0eb2a31be"}
-  authority_private_key: {"kty":"RSA","n":"pNgMt8lnPDD3TlWYGhRiV1oZkPQmnLdiUzwyb_-35qKD9k-HU86xo0uSgoOUWkBtnvFscq8zNDPAGAlZVokaN_z9ksZblSce0LEl8lJa3ICgghg7e8vg_7Lz5dyHSQ3PCLgenyFGcL401aglDde1Xo4ujdz33Lklc4U9zoyoLUI2_viYmNOU6n5Mn0sJd30FeICMrLD2gX46pGe3MGug6groT9EvpKcdOoJHKoO5yGSVaeY5-Bo3gngvlgjlS2mfwjCtF4NYwIQSd2al-p4BKnuYAVKRSgr8rYnnjhWfJ4GsCaqiyXNi5NPYRV6gl_cx_1jUcA1rRJqQR32I8c8QbAXm5qNO4URcdaKys9tNcVgXBL1FsSdbrLVVFWen1tfWNfHm-8BjiWCWD79-uk5gI0SjC9tWvTzVvswWXI5weNqqVXqpDydr46AsHE2sG40HRCR3UF3LupT-HwXTcYcOZr5dJClJIsU3Hrvy4wLssub69YSNR1Jxn-KX2vUc06xY8CNIuSMpfufEq5cZopL6O2l1pRsW1FQnF3s078_Y9MaQ1gPyBo0IipLBVUj5IjEIfPuiEk4jxkiUYDeqzf7bAvSFckp94yLkRWTs_pEZs7b_ogwRG6WMHjtcaNYe4CufhIm9ekkKDeAWOPRTHfKNmohRBh09XuvSjqrx5Z7rqb8","e":"AQAB","kid":"b8dba1459df956d60107690c34fa490db681eac4f73ffaf6e4055728c02ddc8e","d":"Uh3KIBe1VJez6pLbBUrYPlmE2N-3CGSWF46qNX62lq6ofB_b8xTJCuaPonJ3iYoE0aPEeVDrefq5m3-0wFXl-LQPgXlMj_1_7UgB9jeuSZ_N1WDK6P2EJPx5YS09O1gkpVxK7Mx_sZQe77wmUUH-eI7tg__qfUrB7E0Yn_cTpBATI2qlYaQsz6-A7e1MVvixq_ilmzVAZvuBrPp5mCZVb6FlXrV_PU9-UPIrD3O1La1lfO6SPBSbSGQkmGHwD2QbkHn9D_R_Vs-z_0TkM_dX71jIPQhrle3pN222KuJ8eQqwr9QP6biQMBuT5eKgr3MVtfUDRpp4sCEq9GIFwSd8LvbmGPrOoz8ueOEQ05nisIBQuOTYiWpYs2CEV062HR1bLFRLDUcSlflGNr0bgiXTUFx4wxRG06OaI-rQ6nG3M8TE0I0phMNCG3c7YyV28z_k2I65oQF9aKtiwFwc0YsUSGPTOFZGWHuCCPLm0lFeebpI_JIYqIv70NJxbSZEBY8DAIqZPqP6y_CRo2_C7piCgsjg9pnF8cp45vz4L6DWZ0Tumc_5aRuqIBkYXXwP9TjqhzxL-2SQHIqUAjj6Y6S35tZT6ekZSbnPIKX_e42y6bDT_Ztf01QfKiTkcx3_I8RwOuh6CzJzr72AykQpU3XKOKF1x1GBtYyrno4jG5LgaGE","p":"1UARZ-rRnpKG5NHKlXTys3irCy-d91edHL3fEIzDKvhMRQCIWh7dt8l0_sIpcBF-EbVilbFKj7yfgZBTr8EkAXHgweayK8rnlMqi2jte1_u-5DBtrGVVUTSQltSLDOZHK5QfUxVK6Bbk8K5ROLvef91oNgnSNWNOeoCZdlS55nMZcAgY_6mxSuuMq54Tgy8o4Ip890-ZEYY6OSFXhU-ieoGO4Jw--c6QzmCa3gGo2oVClidMNaM1jquK4Pj6xaoxR2NWeIX9Ix7k1P2B24pegyHXjSIpQ6JYdn352VViXi2tx7TTJh6ClNVjgoRmL4Gfy_IJNx0GhF5OB3yughUc7w","q":"xePJGBt466qM9F0BPxWFjyWbIs_GNXr-lBGASui0Z94cfgFbsZwqRsWQEf7jDVQsDNVnPSWZ_Wd6UqoQaIxc0tE8gaokPG6A4EUDyoLaZ231ZydDVoWof8FnPDaJwrcPwZ4R6ZLKGmkfytCZuU9I_9B4uuV0dyjEzKfS-Os3UcLumKPlgJ71OZAb49GTqUHuTePcSJjyYOYXx6eE7i_1m8TjU9Ut18BJNQhLqWmerA6X1ijbR2_syY6GXhGSfciSBH8xVkiUnqXb2jt1bE8nwWw-Sam5ikjzNbXqqs978IcCE5HTddQmy99bwuArA8PLqIFj3OOO1CSo8oyn2XDgMQ","dp":"Diky_rOZN-6DBq7nxQT_GOvqb9O5qbMnu8DgDzlJvJDAf9SJOXLTRmEaY9CA7_A5bvOcmFQtn13nObNb20_4FCB7zGSFcGMI_dh2-Ab5RV5yTrTok4onID1dXKbAlRq1ny825U2Eq-TZTyJEQoA3RkZtpSkBzInLrFbd2f3GWodKKSZggpnCLDd4H-1fXlbDYCXSJpoikAdZ1nFgXnnrUDdKRaAajnwpIYtIvXVewSQYR-BULzunUtIRZt8hx_6FRzhRha9gH_TtPTeYZ_vISuz0Y2rhUpx1Q2kaLlR9M8PUxm47l0xvX3LMKN6h6oWxFtn7wq0qwZ-Bjv24mOrOAQ","dq":"nXGD10hURrwk9W7hxP0sjB2Rdnr06iv3THs4JWFL16_h32bZO1BSWoho_chbgYlMmtFXGFFIWVLxAcAI2gWC_MA4cbmapvIMW2LNh1vgxJW5v95_NuGUlECeEEwcAu1-_b7z5XBCmAy3nLem9sbb_5wv0hMpPH0VRvbnZeBO3SBIkO0lddYCqU-8wN9HqkyoexQleSUnAm1O0iy4GIHT2aEmdNaRaKy2EhmNiTZdZeseZueOvyGPtTVONp2ofacMdcN0z39jr22qo9DWtdusd7nVPOpqkllEF6GrGUeHBnGD92n4YjDuxRnqefu8fXxUFrcLav0p8CNSv9ek291woQ","qi":"w6hfKEBLLHRWPkjajgxZyyetj-UFfVkILRT0plOllJ2JV8whcOXRXbiXH2r8zqMeyMFrrMwmuvv4TVQaruKB0ZQOG7Tz5Lw0RZEREOLnBwc3vSi_iLd-jBz01LdExTpqsAHMkaMQR9x62J8DE1ZNxVdn3ELYKik0f1L2r_WErzhvT1uq69HAybUp6WHcFYH0PSqHg4LOneXAdU1_g-ji2Zn9dlA_2oYGQ5S6JXPV7v2IVbEFpxyVD1lPbFT0iKhyZZevictjgD_JGHveIVqsq5w0Csyz08h0oEW9hYEq-4bquMxSf18gjldoS5uQPD7FUECgL8bxsCdc4hP6UEKYGw"}
-  authority_name: "Decidim Test Authority"
-  authority_api_key: "89Ht70GZNcicu8WEyagz_rRae6brbqZAGuBEICYBCii-PTV3MAstAtx1aRVe5H5YfODi-JgYPvyf9ZMH7tOeZ15e3mf9B2Ymgw7eknvBFMRP213YFGo1SPn_C4uLK90G"
-  scheme_name: "dummy"
-  quorum: 2
-  number_of_trustees: 3
-  setup_minimum_hours_before_start: 1
-  document_types: <%%= Decidim::Env.new("ELECTIONS_DOCUMENT_TYPES", "identification_number,passport").to_array.to_json %>
-
 storage_default: &storage_default
   provider: <%%= Decidim::Env.new("STORAGE_PROVIDER", "local").to_s %>
   cdn_host: <%%= ENV["STORAGE_CDN_HOST"] %>
@@ -156,8 +138,6 @@ default: &default
     server: <%%= ENV["ETHERPAD_SERVER"] %>
     api_key: <%%= ENV["ETHERPAD_API_KEY"] %>
     api_version: <%%= Decidim::Env.new("ETHERPAD_API_VERSION", "1.2.1") %>
-  elections:
-    <<: *elections_default
   storage:
     <<: *storage_default
   vapid:
@@ -189,12 +169,6 @@ test:
       enabled: true
       client_id:
       client_secret:
-    test:
-      enabled: true
-      icon: tools-line
-  elections:
-    <<: *elections_default
-    bulletin_board_server: <%%= Decidim::Env.new("ELECTIONS_BULLETIN_BOARD_SERVER", 'http://bulletin-board.lvh.me:5017/api').to_s %>
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
@@ -208,21 +182,3 @@ production:
   smtp_port: <%%= Decidim::Env.new("SMTP_PORT", 587).to_i %>
   smtp_starttls_auto: <%%= Decidim::Env.new("SMTP_STARTTLS_AUTO").to_boolean_string %>
   smtp_authentication: <%%= Decidim::Env.new("SMTP_AUTHENTICATION", "plain").to_s %>
-  elections:
-    bulletin_board_server: <%%= ENV["BULLETIN_BOARD_SERVER"] %>
-    bulletin_board_public_key: <%%= ENV["BULLETIN_BOARD_PUBLIC_KEY"] %>
-    authority_api_key: <%%= ENV["BULLETIN_BOARD_API_KEY"] %>
-    authority_name: <%%= ENV["AUTHORITY_NAME"] %>
-    authority_private_key: <%%= ENV["AUTHORITY_PRIVATE_KEY"] %>
-    scheme_name: <%%= Decidim::Env.new("ELECTIONS_SCHEME_NAME", "electionguard").to_s %>
-    number_of_trustees: <%%= Decidim::Env.new("ELECTIONS_NUMBER_OF_TRUSTEES").to_i %>
-    quorum: <%%= Decidim::Env.new("ELECTIONS_QUORUM").to_i %>
-    setup_minimum_hours_before_start: <%%= Decidim::Env.new("ELECTIONS_SETUP_MINIMUM_HOURS_BEFORE_START", 1).to_i %>
-    start_vote_maximum_hours_before_start: <%%= Decidim::Env.new("ELECTIONS_START_VOTE_MAXIMUM_HOURS_BEFORE_START", 6).to_i %>
-    voter_token_expiration_minutes: <%%= Decidim::Env.new("ELECTIONS_VOTER_TOKEN_EXPIRATION_MINUTES", 120).to_i %>
-    document_types: <%%= Decidim::Env.new("ELECTIONS_DOCUMENT_TYPES", "identification_number,passport").to_array.to_json %>
-    votings:
-      check_census_max_requests: <%%= Decidim::Env.new("VOTINGS_CHECK_CENSUS_MAX_REQUESTS", 5).to_i %>
-      throttling_period: <%%= Decidim::Env.new("VOTINGS_THROTTLING_PERIOD", 1).to_i %>
-      census:
-        access_codes_export_expiry_time: <%%= Decidim::Env.new("VOTINGS_CENSUS_ACCESS_CODES_EXPORT_EXPIRY_TIME", 2).to_i %>

data/lib/decidim/generators/component_templates/.ruby-version

@@ -1 +1 @@
-3.1.1
+3.2.2

data/lib/decidim/generators/component_templates/Gemfile.erb

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "~> 0.28.6"
+gem "decidim", "~> 0.29.0.rc1"
 gem "decidim-<%= component_name %>", path: "."
 
 gem "puma", ">= 6.3.1"
@@ -14,12 +14,14 @@ gem "bootsnap", "~> 1.4"
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
 
-  gem "decidim-dev", "~> 0.28.6"
+  gem "decidim-dev", "~> 0.29.0.rc1"
 end
 
 group :development do
   gem "faker", "~> 3.2"
   gem "letter_opener_web", "~> 2.0"
   gem "listen", "~> 3.1"
+  gem "spring", "~> 4.0"
+  gem "spring-watcher-listen", "~> 2.0"
   gem "web-console", "~> 4.2"
 end

data/lib/decidim/generators/component_templates/README.md.erb

@@ -29,7 +29,7 @@ We expect the contributions to follow the [Decidim's contribution guide](https:/
 
 ## Security
 
-Security is very important to us. If you have any issue regarding security, please disclose the information responsibly by sending an email to __<%= security_email %>__ and not by creating a Github issue.
+Security is very important to us. If you have any issue regarding security, please disclose the information responsibly by sending an email to __<%= security_email %>__ and not by creating a GitHub issue.
 
 ## License
 

data/lib/decidim/generators/component_templates/decidim-component.gemspec.erb

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::<%= component_module_name %>.version
   s.authors = ["<%= %x[git config user.name].chomp %>"]
   s.email = ["<%= %x[git config user.email].chomp %>"]
-  s.license = "AGPL-3.0-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",

data/lib/decidim/generators/component_templates/github/ci.yml.erb

@@ -21,7 +21,7 @@ concurrency:
 jobs:
   main:
     name: Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     services:
       postgres:
@@ -39,19 +39,19 @@ jobs:
       DATABASE_PASSWORD: postgres
       DATABASE_HOST: localhost
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Get npm cache directory path
         id: npm-cache-dir-path
         run: echo "dir=$(npm get cache)-<%= component_name %>" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
@@ -63,12 +63,12 @@ jobs:
       - run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
         name: Create the screenshots folder
       - uses: nanasess/setup-chromedriver@v2
-      - run: RAILS_ENV=test bundle exec rails assets:precompile
+      - run: RAILS_ENV=test bundle exec rails shakapacker:compile
         name: Precompile assets
         working-directory: ./spec/decidim_dummy_app/
       - run: bundle exec rspec
         name: RSpec
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
       - uses: actions/upload-artifact@v4
         if: always()
         with:

data/lib/decidim/generators/component_templates/package.json.erb

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": <%= JSON.generate(component_description || "") %>,
   "private": true,
-  "license": "AGPL-3.0-or-later",
+  "license": "AGPL-3.0",
   "scripts": {
     "lint": "eslint -c .eslintrc.json --no-error-on-unmatched-pattern --ignore-pattern app/packs/vendor --ext .js app/packs",
     "stylelint": "stylelint app/packs/**/*.scss"

data/lib/decidim/generators/install_generator.rb

@@ -45,10 +45,6 @@ module Decidim
         RUBY
       end
 
-      def copy_initializer
-        copy_file "carrierwave.rb", "config/initializers/carrierwave.rb"
-      end
-
       def secrets
         template "secrets.yml.erb", "config/secrets.yml", force: true
       end
@@ -77,6 +73,12 @@ module Decidim
         end
       end
 
+      def skip_gemfile_if_defined
+        return unless options[:skip_gemfile]
+
+        remove_file "Gemfile"
+      end
+
       def install_decidim_webpacker
         # Copy CSS file
         copy_file "decidim_application.scss", "app/packs/stylesheets/decidim/decidim_application.scss"
@@ -94,6 +96,9 @@ module Decidim
         bundle_install
         rails "shakapacker:binstubs"
 
+        # Copy package.json
+        copy_file "package.json", "package.json"
+
         # Run Decidim custom webpacker installation
         rails "decidim:webpacker:install"
 
@@ -109,33 +114,6 @@ module Decidim
         rails "decidim_api:generate_docs"
       end
 
-      def remove_old_assets
-        remove_file "config/initializers/assets.rb"
-        remove_dir("app/assets")
-        remove_dir("app/javascript")
-      end
-
-      def remove_sprockets_requirement
-        gsub_file "config/application.rb", %r{require ['"]rails/all['"]\R}, <<~RUBY
-          require "decidim/rails"
-
-          # Add the frameworks used by your app that are not loaded by Decidim.
-          # require "action_mailbox/engine"
-          # require "action_text/engine"
-          require "action_cable/engine"
-          require "rails/test_unit/railtie"
-        RUBY
-
-        gsub_file "config/environments/development.rb", /config\.assets.*$/, ""
-        gsub_file "config/environments/test.rb", /config\.assets.*$/, ""
-        gsub_file "config/environments/production.rb", /config\.assets.*$/, ""
-      end
-
-      def copy_migrations
-        rails "decidim:choose_target_plugins", "railties:install:migrations"
-        recreate_db if options[:recreate_db]
-      end
-
       def letter_opener_web
         route <<~RUBY
           if Rails.env.development?
@@ -173,10 +151,31 @@ module Decidim
         copy_file "rack_profiler_initializer.rb", "config/initializers/rack_profiler.rb"
       end
 
+      def tweak_spring
+        run "bundle exec spring stop"
+        run "bundle exec spring binstub --all"
+
+        create_file "config/spring.rb", <<~CONFIG
+          require "decidim/spring"
+
+          Spring.watch(
+            ".ruby-version",
+            ".rbenv-vars",
+            "tmp/restart.txt",
+            "tmp/caching-dev.txt"
+          )
+        CONFIG
+      end
+
       def bundle_install
         run "bundle install"
       end
 
+      def copy_migrations
+        rails "decidim:choose_target_plugins", "railties:install:migrations"
+        recreate_db if options[:recreate_db]
+      end
+
       private
 
       def recreate_db
@@ -185,19 +184,21 @@ module Decidim
 
         rails "db:migrate"
 
-        rails "db:seed" if options[:seed_db]
+        rails "assets:precompile"
+
+        rails "--trace", "db:seed" if options[:seed_db]
 
         rails "db:test:prepare"
       end
 
-      # Runs rails commands in a subprocess, and aborts if it does not suceeed
-      def rails(*args)
-        abort unless system("bin/rails", *args)
+      # Runs rails commands in a subprocess, and aborts if it does not succeed
+      def rails(*)
+        abort unless system("bin/rails", *)
       end
 
       # Runs rails commands in a subprocess silencing errors, and ignores status
-      def soft_rails(*args)
-        system("bin/rails", *args, err: File::NULL)
+      def soft_rails(*)
+        system("bin/rails", *, err: File::NULL)
       end
 
       def cut(text, strip: true)