decidim-debates 0.25.0.rc1 → 0.25.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97828fac1d6b2d8cd43062632817987a4fc5391df31e8a1bdcd69836fcd428fa
-  data.tar.gz: 68783612163514c85d2aa437ea1b459c1dd00aaa12fe231173cf4c43175a674c
+  metadata.gz: 82cb7a6fc595965aebb6b4cce2034cf8fe6fdc5f3df354e096a1d499144801bf
+  data.tar.gz: 93b13e03a11fa50e576781ca8fba491d460fc48299e11c8fc8c9f1f1080972d0
 SHA512:
-  metadata.gz: 017cb858eb199b43f9fb10008aa1cd92220fc95390d84c751072a1a87fd619364d7c460ad2754ff2b274dc46f5d56eaaf233ba11ea9d9f7df3cd1a26a03fd3e8
-  data.tar.gz: 20f8b2818ad13a1d1496c8a4e57e45206a8ea7c11e8a35e468f7d3d23a6dab6702a98f498db190409ba377a2a60a942032a85616a58a174c76fbde62452f9d7d
+  metadata.gz: 43af1a218cd7f16db62aa73f84d7e4e5ee32c97737ec5e5ee90b065de2ddac0aff845134e226709427fca4369fa1013723404968b2b20c7af9f5a31d65ab79db
+  data.tar.gz: 7512eabfc220d3eaba29b4cd1ec6f56d5622410aacf9db8785605ff812bf19ebba4f3bcf18dee8b308095a71bee14c2149cde3bff42235cb05bf995a699fbca7

data/app/presenters/decidim/debates/debate_presenter.rb

@@ -5,11 +5,9 @@ module Decidim
     #
     # Decorator for debates
     #
-    class DebatePresenter < SimpleDelegator
+    class DebatePresenter < Decidim::ResourcePresenter
       include Decidim::TranslationsHelper
       include Decidim::ResourceHelper
-      include Decidim::SanitizeHelper
-      include Decidim::TranslatableAttributes
       include ActionView::Helpers::DateHelper
 
       def debate
@@ -26,13 +24,10 @@ module Decidim
                     end
       end
 
-      def title(links: false, all_locales: false)
+      def title(links: false, all_locales: false, html_escape: false)
         return unless debate
 
-        handle_locales(debate.title, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
-          renderer.render(links: links).html_safe
-        end
+        super debate.title, links, html_escape, all_locales
       end
 
       def description(strip_tags: false, links: false, all_locales: false)
@@ -47,20 +42,6 @@ module Decidim
         end
       end
 
-      def handle_locales(content, all_locales, &block)
-        if all_locales
-          content.each_with_object({}) do |(key, value), parsed_content|
-            parsed_content[key] = if key == "machine_translations"
-                                    handle_locales(value, all_locales, &block)
-                                  else
-                                    block.call(value)
-                                  end
-          end
-        else
-          yield(translated_attribute(content))
-        end
-      end
-
       def last_comment_at
         return unless debate.last_comment_at
 

data/app/views/decidim/debates/admin/debates/index.html.erb

@@ -25,7 +25,7 @@
           <% debates.each do |debate| %>
             <tr data-id="<%= debate.id %>">
               <td>
-                <%= link_to present(debate).title, resource_locator(debate).path, target: :blank %><br>
+                <%= link_to present(debate).title(html_escape: true), resource_locator(debate).path, target: :blank %><br>
               </td>
               <td>
                 <% if debate.start_time %>

data/app/views/decidim/debates/debates/show.html.erb

@@ -1,6 +1,6 @@
 <% add_decidim_meta_tags({
   description: translated_attribute(debate.description),
-  title: present(debate).title,
+  title: present(debate).title(html_escape: true ),
   url: debate_url(debate.id)
 }) %>
 
@@ -22,7 +22,7 @@ edit_link(
   </div>
 
   <h2 class="heading3">
-    <%== present(debate).title(links: true) %>
+    <%== present(debate).title(links: true, html_escape: true) %>
   </h2>
 
   <% debate_presenter = Decidim::Debates::DebatePresenter.new(debate) %>

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

@@ -6,7 +6,17 @@ end
 
 FactoryBot.define do
   factory :debate, class: "Decidim::Debates::Debate" do
-    title { generate_localized_debate_title }
+    transient do
+      skip_injection { false }
+    end
+
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
+      end
+    end
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     information_updates { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.25.0.rc1"
+      "0.25.0.rc2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.25.0.rc1
+  version: 0.25.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,56 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim debates module