Merge pull request #2781 from AlchemyCMS/backport/7.0-stable/pr-2779

[7.0-stable] Mark ingredient output as html_safe

app/components/alchemy/ingredients/audio_view.rb

@@ -4,7 +4,7 @@ class AudioView < BaseView
       def call
         content_tag(:audio, **html_options) do
           tag(:source, src: src, type: type)
-        end
+        end.html_safe
       end
 
       def render?

app/components/alchemy/ingredients/base_view.rb

@@ -16,7 +16,7 @@ def initialize(ingredient, html_options: {})
       end
 
       def call
-        value
+        value.html_safe
       end
 
       def render?

app/components/alchemy/ingredients/boolean_view.rb

@@ -2,7 +2,7 @@ module Alchemy
   module Ingredients
     class BooleanView < BaseView
       def call
-        Alchemy.t(value, scope: "ingredient_values.boolean")
+        Alchemy.t(value, scope: "ingredient_values.boolean").html_safe
       end
 
       def render?

app/components/alchemy/ingredients/datetime_view.rb

@@ -15,7 +15,7 @@ def call
           ingredient.value.to_s(:rfc822)
         else
           ::I18n.l(ingredient.value, format: date_format)
-        end
+        end.html_safe
       end
     end
   end

app/components/alchemy/ingredients/file_view.rb

@@ -23,7 +23,7 @@ def call
             class: ingredient.css_class.presence,
             title: ingredient.title.presence
           }.merge(html_options)
-        )
+        ).html_safe
       end
 
       def render?

app/components/alchemy/ingredients/headline_view.rb

@@ -7,13 +7,22 @@ def initialize(ingredient, level: nil, html_options: {})
       end
 
       def call
-        content_tag "h#{@level || ingredient.level}",
-          ingredient.value,
-          id: ingredient.dom_id.presence,
-          class: [
-            ingredient.size ? "h#{ingredient.size}" : nil,
-            html_options[:class]
-          ]
+        content_tag tag_name, id: dom_id, class: css_classes do
+          ingredient.value
+        end.html_safe
+      end
+
+      private
+
+      def tag_name = "h#{@level || ingredient.level}"
+
+      def dom_id = ingredient.dom_id.presence
+
+      def css_classes
+        [
+          ingredient.size ? "h#{ingredient.size}" : nil,
+          html_options[:class]
+        ]
       end
     end
   end

app/components/alchemy/ingredients/link_view.rb

@@ -12,7 +12,7 @@ def initialize(ingredient, text: nil, html_options: {})
       end
 
       def call
-        link_to(link_text, value, {target: link_target}.merge(html_options))
+        link_to(link_text, value, {target: link_target}.merge(html_options)).html_safe
       end
 
       private

app/components/alchemy/ingredients/page_view.rb

@@ -4,7 +4,7 @@ class PageView < BaseView
       delegate :page, to: :ingredient
 
       def call
-        link_to page.name, alchemy.show_page_path(urlname: page.urlname)
+        link_to(page.name, alchemy.show_page_path(urlname: page.urlname)).html_safe
       end
 
       def render?

app/components/alchemy/ingredients/picture_view.rb

@@ -57,7 +57,7 @@ def call
           content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
         else
           output
-        end
+        end.html_safe
       end
 
       private

app/components/alchemy/ingredients/richtext_view.rb

@@ -15,7 +15,7 @@ def call
           ingredient.stripped_body
         else
           value.to_s.html_safe
-        end
+        end.html_safe
       end
     end
   end

app/components/alchemy/ingredients/text_view.rb

@@ -24,7 +24,7 @@ def call
             target: ((link_target == "blank") ? "_blank" : nil),
             data: {link_target: link_target}
           }.merge(html_options))
-        end
+        end.html_safe
       end
 
       private

app/components/alchemy/ingredients/video_view.rb

@@ -6,7 +6,7 @@ class VideoView < BaseView
       def call
         content_tag(:video, html_options) do
           tag(:source, src: src, type: attachment.file_mime_type)
-        end
+        end.html_safe
       end
 
       def render?