From 1d2717a1378bc4c6ff3fcf4599b236ee37fa21a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Fri, 18 Sep 2015 12:34:44 +0200
Subject: [PATCH] improves social cards info for proposals

---
 app/views/proposals/show.html.erb                 |  7 ++++---
 app/views/shared/_social_media_meta_tags.html.erb | 10 +++++-----
 spec/features/proposals_spec.rb                   |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 5506fc174..5380f2220 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -1,8 +1,9 @@
+<% provide :title do %><%= @proposal.title %><% end %>
 <% provide :social_media_meta_tags do %>
 <%= render "shared/social_media_meta_tags",
-            url: proposal_url(@proposal),
-            title: @proposal.title,
-            description: @proposal.summary %>
+            social_url: proposal_url(@proposal),
+            social_title: @proposal.title,
+            social_description: @proposal.summary %>
 <% end %>
 <% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %>
   <section class="proposal-show">
diff --git a/app/views/shared/_social_media_meta_tags.html.erb b/app/views/shared/_social_media_meta_tags.html.erb
index 5b99426de..4d98345bb 100644
--- a/app/views/shared/_social_media_meta_tags.html.erb
+++ b/app/views/shared/_social_media_meta_tags.html.erb
@@ -1,16 +1,16 @@
 <!-- Twitter -->
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@abriendomadrid" />
-<meta name="twitter:title" content="<%= title %>" />
-<meta name="twitter:description" content="<%= description %>" />
+<meta name="twitter:title" content="<%= social_title %>" />
+<meta name="twitter:description" content="<%= social_description %>" />
 <meta name="twitter:image" content="https://decide.madrid.es/social-media-icon.png" />
 <!-- Facebook OG -->
-<meta id="ogtitle" property="og:title" content="<%= title %>"/>
+<meta id="ogtitle" property="og:title" content="<%= social_title %>"/>
 <meta property="article:publisher" content="http://decide.madrid.es"/>
 <meta property="article:author" content="https://www.facebook.com/Ayuntamiento-de-Madrid-770904446353931"/>
 <meta property="og:type" content="article"/>
-<meta id="ogurl" property="og:url" content="<%= url %>"/>
+<meta id="ogurl" property="og:url" content="<%= social_url %>"/>
 <meta id="ogimage" property="og:image" content="https://decide.madrid.es/social-media-icon.png"/>
 <meta property="og:site_name" content="Madrid Participación"/>
-<meta id="ogdescription" property="og:description" content="<%= description %>"/>
+<meta id="ogdescription" property="og:description" content="<%= social_description %>"/>
 <meta property="fb:app_id" content="1662598980652932"/>
\ No newline at end of file
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 5ea58d225..453f3053a 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -47,6 +47,7 @@ feature 'Proposals' do
     expect(page).to have_content proposal.author.name
     expect(page).to have_content I18n.l(proposal.created_at.to_date)
     expect(page).to have_selector(avatar(proposal.author.name))
+    expect(page.html).to include "<title>#{proposal.title}</title>"
 
     within('.social-share-button') do
       expect(page.all('a').count).to be(3) # Twitter, Facebook, Google+