From bda04664b0a959358f912a011e70e22fce4ecc99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Sat, 4 May 2013 01:06:05 +0200 Subject: [PATCH] prevent warning message about already defined constants --- lib/oneboxer/handlebars_onebox.rb | 4 +++- lib/oneboxer/oembed_onebox.rb | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/oneboxer/handlebars_onebox.rb b/lib/oneboxer/handlebars_onebox.rb index 3411bbc7d..66d85cb39 100644 --- a/lib/oneboxer/handlebars_onebox.rb +++ b/lib/oneboxer/handlebars_onebox.rb @@ -5,7 +5,9 @@ module Oneboxer class HandlebarsOnebox < BaseOnebox - MAX_TEXT = 500 + unless defined? MAX_TEXT + MAX_TEXT = 500 + end def self.template_path(template_name) "#{Rails.root}/lib/oneboxer/templates/#{template_name}.hbrs" diff --git a/lib/oneboxer/oembed_onebox.rb b/lib/oneboxer/oembed_onebox.rb index 3ddb15eab..96ae66382 100644 --- a/lib/oneboxer/oembed_onebox.rb +++ b/lib/oneboxer/oembed_onebox.rb @@ -5,8 +5,6 @@ module Oneboxer class OembedOnebox < HandlebarsOnebox - MAX_TEXT = 500 - def oembed_endpoint @url end @@ -16,12 +14,10 @@ module Oneboxer end def onebox - parsed = JSON.parse(open(oembed_endpoint).read) # If it's a video, just embed the iframe if %w(video rich).include?(parsed['type']) - # Return a preview of the thumbnail url, since iframes don't do well on previews preview = nil preview = "" if parsed['thumbnail_url'].present? @@ -35,7 +31,6 @@ module Oneboxer parsed['html'] ||= parsed['abstract'] parsed['host'] = nice_host - Mustache.render(File.read(template), parsed) rescue OpenURI::HTTPError nil