From 84c04d5fc5c7e2774e68c66b7ace2806a22939f1 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Tue, 25 Jun 2019 22:27:24 +0200
Subject: [PATCH] Cleaner call to helper methods

---
 app/helpers/events_helper.rb    | 14 +++++++-------
 app/helpers/orgas_helper.rb     | 14 +++++++-------
 app/views/events/show.html.haml |  4 ++--
 app/views/orgas/show.html.haml  |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 3d7c04b9..41aef1c6 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -11,15 +11,15 @@ module EventsHelper
       }
   end
 
-  def set_event_meta
+  def set_event_meta(event = @event)
     set_meta_tags \
-      keywords: @event.tag_list,
-      DC: { title: @event.title, date: @event.start_time.to_s },
+      keywords: event.tag_list,
+      DC: { title: event.title, date: event.start_time.to_s },
       geo: {
-        placename: @event.city,
-        region: @event.region,
-        position: "#{@event.latitude};#{@event.longitude}",
-        ICBM: "#{@event.latitude}, #{@event.longitude}"
+        placename: event.city,
+        region: event.region,
+        position: "#{event.latitude};#{event.longitude}",
+        ICBM: "#{event.latitude}, #{event.longitude}"
       }
   end
 
diff --git a/app/helpers/orgas_helper.rb b/app/helpers/orgas_helper.rb
index 376a6619..e73287af 100644
--- a/app/helpers/orgas_helper.rb
+++ b/app/helpers/orgas_helper.rb
@@ -1,14 +1,14 @@
 # Helper for the orga views
 module OrgasHelper
-  def set_orga_meta
+  def orga_meta(orga)
     set_meta_tags \
-      description: strip_tags(@orga.description),
-      DC: { title: @orga.name },
+      description: strip_tags(orga.description),
+      DC: { title: orga.name },
       geo: {
-        placename: @orga.city,
-        region: @orga.region,
-        position: "#{@orga.latitude};#{@orga.longitude}",
-        ICBM: "#{@orga.latitude}, #{@orga.longitude}"
+        placename: orga.city,
+        region: orga.region,
+        position: "#{orga.latitude};#{orga.longitude}",
+        ICBM: "#{orga.latitude}, #{orga.longitude}"
       }
   end
 end
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index c96c3fa4..a09f012a 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -1,4 +1,4 @@
-- set_event_meta
+- event_meta @event
 
 = render partial: '/tags/context', locals: { tags: @event.tag_list }
 
@@ -14,7 +14,7 @@
 
 %h3= t '.dateAndPlace'
 
-%p= display_date
+%p= display_date @event
 
 %p.full_address
   - if @event.place_name.present?
diff --git a/app/views/orgas/show.html.haml b/app/views/orgas/show.html.haml
index ef2823c4..4d9a609e 100644
--- a/app/views/orgas/show.html.haml
+++ b/app/views/orgas/show.html.haml
@@ -1,4 +1,4 @@
-- set_orga_meta
+- orga_meta @orga
 
 %h2
   - if @orga.kind