decidim 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ffce179e14eeb2eaeeee7f17b624b440c24f9fced3c4de51b1ee7c1aff5aa6
-  data.tar.gz: 2f160e31c2dd4d58644b3246b2b5471ff7e954fc685c39b0a3c0db4795f88d48
+  metadata.gz: b78d83e0c5eb8adf3edd807545e4295c0db4c06deb4c39589b7d0230056cbdc4
+  data.tar.gz: e266cf1aabe4c9763d588c96cf385f94b0dcbc0f20d5bc1c90f9f83b199a4170
 SHA512:
-  metadata.gz: 2c7f5f2737a3380773fd049bfeab63a72117d0135efbe1b5d03093689f13f12033ba5002062332806417e1189543c6425636441f5ff22420e92d3a937cb35940
-  data.tar.gz: 4c77afa4ba8827c307fbf114fc363f89aa60eede9cab4b7fcd579bdcd6eddfb284e34d252e775f363ff65ce58be17615ae70fea3e45002c81ef3ad0bbcb79439
+  metadata.gz: 54dc79fe6f887690b0b5299ca16760448e062fdd6645c04e249969703fffc5d731758a14264d2dc209257b1b47422fdbab0f8f879ce2f87fe99fa352fe39da3d
+  data.tar.gz: 910c4939a2a6bd0c58d0cfd6c0038fedf4a73e2efbc362784efdb1d30b15ce5e6c675d5426884f32bc23d78e86d16ddb80c8c3c2df7e3ca7437421c07226e883

data/Rakefile

@@ -27,6 +27,11 @@ task :update_versions do
   Decidim::GemManager.replace_versions
 end
 
+desc "Patch generators with required library versions"
+task :patch_generators do
+  Decidim::GemManager.patch_component_gemfile_generator
+end
+
 Decidim::GemManager.all_dirs(include_root: false) do |dir|
   manager = Decidim::GemManager.new(dir)
   name = manager.short_name

data/decidim-core/lib/decidim/webpacker/webpack/.modernizrrc

@@ -0,0 +1,9 @@
+{
+  "minify": true,
+    "options": [
+      "setClasses"
+    ],
+    "feature-detects": [
+      "css/transitions"
+    ]
+}

data/decidim.gemspec

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/version"
+
+Gem::Specification.new do |s|
+  s.version = Decidim.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"
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.name = "decidim"
+
+  s.summary = "Citizen participation framework for Ruby on Rails."
+  s.description = "A generator and multiple gems made with Ruby on Rails."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(
+                        docs/
+                        lib/
+                        LICENSE-AGPLv3.txt
+                        Rakefile
+                        README.md
+                        package.json
+                        package-lock.json
+                        packages/
+                        babel.config.json
+                        decidim-core/lib/decidim/webpacker/
+                      ))
+    end
+  end
+
+  s.require_paths = ["lib"]
+
+  s.add_dependency "decidim-accountability", Decidim.version
+  s.add_dependency "decidim-admin", Decidim.version
+  s.add_dependency "decidim-api", Decidim.version
+  s.add_dependency "decidim-assemblies", Decidim.version
+  s.add_dependency "decidim-blogs", Decidim.version
+  s.add_dependency "decidim-budgets", Decidim.version
+  s.add_dependency "decidim-comments", Decidim.version
+  s.add_dependency "decidim-core", Decidim.version
+  s.add_dependency "decidim-debates", Decidim.version
+  s.add_dependency "decidim-forms", Decidim.version
+  s.add_dependency "decidim-generators", Decidim.version
+  s.add_dependency "decidim-meetings", Decidim.version
+  s.add_dependency "decidim-pages", Decidim.version
+  s.add_dependency "decidim-participatory_processes", Decidim.version
+  s.add_dependency "decidim-proposals", Decidim.version
+  s.add_dependency "decidim-sortitions", Decidim.version
+  s.add_dependency "decidim-surveys", Decidim.version
+  s.add_dependency "decidim-system", Decidim.version
+  s.add_dependency "decidim-templates", Decidim.version
+  s.add_dependency "decidim-verifications", Decidim.version
+
+  s.add_development_dependency "bundler", "~> 2.2", ">= 2.2.18"
+  s.add_development_dependency "rake", "~> 12.0"
+  s.add_development_dependency "rspec", "~> 3.0"
+end

data/docs/modules/customize/pages/styles.adoc

@@ -50,11 +50,11 @@ image::header-snippet.png[Header snippet]
 
 Notice that you can resize this textarea.
 
-== Webpacker
+== Shakapacker
 
-Decidim uses Webpacker to compile assets. There are two ways to customize CSS:
+Decidim uses Shakapacker to compile assets. There are two ways to customize CSS:
 
-1. if you want to redefine a specific snippet of CSS (say a few classes but not a whole file) you can use decidim_application.scss
+1. if you want to redefine a specific snippet of CSS (say a few classes but not a whole file) you can use decidim_application.scss. You can read more about this in the <<Overriding CSS and styles>> section.
 2. and of course you can overwrite whole files by copying them into the application i.e: to replace `decidim-core/app/packs/stylesheets/decidim/modules/_data-consent.scss` you should create in your Rails app a file in `app/packs/stylesheets/decidim/modules/_data-consent.scss` and it will have more priority over the Decidim file.
 3. if you want to customize the application colors yo can use the admin interface.
 
@@ -68,6 +68,17 @@ Since this file is being managed by Decidim, it will be impossible to customize
 
 You can override the default configuration by creating a file  `config/tailwind.config.js.erb` starting from the following https://github.com/decidim/decidim/blob/develop/decidim-core/lib/decidim/assets/tailwind/tailwind.config.js.erb[content]
 
+== Overriding CSS and styles
+
+If you want to override a specific CSS class, you can do so by adding a new CSS class in your `app/assets/stylesheets/decidim_application.scss` file. This will allow you to override the default styles provided by Decidim.
+
+*Please note:* the above file is created by default when you install Decidim. Also the file is empty. This file allows you to edit *only* the end user styles.
+
+If you want to override other layouts, you can do so by creating new files:
+
+. /admin: `app/packs/stylesheets/decidim/admin/decidim_application.scss`
+. /system: `app/packs/stylesheets/decidim/system/decidim_application.scss`
+
 == Accessibility
 
 To maintain accesibility level, if you add new colors use a http://webaim.org/resources/contrastchecker/[Color contrast checker] (WCAG AA is mandatory, WCAG AAA is recommended)

data/docs/modules/develop/pages/maintainers/releases.adoc

@@ -17,6 +17,7 @@ Mark `develop` as the reference to the next release:
 . Turn develop into the `dev` branch for the next release:
  .. Update `.decidim-version` to the new `dev` development version: `x.y.z.dev`, where `x.y.z` is the new semver number for the next version
  .. Run `bin/rake update_versions`, this will update all references to the new version.
+ .. Run `bin/rake patch_generators`, this will update the Gemfile for the generators to the new version.
  .. Run `bin/rake bundle`, this will update all the `Gemfile.lock` files
  .. Run `bin/rake webpack`, this will update the JavaScript bundle.
 . Update `SECURITY.md` and change the supported version to the new version.
@@ -193,6 +194,7 @@ If this is a *Release Candidate version* release, the steps to follow are:
 . Checkout the release stable branch `git checkout release/x.y-stable`.
 . Update `.decidim-version` to the new version `x.y.z.rc1`
 . Run `bin/rake update_versions`, this will update all references to the new version.
+. Run `bin/rake patch_generators`, this will update the Gemfile for the generators to the new version.
 . Run `bin/rake bundle`, this will update all the `Gemfile.lock` files
 . Run `bin/rake webpack`, this will update the JavaScript bundle.
 . Run `bin/rspec`, this will check things like if all the officially supported languages translations are OK.
@@ -216,6 +218,7 @@ Release Candidates will be tested in a production server (usually Metadecidim) d
 . Checkout the release stable branch `git checkout release/x.y-stable`.
 . Update `.decidim-version` by removing the `.rcN` suffix, leaving a clean version number like `x.y.z`
 . Run `bin/rake update_versions`, this will update all references to the new version.
+. Run `bin/rake patch_generators`, this will update the Gemfile for the generators to the new version.
 . Run `bin/rake bundle`, this will update all the `Gemfile.lock` files
 . Run `bin/rake webpack`, this will update the JavaScript bundle.
 . Update the `CHANGELOG.md`.
@@ -279,6 +282,7 @@ The process is very similar from releasing a new Decidim version:
 . Checkout the branch you want to release: `git checkout -b release/x.y-stable`
 . Update `.decidim-version` to the new version number.
 . Run `bin/rake update_versions`, this will update all references to the new version.
+. Run `bin/rake patch_generators`, this will update the Gemfile for the generators to the new version.
 . Run `bin/rake bundle`, this will update all the `Gemfile.lock` files
 . Run `bin/rake webpack`, this will update the JavaScript bundle.
 . Update the `CHANGELOG.md`.

data/docs/modules/install/pages/manual.adoc

@@ -4,13 +4,17 @@ In order to develop on decidim, you will need:
 
 * *Git* 2.34+
 * *PostgreSQL* 14.5+
-* *Ruby* 3.0.2
+* *Ruby* 3.1.1
 * *NodeJS* 18.17.x
 * *Npm* 9.6.x
 * *ImageMagick*
 * *Chrome* browser and https://sites.google.com/a/chromium.org/chromedriver/[chromedriver].
 
-We are starting with an Ubuntu 22.04.1 LTS. This is an opinionated guide, so you are free to use the technology that you are most comfortable. If you have any doubts and you are blocked you can go and ask on https://matrix.to/#/#decidimdevs:matrix.org[our Matrix.org chat room for developers].
+The compatibility between the different versions of the components is the following:
+
+include::install:partial$version_matrix.adoc[]
+
+We are starting with an Ubuntu 22.04.3 LTS. This is an opinionated guide, so you are free to use the technology that you are most comfortable. If you have any doubts and you are blocked you can go and ask on https://matrix.to/#/#decidimdevs:matrix.org[our Matrix.org chat room for developers].
 
 We recommend to have at least some basic proficiency in GNU/Linux (i.e. how to use the command-line, packages, etc), networking knowledge, server administration, development in general, and some basic knowledge about software package managers. It would be great to have Ruby on Rails development basics (a good starting point is http://guides.rubyonrails.org/getting_started.html[Getting Started with Ruby on Rails]) and have some knowledge on how package libraries are working (we use `bundler` for handling ruby packages, and `npm`/`yarn` for handling javascript).
 
@@ -29,8 +33,8 @@ echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
 echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 source ~/.bashrc
 git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
-rbenv install 3.0.2
-rbenv global 3.0.2
+rbenv install 3.1.1
+rbenv global 3.1.1
 ----
 
 == 2. Installing PostgreSQL
@@ -51,8 +55,10 @@ An important component for Decidim is Node.js and Yarn. With this commands you w
 
 [source,bash]
 ----
-curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
-sudo apt-get install -y nodejs
+sudo mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+sudo apt-get update && sudo apt-get install -y nodejs
 curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null
 echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
 sudo apt-get update && sudo apt-get install -y yarn
@@ -111,6 +117,11 @@ EOF
 
 Be careful where you put the `.rbenv-vars` file, as if you put it in the same folder of your decidim generated application, and if you use a version control system (like `git`, which we strongly recommend), then you should ignore this file (ie with the `.gitignore` file).
 
+[source,bash]
+----
+echo -e "\n\n# Ignore environment variables\n.rbenv-vars" >> .gitignore
+----
+
 == 6. Initializing your app for local development
 
 [NOTE]
@@ -133,7 +144,7 @@ You can now start your server!
 
 [source,bash]
 ----
-bin/rails s
+bin/dev
 ----
 
 Visit http://localhost:3000 to see your app running. 🎉 🎉

data/docs/modules/install/pages/update.adoc

@@ -80,6 +80,11 @@ gem "decidim-initiatives", DECIDIM_VERSION
 gem "decidim-dev", DECIDIM_VERSION
 ----
 
+== Compatiblity versions matrix
+
+There are different versions of Decidim that are compatible with different versions of Ruby and Node. You can check the following table to see which versions are compatible with each other:
+
+include::install:partial$version_matrix.adoc[]
 
 [discrete]
 == Recommendations

data/docs/modules/install/partials/version_matrix.adoc

@@ -0,0 +1,13 @@
+
+|===
+|Decidim version |Ruby version |Node version | Status
+
+|develop | 3.2.2 | 18.17.x | Unreleased
+
+|v0.28 | 3.1.1 | 18.17.x | Bug fixes and security updates
+
+|v0.27 | 3.0.2 | 16.18.x | Bug fixes and security updates
+
+|v0.26 | 2.7.5+ | 16.9.x | Not maintained
+
+|===

data/lib/decidim/gem_manager.rb

@@ -199,8 +199,46 @@ module Decidim
         ENV.fetch("RETRY_TIMES", 10).to_i
       end
 
+      def patch_component_gemfile_generator
+        content = %(# frozen_string_literal: true
+<%# This file is automatically generated. Do not edit this file, it will be overwritten
+If you want to modify it you can do it in the Decidim::GemManager.patch_component_gemfile_generator method %>
+source "https://rubygems.org"
+
+ruby RUBY_VERSION
+
+gem "decidim", "~> #{version}"
+gem "decidim-<%= component_name %>", path: "."
+
+gem "puma", "#{fetch_gemfile_version("puma")}"
+gem "bootsnap", "#{fetch_gemfile_version("bootsnap")}"
+
+group :development, :test do
+  gem "byebug", "#{fetch_gemfile_version("byebug")}", platform: :mri
+
+  gem "decidim-dev", "~> #{version}"
+end
+
+group :development do
+  gem "faker", "#{Gem.loaded_specs["decidim-dev"].dependencies.select { |a| a.name == "faker" }.first.requirement}"
+  gem "letter_opener_web", "#{fetch_gemfile_version("letter_opener_web")}"
+  gem "listen", "#{fetch_gemfile_version("listen")}"
+  gem "spring", "#{fetch_gemfile_version("spring")}"
+  gem "spring-watcher-listen", "#{fetch_gemfile_version("spring-watcher-listen")}"
+  gem "web-console", "#{fetch_gemfile_version("web-console")}"
+end
+)
+
+        file_path = File.join(root, "decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb")
+        File.write(file_path, content)
+      end
+
       private
 
+      def fetch_gemfile_version(bundle_name)
+        Bundler.definition.dependencies.select { |a| a.name == bundle_name }.first.requirement.to_s
+      end
+
       def root
         File.expand_path(File.join("..", ".."), __dir__)
       end

data/lib/decidim/version.rb

@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.28.0"
+    "0.28.1"
   end
 end