Merge pull request #391 from echarp/rails7

Trim · web-flow · commit e718ec18c41a · 2024-04-14T10:43:30.000+02:00
Upgrade haml and sass
diff --git a/Gemfile b/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"
@@ -38,10 +38,10 @@ gem "state_machines-activerecord"
 # Gems used for assets
 assets = !%w(production alpha).include?(ENV['RAILS_ENV'])
 assets = true if ENV['RAILS_GROUPS'] == "assets"
-gem "jquery-rails",          "~>4.0", require: assets
-gem "normalize-rails",       "~>8.0", require: assets
-gem "sass-rails",            "~>5.0", require: assets
-gem "terser", "~> 1.2",               require: assets
+gem "jquery-rails",            "~>4.0", require: assets
+gem "normalize-rails",         "~>8.0", require: assets
+gem "sassc-rails",                      require: assets
+gem "terser", "~> 1.2",                 require: assets
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -64,5 +64,5 @@ group :test do
 end
 
 group :production, :alpha do
-  gem "unicorn",						 "~>6.1"
+  gem "unicorn",						   "~>6.1"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -132,7 +132,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -143,13 +143,14 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     canable (0.3.0)
-    carrierwave (3.0.6)
+    carrierwave (3.0.7)
       activemodel (>= 6.0.0)
       activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
+    childprocess (5.0.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
@@ -173,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)
@@ -216,10 +218,11 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     kgio (2.11.4)
-    launchy (2.5.2)
+    launchy (3.0.0)
       addressable (~> 2.8)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -231,7 +234,7 @@ GEM
     marcel (1.0.4)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
     mutex_m (0.2.0)
@@ -243,10 +246,10 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.2-x86_64-linux)
+    nio4r (2.7.1)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -261,14 +264,14 @@ GEM
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
     racc (1.7.3)
-    rack (2.2.8.1)
-    rack-session (1.0.2)
-      rack (< 3)
+    rack (3.0.10)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.0)
-      rack (< 3)
-      webrick
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rails (7.1.3.2)
       actioncable (= 7.1.3.2)
       actionmailbox (= 7.1.3.2)
@@ -303,37 +306,34 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (5.1.0)
       redis-client (>= 0.17.0)
-    redis-client (0.21.0)
+    redis-client (0.21.1)
       connection_pool
-    reline (0.4.3)
+    reline (0.5.0)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rinku (2.0.6)
-    rouge (4.2.0)
+    rouge (4.2.1)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
     sanitize (5.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -342,9 +342,9 @@ GEM
     simplecov_json_formatter (0.1.4)
     sitemap_generator (2.2.1)
     spring (4.1.3)
-    sprockets (3.7.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -359,7 +359,7 @@ GEM
       state_machines-activemodel (>= 0.9.0)
     stringio (3.1.0)
     temple (0.10.3)
-    terser (1.2.0)
+    terser (1.2.1)
       execjs (>= 0.3.0, < 3)
     thor (1.3.1)
     tilt (2.3.0)
@@ -403,7 +403,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)
@@ -421,7 +421,7 @@ DEPENDENCIES
   rails (~> 7.1)
   redis (~> 5.0)
   rinku (~> 2.0)
-  sass-rails (~> 5.0)
+  sassc-rails
   simplecov
   sitemap_generator (~> 2.1)
   spring
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -1,28 +1,3 @@
 @charset "UTF-8";
 
-/* Color constants */
-$C_CLAIR: #e9e6e4;
-$C_BANDEAU: #4c575f !default;
-$C_FONCE: #877768;
-$C_INTER: #93877b;
-$C_SOMBRE: #4e4e50;
-$C_INACTIVE: #cacacb;
-$C_BAS_FOND: #e4e4e4;
-$C_FOOT: #d4d1cf;
-$C_MIBLANC_MIFOOT: #e9e8e7;
-$C_CONTAINER: #f9f9f9;
-$C_MENU: #4c575f;
-$C_BORDER_FONCE: #999;
-
-/*$C_BD1: #F9DEE8;
-$C_BD2: #F1ABC5;
-$C_BD3: #E978A3;
-$C_BD4: #E14E85;
-$C_BD5: #D91C64;*/
-$C_BD1: transparentize($C_BANDEAU, 0.84);
-$C_BD2: transparentize($C_BANDEAU, 0.67);
-$C_BD3: transparentize($C_BANDEAU, 0.5);
-$C_BD4: transparentize($C_BANDEAU, 0.33);
-$C_BD5: transparentize($C_BANDEAU, 0.17);
-
 @import "RonRonnement";
diff --git a/app/assets/stylesheets/parts/_variables.scss b/app/assets/stylesheets/parts/_variables.scss
@@ -0,0 +1,24 @@
+/* Color constants */
+$C_CLAIR: #e9e6e4;
+$C_BANDEAU: #4c575f !default;
+$C_FONCE: #877768;
+$C_INTER: #93877b;
+$C_SOMBRE: #4e4e50;
+$C_INACTIVE: #cacacb;
+$C_BAS_FOND: #e4e4e4;
+$C_FOOT: #d4d1cf;
+$C_MIBLANC_MIFOOT: #e9e8e7;
+$C_CONTAINER: #f9f9f9;
+$C_MENU: #4c575f;
+$C_BORDER_FONCE: #999;
+
+/*$C_BD1: #F9DEE8;
+$C_BD2: #F1ABC5;
+$C_BD3: #E978A3;
+$C_BD4: #E14E85;
+$C_BD5: #D91C64;*/
+$C_BD1: transparentize($C_BANDEAU, 0.84);
+$C_BD2: transparentize($C_BANDEAU, 0.67);
+$C_BD3: transparentize($C_BANDEAU, 0.5);
+$C_BD4: transparentize($C_BANDEAU, 0.33);
+$C_BD5: transparentize($C_BANDEAU, 0.17);
diff --git a/app/helpers/application_helper.rb b/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
diff --git a/test/fixtures/news.yml b/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: test@exemple.com
+  body: Uns seule partie
