Merge remote-tracking branch 'upstream/pull/5003'

[rails.git] / app / helpers / open_graph_helper.rb

diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index a91457645416f49c3ef01a4e50d63d239804d36b..a41831ca69d98bc6e287c495ec94653817245b2b 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -1,11 +1,12 @@
 module OpenGraphHelper
 module OpenGraphHelper

-  def opengraph_tags(title = nil)
+  require "addressable/uri"
+
+  def opengraph_tags(title = nil, og_image = nil)

     tags = {
       "og:site_name" => t("layouts.project_name.title"),
     tags = {
       "og:site_name" => t("layouts.project_name.title"),

-      "og:title" => [title, t("layouts.project_name.title")].compact.join(" | "),
+      "og:title" => title || t("layouts.project_name.title"),

       "og:type" => "website",
       "og:type" => "website",

-      "og:image" => image_url("osm_logo_256.png", :protocol => "http"),
-      "og:image:secure_url" => image_url("osm_logo_256.png", :protocol => "https"),
+      "og:image" => og_image_url(og_image),

       "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
     }
       "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
     }


@@ -14,4 +15,15 @@ module OpenGraphHelper
       tag.meta(:property => property, :content => content)
     end, "\n")
   end
       tag.meta(:property => property, :content => content)
     end, "\n")
   end

+
+  private
+
+  def og_image_url(og_image)
+    begin
+      return Addressable::URI.join(root_url, og_image).normalize if og_image
+    rescue Addressable::URI::InvalidURIError
+      # return default image
+    end
+    image_url("osm_logo_256.png")
+  end

 end
 end