From 4f262d0ce11c4a29c031f1efea9ceb0bcdba9700 Mon Sep 17 00:00:00 2001
From: Larissa Reis <larissa@colivre.coop.br>
Date: Tue, 12 Jul 2016 18:40:00 -0300
Subject: [PATCH] video plugin: Set default thumbnail dimensions to avoid crash with nil value on gallery page

---
 plugins/video/lib/video_plugin/video.rb | 8 ++++----
 plugins/video/test/unit/video_test.rb   | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/video/lib/video_plugin/video.rb b/plugins/video/lib/video_plugin/video.rb
index a6b1f19..2a9f4c2 100644
--- a/plugins/video/lib/video_plugin/video.rb
+++ b/plugins/video/lib/video_plugin/video.rb
@@ -12,8 +12,8 @@ class VideoPlugin::Video < Article
   settings_items :video_format,      :type => :string
   settings_items :video_id,          :type => :string
   settings_items :video_thumbnail_url,    :type => :string, :default => '/plugins/video/images/video_generic_thumbnail.jpg'
-  settings_items :video_thumbnail_width,  :type=> :integer
-  settings_items :video_thumbnail_height, :type=> :integer
+  settings_items :video_thumbnail_width,  :type=> :integer, :default => 239
+  settings_items :video_thumbnail_height, :type=> :integer, :default => 210
   settings_items :video_duration, :type=> :integer, :default => 0
 
   attr_accessible :video_url
@@ -35,14 +35,14 @@ class VideoPlugin::Video < Article
   def self.description
     _('Display embedded videos.')
   end
-  
+
   def is_youtube?
     VideoPlugin::Video.is_youtube?(self.video_url)
   end
 
   def is_vimeo?
     VideoPlugin::Video.is_vimeo?(self.video_url)
-  end  
+  end
 
   include ActionView::Helpers::TagHelper
   def to_html(options={})
diff --git a/plugins/video/test/unit/video_test.rb b/plugins/video/test/unit/video_test.rb
index 57bb067..f0e0077 100644
--- a/plugins/video/test/unit/video_test.rb
+++ b/plugins/video/test/unit/video_test.rb
@@ -46,6 +46,11 @@ class VideoTest < ActiveSupport::TestCase
     assert_equal thumbnail_fitted_height, @video.thumbnail_fitted_height
   end
 
+  should "have dimensions of default thumbnail" do
+    assert @video.video_thumbnail_height.present? && @video.video_thumbnail_height > 0
+    assert @video.video_thumbnail_width.present? && @video.video_thumbnail_width > 0
+  end
+
   should "show a no_browser_support_message" do
     assert_equal @video.no_browser_support_message, '<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>'
   end
--
libgit2 0.21.2