decidim-core 0.26.1 → 0.26.2

data/config/locales/pt.yml

@@ -21,7 +21,7 @@ pt:
         details: Comentários adicionais
       user:
         about: Sobre
-        email: O seu email
+        email: O seu e-mail
         name: O seu nome
         nickname: Alcunha
         password: Palavra-passe
@@ -44,7 +44,7 @@ pt:
     attributes:
       decidim/user:
         current_password: Senha atual
-        email: Email
+        email: E-mail
         name: Alcunha
         password: Senha
         password_confirmation: Confirmação da senha

data/config/locales/sv.yml

@@ -22,6 +22,7 @@ sv:
       user:
         about: Om
         email: Din e-postadress
+        locale: Språk
         name: Ditt namn
         nickname: Användarnamn
         password: Lösenord
@@ -107,6 +108,7 @@ sv:
   decidim:
     accessibility:
       external_link: Extern länk
+      front_page_link: Gå till startsidan
       logo: "%{organization}s logotyp"
       skip_button: Gå till innehåll
     account:
@@ -1651,7 +1653,7 @@ sv:
         title: Vill du fortsätta med din session?
       user_menu:
         account: 'Användarkonto: %{name}'
-        admin_dashboard: Admin kontrollpanel
+        admin_dashboard: Adminpanel
         conversations: Konversationer
         notifications: Meddelanden
         profile: Mitt konto

data/lib/decidim/content_parsers/hashtag_parser.rb

@@ -18,7 +18,7 @@ module Decidim
 
       # Matches a hashtag if it starts with a letter or number
       # and only contains letters, numbers or underscores.
-      HASHTAG_REGEX = /\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
+      HASHTAG_REGEX = /\s\K\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
 
       # Replaces hashtags name with new or existing hashtags models global ids.
       #

data/lib/decidim/content_parsers/resource_parser.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentParsers
+    # A parser that searches mentions of Resources in content.
+    #
+    # @see BaseParser Examples of how to use a content parser
+    class ResourceParser < BaseParser
+      # Matches a URL
+      URL_REGEX_SCHEME = '(?:http(s)?:\/\/)'
+      URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
+      URL_REGEX_END_CHAR = '[\d]'
+      # Matches a mentioned resource ID (~(d)+ expression)
+      ID_REGEX = /~(\d+)/.freeze
+
+      # Replaces found mentions matching an existing
+      # Resource with a global id for that Resource. Other mentions found that doesn't
+      # match an existing Resource are returned as they are.
+      #
+      # @return [String] the content with the valid mentions replaced by a global id.
+      def rewrite
+        rewrited_content = parse_for_urls(content)
+        parse_for_ids(rewrited_content)
+      end
+
+      private
+
+      def parse_for_urls(content)
+        content.gsub(url_regex) do |match|
+          resource = resource_from_url_match(match)
+          if resource
+            update_metadata(resource)
+            resource.to_global_id
+          else
+            match
+          end
+        end
+      end
+
+      def parse_for_ids(content)
+        content.gsub(ID_REGEX) do |match|
+          resource = resource_from_id_match(Regexp.last_match(1))
+          if resource
+            update_metadata(resource)
+            resource.to_global_id
+          else
+            match
+          end
+        end
+      end
+
+      def resource_from_url_match(match)
+        uri = URI.parse(match)
+        return if uri.path.blank?
+        return unless find_organization(uri.host)
+
+        resource_id = uri.path.split("/").last
+        find_resource_by_id(resource_id)
+      rescue URI::InvalidURIError
+        Rails.logger.error("#{e.message}=>#{e.backtrace}")
+        nil
+      end
+
+      def resource_from_id_match(match)
+        resource_id = match
+        find_resource_by_id(resource_id)
+      end
+
+      def find_resource_by_id(id)
+        if id.present?
+          spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
+            manifest.participatory_spaces.call(context[:current_organization]).public_spaces
+          end
+          components = Component.where(participatory_space: spaces).published
+          model_class.constantize.where(component: components).find_by(id: id)
+        end
+      end
+
+      def find_organization(uri_host)
+        current_organization = context[:current_organization]
+        (current_organization.host == uri_host) || current_organization.secondary_hosts.include?(uri_host)
+      end
+
+      def url_regex
+        raise "Not implemented"
+      end
+
+      def model_class
+        raise "Not implemented"
+      end
+
+      def update_metadata(resource)
+        # code to update metadata - needs to be overwritten
+      end
+    end
+  end
+end

data/lib/decidim/content_parsers.rb

@@ -9,5 +9,6 @@ module Decidim
     autoload :NewlineParser, "decidim/content_parsers/newline_parser"
     autoload :LinkParser, "decidim/content_parsers/link_parser"
     autoload :InlineImagesParser, "decidim/content_parsers/inline_images_parser"
+    autoload :ResourceParser, "decidim/content_parsers/resource_parser"
   end
 end

data/lib/decidim/content_processor.rb

@@ -100,7 +100,8 @@ module Decidim
       simple_format(
         render_without_format(content, options),
         {},
-        wrapper_tag: wrapper_tag
+        wrapper_tag: wrapper_tag,
+        sanitize: false
       )
     end
 

data/lib/decidim/content_renderers/resource_renderer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentRenderers
+    class ResourceRenderer < BaseRenderer
+      # Matches a global id representing a Decidim::User
+
+      # Replaces found Global IDs matching an existing resource with
+      # a link to its show page. The Global IDs representing an
+      # invalid Resource are replaced with '???' string.
+      #
+      # @return [String] the content ready to display (contains HTML)
+      def render(_options = nil)
+        return content unless content.respond_to?(:gsub)
+
+        content.gsub(regex) do |resource_gid|
+          resource = GlobalID::Locator.locate(resource_gid)
+          resource.presenter.display_mention
+        rescue ActiveRecord::RecordNotFound
+          resource_id = resource_gid.split("/").last
+          "~#{resource_id}"
+        end
+      end
+
+      def regex
+        raise "Not implemented"
+      end
+    end
+  end
+end

data/lib/decidim/content_renderers.rb

@@ -7,5 +7,6 @@ module Decidim
     autoload :UserGroupRenderer, "decidim/content_renderers/user_group_renderer"
     autoload :HashtagRenderer, "decidim/content_renderers/hashtag_renderer"
     autoload :LinkRenderer, "decidim/content_renderers/link_renderer"
+    autoload :ResourceRenderer, "decidim/content_renderers/resource_renderer"
   end
 end

data/lib/decidim/core/test/factories.rb

@@ -125,7 +125,7 @@ FactoryBot.define do
 
   factory :user, class: "Decidim::User" do
     email { generate(:email) }
-    password { "password1234" }
+    password { "decidim123456" }
     password_confirmation { password }
     name { generate(:name) }
     nickname { generate(:nickname) }
@@ -139,6 +139,7 @@ FactoryBot.define do
     accepted_tos_version { organization.tos_version }
     email_on_notification { true }
     email_on_moderations { true }
+    extended_data { {} }
 
     trait :confirmed do
       confirmed_at { Time.current }

data/lib/decidim/core/version.rb

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

data/lib/devise/models/decidim_validatable.rb

@@ -11,7 +11,6 @@ module Devise
     # Validatable adds the following options to devise_for:
     #
     #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 8..72.
     #
     module DecidimValidatable
       # All validations used by this module.
@@ -33,7 +32,8 @@ module Devise
 
           validates_presence_of :password, if: :password_required?
           validates_confirmation_of :password, if: :password_required?
-          validates_length_of :password, within: password_length, allow_blank: true
+
+          validates :password, password: { name: :name, email: :email, username: :nickname }
         end
       end
 
@@ -61,7 +61,7 @@ module Devise
 
       # Methods to be injected at class level.
       module ClassMethods
-        Devise::Models.config(self, :email_regexp, :password_length)
+        Devise::Models.config(self, :email_regexp)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -256,14 +256,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -754,28 +754,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -886,7 +886,6 @@ files:
 - app/cells/decidim/endorsement_buttons/select_identity_button.erb
 - app/cells/decidim/endorsement_buttons/show.erb
 - app/cells/decidim/endorsement_buttons_cell.rb
-- app/cells/decidim/endorsement_buttons_cell.rb.2
 - app/cells/decidim/endorsers_list/show.erb
 - app/cells/decidim/endorsers_list_cell.rb
 - app/cells/decidim/fingerprint/show.erb
@@ -1066,6 +1065,7 @@ files:
 - app/controllers/concerns/decidim/resource_versions_concern.rb
 - app/controllers/concerns/decidim/safe_redirect.rb
 - app/controllers/concerns/decidim/settings.rb
+- app/controllers/concerns/decidim/skip_timeoutable.rb
 - app/controllers/concerns/decidim/use_organization_time_zone.rb
 - app/controllers/concerns/decidim/user_blocked_checker.rb
 - app/controllers/concerns/decidim/user_groups.rb
@@ -1215,7 +1215,6 @@ files:
 - app/helpers/decidim/sanitize_helper.rb
 - app/helpers/decidim/scopes_helper.rb
 - app/helpers/decidim/searches_helper.rb
-- app/helpers/decidim/social_share_button_helper.rb
 - app/helpers/decidim/tooltip_helper.rb
 - app/helpers/decidim/traceability_helper.rb
 - app/helpers/decidim/translations_helper.rb
@@ -2309,6 +2308,7 @@ files:
 - lib/decidim/content_parsers/inline_images_parser.rb
 - lib/decidim/content_parsers/link_parser.rb
 - lib/decidim/content_parsers/newline_parser.rb
+- lib/decidim/content_parsers/resource_parser.rb
 - lib/decidim/content_parsers/user_group_parser.rb
 - lib/decidim/content_parsers/user_parser.rb
 - lib/decidim/content_processor.rb
@@ -2316,6 +2316,7 @@ files:
 - lib/decidim/content_renderers/base_renderer.rb
 - lib/decidim/content_renderers/hashtag_renderer.rb
 - lib/decidim/content_renderers/link_renderer.rb
+- lib/decidim/content_renderers/resource_renderer.rb
 - lib/decidim/content_renderers/user_group_renderer.rb
 - lib/decidim/content_renderers/user_renderer.rb
 - lib/decidim/core.rb
@@ -2534,9 +2535,6 @@ files:
 - lib/decidim/settings_manifest.rb
 - lib/decidim/shareable_with_token.rb
 - lib/decidim/snippets.rb
-- lib/decidim/social_share.rb
-- lib/decidim/social_share/service.rb
-- lib/decidim/social_share/service_registry.rb
 - lib/decidim/stats_registry.rb
 - lib/decidim/traceable.rb
 - lib/decidim/translatable_attributes.rb

data/app/cells/decidim/endorsement_buttons_cell.rb.2

@@ -1,211 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This cell renders the endrosement button and the endorsements count.
-  # It only supports one row of buttons per page due to current tag ids used by javascript.
-  class EndorsementButtonsCell < Decidim::ViewModel
-    include LayoutHelper
-    include CellsHelper
-    include EndorsableHelper
-    include ResourceHelper
-    include Decidim::SanitizeHelper
-
-    delegate :current_user, to: :controller, prefix: false
-    delegate :current_settings, to: :controller, prefix: false
-    delegate :current_component, to: :controller, prefix: false
-    delegate :allowed_to?, to: :controller, prefix: false
-
-    def show
-      render
-    end
-
-    # Public: Renders the "Endorse" button.
-    # Contains all the logic about how the button should be rendered
-    # and which actions the button must trigger.
-    #
-    # It takes into account:
-    # - if endorsements are enabled
-    # - if users are logged in
-    # - if users can endorse with many identities (of their user_groups)
-    # - if users require verification
-    def render_endorsements_button
-      render_disabled_endorsements_button if endorsements_blocked_or_user_can_not_participate?
-      render_user_login_button unless current_user
-      render "select_identity_button" if current_user_and_allowed? && user_has_verified_groups?
-      render_user_identity_endorse_button if current_user_and_allowed?
-
-      render_verification_modal
-    end
-
-    # Public: Renders the counter of endorsements that appears in m-cards.
-    def render_endorsements_count
-      content = icon("bullhorn", class: "icon--small", aria_label: t("decidim.endorsable.endorsements_count"), role: "img")
-      content += resource.endorsements_count.to_s
-      html_class = "button small compact button--shadow secondary"
-      html_class += " active" if fully_endorsed?(resource, current_user)
-      tag_params = { id: "resource-#{resource.id}-endorsements-count", class: html_class }
-      if resource.endorsements_count.positive?
-        link_to "#list-of-endorsements", tag_params do
-          content
-        end
-      else
-        content_tag(:div, tag_params) do
-          content
-        end
-      end
-    end
-
-    # Public: Renders the endorsements button but disabled.
-    # To be used to let the user know that endorsements are enabled but are blocked or cant participate.
-    def render_disabled_endorsements_button
-      content_tag :span, class: "#{card_button_html_class} #{endorsement_button_classes(from_resourcess_list: false)} disabled", disabled: true, title: endorse_translated do
-        endorse_translated + render_screen_reader_context_title
-      end
-    end
-
-    # Public: Render content for screen readers only (accessibility)
-    def render_screen_reader_context_title
-      content_tag :span, class: "show-for-sr" do
-        decidim_html_escape(resource_title(resource))
-      end
-    end
-
-    # Public: Returns the CSS classes used for proposal endorsement button in both proposals list and show pages
-    #
-    # from_resourcess_list - A boolean to indicate if the template is rendered from the list page of the resource.
-    #
-    # Returns a string with the value of the css classes.
-    def endorsement_button_classes(from_resourcess_list: false)
-      return "small" if from_resourcess_list
-
-      "button small compact light button--sc expanded secondary"
-    end
-
-    # Public: Returns the CSS classes used for proposal endorsement button 
-    def card_button_html_class
-      "card__button button"
-    end
-
-    # Public: Renders a button to endorse the given +resource+ with the personal identity of the user.
-    # To override the translation for both buttons: endorse and unendorse (use to be the name of the user/user_group).
-    #
-    # This button may have different behaviours:
-    # - If the user is not logged in, the button will open the signin/signup popup.
-    # - If the user is logged in, and the resource has not been endorsed, the button will allow to endorse.
-    # - If the user is logged in, and the resource has already been endorsed, the button will allow to UNendorse.
-    #
-    # Parameters:
-    #   resources  - The endorsable resource.
-    def render_user_identity_endorse_button
-      content_tag(:div, id: "resource-#{resource.id}-endorsement-button") do
-        if !current_user
-          render_user_login_button
-        elsif resource.endorsed_by?(current_user)
-          unendorse_label = t("decidim.endorsement_buttons_cell.already_endorsed")
-          destroy_endorsement_url = path_to_destroy_endorsement(resource)
-          action_authorized_button_to(
-            :endorse,
-            destroy_endorsement_url,
-            resource: resource,
-            method: :delete,
-            remote: true,
-            class: "button #{endorsement_button_classes} active",
-            id: "endorsement_button"
-          ) do
-            unendorse_label + render_screen_reader_context_title
-          end
-        else
-          action_authorized_button_to(
-            :endorse,
-            path_to_create_endorsement(resource),
-            resource: resource,
-            remote: true,
-            class: "button #{endorsement_button_classes}",
-            id: "endorsement_button"
-          ) do
-            endorse_translated + render_screen_reader_context_title
-          end
-        end
-      end
-    end
-
-    # Public: The resource being un/endorsed is the Cell's model.
-    def resource
-      model
-    end
-
-    # Public: produce the reveal identities URL as the cell doesn't have access to routes
-    def reveal_identities_url
-      decidim.identities_endorsement_path(resource.to_gid.to_param)
-    end
-
-    # Public: produce the path to endorsements from the engine routes as the cell doesn't have access to routes
-    def endorsements_path(*args)
-      decidim.endorsements_path(*args)
-    end
-
-    # Public: produce the path to an endorsement from the engine routes as the cell doesn't have access to routes
-    def endorsement_path(*args)
-      decidim.endorsement_path(*args)
-    end
-
-    # Public; returns the identity presenter for user and user groups
-    def endorsement_identity_presenter(endorsement)
-      if endorsement.user_group
-        Decidim::UserGroupPresenter.new(endorsement.user_group)
-      else
-        Decidim::UserPresenter.new(endorsement.author)
-      end
-    end
-
-    private
-
-    # Private: render the user login button for visitors (non logged in users)
-    def render_user_login_button
-      action_authorized_button_to(:endorse,
-                                  path_to_create_endorsement(resource),
-                                  resource: resource,
-                                  class: "button #{endorsement_button_classes}") do
-        endorse_translated + render_screen_reader_context_title
-      end
-    end
-
-    # Private: render the verification modal when there's a current user that needs an authorization
-    def render_verification_modal
-      button_to(endorsement_path(resource),
-                data: { open: "authorizationModal", "open-url": modal_path(:endorse, resource) },
-                class: "#{card_button_html_class} #{endorsement_button_classes(from_resourcess_list: false)}") do
-        endorse_translated + render_screen_reader_context_title
-      end
-    end
-
-    # Private: check if the endorsements are blocked or the user can't participate
-    #
-    # Returns a boolean
-    def endorsements_blocked_or_user_can_not_participate?
-      current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user)
-    end
-
-    # Private: check if there's an user logged in and they have permissions
-    #
-    # Returns a boolean
-    def current_user_and_allowed?
-      current_user && allowed_to?(:create, :endorsement, resource: resource)
-    end
-
-    # Private: check if there's an user logged in and they have user groups associated
-    #
-    # Returns a boolean
-    def user_has_verified_groups?
-      current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
-    end
-
-    def endorse_translated
-      @endorse_translated ||= t("decidim.endorsement_buttons_cell.endorse")
-    end
-
-    def raw_model
-      model.try(:__getobj__) || model
-    end
-  end
-end

data/app/helpers/decidim/social_share_button_helper.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A Helper that reimplements the SocialShareButton gem helpers, so that we don't depend on it anymore.
-  module SocialShareButtonHelper
-    def social_share_button_tag(title, **args)
-      content_tag :div, class: "social-share-button" do
-        render_social_share_buttons(enabled_services, title, **args)
-      end
-    end
-
-    def render_social_share_buttons(services, title, **args)
-      services.map do |service|
-        link_to service.formatted_share_uri(title, **args), rel: "nofollow", class: "ssb-icon ssb-#{service.name}", title: t(".share_on", service: service.name) do
-          image_tag service.icon_path
-        end
-      end.join.html_safe
-    end
-
-    private
-
-    def enabled_services
-      Decidim::SocialShare.enabled_services
-    end
-  end
-end

data/lib/decidim/social_share/service.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module SocialShare
-    # This class represents an abstract social network.
-    class Service
-      include Decidim::AttributeObject::Model
-      include ActiveModel::Validations
-
-      # The name of the social networking service.
-      attribute :name, String
-
-      # The icon of the social networking service.
-      attribute :icon, String
-
-      # The share_url of the social networking service.
-      attribute :share_uri, String
-
-      # TODO validate #{url} in share_url
-
-      def formatted_share_uri(title, **args)
-        format(share_uri, title: title, **args)
-      end
-
-      # Public: Returns an image of the icon for this social network.
-      #
-      # Returns a String with the icon.
-      def icon_path
-        ActionController::Base.helpers.asset_pack_path("media/images/#{icon}")
-      end
-    end
-  end
-end