decidim-core 0.23.3 → 0.24.0.rc1

data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb

@@ -36,5 +36,51 @@ shared_examples "searchable results" do
         end
       end
     end
+
+    context "when participatory space is not visible" do
+      shared_examples_for "no searchs found" do
+        it "not contains these searchables" do
+          expect(searchables).not_to be_empty
+          expect(term).not_to be_empty
+
+          fill_in "term", with: term
+          find("input#term").native.send_keys :enter
+
+          expect(page).to have_current_path decidim.search_path, ignore_query: true
+          expect(page).to have_content(/results for the search: "#{term}"/i)
+          expect(page).to have_selector(".filters__section")
+          expect(page.find("#search-count .section-heading").text.to_i).not_to be_positive
+        end
+
+        it "doesn't find content by hashtag" do
+          if respond_to?(:hashtag)
+            fill_in "term", with: hashtag
+            find("input#term").native.send_keys :enter
+
+            expect(page.find("#search-count .section-heading").text.to_i).not_to be_positive
+
+            within "#results" do
+              expect(page).not_to have_content(hashtag)
+            end
+          end
+        end
+      end
+
+      context "when participatory space is unpublished" do
+        before do
+          perform_enqueued_jobs { participatory_space.update!(published_at: nil) }
+        end
+
+        it_behaves_like "no searchs found"
+      end
+
+      context "when participatory space is private" do
+        before do
+          perform_enqueued_jobs { participatory_space.update!(private_space: true) }
+        end
+
+        it_behaves_like "no searchs found"
+      end
+    end
   end
 end

data/lib/decidim/core/test/shared_examples/static_pages_examples.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "accessible static pages" do
+  let(:organization) do
+    create(
+      :organization,
+      create_static_pages: false,
+      force_users_to_authenticate_before_access_organization: true
+    )
+  end
+  let!(:public_pages) { create_list(:static_page, 5, organization: organization, allow_public_access: true) }
+  let!(:private_pages) { create_list(:static_page, 5, organization: organization) }
+  let(:actual_page_ids) { [] }
+
+  def expect_correct_accessible_static_pages
+    expect(actual_page_ids).to match_array(expected_page_ids)
+  end
+
+  context "with a user" do
+    let(:user) { create(:user, organization: organization) }
+    let(:expected_page_ids) { public_pages.pluck(:id) + private_pages.pluck(:id) }
+
+    it { expect_correct_accessible_static_pages }
+  end
+
+  context "without a user" do
+    let(:user) { nil }
+    let(:expected_page_ids) { public_pages.pluck(:id) }
+
+    it { expect_correct_accessible_static_pages }
+
+    context "when the organization does not force users to authenticate" do
+      let(:organization) { create(:organization, create_static_pages: false) }
+      let(:expected_page_ids) do
+        public_pages.pluck(:id) + private_pages.pluck(:id)
+      end
+
+      it { expect_correct_accessible_static_pages }
+    end
+  end
+end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.23.3"
+      "0.24.0.rc1"
     end
   end
 end

data/lib/decidim/diffy_extension.rb

@@ -36,11 +36,11 @@ module Decidim
       end
 
       def unescaped_split_left
-        @diff.gsub(%r{<li class="ins">([\s\S]*?)<\/li>}, "")
+        @diff.gsub(%r{<li class="ins">([\s\S]*?)</li>}, "")
       end
 
       def unescaped_split_right
-        @diff.gsub(%r{<li class="del">([\s\S]*?)<\/li>}, "")
+        @diff.gsub(%r{<li class="del">([\s\S]*?)</li>}, "")
       end
     end
   end

data/lib/decidim/exporters/csv.rb

@@ -53,12 +53,13 @@ module Decidim
       end
 
       def flatten(object, key = nil)
-        if object.is_a? Hash
+        case object
+        when Hash
           object.inject({}) do |result, (subkey, value)|
             new_key = key ? "#{key}/#{subkey}" : subkey.to_s
             result.merge(flatten(value, new_key))
           end
-        elsif object.is_a?(Array)
+        when Array
           { key.to_s => object.compact.map(&:to_s).join(", ") }
         else
           { key.to_s => object }

data/lib/decidim/exporters/export_data.rb

@@ -28,7 +28,7 @@ module Decidim
       # Returns a String with the filename of the export.
       def filename(prefix = "export", options = {})
         options[:extension] = !options[:extension].nil? ? options[:extension] : true
-        result = "#{prefix}-#{I18n.localize(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
+        result = "#{prefix}-#{I18n.l(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
         result += ".#{extension}" if options[:extension]
         result
       end

data/lib/decidim/faker/internet.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "faker"
+
+module Decidim
+  module Faker
+    # A Custom Faker wrapper to modify Faker::Internet#slug
+    class Internet < ::Faker::Internet
+      # Fakes a slug, using EN locale to allow ASCII only
+      def self.slug(...)
+        with_locale(:en) do
+          ::Faker::Internet.slug(...)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/faker/localized.rb

@@ -46,9 +46,9 @@ module Decidim
       # Builds many Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.words(*args)
+      def self.words(...)
         localized do
-          ::Faker::Lorem.words(*args)
+          ::Faker::Lorem.words(...)
         end
       end
 
@@ -64,63 +64,63 @@ module Decidim
       # Builds many Lorem Ipsum characters. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.characters(*args)
+      def self.characters(...)
         localized do
-          ::Faker::Lorem.characters(*args)
+          ::Faker::Lorem.characters(...)
         end
       end
 
       # Builds a sentence with Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.sentence(*args)
+      def self.sentence(...)
         localized do
-          ::Faker::Lorem.sentence(*args)
+          ::Faker::Lorem.sentence(...)
         end
       end
 
       # Builds many sentences with Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.sentences(*args)
+      def self.sentences(...)
         localized do
-          ::Faker::Lorem.sentences(*args)
+          ::Faker::Lorem.sentences(...)
         end
       end
 
       # Builds a paragraph with Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.paragraph(*args)
+      def self.paragraph(...)
         localized do
-          ::Faker::Lorem.paragraph(*args)
+          ::Faker::Lorem.paragraph(...)
         end
       end
 
       # Builds many paragraphs with Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.paragraphs(*args)
+      def self.paragraphs(...)
         localized do
-          ::Faker::Lorem.paragraphs(*args)
+          ::Faker::Lorem.paragraphs(...)
         end
       end
 
       # Builds a question with Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.question(*args)
+      def self.question(...)
         localized do
-          ::Faker::Lorem.question(*args)
+          ::Faker::Lorem.question(...)
         end
       end
 
       # Builds many questions with Lorem Ipsum words. See Faker::Lorem for options.
       #
       # Returns a Hash with a value for each locale.
-      def self.questions(*args)
+      def self.questions(...)
         localized do
-          ::Faker::Lorem.questions(*args)
+          ::Faker::Lorem.questions(...)
         end
       end
 
@@ -150,8 +150,16 @@ module Decidim
       # Returns a Hash with a value for each locale.
       def self.wrapped(before, after)
         result = yield
-        result.inject({}) do |wrapped, (locale, text)|
-          wrapped.update(locale => [before, text, after].join)
+        result.inject({}) do |wrapped, (locale, value)|
+          if value.is_a?(Hash)
+            final_value = value.inject({}) do |new_wrapped, (new_locale, new_value)|
+              new_wrapped.update(new_locale => [before, new_value, after].join)
+            end
+
+            wrapped.update(locale => final_value)
+          else
+            wrapped.update(locale => [before, value, after].join)
+          end
         end
       end
 
@@ -160,13 +168,21 @@ module Decidim
       #
       # Returns a Hash with a value for each locale.
       def self.localized
-        Decidim.available_locales.inject({}) do |result, locale|
+        *locales, last_locale = Decidim.available_locales
+
+        value = locales.inject({}) do |result, locale|
           text = ::Faker::Base.with_locale(locale) do
             yield
           end
 
           result.update(locale => text)
         end.with_indifferent_access
+
+        value.update(
+          "machine_translations" => {
+            last_locale => ::Faker::Base.with_locale(last_locale) { yield }
+          }.with_indifferent_access
+        )
       end
 
       # Prefixes the +msg+ for each available locale and returns as a Hash
@@ -174,9 +190,16 @@ module Decidim
       #
       # Return a Hash with a value for each locale.
       def self.prefixed(msg, locales = Decidim.available_locales)
-        locales.inject({}) do |result, locale|
+        *all_locales, last_locale = locales
+        value = all_locales.inject({}) do |result, locale|
           result.update(locale => "#{locale.to_s.upcase}: #{msg}")
         end.with_indifferent_access
+
+        value.update(
+          "machine_translations" => {
+            last_locale => "#{last_locale.to_s.upcase}: #{msg}"
+          }.with_indifferent_access
+        )
       end
     end
   end

data/lib/decidim/file_validator_humanizer.rb

@@ -36,7 +36,7 @@ module Decidim
         )
       end
 
-      if (extensions = extension_whitelist)
+      if (extensions = extension_allowlist)
         messages << I18n.t(
           "allowed_file_extensions",
           extensions: extensions.join(" "),
@@ -47,6 +47,7 @@ module Decidim
       messages
     end
 
+    # rubocop: disable Metrics/CyclomaticComplexity
     def max_file_size
       # First try if the record itself has a file size validator defined.
       validator = record.singleton_class.validators_on(attribute).find do |v|
@@ -70,13 +71,14 @@ module Decidim
 
       lte.call(passthru_record) if lte.respond_to?(:call)
     end
+    # rubocop: enable Metrics/CyclomaticComplexity
 
-    def extension_whitelist
-      return unless uploader.respond_to?(:extension_whitelist, true)
+    def extension_allowlist
+      return unless uploader.respond_to?(:extension_allowlist, true)
 
       # It may be a private method in some uploaders which is why we need to use
       # `#send`.
-      uploader.send(:extension_whitelist)
+      uploader.send(:extension_allowlist)
     end
 
     private

data/lib/decidim/form_builder.rb

@@ -349,7 +349,7 @@ module Decidim
 
     # Public: Override so checkboxes are rendered before the label.
     def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
-      custom_label(attribute, options[:label], options[:label_options], true) do
+      custom_label(attribute, options[:label], options[:label_options], field_before_label: true) do
         options.delete(:label)
         options.delete(:label_options)
         @template.check_box(@object_name, attribute, objectify_options(options), checked_value, unchecked_value)
@@ -361,7 +361,7 @@ module Decidim
     def date_field(attribute, options = {})
       value = object.send(attribute)
       data = { datepicker: "" }
-      data[:startdate] = I18n.localize(value, format: :decidim_short) if value.present? && value.is_a?(Date)
+      data[:startdate] = I18n.l(value, format: :decidim_short) if value.present? && value.is_a?(Date)
       datepicker_format = ruby_format_to_datepicker(I18n.t("date.formats.decidim_short"))
       data[:"date-format"] = datepicker_format
 
@@ -379,7 +379,7 @@ module Decidim
     def datetime_field(attribute, options = {})
       value = object.send(attribute)
       data = { datepicker: "", timepicker: "" }
-      data[:startdate] = I18n.localize(value, format: :decidim_short) if value.present? && value.is_a?(ActiveSupport::TimeWithZone)
+      data[:startdate] = I18n.l(value, format: :decidim_short) if value.present? && value.is_a?(ActiveSupport::TimeWithZone)
       datepicker_format = ruby_format_to_datepicker(I18n.t("time.formats.decidim_short"))
       data[:"date-format"] = datepicker_format
 
@@ -388,7 +388,7 @@ module Decidim
         options.merge(data: data)
       )
       help_text = I18n.t("decidim.datepicker.help_text", datepicker_format: datepicker_format)
-      template += error_and_help_text(attribute, options.merge(help_text: help_text))
+      template += content_tag(:span, help_text, class: "help-text")
       template.html_safe
     end
 
@@ -414,7 +414,7 @@ module Decidim
       template += upload_help(attribute, options)
       template += @template.file_field @object_name, attribute
 
-      template += extension_whitelist_help(options[:extension_whitelist]) if options[:extension_whitelist].present?
+      template += extension_allowlist_help(options[:extension_allowlist]) if options[:extension_allowlist].present?
       template += image_dimensions_help(options[:dimensions_info]) if options[:dimensions_info].present?
 
       if file_is_image?(file)
@@ -429,14 +429,12 @@ module Decidim
         template += @template.link_to file.file.filename, file.url, target: "_blank", rel: "noopener"
       end
 
-      if file_is_present?(file)
-        if options[:optional]
-          template += content_tag :div, class: "field" do
-            safe_join([
-                        @template.check_box(@object_name, "remove_#{attribute}"),
-                        label("remove_#{attribute}", I18n.t("remove_this_file", scope: "decidim.forms"))
-                      ])
-          end
+      if file_is_present?(file) && options[:optional]
+        template += content_tag :div, class: "field" do
+          safe_join([
+                      @template.check_box(@object_name, "remove_#{attribute}"),
+                      label("remove_#{attribute}", I18n.t("remove_this_file", scope: "decidim.forms"))
+                    ])
         end
       end
 
@@ -451,20 +449,28 @@ module Decidim
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
 
-    def upload_help(attribute, _options = {})
+    def upload_help(attribute, options = {})
       humanizer = FileValidatorHumanizer.new(object, attribute)
 
       help_scope = begin
-        if humanizer.uploader.is_a?(Decidim::ImageUploader)
+        if options[:help_i18n_scope].present?
+          options[:help_i18n_scope]
+        elsif humanizer.uploader.is_a?(Decidim::ImageUploader)
           "decidim.forms.file_help.image"
         else
           "decidim.forms.file_help.file"
         end
       end
 
-      content_tag(:div, class: "help-text") do
-        help_messages = %w(message_1 message_2)
+      help_messages = begin
+        if options[:help_i18n_messages].present?
+          Array(options[:help_i18n_messages])
+        else
+          %w(message_1 message_2)
+        end
+      end
 
+      content_tag(:div, class: "help-text") do
         inner = "<p>#{I18n.t("explanation", scope: help_scope)}</p>".html_safe
         inner + content_tag(:ul) do
           messages = help_messages.each.map { |msg| I18n.t(msg, scope: help_scope) }
@@ -556,6 +562,9 @@ module Decidim
       html + error_and_help_text(attribute, options.merge(help_text: help_text))
     end
 
+    # rubocop: disable Metrics/CyclomaticComplexity
+    # rubocop: disable Metrics/PerceivedComplexity
+
     # Private: Builds a Hash of options to be injected at the HTML output as
     # HTML5 validations.
     #
@@ -574,6 +583,8 @@ module Decidim
       validation_options[:maxlength] ||= max_length if max_length.to_i.positive?
       validation_options
     end
+    # rubocop: enable Metrics/CyclomaticComplexity
+    # rubocop: enable Metrics/PerceivedComplexity
 
     # Private: Tries to find if an attribute is required in the form object.
     #
@@ -644,7 +655,7 @@ module Decidim
     # Returns a String.
     # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/PerceivedComplexity
-    def custom_label(attribute, text, options, field_before_label = false, show_required = true)
+    def custom_label(attribute, text, options, field_before_label: false, show_required: true)
       return block_given? ? yield.html_safe : "".html_safe if text == false
 
       text = default_label_text(object, attribute) if text.nil? || text == true
@@ -677,7 +688,7 @@ module Decidim
 
       options = { count: 1, default: defaults }
 
-      text = I18n.t(defaults.shift, options)
+      text = I18n.t(defaults.shift, **options)
       content_tag(:span, text, class: "form-error")
     end
 
@@ -800,12 +811,12 @@ module Decidim
       name.to_s.parameterize.underscore
     end
 
-    def extension_whitelist_help(extension_whitelist)
+    def extension_allowlist_help(extension_allowlist)
       content_tag :p, class: "extensions-help help-text" do
         safe_join([
-                    content_tag(:span, I18n.t("extension_whitelist", scope: "decidim.forms.files")),
+                    content_tag(:span, I18n.t("extension_allowlist", scope: "decidim.forms.files")),
                     " ",
-                    safe_join(extension_whitelist.map { |ext| content_tag(:b, ext) }, ", ")
+                    safe_join(extension_allowlist.map { |ext| content_tag(:b, ext) }, ", ")
                   ])
       end
     end