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

[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 a41831ca69d98bc6e287c495ec94653817245b2b..a496268e49909c7381cec21ec2729c15dfc4aeb4 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -1,15 +1,18 @@
 module OpenGraphHelper
   require "addressable/uri"
 
 module OpenGraphHelper
   require "addressable/uri"
 

-  def opengraph_tags(title = nil, og_image = nil)
+  def opengraph_tags(title, properties)

     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"),
+      "og:title" => properties["og:title"] || title || t("layouts.project_name.title"),

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

-      "og:image" => og_image_url(og_image),

       "og:url" => url_for(:only_path => false),
       "og:url" => url_for(:only_path => false),

-      "og:description" => t("layouts.intro_text")
-    }
+      "og:description" => properties["og:description"] || t("layouts.intro_text")
+    }.merge(
+      opengraph_image_properties(properties)
+    ).merge(
+      properties.slice("article:published_time")
+    )

 
     safe_join(tags.map do |property, content|
       tag.meta(:property => property, :content => content)
 
     safe_join(tags.map do |property, content|
       tag.meta(:property => property, :content => content)


@@ -18,12 +21,20 @@ module OpenGraphHelper
 
   private
 
 
   private
 

-  def og_image_url(og_image)
+  def opengraph_image_properties(properties)

     begin
     begin

-      return Addressable::URI.join(root_url, og_image).normalize if og_image
+      if properties["og:image"]
+        image_properties = {}
+        image_properties["og:image"] = Addressable::URI.join(root_url, properties["og:image"]).normalize
+        image_properties["og:image:alt"] = properties["og:image:alt"] if properties["og:image:alt"]
+        return image_properties
+      end

     rescue Addressable::URI::InvalidURIError
       # return default image
     end
     rescue Addressable::URI::InvalidURIError
       # return default image
     end

-    image_url("osm_logo_256.png")
+    {
+      "og:image" => image_url("osm_logo_256.png"),
+      "og:image:alt" => t("layouts.logo.alt_text")
+    }

   end
 end
   end
 end