Merge branch 'master' into followup-template

Author: Oumph

Docker.md

@@ -5,14 +5,10 @@ To simplify set up of a developement environment, LinuxFr.org can be
 run on Docker with `docker-compose up`.
 
 To init the SQL database schema, you need to wait upto the `database`
-and `database-test` containers are ready to listen MySQL connections.
+container to be ready to listen MySQL connections.
 
 For example, you should see in the logs:
 
-> database-test_1  | 2020-09-21 16:03:12 140126029907968 [Note] mysqld: ready for connections.
->
-> database-test_1  | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution
->
 > database_1       | 2020-09-21 16:03:12 139820938893312 [Note] mysqld: ready for connections.
 >
 > database_1       | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution
@@ -26,9 +22,12 @@ docker-compose run linuxfr.org bin/rails db:setup
 Finally, the environment is ready and you can open [http://dlfp.lo](http://dlfp.lo)
 in your favorite browser.
 
-Note: to be able to access this URL, you'll need to add the line
-`127.0.0.1 dlfp.lo image.dlfp.lo` to the `/etc/hosts` file of your
-machine.
+Note: to be able to access this URL, you'll need to add the following line
+into the `/etc/hosts` file of your machine:
+
+```
+127.0.0.1 dlfp.lo image.dlfp.lo
+```
 
 Personalize configuration
 =========================
@@ -62,19 +61,39 @@ will directly detect changes and apply them on next page reload.
 Furthermore, if you need to access the Rails console, you need a second
 terminal and run:
 
-`docker-compose run linuxfr.org bin/rails console`
+```
+docker-compose run linuxfr.org bin/rails console
+```
 
 Note: currently, we didn't configure rails to show directly the
 `webconsole` in your browser. That's just because of time needed to
 find the good configuration, any help will be appreciated !
 
+Run application tests
+=====================
+
+To help maintainers, we are in the process of adding tests to check the
+application has still the expected behaviour.
+
+To get help about writing tests, see the 
+[Ruby on Rails documentation](https://guides.rubyonrails.org/testing.html#the-rails-test-runner)
+.
+
+To run tests with Docker environment, you need to use this command:
+
+```
+docker-compose run linuxfr.org bin/rails test -v
+```
+
 Inspect database schema
 =======================
 
 In case you need to inspect the database, you need a second terminal
 and run:
 
-`docker-compose run database mysql -hdatabase -ulinuxfr_rails -p linuxfr_rails`
+```
+docker-compose run database mysql -hdatabase -ulinuxfr_rails -p linuxfr_rails
+```
 
 By default, the requested password is the same as the username.
 
@@ -84,12 +103,16 @@ Apply database migrations
 In case you need to apply new database migrations, you need a second
 terminal and run:
 
-`docker-compose run linuxfr.org bin/rails db:migrate`
+```
+docker-compose run linuxfr.org bin/rails db:migrate
+```
 
 If you had issue and want to reset all data in your database system,
 use:
 
-`docker-compose run linuxfr.org bin/rails db:reset`
+```
+docker-compose run linuxfr.org bin/rails db:reset
+```
 
 Services provided by the docker-compose
 =======================================

Gemfile

@@ -45,11 +45,15 @@ gem "sass-rails",            "~>5.0", require: assets
 gem "rails-sass-images",              require: assets
 gem "uglifier",                       require: assets
 
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem "byebug", platforms: :mri
+end
+
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
-  gem "byebug",                platform: :mri
   gem "capistrano",            "~>2.15", github: 'capistrano', branch: 'legacy-v2'
   gem "capistrano-maintenance"
   gem "letter_opener"
@@ -62,6 +66,12 @@ group :development do
   gem "web-console"
 end
 
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem "capybara", ">= 2.15"
+  gem "selenium-webdriver"
+end
+
 group :production, :alpha do
   gem "unicorn",               "~>5.1"
   gem "gctools",               "~>0.2"

INSTALL.md

@@ -176,12 +176,24 @@ server {
 
     listen 0.0.0.0:80;
 
-    location ~ ^/(avatars|medias)/ {
+    location ~ ^/medias/ {
       root /home/linuxfr/linuxfr.org/uploads;
     }
 
-    # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
+    # Avatars files uploaded on linuxfr server are stored in partitions
+    # with folder name containing 3 digits
+    location ~ ^/avatars/\d\d\d/ { 
+      root /home/linuxfr/linuxfr.org/uploads;
+    }
+
+    # Avatars URLs has to be served by the image service
+    location ~ ^/avatars/ {
+        # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
+        proxy_pass http://localhost:8000;
+    }
+
     location /img/ {
+        # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
         proxy_pass http://localhost:8000;
     }
 

app/assets/javascripts/application.coffee

@@ -34,14 +34,15 @@ $("textarea, #form_answers input").keypress (event) ->
 # Add/Remove dynamically links in the news form
 langs =
   fr: "Français"
-  en: "Anglais"
   de: "Allemand"
+  en: "Anglais"
   eu: "Basque"
   ct: "Catalan"
   cn: "Chinois"
   ko: "Coréen"
   da: "Danois"
   es: "Espagnol"
+  ee: "Estonien"
   fi: "Finnois"
   el: "Grec"
   it: "Italien"
@@ -53,6 +54,7 @@ langs =
   ru: "Russe"
   sv: "Suédois"
   xx: "!? hmmm ?!"
+  wq: "Code/binaire"
 
 $("#form_links").nested_fields "news", "link", "lien", "fieldset", title: "text", url: "url", lang: langs
 $("#form_answers").nested_fields "poll", "answer", "choix", "p", answer: "text"
@@ -63,7 +65,7 @@ $("article.news .edited_by").each ->
   nb = field.find("a").length
   if nb > 3
     was = field.html()
-    field.html "<a>#{nb} contributeurs</a>"
+    field.html "<a>#{nb} personnes</a>"
     field.one "click", -> field.html was
 
 # Toolbar preferences

app/assets/javascripts/edition_in_place.coffee

@@ -42,6 +42,20 @@ class EditionInPlace
     false
 
   error: =>
+    try
+      error = @el.find("ul.error")
+      response = $.parseJSON(@xhr.responseText)
+      messages = []
+      for attribute, errors of response.errors
+        for message in errors
+          messages.push(message)
+      if messages.length == 1
+        error.text("Erreur : " + messages[0])
+      else
+        error.text("Erreurs :")
+        for message in messages
+          error.append($("<li>").append(message))
+      error.show()
     @el.trigger "in_place:error", @xhr
     @xhr = null
 

app/assets/stylesheets/common/generics.scss

@@ -40,3 +40,7 @@
 #edition img[alt=""] {
   border: 3px dotted red;
 }
+
+textarea {
+  hyphens: none;
+}

app/assets/stylesheets/parts/content.scss

@@ -14,7 +14,9 @@ body#news-revision #contents,
 body#boards-show #contents,
 body#stylesheets-edit #contents,
 body#wiki_pages-changes #contents,
-body#admin-index #container > ul {
+body#admin-index #container > ul,
+#redaction #new_link,
+#redaction .edit_link {
   display: block;
   background: white;
   padding: 10px $PX_PAD_NODE 10px $PX_PAD_NODE;

app/assets/stylesheets/parts/redaction.scss

@@ -503,6 +503,10 @@ body#redaction-index {
       }
     }
   }
+  #new_link,
+  .edit_link {
+    padding: 5px;
+  }
   input#link_title {
     width: 100%; // this rule force the input to not enlarge the #edition flex box
   }

app/controllers/admin/accounts_controller.rb

@@ -48,7 +48,9 @@ def update
     else
       @account.inactivate!
       user = @account.user
-      user.homesite = ""
+      user.homesite = nil
+      user.jabber_id = nil
+      user.mastodon_url = nil
       user.save
       Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a été désactivé par #{current_user.name} #{user_url(current_user)}")
       redirect_back notice: "Compte désactivé", fallback_location: admin_accounts_url
@@ -58,7 +60,9 @@ def update
   def destroy
     @account.inactivate!
     user = @account.user
-    user.homesite = ""
+    user.homesite = nil
+    user.jabber_id = nil
+    user.mastodon_url = nil
     user.save
     Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a été désactivé par #{current_user.name} #{user_url(current_user)}")
     redirect_to admin_accounts_url, notice: "Compte désactivé"

app/controllers/application_controller.rb

@@ -37,6 +37,7 @@ def seo_filter
     @keywords      = %w(Linux Logiciel Libre GNU Free Software Actualité Forum Communauté)
     @description   = "L’actualité du logiciel libre et des sujets voisins (DIY, Open Hardware, Open Data, les Communs, etc.), sur un site francophone contributif géré par une équipe bénévole par et pour des libristes enthousiastes"
     @feeds         = {}
+    @links         = {}
     @last_comments = Comment.footer
     @popular_tags  = Tag.footer
     @friend_sites  = FriendSite.select([:url, :title])
@@ -56,7 +57,7 @@ def configure_permitted_parameters
       :sort_by_date_on_home, :hide_signature, :show_negative_nodes,
       :totoz_style, :totoz_source,
       :board_in_sidebar,
-      user_attributes: [:id, :name, :homesite, :jabber_id, :signature, :avatar, :custom_avatar_url]
+      user_attributes: [:id, :name, :homesite, :jabber_id, :mastodon_url, :signature, :avatar, :custom_avatar_url]
     ])
   end