Passage à Haml 6+

La nouvelle version supprime quelques helper, dont `list_of` qui était
utilisée ici et là et qui est maintenant rajoutée dans
`application_helper`.

Méthodes supprimées:
  block_is_haml?, capture_haml, escape_once, find_and_preserve, flatten, haml_concat,
  haml_indent, haml_tag, haml_tag_if, html_attrs, html_escape, init_haml_helpers, is_haml?,
  list_of, non_haml, precede, succeed, surround, tab_down, tab_up, with_tabs

Référence: https://github.com/haml/haml/releases/tag/v6.0.0

Author: echarp

Gemfile

@@ -20,7 +20,7 @@ gem "doorkeeper"
 gem "ffi-hunspell",            github: "postmodern/ffi-hunspell"
 gem "french_rails",            "~>0.5", github: "linuxfrorg/french-rails"
 gem "friendly_id",             "~>5.1"
-gem "haml",                    "~>5.0"
+gem "haml",                    "~>6.3"
 gem "htmlentities",            "~>4.3"
 gem "html-pipeline-linuxfr",   "~>0.17", github: "linuxfrorg/html-pipeline-linuxfr"
 gem "html_spellchecker",       "~>0.1"

Gemfile.lock

@@ -174,8 +174,9 @@ GEM
       activerecord (>= 4.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     has_scope (0.8.2)
       actionpack (>= 5.2)
@@ -406,7 +407,7 @@ DEPENDENCIES
   ffi-hunspell!
   french_rails (~> 0.5)!
   friendly_id (~> 5.1)
-  haml (~> 5.0)
+  haml (~> 6.3)
   html-pipeline-linuxfr (~> 0.17)!
   html_spellchecker (~> 0.1)
   html_truncator (~> 0.4)

app/helpers/application_helper.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
+# Helper methods for the whole application
 module ApplicationHelper
-
-  def title(title, tag=nil)
+  def title(title, tag = nil)
     title = h(title)
     @title.unshift title
     content_tag(tag, title) if tag
@@ -11,7 +10,7 @@ def h1(str)
     title(str, :h1)
   end
 
-  def feed(title, link=nil)
+  def feed(title, link = nil)
     link ||= { format: :atom }
     @feeds[link] = title
   end
@@ -22,15 +21,30 @@ def link(rel, link)
 
   def meta_for(content)
     @author      = content.node.user.try(:name)
-    @keywords    = content.node.popular_tags.map &:name
+    @keywords    = content.node.popular_tags.map(&:name)
     @description = content.title
-    @dont_index  = true if content.node.score < 0
-    published_at = content.node.try(:created_at) || DateTime.now()
+    @dont_index  = true if content.node.score.negative?
+    published_at = content.node.try(:created_at) || DateTime.now
     # For all content recently published, ask robots to not index it if
     # a minimum score is not reached during the first 24 hours.
     # The threshold is set to the one used by moderated News, so the moderated
     # content can still be fastly indexed by robots.
-    @dont_index ||= true if published_at > DateTime.now() - 24.hour && content.node.score <= News.accept_threshold
+    @dont_index ||= true if published_at > DateTime.now - 24.hours && content.node.score <= News.accept_threshold
   end
 
+  def list_of(enum, opts = {}, &block)
+    opts_attributes = opts.map { |k, v| " #{k}='#{v}'" }.join
+    enum.map do |i|
+      result = capture(i, &block)
+
+      if result.count("\n") > 1
+        result.gsub!("\n", "\n  ")
+        result = "\n  #{result.strip}\n"
+      else
+        result.strip!
+      end
+
+      %(<li#{opts_attributes}>#{result}</li>)
+    end.join("\n").html_safe
+  end
 end

test/fixtures/news.yml

@@ -36,3 +36,4 @@ first_part_only:
   cached_slug: une-actualite-avec-une-seule-partie
   author_name: Auteur sympa
   author_email: [email protected]
+  body: Uns seule partie