decidim-generators 0.31.5 → 0.32.0.rc2

data/README.md

@@ -1,12 +1,10 @@
-# Decidim::Generators
+# decidim-generators
 
 This gem provides several generators to create decidim applications & components
 
 ## Installation
 
-```console
-gem install decidim-generators
-```
+This is on the default Decidim installation so you should not change anything to use this feature.
 
 ## Usage
 

data/decidim-generators.gemspec

@@ -2,11 +2,9 @@
 
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
-# Maintain your gem's version:
-require "decidim/generators/version"
-
 Gem::Specification.new do |s|
-  s.version = Decidim::Generators.version
+  version = "0.32.0.rc2"
+  s.version = 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"
@@ -18,7 +16,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.3.0"
+  s.required_ruby_version = "~> 3.4.0"
 
   s.name = "decidim-generators"
 
@@ -36,7 +34,7 @@ Gem::Specification.new do |s|
   s.executables = ["decidim"]
   s.require_paths = ["lib"]
 
-  s.add_dependency "decidim-core", Decidim::Generators.version
+  s.add_dependency "decidim-core", version
 
   s.add_development_dependency "bundler", "~> 2.2"
 end

data/exe/decidim

@@ -9,29 +9,29 @@ if File.exist?(File.expand_path("../../.git", __dir__))
 end
 
 case ARGV[0]
-when "--component"
+when "--component", "-c"
   ARGV.replace(["component", *ARGV[1..-1]])
 
   require "decidim/generators/component_generator"
 
   Decidim::Generators::ComponentGenerator.start
-when "--version"
+when "--version", "-v"
   require "decidim/core/version"
   puts Decidim::Core.version
-when "--help"
+when "--help", "-h"
   require "decidim/core/version"
   puts "Decidim #{Decidim::Core.version}
 Syntax: decidim [options] [App or Module name]
 https://decidim.org
 
 Options:
-  --help                   display this help and exit
-  --version                output version information and exit
-  --component [name]       creates a component for Decidim
+  -h, --help                   display this help and exit
+  -v, --version                output version information and exit
+  -c, --component [name]       creates a component for Decidim
   [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 appropriate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure
+  --storage [provider]     Setup the Gemfile with the appropriate gem to handle a storage provider. Supported options are: local (default), s3, gcs
   --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
@@ -48,6 +48,10 @@ App generation extra options (ignored if the --component flag is on):
   --seed_db [true|false]   Seed the database: generate demo data for each participatory space and component
   --recreate_db            Recreate the database after installing Decidim
 
+Component generation extra options (ignored if the --component flag is not defined)
+  --external               To create a new module external to the main decidim repository
+  --destination-folder     IF you want to point to an existing folder or give it a custom name
+
 Examples:
   decidim my-application
   decidim --storage=s3 my-application
@@ -55,6 +59,9 @@ Examples:
   decidim --locales=en,ca,es,fr my-application
   decidim --queue sidekiq my-application
   decidim --queue sidekiq --storage s3 my-application
+
+  decidim --component --external my_component
+  decidim --component --external my_component --destination-folder my-comp
 "
 else
   require "decidim/generators/app_generator"

data/lib/decidim/generators/app_generator.rb

@@ -79,7 +79,7 @@ module Decidim
 
       class_option :storage, type: :string,
                              default: "local",
-                             desc: "Setup the Gemfile with the appropriate 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"
 
       class_option :queue, type: :string,
                            default: "",
@@ -119,13 +119,14 @@ module Decidim
         gsub_file "config/environments/production.rb", /config\.assets.*$/, ""
       end
 
+      def patch_production_file
+        gsub_file "config/environments/production.rb", /config\.action_mailer\.default_url_options = { host: "example.com" }$/,
+                  "# config.action_mailer.default_url_options = { host: \"example.com\" }"
+      end
+
       def patch_test_file
-        gsub_file "config/environments/test.rb", /config\.action_mailer\.default_url_options = { host: "www.example.com" }$/,
-                  "# config.action_mailer.default_url_options = { host: \"www.example.com\" }"
-        gsub_file "config/environments/test.rb", /config\.action_controller\.raise_on_missing_callback_actions = true$/,
-                  "# config.action_controller.raise_on_missing_callback_actions = false"
-        gsub_file "config/environments/development.rb", /config\.action_controller\.raise_on_missing_callback_actions = true$/,
-                  "# config.action_controller.raise_on_missing_callback_actions = false"
+        gsub_file "config/environments/test.rb", /config\.action_mailer\.default_url_options = { host: "example.com" }$/,
+                  "# config.action_mailer.default_url_options = { host: \"example.com\" }"
       end
 
       def disable_annotate_rendered_view_on_development
@@ -210,14 +211,13 @@ module Decidim
 
         providers = options[:storage].split(",")
 
-        abort("#{providers} is not supported as storage provider, please use local, s3, gcs or azure") unless (providers - %w(local s3 gcs azure)).empty?
+        abort("#{providers} is not supported as storage provider, please use local, s3 or gcs") unless (providers - %w(local s3 gcs)).empty?
         gsub_file "config/environments/production.rb",
                   /config.active_storage.service = :local/,
                   %{config.active_storage.service = Decidim::Env.new("STORAGE_PROVIDER", "local").to_s}
 
         add_production_gems do
           gem "aws-sdk-s3", require: false if providers.include?("s3")
-          gem "azure-storage-blob", require: false if providers.include?("azure")
           gem "google-cloud-storage", "~> 1.11", require: false if providers.include?("gcs")
         end
       end
@@ -344,19 +344,11 @@ module Decidim
       end
 
       def production_environment
-        gsub_file "config/environments/production.rb",
-                  /config.log_level = :info/,
-                  "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"},
                   "config.asset_host = ENV['RAILS_ASSET_HOST'] if ENV['RAILS_ASSET_HOST'].present?"
-        gsub_file "config/environments/production.rb", /# Log to STDOUT by default\n((.*)\n){3}/, <<~CONFIG
-          if ENV["RAILS_LOG_TO_STDOUT"].present?
-            config.logger = ActiveSupport::Logger.new(STDOUT)
-              .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
-              .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
-          end
+        gsub_file "config/environments/production.rb", /config\.logger\s*=\s*ActiveSupport::TaggedLogging\.logger\(STDOUT\)/, <<~CONFIG
+          config.logger   = ActiveSupport::TaggedLogging.logger(STDOUT) if ENV["RAILS_LOG_TO_STDOUT"].present?
         CONFIG
       end
 
@@ -380,6 +372,10 @@ module Decidim
         CONFIG
       end
 
+      def patch_controller
+        gsub_file "app/controllers/application_controller.rb", /\n  stale_when_importmap_changes/, ""
+      end
+
       def authorization_handler
         return unless options[:demo]
 

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

@@ -1 +1 @@
-3.3.4
+3.4.7

data/lib/decidim/generators/app_templates/storage.yml

@@ -15,12 +15,15 @@ s3:
   <%= "region: #{Decidim::Env.new("AWS_REGION").to_s}" if Decidim::Env.new("AWS_REGION").present? %>
   <%= "endpoint: #{ Decidim::Env.new("AWS_ENDPOINT").to_s}" if Decidim::Env.new("AWS_ENDPOINT").present? %>
 
-azure:
-  service: AzureStorage
-  public: <%= Decidim::Env.new("AZURE_PUBLIC", "true").to_boolean_string %>
-  storage_account_name: <%= Decidim::Env.new("AZURE_STORAGE_ACCOUNT_NAME").to_s %>
-  storage_access_key: <%= Decidim::Env.new("AZURE_STORAGE_ACCESS_KEY").to_s %>
-  container: <%= Decidim::Env.new("AZURE_CONTAINER").to_s %>
+# Rails core team removed support for Azure Storage, as the official Azure Ruby gems are not maintained since 2024.
+# See https://github.com/rails/rails/issues/49983
+# You can use an unofficial gem: https://github.com/testdouble/azure-blob
+#azure:
+#  service: AzureBlob
+#  public: <%= Decidim::Env.new("AZURE_PUBLIC", "true").to_boolean_string %>
+#  storage_account_name: <%= Decidim::Env.new("AZURE_STORAGE_ACCOUNT_NAME").to_s %>
+#  storage_access_key: <%= Decidim::Env.new("AZURE_STORAGE_ACCESS_KEY").to_s %>
+#  container: <%= Decidim::Env.new("AZURE_CONTAINER").to_s %>
 
 gcs:
   service: GCS

data/lib/decidim/generators/component_generator.rb

@@ -48,7 +48,7 @@ module Decidim
         template "LICENSE-AGPLv3.txt", "#{component_folder}/LICENSE-AGPLv3.txt"
         template "README.md.erb", "#{component_folder}/README.md"
         template "gitignore", "#{component_folder}/.gitignore"
-        template "github/ci.yml.erb", "#{component_folder}/.github/workflows/ci_#{component_name}.yml"
+        template "github/ci.yml", "#{component_folder}/.github/workflows/ci_#{component_name}.yml"
         template "package.json.erb", "#{component_folder}/package.json"
         copy_file ".ruby-version", "#{component_folder}/.ruby-version"
         copy_file ".node-version", "#{component_folder}/.node-version"

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

@@ -1 +1 @@
-3.3.4
+3.4.7

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

@@ -5,21 +5,21 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "decidim", "~> 0.31.5"
+gem "decidim", "~> 0.32.0.rc2"
 gem "decidim-<%= component_name %>", path: "."
 
 gem "puma", ">= 6.3.1"
-gem "bootsnap", "~> 1.4"
+gem "bootsnap", "~> 1.23"
 
 group :development, :test do
-  gem "byebug", "~> 11.0", platform: :mri
+  gem "byebug", "~> 13.0", platform: :mri
 
-  gem "decidim-dev", "~> 0.31.5"
+  gem "decidim-dev", "~> 0.32.0.rc2"
 end
 
 group :development do
   gem "faker", "~> 3.2"
-  gem "letter_opener_web", "~> 2.0"
-  gem "listen", "~> 3.1"
-  gem "web-console", "~> 4.2"
+  gem "letter_opener_web", "~> 3.0"
+  gem "listen", "~> 3.10"
+  gem "web-console", "~> 4.3"
 end

data/lib/decidim/generators/component_templates/github/{ci.yml.erb → ci.yml}

@@ -39,19 +39,19 @@ jobs:
       DATABASE_PASSWORD: postgres
       DATABASE_HOST: localhost
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         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@v4
+      - uses: actions/cache@v5
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
@@ -68,8 +68,8 @@ jobs:
         working-directory: ./spec/decidim_dummy_app/
       - run: bundle exec rspec
         name: RSpec
-      - uses: codecov/codecov-action@v5
-      - uses: actions/upload-artifact@v4
+      - uses: codecov/codecov-action@v6
+      - uses: actions/upload-artifact@v7
         if: always()
         with:
           name: screenshots

data/lib/decidim/generators/component_templates/lib/decidim/component/component.rb.erb

@@ -7,10 +7,6 @@ Decidim.register_component(:<%= component_name %>) do |component|
   component.admin_engine = Decidim::<%= component_module_name %>::AdminEngine
   component.icon = "decidim/<%= component_name %>/icon.svg"
 
-  # component.on(:before_destroy) do |instance|
-  #   # Code executed before removing the component
-  # end
-
   # These actions permissions can be configured in the admin panel
   # component.actions = %w()
 

data/lib/decidim/generators/test/generator_examples.rb

@@ -27,7 +27,6 @@ shared_context "when generating a new application" do
     Bundler.with_original_env { Decidim::GemManager.capture(command, env:) }
   end
 
-  # rubocop:disable RSpec/BeforeAfterAll
   before(:all) do
     Bundler.with_original_env { Decidim::GemManager.install_all(out: File::NULL) }
   end
@@ -35,7 +34,6 @@ shared_context "when generating a new application" do
   after(:all) do
     Bundler.with_original_env { Decidim::GemManager.uninstall_all(out: File::NULL) }
   end
-  # rubocop:enable RSpec/BeforeAfterAll
 end
 
 shared_examples_for "a new production application" do
@@ -677,80 +675,67 @@ shared_examples_for "an application with configurable env vars" do
   it "env vars generate secrets application" do
     expect(result[1]).to be_success, result[0]
 
-    # Test onto the initializer when ENV vars are empty strings or undefined
-    json_off = initializer_config_for(test_app, env_off)
     initializer_off.each do |key, value|
-      current = json_off[key]
+      # Test onto the initializer when ENV vars are empty strings or undefined
+      current = rails_value("Decidim.#{key}", test_app, env_off)
       expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:OFF (#{value})"
-    end
 
-    # Test onto the initializer when ENV vars are set to the string "false"
-    json_false = initializer_config_for(test_app, env_false)
-    initializer_off.each do |key, value|
-      current = json_false[key]
+      # Test onto the initializer when ENV vars are set to the string "false"
+      current = rails_value("Decidim.#{key}", test_app, env_false)
       expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:FALSE (#{value})"
     end
 
     # Test onto the initializer when ENV vars are set
-    json_on = initializer_config_for(test_app, env_on)
     initializer_on.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim.#{key}", test_app, env_on)
       expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:ON (#{value})"
     end
 
     # Test onto the initializer when ENV vars are set to OpenStreetMap configuration
-    json_on = initializer_config_for(test_app, env_maps_osm)
     initializer_maps_osm.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim.#{key}", test_app, env_maps_osm)
       expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:Maps OSM (#{value})"
     end
 
     # Test onto the initializer when ENV vars are set to OpenStreetMap-HERE mix configuration
-    json_on = initializer_config_for(test_app, env_maps_mix)
     initializer_maps_mix.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim.#{key}", test_app, env_maps_mix)
       expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:Maps MIX (#{value})"
     end
 
     # Test onto the initializer with ENV vars OFF for the API module
-    json_off = initializer_config_for(test_app, env_off, "Decidim::Api")
     api_initializer_off.each do |key, value|
-      current = json_off[key]
+      current = rails_value("Decidim::Api.#{key}", test_app, env_off)
       expect(current).to eq(value), "API Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
     # Test onto the initializer with ENV vars ON for the API module
-    json_on = initializer_config_for(test_app, env_on, "Decidim::Api")
     api_initializer_on.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim::Api.#{key}", test_app, env_on)
       expect(current).to eq(value), "API Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
     # Test onto the initializer with ENV vars OFF for the Proposals module
-    json_off = initializer_config_for(test_app, env_off, "Decidim::Proposals")
     proposals_initializer_off.each do |key, value|
-      current = json_off[key]
+      current = rails_value("Decidim::Proposals.#{key}", test_app, env_off)
       expect(current).to eq(value), "Proposals Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
     # Test onto the initializer with ENV vars ON for the Proposals module
-    json_on = initializer_config_for(test_app, env_on, "Decidim::Proposals")
     proposals_initializer_on.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim::Proposals.#{key}", test_app, env_on)
       expect(current).to eq(value), "Proposals Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
     # Test onto the initializer with ENV vars OFF for the Meetings module
-    json_off = initializer_config_for(test_app, env_off, "Decidim::Meetings")
     meetings_initializer_off.each do |key, value|
-      current = json_off[key]
+      current = rails_value("Decidim::Meetings.#{key}", test_app, env_off)
       expect(current).to eq(value), "Meetings Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
     # Test onto the initializer with ENV vars ON for the Meetings module
-    json_on = initializer_config_for(test_app, env_on, "Decidim::Meetings")
     meetings_initializer_on.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim::Meetings.#{key}", test_app, env_on)
       expect(current).to eq(value), "Meetings Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
@@ -805,16 +790,14 @@ shared_examples_for "an application with extra configurable env vars" do
     expect(result[1]).to be_success, result[0]
 
     # Test onto the initializer with ENV vars OFF for the Initiatives module
-    json_off = initializer_config_for(test_app, env_off, "Decidim::Initiatives")
     initiatives_initializer_off.each do |key, value|
-      current = json_off[key]
+      current = rails_value("Decidim::Initiatives.#{key}", test_app, env_off)
       expect(current).to eq(value), "Initiatives Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
 
     # Test onto the initializer with ENV vars ON for the Initiatives module
-    json_on = initializer_config_for(test_app, env_on, "Decidim::Initiatives")
     initiatives_initializer_on.each do |key, value|
-      current = json_on[key]
+      current = rails_value("Decidim::Initiatives.#{key}", test_app, env_on)
       expect(current).to eq(value), "Initiatives Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
     end
   end
@@ -828,7 +811,7 @@ end
 
 shared_examples_for "an application with cloud storage gems" do
   let(:services) do
-    %w(local s3 gcs azure)
+    %w(local s3 gcs)
   end
   let(:storage_envs) do
     {
@@ -837,10 +820,7 @@ shared_examples_for "an application with cloud storage gems" do
       "AWS_SECRET_ACCESS_KEY" => "my-aws-secret",
       "AWS_REGION" => "eu-west-1",
       # "AWS_ENDPOINT" => "https://s3.amazonaws.com",
-      "AWS_BUCKET" => "test",
-      "AZURE_STORAGE_ACCOUNT_NAME" => "test",
-      "AZURE_STORAGE_ACCESS_KEY" => "dGVzdA==\n", # Base64 of "test"
-      "AZURE_CONTAINER" => "test"
+      "AWS_BUCKET" => "test"
     }
   end
 
@@ -849,7 +829,6 @@ shared_examples_for "an application with cloud storage gems" do
 
     expect(File.read("#{test_app}/Gemfile"))
       .to match(/gem ["']+aws-sdk-s3["']+/)
-      .and match(/gem ["']+azure-storage-blob["']+/)
       .and match(/gem ["']+google-cloud-storage["']+/)
 
     services.each do |service|
@@ -897,10 +876,6 @@ shared_examples_for "an application with storage and queue gems" do
   end
 end
 
-def initializer_config_for(path, env, mod = "Decidim")
-  JSON.parse cmd_capture(path, "bin/rails runner 'puts #{mod}.config.to_json'", env:)
-end
-
 def rails_value(value, path, env)
   JSON.parse cmd_capture(path, "bin/rails runner 'puts #{value}.to_json'", env:)
 end

data/lib/decidim/generators/version.rb

@@ -4,7 +4,7 @@
 module Decidim
   module Generators
     def self.version
-      "0.31.5"
+      "0.32.0.rc2"
     end
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: decidim-generators
 version: !ruby/object:Gem::Version
-  version: 0.31.5
+  version: 0.32.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.5
+        version: 0.32.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.5
+        version: 0.32.0.rc2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +111,7 @@ files:
 - lib/decidim/generators/component_templates/config/i18n-tasks.yml.erb
 - lib/decidim/generators/component_templates/config/locales/en.yml.erb
 - lib/decidim/generators/component_templates/decidim-component.gemspec.erb
-- lib/decidim/generators/component_templates/github/ci.yml.erb
+- lib/decidim/generators/component_templates/github/ci.yml
 - lib/decidim/generators/component_templates/gitignore
 - lib/decidim/generators/component_templates/lib/decidim/component.rb.erb
 - lib/decidim/generators/component_templates/lib/decidim/component/admin.rb.erb
@@ -138,7 +137,6 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,15 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Citizen participation framework for Ruby on Rails.
 test_files: []