From 30fb53b63f1ae9d393bb66ffd5d14153e0350109 Mon Sep 17 00:00:00 2001
From: Lunar <lunar@anargeek.net>
Date: Wed, 6 Sep 2017 20:24:05 +0200
Subject: [PATCH] =?utf8?q?Suppression=20des=20lignes=20vides=20en=20trop?=
 =?utf8?q?=20dans=20les=20mod=C3=A8les=20ERB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 features/support/fixtures.rb | 6 +++---
 lib/nos_oignons/reminder.rb  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/features/support/fixtures.rb b/features/support/fixtures.rb
index 0d01e20..3c74f4b 100644
--- a/features/support/fixtures.rb
+++ b/features/support/fixtures.rb
@@ -68,10 +68,10 @@ END_OF_YAML
 MEMBER_FILE_TEMPLATE = <<'END_OF_TEMPLATE'
 ---
 name: <%= name %>
-<% unless address.nil? %>
+<% unless address.nil? -%>
 address: |
 <%= address.gsub(/^/, '  ').rstrip %>
-<% end %>
+<% end -%>
 email: <%= email %>
 joined_on: <%= joined_on %>
 membership_fee_paid_on: <%= membership_fee_paid_on %>
@@ -86,7 +86,7 @@ def member_filename_for_id(id)
 end
 
 def render_member_file(locals)
-  ERB.new(MEMBER_FILE_TEMPLATE).result(OpenStruct.new(locals).instance_eval { binding })
+  ERB.new(MEMBER_FILE_TEMPLATE, nil, '-').result(OpenStruct.new(locals).instance_eval { binding })
 end
 
 def new_id
diff --git a/lib/nos_oignons/reminder.rb b/lib/nos_oignons/reminder.rb
index e6d9234..5090be4 100644
--- a/lib/nos_oignons/reminder.rb
+++ b/lib/nos_oignons/reminder.rb
@@ -38,7 +38,7 @@ module NosOignons
             comment faire, écrivez au conseil d'administration. Répondre à cet email
             devrait faire l'affaire.
 
-            <% unless member.address.nil? %>
+            <% unless member.address.nil? -%>
             Au passage, est-ce que vous pourriez vérifier que l'adresse postale est
             toujours bonne ? Voici celle que nous avons retenu :
 
@@ -46,7 +46,7 @@ module NosOignons
 
             Si ce n'est plus le cas, c'est chouette de le signaler.
 
-            <% end %>
+            <% end -%>
             Au plaisir de continuer l'aventure de Nos oignons avec vous,
             -- 
             Le robot du conseil d'administration
@@ -105,7 +105,7 @@ module NosOignons
 
     def send(member)
       locals = { :member => member, :days => days }
-      body = ERB.new(template).result(OpenStruct.new(locals).instance_eval { binding })
+      body = ERB.new(template, nil, '-').result(OpenStruct.new(locals).instance_eval { binding })
       mail = Mail.new :charset => 'utf-8',
                       :from => NosOignons::BOARD_EMAIL,
                       :to => member.email,
-- 
2.39.2