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

[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 b7654ee89a388821797d70b81d1edfbcf1ba215a..cde848e5d13762ac718431632aaf44c597c3bf54 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -1,18 +1,40 @@
 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"),
       "og:title" => title || t("layouts.project_name.title"),
       "og:type" => "website",
-      "og:image" => og_image ? Addressable::URI.join(root_url, og_image).normalize : image_url("osm_logo_256.png"),
       "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)
     end, "\n")
   end
+
+  private
+
+  def opengraph_image_properties(properties)
+    begin
+      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
+    {
+      "og:image" => image_url("osm_logo_256.png"),
+      "og:image:alt" => t("layouts.logo.alt_text")
+    }
+  end
 end