decidim-proposals 0.26.1 → 0.26.3

data/lib/decidim/content_parsers/proposal_parser.rb

@@ -12,89 +12,33 @@ module Decidim
     # Also fills a `Metadata#linked_proposals` attribute.
     #
     # @see BaseParser Examples of how to use a content parser
-    class ProposalParser < BaseParser
+    class ProposalParser < ResourceParser
       # Class used as a container for metadata
       #
       # @!attribute linked_proposals
       #   @return [Array] an array of Decidim::Proposals::Proposal mentioned in content
       Metadata = Struct.new(:linked_proposals)
 
-      # Matches a URL
-      URL_REGEX_SCHEME = '(?:http(s)?:\/\/)'
-      URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
-      URL_REGEX_END_CHAR = '[\d]'
-      URL_REGEX = %r{#{URL_REGEX_SCHEME}#{URL_REGEX_CONTENT}/proposals/#{URL_REGEX_END_CHAR}+}i.freeze
-      # Matches a mentioned Proposal ID (~(d)+ expression)
-      ID_REGEX = /~(\d+)/.freeze
-
       def initialize(content, context)
         super
         @metadata = Metadata.new([])
       end
 
-      # Replaces found mentions matching an existing
-      # Proposal with a global id for that Proposal. Other mentions found that doesn't
-      # match an existing Proposal 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
-
       # (see BaseParser#metadata)
       attr_reader :metadata
 
       private
 
-      def parse_for_urls(content)
-        content.gsub(URL_REGEX) do |match|
-          proposal = proposal_from_url_match(match)
-          if proposal
-            @metadata.linked_proposals << proposal.id
-            proposal.to_global_id
-          else
-            match
-          end
-        end
-      end
-
-      def parse_for_ids(content)
-        content.gsub(ID_REGEX) do |match|
-          proposal = proposal_from_id_match(Regexp.last_match(1))
-          if proposal
-            @metadata.linked_proposals << proposal.id
-            proposal.to_global_id
-          else
-            match
-          end
-        end
-      end
-
-      def proposal_from_url_match(match)
-        uri = URI.parse(match)
-        return if uri.path.blank?
-
-        proposal_id = uri.path.split("/").last
-        find_proposal_by_id(proposal_id)
-      rescue URI::InvalidURIError
-        Rails.logger.error("#{e.message}=>#{e.backtrace}")
-        nil
+      def url_regex
+        %r{#{URL_REGEX_SCHEME}#{URL_REGEX_CONTENT}/proposals/#{URL_REGEX_END_CHAR}+}i
       end
 
-      def proposal_from_id_match(match)
-        proposal_id = match
-        find_proposal_by_id(proposal_id)
+      def model_class
+        "Decidim::Proposals::Proposal"
       end
 
-      def find_proposal_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
-          Decidim::Proposals::Proposal.where(component: components).find_by(id: id)
-        end
+      def update_metadata(resource)
+        @metadata.linked_proposals << resource.id
       end
     end
   end

data/lib/decidim/content_renderers/proposal_renderer.rb

@@ -8,25 +8,9 @@ module Decidim
     # e.g. gid://<APP_NAME>/Decidim::Proposals::Proposal/1
     #
     # @see BaseRenderer Examples of how to use a content renderer
-    class ProposalRenderer < BaseRenderer
-      # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{gid://([\w-]*/Decidim::Proposals::Proposal/(\d+))}i.freeze
-
-      # Replaces found Global IDs matching an existing proposal with
-      # a link to its show page. The Global IDs representing an
-      # invalid Decidim::Proposals::Proposal 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(GLOBAL_ID_REGEX) do |proposal_gid|
-          proposal = GlobalID::Locator.locate(proposal_gid)
-          Decidim::Proposals::ProposalPresenter.new(proposal).display_mention
-        rescue ActiveRecord::RecordNotFound
-          proposal_id = proposal_gid.split("/").last
-          "~#{proposal_id}"
-        end
+    class ProposalRenderer < ResourceRenderer
+      def regex
+        %r{gid://([\w-]*/Decidim::Proposals::Proposal/(\d+))}i
       end
     end
   end

data/lib/decidim/proposals/component.rb

@@ -66,11 +66,11 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :votes_blocked, type: :boolean
     settings.attribute :votes_hidden, type: :boolean, default: false
     settings.attribute :comments_blocked, type: :boolean, default: false
-    settings.attribute :creation_enabled, type: :boolean
+    settings.attribute :creation_enabled, type: :boolean, readonly: ->(context) { context[:component].settings[:participatory_texts_enabled] }
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
-    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :publish_answers_immediately, type: :boolean, default: true
     settings.attribute :answers_with_costs, type: :boolean, default: false
+    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
     settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
     settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
@@ -284,8 +284,8 @@ Decidim.register_component(:proposals) do |component|
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "password1234",
-          password_confirmation: "password1234",
+          password: "decidim123456",
+          password_confirmation: "decidim123456",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -350,8 +350,8 @@ Decidim.register_component(:proposals) do |component|
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "password1234",
-          password_confirmation: "password1234",
+          password: "decidim123456",
+          password_confirmation: "decidim123456",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -372,8 +372,8 @@ Decidim.register_component(:proposals) do |component|
 
           author = Decidim::User.find_or_initialize_by(email: email)
           author.update!(
-            password: "password1234",
-            password_confirmation: "password1234",
+            password: "decidim123456",
+            password_confirmation: "decidim123456",
             name: name,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.26.1"
+      "0.26.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.3
 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-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.3
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -496,6 +496,7 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml