decidim-core 0.29.0.rc2 → 0.29.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58010f8c0acc3bb6a92e20dc385ac989fc98313060d5fbc3ef2c4d484af32720
-  data.tar.gz: 3be55fbdfae89e11566eb7ff9227133209de3e779fc2062cd6b86c6431436584
+  metadata.gz: 3394fbf408e9109f688cd6e8fa7439096050219d59f5ac6328f6be21a51c752d
+  data.tar.gz: b39954abe8812022859ab60690a82dc89078868cfe89b567ea1a2499d7cb7aa0
 SHA512:
-  metadata.gz: b57ad83f76d31c5938f46720f2370dbd08b10378f8acb9a302904574ec99b3af904e8cde5057451108a064cba47d26469fa71d39dabcb55c4e02c299751a62e8
-  data.tar.gz: d44e89eadae907601f933f342d6d6e25e97da2e44e806d5837d057f8c970597a0c69c61302ff9853b7ce43bb08d1ec3ab256620c414f66033a470c14843d02b4
+  metadata.gz: 9402884a433f7bd1d3498bc70429be6704f56c2e3eb4fdb4769ea076d1c9473ee555b5580d142cb7560b6a1ea54d027415ec9821303466fb56c8bfa1889ea611
+  data.tar.gz: 4fcd613c47e4d1a8eed16ef0f3217afa43b4a648f49dbe6a787cb82e7919ef2ba290b1c07b2e39da7d91098620046221b2552eaddc091982eacc03e1f4141db1

data/app/cells/decidim/card_g/show.erb

@@ -1,7 +1,7 @@
 <%= link_to resource_path, class: classes[:default], id: resource_id do %>
   <div class="<%= classes[:img] %>">
     <% if has_image? %>
-      <%= image_tag resource_image_path, alt: alt_title %>
+      <%= image_tag resource_image_url, alt: alt_title %>
     <% else %>
       <%= external_icon "media/images/placeholder-card-g.svg", class: "card__placeholder-g" %>
     <% end %>

data/app/cells/decidim/card_g_cell.rb

@@ -52,12 +52,15 @@ module Decidim
       @id_base_name ||= resource.class.name.gsub(/\ADecidim::/, "").underscore.split("/").join("__")
     end
 
-    def resource_image_path
+    def resource_image_url
+      # Backwards compatibility.
+      return resource_image_path if respond_to?(:resource_image_path)
+
       nil
     end
 
     def has_image?
-      resource_image_path.present?
+      resource_image_url.present?
     end
 
     def show_description?

data/app/cells/decidim/card_l/image.erb

@@ -1,6 +1,6 @@
 <div class="card__list-image">
-  <% if resource_image_path.present? %>
-    <%= image_tag resource_image_path, class: "w-full h-full object-cover" %>
+  <% if has_image? %>
+    <%= image_tag resource_image_url, class: "w-full h-full object-cover" %>
   <% else %>
     <div class="w-full h-full relative">
       <div class="w-full h-full bg-primary opacity-10 absolute top-0 left-0 z-10">

data/app/cells/decidim/card_l_cell.rb

@@ -66,12 +66,15 @@ module Decidim
       "#{class_base_name}__#{class_name}"
     end
 
-    def resource_image_path
+    def resource_image_url
+      # Backwards compatibility.
+      return resource_image_path if respond_to?(:resource_image_path)
+
       nil
     end
 
     def has_image?
-      resource_image_path.present?
+      resource_image_url.present?
     end
 
     def has_link_to_resource?

data/app/cells/decidim/content_blocks/hero_cell.rb

@@ -15,7 +15,7 @@ module Decidim
       end
 
       def background_image
-        model.images_container.attached_uploader(:background_image).path(variant: :big)
+        model.images_container.attached_uploader(:background_image).variant_url(:big)
       end
 
       private

data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb

@@ -1,4 +1,4 @@
-<section id="highlighted_content_banner" class="home__section-image" style="--hero-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>');">
+<section id="highlighted_content_banner" class="home__section-image" style="--hero-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).url %>');">
   <div class="home__section-content-banner home__section">
     <div>
       <h2 class="home__section-content-banner__title">

data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb

@@ -32,9 +32,9 @@ module Decidim
       # If it is called from the landing page content block, use the background image defined there
       # Else, use the banner image defined in the space (for assemblies)
       def image_path
-        return model.images_container.attached_uploader(:background_image).path if model.respond_to?(:images_container)
+        return model.images_container.attached_uploader(:background_image).url if model.respond_to?(:images_container)
 
-        attached_uploader(:banner_image).path
+        attached_uploader(:banner_image).url
       end
 
       def has_hashtag?

data/app/commands/decidim/create_omniauth_registration.rb

@@ -55,7 +55,12 @@ module Decidim
         # If user has left the account unconfirmed and later on decides to sign
         # in with omniauth with an already verified account, the account needs
         # to be marked confirmed.
-        @user.skip_confirmation! if !@user.confirmed? && @user.email == verified_email
+        if !@user.confirmed? && @user.email == verified_email
+          @user.skip_confirmation!
+          @user.after_confirmation
+        end
+        @user.tos_agreement = "1"
+        @user.save!
       else
         @user.email = (verified_email || form.email)
         @user.name = form.name
@@ -69,10 +74,11 @@ module Decidim
           @user.avatar.attach(io: file, filename:)
         end
         @user.skip_confirmation! if verified_email
-      end
+        @user.tos_agreement = "1"
+        @user.save!
 
-      @user.tos_agreement = "1"
-      @user.save!
+        @user.after_confirmation if verified_email
+      end
     end
 
     def create_identity

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -21,6 +21,7 @@ module Decidim
       include Decidim::SafeRedirect
       include NeedsSnippets
       include UserBlockedChecker
+      include ActiveStorage::SetCurrent
 
       helper Decidim::TranslationsHelper
       helper Decidim::MetaTagsHelper

data/app/controllers/decidim/application_controller.rb

@@ -24,6 +24,7 @@ module Decidim
     include DisableRedirectionToExternalHost
     include NeedsPasswordChange
     include LinkedResourceReference
+    include ActiveStorage::SetCurrent
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper

data/app/models/decidim/attachment.rb

@@ -84,11 +84,12 @@ module Decidim
     #
     # Returns String.
     def url
-      if file?
-        attached_uploader(:file).path
-      elsif link?
-        link
-      end
+      @url ||=
+        if file?
+          attached_uploader(:file).url
+        elsif link?
+          link
+        end
     end
 
     # The URL to download the thumbnail of the file. Only works with images.
@@ -97,7 +98,7 @@ module Decidim
     def thumbnail_url
       return unless photo?
 
-      attached_uploader(:file).path(variant: :thumbnail)
+      @thumbnail_url ||= attached_uploader(:file).variant_url(:thumbnail)
     end
 
     # The URL to download the a big version of the file. Only works with images.
@@ -106,7 +107,7 @@ module Decidim
     def big_url
       return unless photo?
 
-      attached_uploader(:file).path(variant: :big)
+      @big_url ||= attached_uploader(:file).variant_url(:big)
     end
 
     def set_content_type_and_size

data/app/models/decidim/content_block.rb

@@ -60,8 +60,8 @@ module Decidim
     #
     #     # This is how you can access the image data, just like with any other
     #     # uploader field. You can use the uploader variants too.
-    #     content_block.images_container.attached_uploader(:my_image).path
-    #     content_block.images_container.attached_uploader(:my_image).path(variant: :big)
+    #     content_block.images_container.attached_uploader(:my_image).url
+    #     content_block.images_container.attached_uploader(:my_image).variant_url(:big)
     #
     #     # This will delete the attached image
     #     content_block.images_container.my_image = nil

data/app/models/decidim/user.rb

@@ -278,6 +278,18 @@ module Decidim
       false
     end
 
+    def after_confirmation
+      return unless organization.send_welcome_notification?
+
+      Decidim::EventsManager.publish(
+        event: "decidim.events.core.welcome_notification",
+        event_class: WelcomeNotificationEvent,
+        resource: self,
+        affected_users: [self],
+        extra: { force_email: true }
+      )
+    end
+
     protected
 
     # Overrides devise email required validation.
@@ -296,18 +308,6 @@ module Decidim
       super
     end
 
-    def after_confirmation
-      return unless organization.send_welcome_notification?
-
-      Decidim::EventsManager.publish(
-        event: "decidim.events.core.welcome_notification",
-        event_class: WelcomeNotificationEvent,
-        resource: self,
-        affected_users: [self],
-        extra: { force_email: true }
-      )
-    end
-
     private
 
     # Changes default Devise behaviour to use ActiveJob to send async emails.

data/app/packs/stylesheets/decidim/_filters.scss

@@ -1,6 +1,8 @@
 .filter {
+  @apply flex gap-2 p-1.5 relative;
+
   label {
-    @apply flex items-center gap-2 p-1.5 rounded cursor-pointer relative;
+    @apply flex items-center gap-2 p-1.5 rounded cursor-pointer relative w-full;
   }
 
   &-container {

data/app/packs/stylesheets/decidim/_footer.scss

@@ -3,7 +3,7 @@ footer {
     @apply bg-gray-4;
 
     &__top {
-      @apply hidden flex flex-col lg:flex-row lg:block gap-8 container py-10;
+      @apply hidden lg:flex flex-row gap-8 container py-10;
     }
 
     &__down {

data/app/services/decidim/download_your_data_exporter.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "seven_zip_ruby"
-require "zip"
-require_relative "zip_stream/writer"
+require "decidim/seven_zip_wrapper"
 
 module Decidim
   # Public: Generates a 7z(seven zip) file with data files ready to be persisted
@@ -10,8 +8,6 @@ module Decidim
   #
   # In fact, the 7z file wraps a ZIP file which finally contains the data files.
   class DownloadYourDataExporter
-    include ::Decidim::ZipStream::Writer
-
     DEFAULT_EXPORT_FORMAT = "CSV"
     ZIP_FILE_NAME = "download-your-data.zip"
 
@@ -29,36 +25,25 @@ module Decidim
     end
 
     def export
-      dirname = File.dirname(@path)
-      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      File.open(@path, "wb") do |file|
-        SevenZipRuby::Writer.open(file, password: @password) do |szw|
-          szw.header_encryption = true
-          szw.add_data(data, ZIP_FILE_NAME)
-        end
-      end
+      tmpdir = Dir.mktmpdir("temporary-download-your-data-dir")
+      user_data, user_attachments = data_and_attachments_for_user
+      save_user_data(tmpdir, user_data)
+      save_user_attachments(tmpdir, user_attachments)
+
+      SevenZipWrapper.compress_and_encrypt(filename: @path, password: @password, input_directory: tmpdir)
     end
 
     private
 
-    def data
-      buffer = Zip::OutputStream.write_buffer do |out|
-        user_data, attachments = data_for(@user, @export_format)
+    attr_reader :user, :export_format
 
-        add_user_data_to_zip_stream(out, user_data)
-        add_attachments_to_zip_stream(out, attachments)
-      end
-
-      buffer.string
-    end
-
-    def data_for(user, format)
+    def data_and_attachments_for_user
       export_data = []
       export_attachments = []
 
       download_your_data_entities.each do |object|
         klass = Object.const_get(object)
-        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
+        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(export_format).new(klass.user_collection(user), klass.export_serializer).export]
         attachments = klass.download_your_data_images(user)
         export_attachments << [klass.model_name.name.parameterize.pluralize, attachments.flatten] unless attachments.nil?
       end
@@ -69,5 +54,31 @@ module Decidim
     def download_your_data_entities
       @download_your_data_entities ||= DownloadYourDataSerializers.data_entities
     end
+
+    def save_user_data(tmpdir, user_data)
+      user_data.each do |entity, exporter_data|
+        next if exporter_data.read == "\n"
+
+        file_name = File.join(tmpdir, "#{entity}-#{exporter_data.filename}")
+        File.write(file_name, exporter_data.read)
+      end
+    end
+
+    def save_user_attachments(tmpdir, user_attachments)
+      user_attachments.each do |entity, attachment_block|
+        attachment_block.each do |attachment|
+          next unless attachment.attached?
+
+          blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
+          blobs.each do |blob|
+            Dir.mkdir(File.join(tmpdir, entity.parameterize))
+            file_name = File.join(tmpdir, entity.parameterize, blob.filename.to_s)
+            blob.open do |blob_file|
+              File.write(file_name, blob_file.read.force_encoding("UTF-8"))
+            end
+          end
+        end
+      end
+    end
   end
 end

data/app/views/decidim/manifests/show.json.erb

@@ -8,22 +8,22 @@
   "background_color": "#FFFFFF",
   "icons": [
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :small %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :small %>",
       "sizes": "32x32",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :medium %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :medium %>",
       "sizes": "180x180",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :big %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :big %>",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :huge %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :huge %>",
       "sizes": "512x512",
       "type": "image/png"
     }

data/app/views/layouts/decidim/_logo.html.erb

@@ -1,7 +1,7 @@
 <% if organization %>
   <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
     <% if organization.logo.attached? %>
-      <%= image_tag organization.attached_uploader(:logo).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
+      <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
     <% else %>
       <span><%= current_organization_name %></span>
     <% end %>

data/app/views/layouts/decidim/footer/_main.html.erb

@@ -3,7 +3,7 @@
     <div class="lg:w-1/3">
       <%= render partial: "layouts/decidim/footer/main_intro" %>
     </div>
-    <div class="lg:w-2/3 grid grid-cols-1 gap-x-44 gap-y-10 lg:grid-cols-4 text-md text-white">
+    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 gap-y-10 lg:grid-cols-4 text-md text-white">
       <%= render partial: "layouts/decidim/footer/main_links" %>
     </div>
   </div>

data/app/views/layouts/decidim/footer/_main_intro.html.erb

@@ -1,6 +1,6 @@
 <% if current_organization.official_img_footer.attached? %>
   <%= link_to current_organization.official_url, class: "block mb-6" do %>
-    <%= image_tag current_organization.attached_uploader(:official_img_footer).path, alt: current_organization_name, class: "max-h-16" %>
+    <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: current_organization_name, class: "max-h-16" %>
   <% end %>
 <% end %>
 <div class="text-sm text-white prose">

data/app/views/layouts/decidim/header/_main_links_desktop.html.erb

@@ -35,7 +35,7 @@
         <span class="main-bar__avatar">
           <span>
             <%= image_tag(
-                  current_user.attached_uploader(:avatar).path(variant: :thumb),
+                  current_user.attached_uploader(:avatar).variant_url(:thumb),
                   alt: t("decidim.author.avatar", name: decidim_sanitize(current_user.avatar.name))
                 ) %>
           </span>

data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb

@@ -20,7 +20,7 @@
     <% if current_user.avatar.attached? %>
       <div class="main-bar__avatar">
         <%= image_tag(
-                current_user.attached_uploader(:avatar).path(variant: :thumb),
+                current_user.attached_uploader(:avatar).variant_url(:thumb),
                 alt: t("decidim.author.avatar", name: decidim_sanitize(current_user.avatar.name))
               ) %>
       </div>

data/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb

@@ -6,7 +6,7 @@
     <% if current_user.avatar.attached? %>
       <span class="main-bar__avatar">
         <%= image_tag(
-                current_user.attached_uploader(:avatar).path(variant: :thumb),
+                current_user.attached_uploader(:avatar).variant_url(:thumb),
                 alt: t("decidim.author.avatar", name: decidim_sanitize(current_user.avatar.name))
               ) %>
       </span>

data/decidim-core.gemspec

@@ -80,7 +80,6 @@ Gem::Specification.new do |s|
   s.add_dependency "request_store", "~> 1.5.0"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
-  s.add_dependency "seven_zip_ruby", "~> 1.3"
   s.add_dependency "shakapacker", "~> 7.1.0"
   s.add_dependency "valid_email2", "~> 4.0"
   s.add_dependency "web-push", "~> 3.0"

data/lib/decidim/asset_router/storage.rb

@@ -6,6 +6,23 @@ module Decidim
     # saved through ActiveStorage. This handles the different cases for routing
     # to the remote routes when using an assets CDN or to local routes when
     # using the local disk storage driver.
+    #
+    # Note that when the assets are stored in a remote storage service, such as
+    # Amazon S3, Google Cloud Storage or Azure Storage, this generates the asset
+    # URL directly to the storage service itself bypassing the Rails server and
+    # saving CPU time from serving the asset redirect requests. This causes a
+    # significant performance improvement on pages that display a lot of images.
+    # It will also produce a less significant performance improvement when using
+    # the local disk storage because in this situation, the images are served
+    # using one request instead of two when served directly from the storage
+    # service rather than through the asset redirect URL.
+    #
+    # When implementing changes to the logic, please keep the remote storage
+    # options and performance implications in mind because the specs for this
+    # utility do not cover the remote storage options because the extra
+    # configuration needed to test, the service itself needed for testing and
+    # the extra dependency overhead for adding these remote storage gems when
+    # they are not needed.
     class Storage
       # Initializes the router.
       #
@@ -13,25 +30,36 @@ module Decidim
       #   to
       def initialize(asset)
         @asset = asset
+        @blob =
+          case asset
+          when ActiveStorage::Blob
+            asset
+          else
+            asset&.blob
+          end
       end
 
       # Generates the correct URL to the asset with the provided options.
       #
       # @param options The options for the URL that are the normal route options
       #   Rails route helpers accept
-      def url(**options)
-        if asset.is_a? ActiveStorage::Attached
-          routes.rails_blob_url(asset.blob, **default_options.merge(options))
-        elsif asset.is_a? ActiveStorage::Blob
-          routes.rails_blob_url(asset, **default_options.merge(options))
-        else
-          representation_url(**options)
+      # @return [String] The URL of the asset
+      def url(**)
+        case asset
+        when ActiveStorage::Attached
+          ensure_current_host(asset.record, **)
+          blob_url(**)
+        when ActiveStorage::Blob
+          blob_url(**)
+        else # ActiveStorage::VariantWithRecord, ActiveStorage::Variant
+          ensure_current_host(nil, **)
+          representation_url(**)
         end
       end
 
       private
 
-      attr_reader :asset
+      attr_reader :asset, :blob
 
       # Provides the route helpers depending on whether the URL is generated to
       # the local host or an external CDN (remote).
@@ -80,24 +108,199 @@ module Decidim
         }.compact
       end
 
-      # Converts the variation URLs last part to the correct file extension in
-      # case the variation has a different format than the original image.
+      # Most of the times the current host should be set through the controller
+      # already when the logic below is unnecessary. This logic is needed e.g.
+      # for serializers where the request context is not available.
+      #
+      # @param record The record for which to check the organization
+      # @param opts Options for building the URL
+      # @return [void]
+      def ensure_current_host(record, **opts)
+        return if asset_url_available?
+
+        options = remote? ? remote_storage_options : routes.default_url_options
+        options = options.merge(opts)
+
+        if opts[:host].blank? && record.present?
+          organization = organization_for(record)
+          options[:host] = organization.host if organization
+        end
+
+        uri =
+          if options[:protocol] == "https" || options[:scheme] == "https"
+            URI::HTTPS.build(options)
+          else
+            URI::HTTP.build(options)
+          end
+
+        ActiveStorage::Current.url_options = { host: uri.to_s }
+      end
+
+      # Determines the organization for the passed record.
       #
-      # @return [String] The converted representation URL
+      # @param record The record for which to fetch the organization
+      # @return [Decidim::Organization, nil] The organization for the record or
+      #   `nil` if the organization cannot be determined
+      def organization_for(record)
+        if record.is_a?(Decidim::Organization)
+          record
+        elsif record.respond_to?(:organization)
+          record.organization
+        end
+      end
+
+      # Returns the URL for the given blob object.
+      #
+      # @param blob The blob object
+      # @param options Options for building the URL
+      # @return [String, nil] The URL to the blob object or `nil` if the blob is
+      #   not defined.
+      def blob_url(**options)
+        return unless blob
+
+        if options[:only_path] || remote? || !asset_url_available?
+          routes.rails_blob_url(blob, **default_options.merge(options))
+        else
+          blob.url(**options)
+        end
+      end
+
+      # Returns a representation URL for the asset either directly through the
+      # storage service or through the Rails representation URL in case the
+      # path URL is requested or if the asset variant has not been processed yet
+      # and is not therefore yet stored at the storage service.
+      #
+      # @return [String] The representation URL for the image variant
       def representation_url(**options)
+        return rails_representation_url(**options) if options[:only_path] || remote?
+
+        representation_url = variant_url(**options)
+        return representation_url if representation_url.present?
+
+        # In case the representation has not been processed yet, it may not have
+        # a representation URL yet and it therefore needs to be served through
+        # the local representation URL for the first time (or until it has been
+        # processed).
+        if options[:host]
+          rails_representation_url(**options)
+        else
+          representation_url(**options.merge(only_path: true))
+        end
+      end
+
+      # Returns the local Rails representation URL meaning that the asset will
+      # be served through the service itself. This may be necessary if the asset
+      # variant (e.g. a thumbnail) has not been processed yet because the
+      # variant representation has not been requested before.
+      #
+      # Due to performance reasons it is advised to avoid requesting the assets
+      # through the Rails representation URLs when possible because that causes
+      # a lot of requests to the Rails backend and slowness to the service under
+      # heavy loads.
+      #
+      # Converts the variation URLs last part to the correct file extension in
+      # case the variation has a different format than the original image. The
+      # conversion needs to be only done for the Rails representation URLs
+      # because once the image is stored at the storage service, it already has
+      # the correct file extension.
+      #
+      # @param options The options for building the URL
+      # @return [String, nil] The converted representation URL or `nil` if the
+      #   asset is not defined.
+      def rails_representation_url(**options)
+        return unless asset
+
         representation_url = routes.rails_representation_url(asset, **default_options.merge(options))
+
         variation = asset.try(:variation)
         return representation_url unless variation
 
         format = variation.try(:format)
         return representation_url unless format
+        return unless blob
 
-        original_ext = File.extname(asset.blob.filename.to_s)
+        original_ext = File.extname(blob.filename.to_s)
         return representation_url if original_ext == ".#{format}"
 
-        basename = File.basename(asset.blob.filename.to_s, original_ext)
+        basename = File.basename(blob.filename.to_s, original_ext)
         representation_url.sub(/#{basename}\.#{original_ext.tr(".", "")}$/, "#{basename}.#{format}")
       end
+
+      # Fetches the image variant's URL at the storage service if the variant
+      # has already been processed and is stored at the storage service. If the
+      # variant has not been processed yet, returns `nil` in which case the
+      # variant has to be served through the service's own representation URL
+      # causing it to be processed and stored at the storage service.
+      #
+      # @param options The options for building the URL
+      # @return [String, nil] The variant URL at the storage service or `nil` if
+      #   the variant has not been processed yet and does not yet exist at the
+      #   storage service or `nil` when the asset is not defined
+      def variant_url(**options)
+        return unless asset
+        return unless asset_url_available?
+        return unless asset_exist?
+
+        case asset
+        when ActiveStorage::VariantWithRecord
+          # This is used when `ActiveStorage.track_variants` is enabled through
+          # `config.active_storage.track_variants`. In case the variant has not
+          # been processed yet, the `#url` method would return nil.
+          #
+          # Note that if the `asset.processed?` returns `true`, the variant
+          # record has been created in the database but it does not mean that
+          # it has been uploaded to the storage service yet. Likely a bug in
+          # ActiveStorage but to be sure that the asset is uploaded to the
+          # storage service, we also check that.
+          asset.url(**options) if asset.processed?
+        else # ActiveStorage::Variant
+          # Check whether the variant exists at the storage service before
+          # returning its URL. Otherwise the URL would be returned even when the
+          # variant is not yet processed causing 404 errors for the images on
+          # the page.
+          #
+          # Note that the `ActiveStorage::Variant#url` method only accepts
+          # certain keyword arguments where as the other objects allow any
+          # keyword arguments.
+          possible_kwargs = asset.method(:url).parameters.select { |p| p[0] == :key }.map { |p| p[1] }
+          asset.url(**options.slice(*possible_kwargs))
+        end
+      end
+
+      # Determines if the asset exists at the storage service.
+      #
+      # @return [Boolean] A boolean answering the question "does this asset
+      # exist at the storage service?".
+      def asset_exist?
+        return false if asset.key.blank?
+
+        blob.service.exist?(asset.key)
+      end
+
+      # Determines if the current host is required to build the asset URL.
+      #
+      # @return [Boolean] A boolean indicating if the current host is required
+      #   to build the asset URL.
+      def current_host_required?
+        return false unless blob
+        return false unless defined?(ActiveStorage::Service::DiskService)
+
+        blob.service.is_a?(ActiveStorage::Service::DiskService)
+      end
+
+      # Determines if the asset URL can be generated.
+      #
+      # @return [Boolean] A boolean indicating if the asset URL can be
+      #   generated.
+      def asset_url_available?
+        # If the service is an external service, the URL can be generated
+        # regardless of the current host being set.
+        return true unless current_host_required?
+
+        # For the disk service, the URL can be only generated if the current
+        # host has been set.
+        ActiveStorage::Current.url_options&.dig(:host).present?
+      end
     end
   end
 end

data/lib/decidim/core/engine.rb

@@ -239,6 +239,14 @@ module Decidim
         app.config.action_mailer.deliver_later_queue_name = :mailers
       end
 
+      initializer "decidim_core.signed_global_id", after: "global_id" do |app|
+        next if app.config.global_id.fetch(:expires_in, nil).present?
+
+        config.after_initialize do
+          SignedGlobalID.expires_in = nil
+        end
+      end
+
       initializer "decidim_core.middleware" do |app|
         if app.config.public_file_server.enabled
           headers = app.config.public_file_server.headers || {}

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

@@ -10,7 +10,7 @@ shared_examples_for "attachable interface" do
 
     it "includes the attachment urls" do
       attachment_urls = response["attachments"].map { |attachment| attachment["url"] }
-      expect(attachment_urls).to include(*attachments.map(&:url))
+      expect(attachment_urls).to include_blob_urls(*attachments.map(&:file).map(&:blob))
     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.29.0.rc2"
+      "0.29.0.rc4"
     end
   end
 end

data/lib/decidim/seven_zip_wrapper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "shellwords"
+
+module Decidim
+  class SevenZipWrapper
+    class << self
+      def compress_and_encrypt(filename:, password:, input_directory:)
+        run("cd #{escape(input_directory)} && 7z a -tzip -p#{escape(password)} -mem=AES256 #{escape(filename)} .")
+      end
+
+      def extract_and_decrypt(filename:, password:, output_directory:)
+        run("7z x -tzip #{escape(filename)} -o#{escape(output_directory)} -p#{escape(password)}")
+      end
+
+      private
+
+      def run(command)
+        success = system(command)
+
+        raise "Command failed: #{command}" unless success
+      end
+
+      def escape(string)
+        Shellwords.escape(string)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.29.0.rc2
+  version: 0.29.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -696,20 +696,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: seven_zip_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: shakapacker
   requirement: !ruby/object:Gem::Requirement
@@ -772,28 +758,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1907,7 +1893,6 @@ files:
 - app/services/decidim/static_map_generator.rb
 - app/services/decidim/tokenizer.rb
 - app/services/decidim/traceability.rb
-- app/services/decidim/zip_stream/writer.rb
 - app/uploaders/decidim/application_uploader.rb
 - app/uploaders/decidim/attachment_uploader.rb
 - app/uploaders/decidim/avatar_uploader.rb
@@ -2939,6 +2924,7 @@ files:
 - lib/decidim/searchable.rb
 - lib/decidim/seeds.rb
 - lib/decidim/settings_manifest.rb
+- lib/decidim/seven_zip_wrapper.rb
 - lib/decidim/shareable_with_token.rb
 - lib/decidim/snippets.rb
 - lib/decidim/social_share_service_manifest.rb

data/app/services/decidim/zip_stream/writer.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ZipStream
-    module Writer
-      def add_user_data_to_zip_stream(out, user_data)
-        user_data.each do |element|
-          filename_file = element.last.filename(element.first.parameterize)
-
-          out.put_next_entry(filename_file)
-          if element.last.read.presence
-            out.write element.last.read
-          else
-            out.write "No data"
-          end
-        end
-      end
-
-      def add_attachments_to_zip_stream(out, export_attachments)
-        export_attachments.each do |attachment_block|
-          next if attachment_block.last.nil?
-
-          folder_name = attachment_block.first.parameterize
-          attachment_block.last.each do |attachment|
-            next unless attachment.attached?
-
-            blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
-            blobs.each do |blob|
-              out.put_next_entry("#{folder_name}/#{blob.filename}")
-              blob.open do |f|
-                out << f.read
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end