decidim-core 0.24.3 → 0.25.0.rc1

data/lib/decidim/form_builder.rb

@@ -417,19 +417,23 @@ module Decidim
       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)
-        template += if file.present?
-                      @template.content_tag :label, I18n.t("current_image", scope: "decidim.forms")
-                    else
-                      @template.content_tag :label, I18n.t("default_image", scope: "decidim.forms")
-                    end
-        template += @template.link_to @template.image_tag(file.url, alt: alt_text), file.url, target: "_blank", rel: "noopener"
-      elsif file_is_present?(file)
+      default_image_path = uploader_default_image_path(attribute)
+      file_path = file_attachment_path(file)
+
+      if file_path.present? && file.attachment.image? || default_image_path.present?
+        if file_path.present?
+          template += @template.content_tag :label, I18n.t("current_image", scope: "decidim.forms")
+          template += @template.link_to @template.image_tag(file_path, alt: alt_text), file_path, target: "_blank", rel: "noopener"
+        else
+          template += @template.content_tag :label, I18n.t("default_image", scope: "decidim.forms")
+          template += @template.link_to @template.image_tag(default_image_path, alt: alt_text), default_image_path, target: "_blank", rel: "noopener"
+        end
+      elsif file_path.present?
         template += @template.label_tag I18n.t("current_file", scope: "decidim.forms")
-        template += @template.link_to file.file.filename, file.url, target: "_blank", rel: "noopener"
+        template += @template.link_to file.filename, file_path, target: "_blank", rel: "noopener"
       end
 
-      if file_is_present?(file) && options[:optional]
+      if file_path.present? && options[:optional]
         template += content_tag :div, class: "field" do
           safe_join([
                       @template.check_box(@object_name, "remove_#{attribute}"),
@@ -622,7 +626,7 @@ module Decidim
       length_validator = find_validator(attribute, ActiveModel::Validations::LengthValidator)
       return length_validator.options[type] if length_validator
 
-      length_validator = find_validator(attribute, ProposalLengthValidator)
+      length_validator = find_validator(attribute, ProposalLengthValidator) if Object.const_defined?("ProposalLengthValidator")
       if length_validator
         length = length_validator.options[type]
         return length.call(object) if length.respond_to?(:call)
@@ -746,19 +750,21 @@ module Decidim
       label(attribute, (text || "").html_safe, options)
     end
 
-    # Private: Returns whether the file is an image or not.
-    def file_is_image?(file)
-      return unless file && file.respond_to?(:url)
-      return file.content_type.start_with? "image" if file.content_type.present?
+    # Private: Returns default url for attribute when uploader is an
+    # image and has defined a default url
+    def uploader_default_image_path(attribute)
+      uploader = FileValidatorHumanizer.new(object, attribute).uploader
+      return if uploader.blank?
+      return unless uploader.is_a?(Decidim::ImageUploader)
 
-      Mime::Type.lookup_by_extension(File.extname(file.url)[1..-1]).to_s.start_with? "image" if file.url.present?
+      uploader.try(:default_url)
     end
 
-    # Private: Returns whether the file exists or not.
-    def file_is_present?(file)
-      return unless file && file.respond_to?(:url)
+    # Private: Returns blob path when file is attached
+    def file_attachment_path(file)
+      return unless file && file.try(:attached?)
 
-      file.present?
+      Rails.application.routes.url_helpers.rails_blob_url(file.blob, only_path: true)
     end
 
     def required_for_attribute(attribute)

data/lib/decidim/gamification/badge.rb

@@ -71,7 +71,7 @@ module Decidim
       #
       # Returns a String with the image.
       def image
-        ActionController::Base.helpers.asset_path("decidim/gamification/badges/#{name}.svg")
+        ActionController::Base.helpers.asset_pack_path("media/images/decidim_gamification_badges_#{name}.svg")
       end
 
       def valid_for?(model)

data/lib/decidim/has_upload_validations.rb

@@ -8,21 +8,54 @@ module Decidim
 
     class_methods do
       def validates_upload(attribute, options = {})
-        max_size = options[:max_size] || ->(record) { record.maximum_upload_size }
+        max_size = options.delete(:max_size) || ->(record) { record.maximum_upload_size }
 
         validates(
           attribute,
           file_size: { less_than_or_equal_to: max_size },
-          uploader_content_type: true
+          organization_present: true,
+          uploader_content_type: true,
+          uploader_image_dimensions: true
         )
+
+        attached_config[attribute] = OpenStruct.new(options)
+        validate_config(attached_config[attribute], attribute)
       end
 
-      def validates_avatar(attribute = :avatar)
+      def validates_avatar(attribute = :avatar, options = {})
         validates_upload(
           attribute,
-          max_size: ->(record) { record.maximum_avatar_size }
+          **options.merge(max_size: ->(record) { record.maximum_avatar_size })
         )
       end
+
+      def attached_config
+        @attached_config ||= superclass.respond_to?(:attached_config) ? superclass.attached_config.dup : {}
+      end
+
+      def attached_options(attached, options = {})
+        attached_config[attached] = OpenStruct.new(options)
+
+        yield(attached_config[attached]) if block_given?
+      end
+
+      private
+
+      def validate_config(config, attribute)
+        valid_keys = [:uploader]
+        unknown_keys = config.to_h.keys - valid_keys
+        return if unknown_keys.blank?
+
+        raise ArgumentError, "Invalid uploader configuration keys found for #{attribute} on #{name}: #{unknown_keys.join(",")}. Allowed keys: #{valid_keys.join(",")}"
+      end
+    end
+
+    delegate :attached_config, to: :class
+
+    def attached_uploader(attached_name)
+      uploader = attached_config.dig(attached_name, :uploader) || Decidim::ApplicationUploader
+
+      uploader.new(self, attached_name)
     end
 
     def maximum_upload_size

data/lib/decidim/map/dynamic_map.rb

@@ -76,12 +76,12 @@ module Decidim
 
         # @see Decidim::Map::View::Builder#stylesheet_snippets
         def stylesheet_snippets
-          template.stylesheet_link_tag("decidim/map")
+          template.stylesheet_pack_tag("decidim_map")
         end
 
         # @see Decidim::Map::View::Builder#javascript_snippets
         def javascript_snippets
-          template.javascript_include_tag("decidim/map/provider/default")
+          template.javascript_pack_tag("decidim_map_provider_default")
         end
       end
     end

data/lib/decidim/map/provider/autocomplete/here.rb

@@ -10,7 +10,7 @@ module Decidim
           class Builder < Decidim::Map::Autocomplete::Builder
             # @see Decidim::Map::FrontendUtility::Builder#javascript_snippets
             def javascript_snippets
-              template.javascript_include_tag("decidim/geocoding/provider/here")
+              template.javascript_pack_tag("decidim_geocoding_provider_here")
             end
           end
         end

data/lib/decidim/map/provider/autocomplete/osm.rb

@@ -10,7 +10,7 @@ module Decidim
           class Builder < Decidim::Map::Autocomplete::Builder
             # @see Decidim::Map::FrontendUtility::Builder#javascript_snippets
             def javascript_snippets
-              template.javascript_include_tag("decidim/geocoding/provider/photon")
+              template.javascript_pack_tag("decidim_geocoding_provider_photon")
             end
           end
         end

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -41,7 +41,7 @@ module Decidim
           class Builder < Decidim::Map::DynamicMap::Builder
             # @see Decidim::Map::DynamicMap::Builder#javascript_snippets
             def javascript_snippets
-              template.javascript_include_tag("decidim/map/provider/here")
+              template.javascript_pack_tag("decidim_map_provider_here")
             end
           end
         end

data/lib/decidim/menu.rb

@@ -8,6 +8,8 @@ module Decidim
     def initialize(name)
       @name = name
       @items = []
+      @removed_items = []
+      @ordered_elements = []
     end
 
     #
@@ -42,18 +44,79 @@ module Decidim
     #   menu.item "Gestor de Procesos", "/processes", if: admin?
     #
     def item(label, url, options = {})
-      @items << MenuItem.new(label, url, options)
+      ActiveSupport::Deprecation.warn("Using menu.item in #{@name} context is deprecated. Use menu.add_item")
+      add_item(nil, label, url, options)
+    end
+
+    # Public: Registers a new item for the menu
+    #
+    # @param identifier [String, Symbol] A compulsory identifier for the menu item
+    # @param label [String, Symbol] A compulsory label for the menu item
+    # @param url [String, Symbol] The URL this item will link to
+    # @param options [Hash] The options for the menu item
+    #
+    # @option options [Float] :position
+    #         The lower the position, the earlier in the menu the item will
+    #         be displayed.  Default: Float::INFINITY
+    #
+    # @option options [Symbol, Proc] :if
+    #         Decides whether the menu item will be displayed. Evaluated on
+    #         each request.
+    #
+    # @example
+    #
+    #   menu.add_item :resources, "My Resource", "/resources"
+    #   menu.add_item :meetings, I18n.t("menu.meetings"), decidim_meetings.root_path
+    #   menu.add_item :profile, current_user.username, decidim.profile_path(current_user.nickname)
+    #   menu.add_item :processes,"Gestor de Procesos", "/processes", active: :exact
+    #   menu.add_item :processes,"Gestor de Procesos", "/processes", if: admin?
+    #
+    def add_item(identifier, label, url, options = {})
+      options = { position: (1 + @items.length) }.merge(options)
+      @items << MenuItem.new(label, url, identifier, options)
+    end
+
+    def move(element, after: nil, before: nil)
+      if after.present?
+        @ordered_elements << { movable: element, anchor: after, operation: :+ }
+      elsif before.present?
+        @ordered_elements << { movable: element, anchor: before, operation: :- }
+      else
+        raise ArgumentError, "The Decidim::Menu.move method has been called with invalid parameters"
+      end
+    end
+
+    # Public: Registers a new item for the menu
+    #
+    # @param identifier [String, Symbol] A compulsory label for the menu item
+    #
+    # @example
+    #
+    #   menu.remove_item :root
+    def remove_item(item)
+      @removed_items << item
     end
 
     #
     # The weighted list of items in the menu
     #
     def items
+      @items.reject! { |item| @removed_items.include?(item.identifier) }
+      @ordered_elements.each { |item| move_element(item) }
       @items.select(&:visible?).sort_by(&:position)
     end
 
     private
 
+    def move_element(movable:, anchor:, operation:)
+      anchor = @items.select { |x| x.identifier == anchor }.first
+      movable = @items.select { |x| x.identifier == movable }.first
+      raise ArgumentError, "The Decidim::Menu.move has been requested to move an element that does not exist" if movable.blank?
+      raise ArgumentError, "The Decidim::Menu.move has been requested to move before / after an element that does not exist" if anchor.blank?
+
+      movable.position = anchor.position.send(operation, 0.0001) if movable.present? && anchor.present?
+    end
+
     def registry
       @registry ||= MenuRegistry.find(@name)
     end

data/lib/decidim/menu_item.rb

@@ -11,16 +11,19 @@ module Decidim
     # @param url [String, Symbol] The URL this item will link to
     # @param options [Hash] The options for the menu item
     #
-    def initialize(label, url, options = {})
+    def initialize(label, url, identifier, options = {})
       @label = label
       @url = url
+      @identifier = identifier
       @position = options[:position] || Float::INFINITY
       @if = options[:if]
       @active = options[:active]
       @icon_name = options[:icon_name]
+      @submenu = options[:submenu]
     end
 
-    attr_reader :label, :url, :position, :active, :icon_name
+    attr_accessor :position
+    attr_reader :label, :url, :active, :icon_name, :submenu, :identifier
 
     def visible?
       return true if @if.nil? || @if

data/lib/decidim/middleware/current_organization.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Middleware
+    # A middleware that enhances the request with the current organization based
+    # on the hostname.
+    class CurrentOrganization
+      # Initializes the Rack Middleware.
+      #
+      # app - The Rack application
+      def initialize(app)
+        @app = app
+      end
+
+      # Main entry point for a Rack Middleware.
+      #
+      # env - A Hash.
+      def call(env)
+        organization = detect_current_organization(env)
+        if organization
+          env["decidim.current_organization"] = organization
+          @app.call(env)
+        else
+          organization = find_secondary_host_org(env)
+          return @app.call(env) unless organization
+
+          location = new_location_for(env, organization.host)
+
+          [301, { "Location" => location, "Content-Type" => "text/html", "Content-Length" => "0" }, []]
+        end
+      end
+
+      private
+
+      def detect_current_organization(env)
+        host = host_for(env)
+        Decidim::Organization.find_by(host: host)
+      end
+
+      def find_secondary_host_org(env)
+        host = host_for(env)
+        Decidim::Organization.find_by("? = ANY(secondary_hosts)", host)
+      end
+
+      def host_for(env)
+        Rack::Request.new(env).host.downcase
+      end
+
+      def new_location_for(env, host)
+        request = Rack::Request.new(env)
+        url = URI(request.url)
+        url.host = host
+        url.to_s
+      end
+    end
+  end
+end

data/lib/decidim/middleware/strip_x_forwarded_host.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Middleware
+    class StripXForwardedHost
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        env["HTTP_X_FORWARDED_HOST"] = nil unless Decidim.follow_http_x_forwarded_host
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/decidim/participable.rb

@@ -8,31 +8,9 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      def demodulized_name
-        @demodulized_name ||= self.class.name.demodulize
-      end
-
-      delegate :foreign_key, to: :demodulized_name
-
-      def module_name
-        "Decidim::#{demodulized_name.pluralize}"
-      end
-
-      def admin_module_name
-        "#{module_name}::Admin"
-      end
-
-      def underscored_name
-        demodulized_name.underscore
-      end
-
-      def mounted_engine
-        "decidim_#{underscored_name.pluralize}"
-      end
-
-      def mounted_admin_engine
-        "decidim_admin_#{underscored_name.pluralize}"
-      end
+      delegate :demodulized_name, :foreign_key, :module_name, :admin_module_name, :underscored_name,
+               :mounted_engine, :mounted_admin_engine, :admin_extension_module, :admins_query,
+               to: :class
 
       def mounted_params
         {
@@ -41,14 +19,6 @@ module Decidim
         }
       end
 
-      def admin_extension_module
-        "#{admin_module_name}::#{demodulized_name}Context".constantize
-      end
-
-      def admins_query
-        "#{admin_module_name}::AdminUsers".constantize
-      end
-
       def admins
         admins_query.for(self)
       end
@@ -94,6 +64,44 @@ module Decidim
     end
 
     class_methods do
+      def demodulized_name
+        @demodulized_name ||= name.demodulize
+      end
+
+      delegate :foreign_key, to: :demodulized_name
+
+      def module_name
+        "Decidim::#{demodulized_name.pluralize}"
+      end
+
+      def admin_module_name
+        "#{module_name}::Admin"
+      end
+
+      def underscored_name
+        demodulized_name.underscore
+      end
+
+      def mounted_engine
+        "decidim_#{underscored_name.pluralize}"
+      end
+
+      def mounted_admin_engine
+        "decidim_admin_#{underscored_name.pluralize}"
+      end
+
+      def admin_extension_module
+        "#{admin_module_name}::#{demodulized_name}Context".constantize
+      end
+
+      def admins_query
+        "#{admin_module_name}::AdminUsers".constantize
+      end
+
+      def moderators(organization)
+        admins_query.for_organization(organization)
+      end
+
       def slug_format
         /\A[a-zA-Z]+[a-zA-Z0-9\-]+\z/
       end