decidim-decidim_awesome 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6040a5cab606622ed2cc0b108db81f7c5f9d248d912ddc4114134d23558570b
-  data.tar.gz: ac4149f478ec1d884a20b5f5501b76a466fe1f53f345814800dcb29f73817b75
+  metadata.gz: 7a93fd5654a7ea63af02a37299d1857ed3b125c83d3ad7b0ee5cb4338c476e00
+  data.tar.gz: 7dc357b32b4d3929ba184cab95a79cd9191639b45952ac0e3fa1ba2f92d686e5
 SHA512:
-  metadata.gz: 28a535597361b171cf5144df3036ee4cf2d84c43eb5847570224348521533081dba61c8f8354af6ddefe7403a109003bd03e645159d838e2379bca202299f1f3
-  data.tar.gz: edbb6c2b87af2a4f4ddb3b81ec5ffd40b92932847c3c12de4b4e0f9b3dcb7c3101926dc30d50f93779e1c97284e4a3f659f7e72b2150f7657cb2feed93abe406
+  metadata.gz: 65a509ac8bc9497765bc86c514ffcbfc1eee346cbf06336e0a1216f413bdcee369677694b2d2a5c7277a699142b0f588cb5c58b13ac59af4161d0cf4b7eb55ca
+  data.tar.gz: 033ca4c1fb845cdfb0cc7b2d84b261c283716a406462673611a25f91ee62487c1f75797063913e7f518d0175fab2b87f9ea0f4e0ad4154f94963d70a6001a4cb

data/CHANGELOG.md

@@ -1,8 +1,20 @@
 CHANGELOG
 =========
 
+v0.12.6
+-------
+
+Compatibility:
+  - Decidim 0.29.x
+
+Fixes:
+  - Fix changing locale when Hashcash is active. Make Hashcash respond only to session & registration controllers.
+  - Fix crash when non-installed modules in system checker.
+  - Fix some variables not respecting the context where configured (auto_save_forms, validate_caps, etc)
+
 v0.12.5
 -------
+
 Compatibility:
   - Decidim 0.29.x
 

data/app/controllers/concerns/decidim/decidim_awesome/needs_hashcash.rb

@@ -30,6 +30,7 @@ module Decidim
 
       # Dynamically configures the gem https://github.com/BaseSecrete/active_hashcash
       def set_hashcash_bits
+        return unless %w(registrations sessions).include?(controller_name)
         return if user_signed_in?
 
         ActiveHashcash.bits = if controller_name == "registrations"

data/app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb

@@ -79,7 +79,7 @@ module Decidim
             position: item.position,
             target: item.try(:target),
             visibility: item.try(:visibility),
-            native?: !item.respond_to?(:overrided?)
+            native?: !item.respond_to?(:overridden?)
           )
         end
 

data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_customizations_base.rb

@@ -11,11 +11,11 @@ module Decidim
         end
 
         def minimum_title_length
-          awesome_config.config[:validate_title_min_length].to_i
+          awesome_config.config[:validate_title_min_length].nil? ? awesome_config.defaults[:validate_title_min_length].to_i : awesome_config.config[:validate_title_min_length].to_i
         end
 
         def minimum_body_length
-          awesome_config.config[:validate_body_min_length].to_i
+          awesome_config.config[:validate_body_min_length].nil? ? awesome_config.defaults[:validate_body_min_length].to_i : awesome_config.config[:validate_body_min_length].to_i
         end
 
         def custom_fields

data/app/packs/src/decidim/decidim_awesome/forms/autosave.js

@@ -32,9 +32,7 @@ document.addEventListener("DOMContentLoaded", () => {
       // '[type="hidden"]',
       '[name="utf8"]',
       '[name="authenticity_token"]',
-      "[disabled]",
-      // there are problems with matrix questions
-      '[type="checkbox"]'
+      "[disabled]"
     ]
   });
 

data/app/presenters/concerns/decidim/decidim_awesome/menu_item_presenter_override.rb

@@ -25,7 +25,7 @@ module Decidim
         end
 
         def hacked_not_overriding?
-          !(@menu_item.is_a?(Decidim::MenuItem) || @menu_item.overrided?)
+          !(@menu_item.is_a?(Decidim::MenuItem) || @menu_item.overridden?)
         end
       end
     end

data/app/validators/concerns/decidim/decidim_awesome/etiquette_validator_override.rb

@@ -6,34 +6,63 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
+        alias_method :original_validate_caps, :validate_caps
+        alias_method :original_validate_marks, :validate_marks
+        alias_method :original_validate_caps_first, :validate_caps_first
+
         private
 
         def validate_caps(record, attribute, value)
-          percent = awesome_config(record, "validate_#{attribute}_max_caps_percent").to_f
+          awesome_config = awesome_config(record, "validate_#{attribute_without_locale(attribute)}_max_caps_percent")
+
+          # original method does not take into account accents or anything else than A-Z
+          # return original_validate_caps_first(record, attribute, value) if awesome_config.nil?
+          percent = if awesome_config.nil?
+                      50
+                    else
+                      awesome_config.to_f
+                    end
           return if value.scan(/[[:upper:]]/).length < value.length * percent / 100
 
           record.errors.add(attribute, options[:message] || I18n.t("too_much_caps", scope: "decidim.decidim_awesome.validators", percent: percent.round))
         end
 
         def validate_marks(record, attribute, value)
-          marks = awesome_config(record, "validate_#{attribute}_max_marks_together").to_i + 1
+          awesome_config = awesome_config(record, "validate_#{attribute_without_locale(attribute)}_max_marks_together")
+
+          marks = if awesome_config.nil?
+                    2
+                  else
+                    awesome_config.to_i + 1
+                  end
           return if value.scan(/[!?¡¿]{#{marks},}/).empty?
 
           record.errors.add(attribute, options[:message] || :too_many_marks)
         end
 
         def validate_caps_first(record, attribute, value)
-          return unless awesome_config(record, "validate_#{attribute}_start_with_caps")
+          awesome_config = awesome_config(record, "validate_#{attribute_without_locale(attribute)}_start_with_caps")
+
+          # original method does not take into account accents or anything else than A-Z
+          # return original_validate_caps_first(record, attribute, value) if awesome_config.nil?
+          return unless awesome_config || awesome_config.nil?
           return if value.scan(/\A[[:lower:]]{1}/).empty?
 
           record.errors.add(attribute, options[:message] || :must_start_with_caps)
         end
 
+        def record_awesome_config(record)
+          record.try(:awesome_config)
+        end
+
         def awesome_config(record, var)
-          config = record.try(:awesome_config)&.config
-          return unless config.is_a?(Hash)
+          record_awesome_config(record)&.config&.[](var.to_sym)
+        end
+
+        def attribute_without_locale(attribute)
+          return attribute unless Decidim.available_locales.map { |locale| "_#{locale}" }.any? { |str| attribute.ends_with?(str) }
 
-          config[var.to_sym]
+          attribute.to_s[0...-3]
         end
       end
     end

data/app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb

@@ -18,7 +18,7 @@
     </thead>
     <tbody>
       <% current_items.each do |item| %>
-        <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
+        <tr<%= " class=menu_hack-addition" if item.try(:overridden?) == false %>>
           <td><%= item.label %></td>
           <td><%= item.url %></td>
           <td><%= item.position %></td>
@@ -26,8 +26,8 @@
           <td><%= visibility_options.invert[item.try(:visibility)] %></td>
           <td class="table-list__actions">
             <%= icon_link_to "pencil-line", decidim_admin_decidim_awesome.edit_menu_hack_path(params[:menu_id], md5(item.url)), t(".edit"), class: "action-icon--edit" %>
-            <% if item.respond_to?(:overrided?) %>
-              <%= icon_link_to "close-circle-line", decidim_admin_decidim_awesome.menu_hack_path(params[:menu_id], md5(item.url)), t(".remove#{"_hack" if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+            <% if item.respond_to?(:overridden?) %>
+              <%= icon_link_to "close-circle-line", decidim_admin_decidim_awesome.menu_hack_path(params[:menu_id], md5(item.url)), t(".remove#{"_hack" if item.overridden?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
             <% else %>
                 <span class="action-icon">
                   <%= icon "close-circle-line", class: "action-icon action-icon--disabled", role: "img" %>

data/lib/decidim/decidim_awesome/checksums.yml

@@ -28,6 +28,7 @@ decidim-core:
     decidim-0.29.1: f04f0f5112499a86079119d5f9ae8487
   /app/helpers/decidim/amendments_helper.rb:
     decidim-0.29.1: 36072334cba7a58841a6b2fb007d24a6
+    decidim-0.29.6: 3cab6a4df40449d985366f46c94db57a
   /app/presenters/decidim/admin_log/component_presenter.rb:
     decidim-0.29.1: 77e80d527727acdf117a0c4517a69a7c
   /app/forms/decidim/account_form.rb:

data/lib/decidim/decidim_awesome/config.rb

@@ -7,6 +7,7 @@ module Decidim
       def initialize(organization)
         @organization = organization
         @vars = AwesomeConfig.for_organization(organization).includes(:constraints)
+        @saved_vars = @vars.map(&:var).map(&:to_sym)
         @context = {
           participatory_space_manifest: nil,
           participatory_space_slug: nil,
@@ -17,7 +18,7 @@ module Decidim
         @sub_configs = {}
       end
 
-      attr_reader :context, :organization, :vars, :application_context
+      attr_reader :context, :organization, :vars, :application_context, :saved_vars
       attr_writer :defaults
 
       def defaults
@@ -75,7 +76,7 @@ module Decidim
         valid = @vars.to_h { |v| [v.var.to_sym, v.value] }
 
         map_defaults do |key, val|
-          valid.has_key?(key) ? valid[key] : val
+          valid[key].nil? ? val : valid[key]
         end
       end
 
@@ -86,6 +87,11 @@ module Decidim
         )
       end
 
+      # Checks if some var has been configured for the organization (not using defaults)
+      def saved?(var)
+        @saved_vars.include?(var.to_sym)
+      end
+
       # Checks if some config setting is enabled in a certain context
       def enabled_in_context?(setting)
         config[setting]
@@ -172,10 +178,18 @@ module Decidim
         end
       end
 
+      # calculates the config according to the current context
+      # - if some var is not valid in the current context, it will be nil
+      # Certain keys may want to know if this is a legit value or it is simply not valid in the current context
+      # Fot that, use the saved?(var) method
       def calculate_config
-        # filter vars compliant with current context
-        valid = @vars.filter { |item| enabled_for_organization?(item.var) && valid_in_context?(item.all_constraints) }
-                     .to_h { |v| [v.var.to_sym, v.value] }
+        # set values to vars according to the current context
+        valid = @vars.to_h do |item|
+          [
+            item.var.to_sym,
+            enabled_for_organization?(item.var) && valid_in_context?(item.all_constraints) ? item.value : nil
+          ]
+        end
 
         map_defaults do |key, val|
           valid.has_key?(key) ? valid[key] : val

data/lib/decidim/decidim_awesome/engine.rb

@@ -111,7 +111,7 @@ module Decidim
 
         # Late registering of components to take into account initializer values
         DecidimAwesome.registered_components.each do |manifest, block|
-          next if DecidimAwesome.disabled_components.include?(manifest)
+          next if DecidimAwesome.disabled_components&.include?(manifest)
           next if Decidim.find_component_manifest(manifest)
 
           Decidim.register_component(manifest, &block)

data/lib/decidim/decidim_awesome/map_component/engine.rb

@@ -16,7 +16,7 @@ module Decidim
 
         initializer "decidim_decidim_awesome.content_blocks" do |_app|
           # do not register this if awesome_map is disabled
-          next if DecidimAwesome.disabled_components.include?(:awesome_map)
+          next if DecidimAwesome.disabled_components&.include?(:awesome_map)
 
           # === Home Map block ===
           Decidim.content_blocks.register(:homepage, :awesome_map) do |content_block|

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -20,7 +20,7 @@ module Decidim
         menu_overrides.each do |item|
           default = default_items.find { |i| i.url.gsub(/\?.*/, "") == item.url }
           if default
-            item.send("overrided?=", true)
+            item.send("overridden?=", true)
             item[:original_active] = default.active
             @items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
           end
@@ -58,7 +58,7 @@ module Decidim
             visibility: item["visibility"],
             visible?: visible?(item),
             target: item["target"],
-            overrided?: false
+            overridden?: false
           )
         end
       end

data/lib/decidim/decidim_awesome/system_checker.rb

@@ -11,7 +11,10 @@ module Decidim
 
           # rubocop:disable Rails/DynamicFindBy
           checksums = YAML.load_file("#{__dir__}/checksums.yml")
-          @overrides = checksums.map do |package, files|
+
+          @overrides = checksums.filter_map do |package, files|
+            next unless Decidim::DependencyResolver.instance.needed?(package)
+
             props = {
               spec: ::Gem::Specification.find_by_name(package),
               files: files.transform_values(&:values)

data/lib/decidim/decidim_awesome/test/shared_examples/proposal_form_examples.rb

@@ -40,6 +40,7 @@ shared_context "with a custom fields enabled" do
   let!(:private_constraint) { create(:config_constraint, awesome_config: private_config_helper, settings: { "participatory_space_manifest" => "participatory_processes" }) }
   let(:slug) { participatory_space.slug }
 end
+
 shared_examples "starts with caps" do |prop|
   let!(:config) { create(:awesome_config, organization:, var: "validate_#{prop}_start_with_caps", value: enabled) }
   let!(:constraint) do
@@ -138,7 +139,7 @@ shared_examples "max caps percent" do |prop|
   context "when scoped under different context" do
     let(:slug) { "another-slug" }
 
-    it_behaves_like "invalid percentage", 25
+    it_behaves_like "invalid percentage", 50
 
     context "when has less than 25% caps" do
       let(prop.to_sym) { "Í only have some CÁPS" }

data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-welcome_text = "Dashboard"
-
 shared_examples "redirects to index" do |_link|
   it "display index page" do
     expect(page).to have_content("You are not authorized to perform this action")
-    expect(page).to have_content(welcome_text)
+    expect(page).to have_content("Dashboard")
     expect(page).to have_current_path(decidim_admin.root_path, ignore_query: true)
   end
 end
@@ -111,12 +109,12 @@ shared_examples "allows all admin routes" do
     visit decidim_admin.root_path
     # this is a workaround to wait for the page to load
     # it seems that the test might fail randomly otherwise
-    # underlaying issue is unknown, maybe capybara is faster clicking than ruby is at storing class variables?
+    # underlying issue is unknown, maybe capybara is faster clicking than ruby is at storing class variables?
     sleep 0.1
   end
 
   it "allows the admin root page" do
-    expect(page).to have_content(welcome_text)
+    expect(page).to have_content("Dashboard")
   end
 
   it "allows the assemblies page" do
@@ -138,7 +136,7 @@ shared_examples "allows scoped admin routes" do
   end
 
   it "allows the admin root page" do
-    expect(page).to have_content(welcome_text)
+    expect(page).to have_content("Dashboard")
   end
 
   it "allows the assemblies page" do

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.12.5"
+    VERSION = "0.12.6"
     COMPAT_DECIDIM_VERSION = [">= 0.29.1", "< 0.30"].freeze
   end
 end

data/package.json

@@ -34,10 +34,10 @@
   },
   "prettier": "@decidim/prettier-config",
   "devDependencies": {
-    "@decidim/dev": "0.29.4",
-    "@decidim/eslint-config": "0.29.4",
-    "@decidim/prettier-config": "0.29.4",
-    "@decidim/stylelint-config": "0.29.4",
+    "@decidim/dev": "0.29.5",
+    "@decidim/eslint-config": "0.29.5",
+    "@decidim/prettier-config": "0.29.5",
+    "@decidim/stylelint-config": "0.29.5",
     "postcss-scss": "^4.0.9"
   },
   "dependencies": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hashcash