Adds Video gallery and other video stuff (like video article and video gallery block)

Evandro Jr · Rodrigo Souto
1 parent 671db6cb
Showing 29 changed files with 744 additions and 125 deletions Show diff stats
plugins/video/README.md
plugins/video/lib/ext/article.rb
plugins/video/lib/video_block.rb
plugins/video/lib/video_plugin.rb
plugins/video/lib/video_plugin/video.rb
plugins/video/lib/video_plugin/video_block.rb
plugins/video/lib/video_plugin/video_gallery.rb
plugins/video/lib/video_plugin/video_gallery_block.rb
plugins/video/lib/video_plugin/video_gallery_helper.rb
plugins/video/public/images/video_generic_thumbnail.jpg
plugins/video/public/style.css
plugins/video/test/functional/video_plugin_environment_design_controller_test.rb
plugins/video/test/functional/video_plugin_profile_design_controller_test.rb
plugins/video/test/unit/video_block_test.rb
plugins/video/test/unit/video_galery_block_test.rb
plugins/video/test/unit/video_galery_test.rb
plugins/video/test/unit/video_plugin_test.rb
plugins/video/test/unit/video_test.rb
plugins/video/views/box_organizer/_html5_video_block.html.erb
plugins/video/views/box_organizer/_iframe_video_block.html.erb
@@ -49,9 +49,10 @@ See Noosfero license.
 AUTHORS
 =======
- Leandro Nunes dos Santos (leandronunes at gmail.com)
+ Leandro Nunes dos Santos (leandronunes at gmail.com) (Video Block)
+ Evandro Magalhães Leite Júnior (evandrojr at gmail.com) (Video Gallery & Video Content)
 ACKNOWLEDGMENTS
 ===============
-The author have been supported by Serpro
+The authors have been supported by Serpro
@@ -0,0 +1,31 @@
+require_dependency 'article'
+
+class Article
+
+  scope :video_gallery, :conditions => ["articles.type = 'VideoPlugin::VideoGallery'"]
+
+  #FIXME This should be done via hotspot
+  def self.folder_types_with_video
+    self.folder_types_without_video << 'VideoPlugin::VideoGallery'
+  end
+
+  #FIXME This should be done via hotspot
+  class << self
+    alias_method_chain :folder_types, :video
+  end
+
+  def self.owner_video_galleries(owner)
+    conditions = owner.kind_of?(Environment) ?  [] : ["profile_id = ?", owner.id]
+    result = Article.video_gallery.find(
+      :all,
+      :order => 'created_at desc',
+      :conditions => conditions)
+  end
+
+end
+
+
+
+
+
+
@@ -1,62 +0,0 @@
-class VideoBlock < Block
-
-  attr_accessible :url, :width, :height
-  
-  settings_items :url, :type => :string, :default => ""
-  settings_items :width, :type => :integer, :default => 400
-  settings_items :height, :type => :integer, :default => 315
-
-  YOUTUBE_ID_FORMAT = '\w-'
-
-  def is_youtube?
-    url.match(/.*(youtube.com.*v=[#{YOUTUBE_ID_FORMAT}]+|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
-  end
-
-  def is_vimeo?
-    url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com|player.vimeo.com\/video)\/[[:digit:]]+/) ? true : false
-  end
-
-  def is_video_file?
-    url.match(/.*(mp4|ogg|ogv|webm)$/) ? true : false
-  end
-
-  def format_embed_video_url_for_youtube
-    "//www.youtube-nocookie.com/embed/#{extract_youtube_id}?rel=0&wmode=transparent" if is_youtube?
-  end
-
-  def format_embed_video_url_for_vimeo
-    "//player.vimeo.com/video/#{extract_vimeo_id}" if is_vimeo?
-  end
-
-  def self.description
-    _('Display a Video')
-  end
-
-  def help
-    _('This block presents a video from youtube, vimeo and some video formats (mp4, ogg, ogv and webm)')
-  end
-
-  def content(args={})
-    block = self
-
-    proc do
-      render :file => 'video_block', :locals => { :block => block }
-    end
-  end
-
-  private
-
-  def extract_youtube_id
-    return nil unless is_youtube?
-    youtube_match = url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
-    youtube_match ||= url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
-    youtube_match[1] unless youtube_match.nil?
-  end
-
-  def extract_vimeo_id
-    return nil unless is_vimeo?
-    vimeo_match = url.match('([[:digit:]]*)$')
-    vimeo_match[1] unless vimeo_match.nil?
-  end
-
-end
-require_dependency File.dirname(__FILE__) + '/video_block'
-
 class VideoPlugin < Noosfero::Plugin
   def self.plugin_name
-    "Video Block Plugin"
+    "Video Content type, Video Block and Video Gallery Plugin"
   end
   def self.plugin_description
@@ -11,8 +9,37 @@ class VideoPlugin &lt; Noosfero::Plugin
   end
   def self.extra_blocks
+      { VideoPlugin::VideoBlock => {}, VideoPlugin::VideoGalleryBlock => {:position=>['1']} }
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def content_types
+    [VideoPlugin::VideoGallery, VideoPlugin::Video]
+  end
+
+  def content_remove_new(content)
+    if content.kind_of?(VideoPlugin::VideoGallery) or content.kind_of?(VideoPlugin::Video)
+      true
+    end
+  end
+
+  def content_remove_upload(content)
+    if content.kind_of?(VideoPlugin::VideoGallery) or content.kind_of?(VideoPlugin::Video)
+      true
+    end
+  end
+
+  def article_extra_toolbar_buttons(content)
+    return [] if !content.kind_of?(VideoPlugin::VideoGallery)
     {
-      VideoBlock => {}
+      :id=>"new-video-btn",
+      :class=>"button with-text icon-new",
+      :url=> {:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id},
+      :title=>_("New Video"),
+      :icon => :new
     }
   end
@@ -0,0 +1,180 @@
+require 'noosfero/translatable_content'
+require 'application_helper'
+require 'net/http'
+
+class VideoPlugin::Video < Article
+
+  settings_items :video_url,    :type => :string, :default => 'http://'
+  settings_items :video_width,  :type => :integer, :default => 499
+  settings_items :video_height, :type => :integer, :default => 353
+  #Video Providers are: youtube, vimeo, file
+  settings_items :video_provider,    :type => :string
+  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_duration, :type=> :integer, :default => 0
+
+  attr_accessible :video_url
+
+  before_save :fill_video_properties
+
+  def self.type_name
+    _('Video')
+  end
+
+  def can_display_versions?
+    true
+  end
+
+  def self.short_description
+    _('Embedded Video')
+  end
+
+  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  
+
+  include ActionView::Helpers::TagHelper
+  def to_html(options={})
+    article = self
+    proc do
+      render :partial => 'content_viewer/video_plugin/video', :locals => {:article => article}
+    end
+  end
+
+  def fitted_width
+    499
+  end
+
+  def fitted_height
+    ((fitted_width * self.video_height) / self.video_width).to_i
+  end
+
+  def thumbnail_fitted_width
+    80
+  end
+
+  def thumbnail_fitted_height
+    ((thumbnail_fitted_width * self.video_thumbnail_height) / self.video_thumbnail_width).to_i
+  end
+
+  def 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
+
+  def self.is_youtube?(video_url)
+    video_url.match(/.*(youtube.com.*v=[#{YOUTUBE_ID_FORMAT}]+|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
+  end
+
+  def self.is_vimeo?(video_url)
+    video_url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com|player.vimeo.com\/video)\/([A-z]|\/)*[[:digit:]]+/) ? true : false
+  end
+
+  def self.is_video_file?(video_url)
+    video_url.match(/\.(mp4|ogg|ogv|webm)/) ? true : false
+  end
+
+  def self.format_embed_video_url_for_youtube(video_url)
+    "//www.youtube-nocookie.com/embed/#{extract_youtube_id(video_url)}?rel=0&wmode=transparent" if is_youtube?(video_url)
+  end
+
+  def self.format_embed_video_url_for_vimeo(video_url)
+    "//player.vimeo.com/video/#{extract_vimeo_id(video_url)}" if is_vimeo?(video_url)
+  end
+
+  def format_embed_video_url_for_youtube
+    VideoPlugin::Video.format_embed_video_url_for_youtube(self.video_url)
+  end
+
+  def format_embed_video_url_for_vimeo
+    VideoPlugin::Video.format_embed_video_url_for_vimeo(self.video_url)
+  end
+
+  def self.extract_youtube_id(video_url)
+    return nil unless self.is_youtube?(video_url)
+    youtube_match = video_url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
+    youtube_match ||= video_url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
+    youtube_match[1] unless youtube_match.nil?
+  end
+
+  def self.extract_vimeo_id(video_url)
+    return nil unless self.is_vimeo?(video_url)
+    vimeo_match = video_url.match('([[:digit:]]*)$')
+    vimeo_match[1] unless vimeo_match.nil?
+  end
+
+  private
+
+  YOUTUBE_ID_FORMAT = '\w-'
+
+  def fill_video_properties
+    if is_youtube?
+      fill_youtube_video_properties
+    elsif is_vimeo?
+      fill_vimeo_video_properties
+    elsif true
+      self.video_format = detect_file_format
+      self.video_provider = 'file'
+    end
+  end
+
+  def fill_youtube_video_properties
+    self.video_provider = 'youtube'
+    self.video_id = extract_youtube_id
+    url = "http://www.youtube.com/oembed?url=http%3A//www.youtube.com/watch?v%3D#{self.video_id}&format=json"
+    resp = Net::HTTP.get_response(URI.parse(url))
+    buffer = resp.body
+    vid = JSON.parse(buffer)
+    self.video_thumbnail_url = vid['thumbnail_url']
+    self.video_width = vid['width']
+    self.video_height = vid['height']
+    self.video_thumbnail_width = vid['thumbnail_width']
+    self.video_thumbnail_height = vid['thumbnail_height']
+  end
+
+  def fill_vimeo_video_properties
+    self.video_provider = 'vimeo'
+    self.video_id = extract_vimeo_id
+    url = "http://vimeo.com/api/v2/video/#{self.video_id}.json"
+    resp = Net::HTTP.get_response(URI.parse(url))
+    buffer = resp.body
+    vid = JSON.parse(buffer)
+    vid = vid[0]
+    self.video_thumbnail_url = vid['thumbnail_large']
+    self.video_width = vid['width']
+    self.video_height = vid['height']
+    self.video_thumbnail_width = 640
+    self.video_thumbnail_height = 360
+  end
+
+  def detect_file_format
+   video_type = 'video/unknown'
+   if /.mp4/i =~ self.video_url or /.mov/i =~ self.video_url
+    video_type='video/mp4'
+   elsif /.webm/i =~ self.video_url
+    video_type='video/webm'
+   elsif /.og[vg]/i =~ self.video_url
+    video_type='video/ogg'
+   end
+   video_type
+  end
+
+  def extract_youtube_id
+    VideoPlugin::Video.extract_youtube_id(self.video_url)
+  end
+
+  def extract_vimeo_id
+    VideoPlugin::Video.extract_vimeo_id(self.video_url)
+  end
+
+end
@@ -0,0 +1,57 @@
+class VideoPlugin::VideoBlock < Block
+
+  attr_accessible :url, :width, :height
+
+  settings_items :url, :type => :string, :default => ""
+  settings_items :width, :type => :integer, :default => 400
+  settings_items :height, :type => :integer, :default => 315
+
+  YOUTUBE_ID_FORMAT = '\w-'
+
+  def is_youtube?
+    VideoPlugin::Video.is_youtube?(url)
+  end
+
+  def is_vimeo?
+    VideoPlugin::Video.is_vimeo?(url)
+  end
+
+  def is_video_file?
+    url.match(/.*(mp4|ogg|ogv|webm)$/) ? true : false
+  end
+
+  def format_embed_video_url_for_youtube
+    VideoPlugin::Video.format_embed_video_url_for_youtube(url)
+  end
+
+  def format_embed_video_url_for_vimeo
+    VideoPlugin::Video.format_embed_video_url_for_vimeo(url)
+  end
+
+  def self.description
+    _('Display a Video')
+  end
+
+  def help
+    _('This block presents a video from youtube, vimeo and some video formats (mp4, ogg, ogv and webm)')
+  end
+
+  def content(args={})
+    block = self
+
+    proc do
+      render :file => 'video_block', :locals => { :block => block }
+    end
+  end
+
+  private
+
+  def extract_youtube_id
+    VideoPlugin::Video.extract_youtube_id(url)
+  end
+
+  def extract_vimeo_id
+    VideoPlugin::Video.extract_vimeo_id(url)
+  end
+
+end
@@ -0,0 +1,63 @@
+class VideoPlugin::VideoGallery < Folder
+
+  def self.type_name
+    _('Video Gallery')
+  end
+
+  settings_items :thumbnail_width, :type => :integer, :default => 50
+  settings_items :thumbnail_height, :type => :integer, :default => 50
+  settings_items :videos_per_row, :type => :integer, :default => 5
+
+  validate :not_belong_to_blog
+
+  def not_belong_to_blog
+    errors.add(:parent, "A video gallery should not belong to a blog.") if parent && parent.blog?
+  end
+
+  acts_as_having_settings :field => :setting
+
+  xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
+
+  include WhiteListFilter
+  filter_iframes :body
+  def iframe_whitelist
+    profile && profile.environment && profile.environment.trusted_sites_for_iframe
+  end
+
+  def self.short_description
+    _('Video Gallery')
+  end
+
+  def self.description
+    _('A gallery of link to videos that are hosted elsewhere.')
+  end
+
+  include ActionView::Helpers::TagHelper
+  def to_html(options = {})
+    video_gallery = self
+    proc do
+      render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery}
+    end
+  end
+
+  def video_gallery?
+    true
+  end
+
+  def can_display_hits?
+    false
+  end
+
+  def accept_comments?
+    false
+  end
+
+  def self.icon_name(article = nil)
+    'Video gallery'
+  end
+
+  def news(limit = 30, highlight = false)
+    profile.recent_documents(limit, ["articles.type != ? AND articles.highlighted = ? AND articles.parent_id = ?", 'Folder', highlight, id])
+  end
+
+end
@@ -0,0 +1,31 @@
+class VideoPlugin::VideoGalleryBlock < Block
+
+  settings_items :video_gallery_id, :type => :integer
+  attr_accessible :video_gallery_id
+
+  include ActionView::Helpers
+  include Rails.application.routes.url_helpers
+
+  def self.description
+    _('Display a Video Gallery')
+  end
+
+  def help
+    _('This block presents a video gallery')
+  end
+
+  def content(args={})
+    block = self
+    if video_gallery_id.present?
+      video_gallery = VideoPlugin::VideoGallery.find(video_gallery_id)
+      proc do
+        render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery}
+      end
+    end
+  end
+
+  def list_my_galleries
+    Article.owner_video_galleries(owner)
+  end
+
+end
@@ -0,0 +1,17 @@
+module VideoPlugin::VideoGalleryHelper
+
+  def list_videos(configure={})
+      configure[:recursive] ||= false
+      configure[:list_type] ||= :folder
+      if !configure[:contents].blank?
+        configure[:contents] = configure[:contents].paginate(
+          :per_page => 17,
+          :page => params[:npage]
+        ).order("updated_at DESC")
+        render :file => 'shared/video_list', :locals => configure
+      else
+        content_tag('em', _('(empty folder)'))
+      end
+  end
+
+end
@@ -0,0 +1,66 @@
+.video-gallery-thumbnail {
+  position: relative;
+  display: inline-block;
+  width: 95px;
+  height: 115px;
+  margin: 1em;
+  border: solid #F0F0F0 1px;
+  vertical-align: top;
+  text-align: left;
+  overflow: hidden;
+  padding-top: 7px;
+  margin-botton: 10px;
+  text-overflow: ellipsis;
+}
+
+.video-gallery-top-box{
+  height: 73px;
+}
+
+.video-duration{
+  position: absolute;
+  bottom: 0px;
+  background-color: black;
+  font-size: 1em;
+  text-color: white;
+}
+
+.video-title{
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.video-author{
+  display: none;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.video-gallery-thumbnail:hover div{
+  display: inline-block;
+}
+
+.video-gallery-table-big{
+  width: 100%;
+  overflow: hidden;
+}
+
+.video-gallery-left-column-big{
+  width: 350px;
+  float: left;
+}
+
+.video-gallery-right-column-big{
+  margin-left: 370px;
+}
+
+.video-title-big{
+  font-size: 2em;
+}
+
+.video-block-center{
+  width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+}
 \ No newline at end of file
@@ -18,9 +18,9 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     @environment.enabled_plugins = ['VideoPlugin']
     @environment.save!
-    VideoBlock.delete_all
+    VideoPlugin::VideoBlock.delete_all
-    @block = VideoBlock.new
+    @block = VideoPlugin::VideoBlock.new
     @block.box = @environment.boxes.first
     @block.save!
   end
@@ -15,11 +15,11 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     @environment.enabled_plugins = ['VideoPlugin']
     @environment.save!
-    VideoBlock.delete_all
+    VideoPlugin::VideoBlock.delete_all
     @box1 = Box.create!(:owner => @profile)
     @profile.boxes = [@box1]
-    @block = VideoBlock.new
+    @block = VideoPlugin::VideoBlock.new
     @block.box = @box1
     @block.save!
@@ -4,94 +4,88 @@ class VideoBlockTest &lt; ActiveSupport::TestCase
   ### Tests for YouTube
   should "is_youtube return true when the url contains http://youtube.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://youtube.com/?v=XXXXX"
     assert block.is_youtube?
   end
   should "is_youtube return true when the url contains https://youtube.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "https://youtube.com/?v=XXXXX"
     assert block.is_youtube?
   end
-  should "is_youtube return true when the url contains https://www.youtube.com" do
-    block = VideoBlock.new
-    block.url = "https://www.youtube.com/?v=XXXXX"
-    assert block.is_youtube?
-  end
-
   should "is_youtube return true when the url contains www.youtube.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "www.youtube.com/?v=XXXXX"
     assert block.is_youtube?
   end
   should "is_youtube return true when the url contains youtube.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "youtube.com/?v=XXXXX"
     assert block.is_youtube?
   end
   should "is_youtube return false when the url not contains youtube video ID" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "youtube.com/"
     refute block.is_youtube?
   end
   should "is_youtube return false when the url contains empty youtube video ID" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "youtube.com/?v="
     refute block.is_youtube?
   end
   should "is_youtube return false when the url contains an invalid youtube link" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.yt.com/?v=XXXXX"
     refute block.is_youtube?
   end
   should "format embed video for youtube videos" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "youtube.com/?v=XXXXX"
     assert_match /\/\/www.youtube-nocookie.com\/embed/, block.format_embed_video_url_for_youtube
   end
   should "format embed video return nil if is not a youtube url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.yt.com/?v=XXXXX"
     assert_nil block.format_embed_video_url_for_youtube
   end
   should "extract youtube id from youtube video url's if it's a valid youtube full url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     id = 'oi43jre2d2'
     block.url = "youtube.com/?v=#{id}"
     assert_equal id, block.send('extract_youtube_id')
   end
   should "extract youtube id from youtube video url's if it has underline and hyphen" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     id = 'oi43_re-d2'
     block.url = "youtube.com/?v=#{id}"
     assert_equal id, block.send('extract_youtube_id')
   end
   should "extract youtube id from youtube video url's if it's a valid youtube short url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     id = 'oi43jre2d2'
     block.url = "youtu.be/#{id}"
     assert_equal id, block.send('extract_youtube_id')
   end
   should "extract_youtube_id return nil if the url it's not a valid youtube url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.yt.com/?v=XXXXX"
     assert_nil block.send('extract_youtube_id')
   end
   should "extract_youtube_id return nil if youtue url there is no id" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "youtube.com/"
     assert_nil block.send('extract_youtube_id')
   end
@@ -99,111 +93,111 @@ class VideoBlockTest &lt; ActiveSupport::TestCase
   #### Tests for Vimeo Videos
   should "is_vimeo return true when the url contains http://vimeo.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://vimeo.com/98979"
     assert block.is_vimeo?
   end
   should "is_vimeo return true when the url contains https://vimeo.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "https://vimeo.com/989798"
     assert block.is_vimeo?
   end
   should "is_vimeo return true when the url contains https://www.vimeo.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "https://www.vimeo.com/98987"
     assert block.is_vimeo?
   end
   should "is_vimeo return true when the url contains www.vimeo.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "www.vimeo.com/989798"
     assert block.is_vimeo?
   end
   should "is_vimeo return true when the url contains vimeo.com" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "vimeo.com/09898"
     assert block.is_vimeo?
   end
   should "is_vimeo return false when the url not contains vimeo video ID" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "vimeo.com/home"
     refute block.is_vimeo?
   end
   should "is_vimeo return false when the url contains empty vimeo video ID" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "vimeo.com/"
     refute block.is_vimeo?
   end
   should "is_vimeo return false when the url contains an invalid vimeo link" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.vmsd.com/98979"
     refute block.is_vimeo?
   end
   should "format embed video for vimeo videos" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "vimeo.com/09898"
     assert_match /\/\/player.vimeo.com\/video\/[[:digit:]]+/, block.format_embed_video_url_for_vimeo
   end
   should "format embed video return nil if is not a vimeo url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.yt.com/?v=XXXXX"
     assert_nil block.format_embed_video_url_for_vimeo
   end
   should "extract vimeo id from vimeo video url's if it's a valid vimeo url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     id = '23048239432'
     block.url = "vimeo.com/#{id}"
     assert_equal id, block.send('extract_vimeo_id')
   end
   should "extract_vimeo_id return nil if the url it's not a valid vimeo url" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.yt.com/XXXXX"
     assert_nil block.send('extract_vimeo_id')
   end
   should "extract_vimeo_id return nil if vimeo url there is no id" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "vimeo.com/"
     assert_nil block.send('extract_youtube_id')
   end
   # Other video formats
   should "is_video return true if url ends with mp4" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.vmsd.com/98979.mp4"
     assert block.is_video_file?
   end
   should "is_video return true if url ends with ogg" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.vmsd.com/98979.ogg"
     assert block.is_video_file?
   end
   should "is_video return true if url ends with ogv" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.vmsd.com/98979.ogv"
     assert block.is_video_file?
   end
   should "is_video return true if url ends with webm" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.vmsd.com/98979.webm"
     assert block.is_video_file?
   end
   should "is_video return false if url ends without mp4, ogg, ogv, webm" do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     block.url = "http://www.vmsd.com/98979.mp4r"
     refute block.is_video_file?
     block.url = "http://www.vmsd.com/98979.oggr"
@@ -215,7 +209,7 @@ class VideoBlockTest &lt; ActiveSupport::TestCase
   end
   should 'display video block partial' do
-    block = VideoBlock.new
+    block = VideoPlugin::VideoBlock.new
     self.expects(:render).with(:file => 'video_block', :locals => {
         :block => block
     })
@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class VideoGaleryBlockTest < ActiveSupport::TestCase
+
+  should "define its description" do
+    assert_equal VideoPlugin::VideoGalleryBlock.description, _('Display a Video Gallery')
+  end
+
+  should "define its help description" do
+    assert_equal VideoPlugin::VideoGalleryBlock.new.help, _('This block presents a video gallery')
+  end
+
+end
@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class VideoGaleryTest < ActiveSupport::TestCase
+
+  should "define its type_name as Video Gallery" do
+    assert_equal VideoPlugin::VideoGallery.type_name, _('Video Gallery')
+  end
+
+  should "define its short_description" do
+    assert_equal VideoPlugin::VideoGallery.short_description, _('Video Gallery')
+  end
+
+  should "define its description" do
+    assert_equal VideoPlugin::VideoGallery.description, _('A gallery of link to videos that are hosted elsewhere.')
+  end
+
+end
@@ -2,7 +2,7 @@ require_relative &#39;../test_helper&#39;
 class VideoPluginTest < ActiveSupport::TestCase
   should "return VideoBlock in extra_blocks class method" do
-    assert  VideoPlugin.extra_blocks.keys.include?(VideoBlock)
+    assert  VideoPlugin.extra_blocks.keys.include?(VideoPlugin::VideoBlock)
   end
 end
@@ -0,0 +1,90 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class VideoTest < ActiveSupport::TestCase
+
+  include AuthenticatedTestHelper
+  fixtures :users, :environments
+
+  def setup
+    @video = VideoPlugin::Video.new
+  end
+
+  should "define its type_name as video" do
+    assert_equal VideoPlugin::Video.type_name, _('Video')
+  end
+
+  should "display version" do
+    assert @video.can_display_versions?
+  end
+
+  should "define its short_description" do
+    assert_equal VideoPlugin::Video.short_description, _('Embedded Video')
+  end
+
+  should "define its description" do
+    assert_equal VideoPlugin::Video.description, _('Display embedded videos.')
+  end
+
+  should "define a fitted_width" do
+    assert_equal @video.fitted_width, 499
+  end
+
+  should "eval a fitted_height" do
+    @video.video_height = 1000
+    @video.video_width =  2000
+    fitted_height = ((@video.fitted_width * @video.video_height) / @video.video_width).to_i
+    assert_equal fitted_height, @video.fitted_height
+  end
+
+  should "define a thumbnail_fitted_width" do
+    assert_equal @video.thumbnail_fitted_width, 80
+  end
+
+  should "eval a thumbnail_fitted_height" do
+    @video.video_thumbnail_height = 60
+    @video.video_thumbnail_width =  30
+    thumbnail_fitted_height = ((@video.thumbnail_fitted_width * @video.video_thumbnail_height) / @video.video_thumbnail_width).to_i
+    assert_equal thumbnail_fitted_height, @video.thumbnail_fitted_height
+  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
+
+
+  ### Tests for YouTube
+
+  should "is_youtube return true when the url contains http://youtube.com" do
+    @video.video_url = "http://youtube.com/?v=XXXXX"
+    assert @video.is_youtube?
+  end
+
+  should "is_youtube return true when the url contains https://youtube.com" do
+    @video.video_url = "https://youtube.com/?v=XXXXX"
+    assert @video.is_youtube?
+  end
+
+  should "is_youtube return false when the url contains an invalid youtube link" do
+    @video.video_url = "http://www.yt.com/?v=XXXXX"
+    assert !@video.is_youtube?
+  end
+
+  ### Tests for vimeo
+
+  should "is_vimeo return true when the url contains vimeo.com" do
+    @video.video_url = "vimeo.com/09898"
+    assert @video.is_vimeo?
+  end
+
+  should "is_vimeo return false when the url not contains vimeo video ID" do
+    @video.video_url = "vimeo.com/home"
+    assert !@video.is_vimeo?
+  end
+
+  should "is_vimeo return true for https://vimeo.com/channels/staffpicks/XXXXXXXXXX" do
+    @video.video_url = "https://vimeo.com/channels/staffpicks/122325664"
+    assert @video.is_vimeo?
+  end
+
+
+
+end
-<video controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
+<video class="video-block-center" controls preload="auto" width='<%="#{width}px"%>' height='<%="#{height}px"%>'>
     <source src=<%= "#{url}" %>>
 </video>
-<iframe width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
+<iframe class="video-block-center" width='<%="#{width}px"%>' height='<%="#{height}px"%>' src='<%= "#{url}" %>' frameborder="0" allowfullscreen></iframe>
 \ No newline at end of file
@@ -1,11 +0,0 @@
-<label for="url" class="formlabel"> Video URL: </label>
-
-<div class="formfield type-text">
-  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
-</div>
-<div class="formfield type-text">
-  <label for="width" class="formlabel"> Width: </label>
-  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
-  <label for="height" class="formlabel"> Height: </label>
-  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
-</div>
@@ -0,0 +1,11 @@
+<label for="url" class="formlabel"> Video URL: </label>
+
+<div class="formfield type-text">
+  <%= text_field_tag 'block[url]', @block.url, :class => 'video-url', :maxlength => 255 %>
+</div>
+<div class="formfield type-text">
+  <label for="width" class="formlabel"> Width: </label>
+  <%= text_field_tag 'block[width]', @block.width, :size => 7, :class => 'video-width', :maxlength => 5 %>
+  <label for="height" class="formlabel"> Height: </label>
+  <%= text_field_tag 'block[height]', @block.height, :size => 7, :class => 'video-height', :maxlength => 5 %>
+</div>
@@ -0,0 +1,3 @@
+<div id='edit-video-gallery-block'>
+  <%= labelled_select(_('Video gallery')+' ', 'block[video_gallery_id]', :id, :name, @block.video_gallery_id, @block.list_my_galleries) %>
+</div>
 \ No newline at end of file
@@ -0,0 +1,12 @@
+<%= required_fields_message %>
+
+<div>
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= required labelled_form_field _('URL of the video'), text_field(:article, :video_url, :size => 80) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
+<%= render :partial => 'general_fields' %>
+<%= render :partial => 'translatable' %>
+</div>
+
+
+
@@ -0,0 +1,6 @@
+<%= required_fields_message %>
+
+<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
+<%= render :partial => 'general_fields' %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
@@ -0,0 +1,14 @@
+<div>
+<%if @page.video_provider=='youtube' %>
+  <iframe class="video-block-center" width='<%="#{@page.fitted_width}px"%>' height='<%="#{@page.fitted_height}px"%>' src='<%= "#{@page.format_embed_video_url_for_youtube}" %>' frameborder="0" allowfullscreen></iframe>
+<% elsif  @page.video_provider=='vimeo' %>
+  <iframe class="video-block-center" width='<%="#{@page.fitted_width}px"%>' height='<%="#{@page.fitted_height}px"%>' src='<%= "#{@page.format_embed_video_url_for_vimeo}" %>' frameborder="0" allowfullscreen></iframe>
+<% elsif  @page.video_provider=='file' %>
+  <video class="video-block-center" controls preload="auto" height="353" width="499" type='<%= @page.video_format %>'>
+    <source src=<%= "#{@page.video_url}" %>>
+  </video>
+<% end %>
+<br style="clear:both" />
+</div>
+<% _("Description:") %>
+<%= @page.body %>
@@ -0,0 +1,14 @@
+<% extend VideoPlugin::VideoGalleryHelper %>
+
+<% unless video_gallery.body.blank? %>
+  <div>
+    <%= video_gallery.body %>
+  </div>
+  <hr/>
+<% end %>
+
+<% if video_gallery.children.empty? %>
+  <em><%= _('(empty video gallery)') %></em>
+<% else %>
+  <%= list_videos(:contents=>video_gallery.children) %>
+<% end %>
@@ -0,0 +1,40 @@
+<div>
+ <%
+  first_video = contents[0]
+  first_video_arr = Array.new
+  first_video_arr.push(first_video)
+  other_videos = contents - first_video_arr %>
+  <% if first_video.display_to?(user) %>
+    <div class="video-gallery-table-big">
+      <div class="video-gallery-left-column-big">
+          <%= link_to first_video.view_url do %>
+            <img  width="320" height="320" src='<%= first_video.video_thumbnail_url %>' class="disable-zoom"/>
+          <% end  %>
+      </div>
+      <div class="video-gallery-right-column-big">
+        <div class="video-title-big"><%= first_video.title %></div>
+        <div class="video-author-big">
+          <%= _("by")  %> <%= first_video.author_name %> <%= _("updated at") %>  <%= time_ago_in_words(first_video.updated_at)  %>
+        </div>
+      </div>
+    </div>
+  <% end  %>
+  <% other_videos.each do |content| %>
+    <% if content.display_to?(user) %>
+      <div class="video-gallery-thumbnail">
+        <div class="video-gallery-top-box">
+          <%= link_to content.view_url do %>
+            <img  width="<%= content.thumbnail_fitted_width %>" height="<%= content.thumbnail_fitted_height %>" src='<%= content.video_thumbnail_url %>' class="disable-zoom"/>
+          <% end  %>
+        </div>
+        <div class="video-gallery-botton-box">
+            <div class="video-author">
+              <%= _("by")  %> <%= content.author_name %> <%= _("updated at") %>  <%= time_ago_in_words(content.updated_at)  %>
+            </div>
+            <div class="video-title"><%= content.title %></div>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
+</div>
@@ -0,0 +1,7 @@
+<%#
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+%>
+
+<%= "video_gallery_block.html" %>
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+require_dependency 'article'
	2	+
	3	+class Article
	4	+
	5	+ scope :video_gallery, :conditions => ["articles.type = 'VideoPlugin::VideoGallery'"]
	6	+
	7	+ #FIXME This should be done via hotspot
	8	+ def self.folder_types_with_video
	9	+ self.folder_types_without_video << 'VideoPlugin::VideoGallery'
	10	+ end
	11	+
	12	+ #FIXME This should be done via hotspot
	13	+ class << self
	14	+ alias_method_chain :folder_types, :video
	15	+ end
	16	+
	17	+ def self.owner_video_galleries(owner)
	18	+ conditions = owner.kind_of?(Environment) ? [] : ["profile_id = ?", owner.id]
	19	+ result = Article.video_gallery.find(
	20	+ :all,
	21	+ :order => 'created_at desc',
	22	+ :conditions => conditions)
	23	+ end
	24	+
	25	+end
	26	+
	27	+
	28	+
	29	+
	30	+
	31	+
	@@ -1,62 +0,0 @@	@@ -1,62 +0,0 @@
1	-class VideoBlock < Block
2	-
3	- attr_accessible :url, :width, :height
4	-
5	- settings_items :url, :type => :string, :default => ""
6	- settings_items :width, :type => :integer, :default => 400
7	- settings_items :height, :type => :integer, :default => 315
8	-
9	- YOUTUBE_ID_FORMAT = '\w-'
10	-
11	- def is_youtube?
12	- url.match(/.(youtube.com.v=[#{YOUTUBE_ID_FORMAT}]+\|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
13	- end
14	-
15	- def is_vimeo?
16	- url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com\|player.vimeo.com\/video)\/[[:digit:]]+/) ? true : false
17	- end
18	-
19	- def is_video_file?
20	- url.match(/.*(mp4\|ogg\|ogv\|webm)$/) ? true : false
21	- end
22	-
23	- def format_embed_video_url_for_youtube
24	- "//www.youtube-nocookie.com/embed/#{extract_youtube_id}?rel=0&wmode=transparent" if is_youtube?
25	- end
26	-
27	- def format_embed_video_url_for_vimeo
28	- "//player.vimeo.com/video/#{extract_vimeo_id}" if is_vimeo?
29	- end
30	-
31	- def self.description
32	- _('Display a Video')
33	- end
34	-
35	- def help
36	- _('This block presents a video from youtube, vimeo and some video formats (mp4, ogg, ogv and webm)')
37	- end
38	-
39	- def content(args={})
40	- block = self
41	-
42	- proc do
43	- render :file => 'video_block', :locals => { :block => block }
44	- end
45	- end
46	-
47	- private
48	-
49	- def extract_youtube_id
50	- return nil unless is_youtube?
51	- youtube_match = url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
52	- youtube_match \|\|= url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
53	- youtube_match[1] unless youtube_match.nil?
54	- end
55	-
56	- def extract_vimeo_id
57	- return nil unless is_vimeo?
58	- vimeo_match = url.match('([[:digit:]]*)$')
59	- vimeo_match[1] unless vimeo_match.nil?
60	- end
61	-
62	-end
1	-require_dependency File.dirname(__FILE__) + '/video_block'
2	-
3	class VideoPlugin < Noosfero::Plugin	1	class VideoPlugin < Noosfero::Plugin
4		2
5	def self.plugin_name	3	def self.plugin_name
6	- "Video Block Plugin"	4	+ "Video Content type, Video Block and Video Gallery Plugin"
7	end	5	end
8		6
9	def self.plugin_description	7	def self.plugin_description
	@@ -11,8 +9,37 @@ class VideoPlugin < Noosfero::Plugin		@@ -11,8 +9,37 @@ class VideoPlugin < Noosfero::Plugin
11	end	9	end
12		10
13	def self.extra_blocks	11	def self.extra_blocks
		12	+ { VideoPlugin::VideoBlock => {}, VideoPlugin::VideoGalleryBlock => {:position=>['1']} }
		13	+ end
		14	+
		15	+ def stylesheet?
		16	+ true
		17	+ end
		18	+
		19	+ def content_types
		20	+ [VideoPlugin::VideoGallery, VideoPlugin::Video]
		21	+ end
		22	+
		23	+ def content_remove_new(content)
		24	+ if content.kind_of?(VideoPlugin::VideoGallery) or content.kind_of?(VideoPlugin::Video)
		25	+ true
		26	+ end
		27	+ end
		28	+
		29	+ def content_remove_upload(content)
		30	+ if content.kind_of?(VideoPlugin::VideoGallery) or content.kind_of?(VideoPlugin::Video)
		31	+ true
		32	+ end
		33	+ end
		34	+
		35	+ def article_extra_toolbar_buttons(content)
		36	+ return [] if !content.kind_of?(VideoPlugin::VideoGallery)
14	{	37	{
15	- VideoBlock => {}	38	+ :id=>"new-video-btn",
		39	+ :class=>"button with-text icon-new",
		40	+ :url=> {:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id},
		41	+ :title=>_("New Video"),
		42	+ :icon => :new
16	}	43	}
17	end	44	end
18		45
@@ -0,0 +1,180 @@		@@ -0,0 +1,180 @@
	1	+require 'noosfero/translatable_content'
	2	+require 'application_helper'
	3	+require 'net/http'
	4	+
	5	+class VideoPlugin::Video < Article
	6	+
	7	+ settings_items :video_url, :type => :string, :default => 'http://'
	8	+ settings_items :video_width, :type => :integer, :default => 499
	9	+ settings_items :video_height, :type => :integer, :default => 353
	10	+ #Video Providers are: youtube, vimeo, file
	11	+ settings_items :video_provider, :type => :string
	12	+ settings_items :video_format, :type => :string
	13	+ settings_items :video_id, :type => :string
	14	+ settings_items :video_thumbnail_url, :type => :string, :default => '/plugins/video/images/video_generic_thumbnail.jpg'
	15	+ settings_items :video_thumbnail_width, :type=> :integer
	16	+ settings_items :video_thumbnail_height, :type=> :integer
	17	+ settings_items :video_duration, :type=> :integer, :default => 0
	18	+
	19	+ attr_accessible :video_url
	20	+
	21	+ before_save :fill_video_properties
	22	+
	23	+ def self.type_name
	24	+ _('Video')
	25	+ end
	26	+
	27	+ def can_display_versions?
	28	+ true
	29	+ end
	30	+
	31	+ def self.short_description
	32	+ _('Embedded Video')
	33	+ end
	34	+
	35	+ def self.description
	36	+ _('Display embedded videos.')
	37	+ end
	38	+
	39	+ def is_youtube?
	40	+ VideoPlugin::Video.is_youtube?(self.video_url)
	41	+ end
	42	+
	43	+ def is_vimeo?
	44	+ VideoPlugin::Video.is_vimeo?(self.video_url)
	45	+ end
	46	+
	47	+ include ActionView::Helpers::TagHelper
	48	+ def to_html(options={})
	49	+ article = self
	50	+ proc do
	51	+ render :partial => 'content_viewer/video_plugin/video', :locals => {:article => article}
	52	+ end
	53	+ end
	54	+
	55	+ def fitted_width
	56	+ 499
	57	+ end
	58	+
	59	+ def fitted_height
	60	+ ((fitted_width * self.video_height) / self.video_width).to_i
	61	+ end
	62	+
	63	+ def thumbnail_fitted_width
	64	+ 80
	65	+ end
	66	+
	67	+ def thumbnail_fitted_height
	68	+ ((thumbnail_fitted_width * self.video_thumbnail_height) / self.video_thumbnail_width).to_i
	69	+ end
	70	+
	71	+ def no_browser_support_message
	72	+ '<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>'
	73	+ end
	74	+
	75	+ def self.is_youtube?(video_url)
	76	+ video_url.match(/.(youtube.com.v=[#{YOUTUBE_ID_FORMAT}]+\|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
	77	+ end
	78	+
	79	+ def self.is_vimeo?(video_url)
	80	+ video_url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com\|player.vimeo.com\/video)\/([A-z]\|\/)*[[:digit:]]+/) ? true : false
	81	+ end
	82	+
	83	+ def self.is_video_file?(video_url)
	84	+ video_url.match(/\.(mp4\|ogg\|ogv\|webm)/) ? true : false
	85	+ end
	86	+
	87	+ def self.format_embed_video_url_for_youtube(video_url)
	88	+ "//www.youtube-nocookie.com/embed/#{extract_youtube_id(video_url)}?rel=0&wmode=transparent" if is_youtube?(video_url)
	89	+ end
	90	+
	91	+ def self.format_embed_video_url_for_vimeo(video_url)
	92	+ "//player.vimeo.com/video/#{extract_vimeo_id(video_url)}" if is_vimeo?(video_url)
	93	+ end
	94	+
	95	+ def format_embed_video_url_for_youtube
	96	+ VideoPlugin::Video.format_embed_video_url_for_youtube(self.video_url)
	97	+ end
	98	+
	99	+ def format_embed_video_url_for_vimeo
	100	+ VideoPlugin::Video.format_embed_video_url_for_vimeo(self.video_url)
	101	+ end
	102	+
	103	+ def self.extract_youtube_id(video_url)
	104	+ return nil unless self.is_youtube?(video_url)
	105	+ youtube_match = video_url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
	106	+ youtube_match \|\|= video_url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
	107	+ youtube_match[1] unless youtube_match.nil?
	108	+ end
	109	+
	110	+ def self.extract_vimeo_id(video_url)
	111	+ return nil unless self.is_vimeo?(video_url)
	112	+ vimeo_match = video_url.match('([[:digit:]]*)$')
	113	+ vimeo_match[1] unless vimeo_match.nil?
	114	+ end
	115	+
	116	+ private
	117	+
	118	+ YOUTUBE_ID_FORMAT = '\w-'
	119	+
	120	+ def fill_video_properties
	121	+ if is_youtube?
	122	+ fill_youtube_video_properties
	123	+ elsif is_vimeo?
	124	+ fill_vimeo_video_properties
	125	+ elsif true
	126	+ self.video_format = detect_file_format
	127	+ self.video_provider = 'file'
	128	+ end
	129	+ end
	130	+
	131	+ def fill_youtube_video_properties
	132	+ self.video_provider = 'youtube'
	133	+ self.video_id = extract_youtube_id
	134	+ url = "http://www.youtube.com/oembed?url=http%3A//www.youtube.com/watch?v%3D#{self.video_id}&format=json"
	135	+ resp = Net::HTTP.get_response(URI.parse(url))
	136	+ buffer = resp.body
	137	+ vid = JSON.parse(buffer)
	138	+ self.video_thumbnail_url = vid['thumbnail_url']
	139	+ self.video_width = vid['width']
	140	+ self.video_height = vid['height']
	141	+ self.video_thumbnail_width = vid['thumbnail_width']
	142	+ self.video_thumbnail_height = vid['thumbnail_height']
	143	+ end
	144	+
	145	+ def fill_vimeo_video_properties
	146	+ self.video_provider = 'vimeo'
	147	+ self.video_id = extract_vimeo_id
	148	+ url = "http://vimeo.com/api/v2/video/#{self.video_id}.json"
	149	+ resp = Net::HTTP.get_response(URI.parse(url))
	150	+ buffer = resp.body
	151	+ vid = JSON.parse(buffer)
	152	+ vid = vid[0]
	153	+ self.video_thumbnail_url = vid['thumbnail_large']
	154	+ self.video_width = vid['width']
	155	+ self.video_height = vid['height']
	156	+ self.video_thumbnail_width = 640
	157	+ self.video_thumbnail_height = 360
	158	+ end
	159	+
	160	+ def detect_file_format
	161	+ video_type = 'video/unknown'
	162	+ if /.mp4/i =~ self.video_url or /.mov/i =~ self.video_url
	163	+ video_type='video/mp4'
	164	+ elsif /.webm/i =~ self.video_url
	165	+ video_type='video/webm'
	166	+ elsif /.og[vg]/i =~ self.video_url
	167	+ video_type='video/ogg'
	168	+ end
	169	+ video_type
	170	+ end
	171	+
	172	+ def extract_youtube_id
	173	+ VideoPlugin::Video.extract_youtube_id(self.video_url)
	174	+ end
	175	+
	176	+ def extract_vimeo_id
	177	+ VideoPlugin::Video.extract_vimeo_id(self.video_url)
	178	+ end
	179	+
	180	+end
@@ -0,0 +1,57 @@		@@ -0,0 +1,57 @@
	1	+class VideoPlugin::VideoBlock < Block
	2	+
	3	+ attr_accessible :url, :width, :height
	4	+
	5	+ settings_items :url, :type => :string, :default => ""
	6	+ settings_items :width, :type => :integer, :default => 400
	7	+ settings_items :height, :type => :integer, :default => 315
	8	+
	9	+ YOUTUBE_ID_FORMAT = '\w-'
	10	+
	11	+ def is_youtube?
	12	+ VideoPlugin::Video.is_youtube?(url)
	13	+ end
	14	+
	15	+ def is_vimeo?
	16	+ VideoPlugin::Video.is_vimeo?(url)
	17	+ end
	18	+
	19	+ def is_video_file?
	20	+ url.match(/.*(mp4\|ogg\|ogv\|webm)$/) ? true : false
	21	+ end
	22	+
	23	+ def format_embed_video_url_for_youtube
	24	+ VideoPlugin::Video.format_embed_video_url_for_youtube(url)
	25	+ end
	26	+
	27	+ def format_embed_video_url_for_vimeo
	28	+ VideoPlugin::Video.format_embed_video_url_for_vimeo(url)
	29	+ end
	30	+
	31	+ def self.description
	32	+ _('Display a Video')
	33	+ end
	34	+
	35	+ def help
	36	+ _('This block presents a video from youtube, vimeo and some video formats (mp4, ogg, ogv and webm)')
	37	+ end
	38	+
	39	+ def content(args={})
	40	+ block = self
	41	+
	42	+ proc do
	43	+ render :file => 'video_block', :locals => { :block => block }
	44	+ end
	45	+ end
	46	+
	47	+ private
	48	+
	49	+ def extract_youtube_id
	50	+ VideoPlugin::Video.extract_youtube_id(url)
	51	+ end
	52	+
	53	+ def extract_vimeo_id
	54	+ VideoPlugin::Video.extract_vimeo_id(url)
	55	+ end
	56	+
	57	+end
@@ -0,0 +1,63 @@		@@ -0,0 +1,63 @@
	1	+class VideoPlugin::VideoGallery < Folder
	2	+
	3	+ def self.type_name
	4	+ _('Video Gallery')
	5	+ end
	6	+
	7	+ settings_items :thumbnail_width, :type => :integer, :default => 50
	8	+ settings_items :thumbnail_height, :type => :integer, :default => 50
	9	+ settings_items :videos_per_row, :type => :integer, :default => 5
	10	+
	11	+ validate :not_belong_to_blog
	12	+
	13	+ def not_belong_to_blog
	14	+ errors.add(:parent, "A video gallery should not belong to a blog.") if parent && parent.blog?
	15	+ end
	16	+
	17	+ acts_as_having_settings :field => :setting
	18	+
	19	+ xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
	20	+
	21	+ include WhiteListFilter
	22	+ filter_iframes :body
	23	+ def iframe_whitelist
	24	+ profile && profile.environment && profile.environment.trusted_sites_for_iframe
	25	+ end
	26	+
	27	+ def self.short_description
	28	+ _('Video Gallery')
	29	+ end
	30	+
	31	+ def self.description
	32	+ _('A gallery of link to videos that are hosted elsewhere.')
	33	+ end
	34	+
	35	+ include ActionView::Helpers::TagHelper
	36	+ def to_html(options = {})
	37	+ video_gallery = self
	38	+ proc do
	39	+ render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery}
	40	+ end
	41	+ end
	42	+
	43	+ def video_gallery?
	44	+ true
	45	+ end
	46	+
	47	+ def can_display_hits?
	48	+ false
	49	+ end
	50	+
	51	+ def accept_comments?
	52	+ false
	53	+ end
	54	+
	55	+ def self.icon_name(article = nil)
	56	+ 'Video gallery'
	57	+ end
	58	+
	59	+ def news(limit = 30, highlight = false)
	60	+ profile.recent_documents(limit, ["articles.type != ? AND articles.highlighted = ? AND articles.parent_id = ?", 'Folder', highlight, id])
	61	+ end
	62	+
	63	+end
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+class VideoPlugin::VideoGalleryBlock < Block
	2	+
	3	+ settings_items :video_gallery_id, :type => :integer
	4	+ attr_accessible :video_gallery_id
	5	+
	6	+ include ActionView::Helpers
	7	+ include Rails.application.routes.url_helpers
	8	+
	9	+ def self.description
	10	+ _('Display a Video Gallery')
	11	+ end
	12	+
	13	+ def help
	14	+ _('This block presents a video gallery')
	15	+ end
	16	+
	17	+ def content(args={})
	18	+ block = self
	19	+ if video_gallery_id.present?
	20	+ video_gallery = VideoPlugin::VideoGallery.find(video_gallery_id)
	21	+ proc do
	22	+ render :partial => 'content_viewer/video_plugin/video_gallery', :locals => {:video_gallery => video_gallery}
	23	+ end
	24	+ end
	25	+ end
	26	+
	27	+ def list_my_galleries
	28	+ Article.owner_video_galleries(owner)
	29	+ end
	30	+
	31	+end
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+module VideoPlugin::VideoGalleryHelper
	2	+
	3	+ def list_videos(configure={})
	4	+ configure[:recursive] \|\|= false
	5	+ configure[:list_type] \|\|= :folder
	6	+ if !configure[:contents].blank?
	7	+ configure[:contents] = configure[:contents].paginate(
	8	+ :per_page => 17,
	9	+ :page => params[:npage]
	10	+ ).order("updated_at DESC")
	11	+ render :file => 'shared/video_list', :locals => configure
	12	+ else
	13	+ content_tag('em', _('(empty folder)'))
	14	+ end
	15	+ end
	16	+
	17	+end
	@@ -0,0 +1,66 @@		@@ -0,0 +1,66 @@
		1	+.video-gallery-thumbnail {
		2	+ position: relative;
		3	+ display: inline-block;
		4	+ width: 95px;
		5	+ height: 115px;
		6	+ margin: 1em;
		7	+ border: solid #F0F0F0 1px;
		8	+ vertical-align: top;
		9	+ text-align: left;
		10	+ overflow: hidden;
		11	+ padding-top: 7px;
		12	+ margin-botton: 10px;
		13	+ text-overflow: ellipsis;
		14	+}
		15	+
		16	+.video-gallery-top-box{
		17	+ height: 73px;
		18	+}
		19	+
		20	+.video-duration{
		21	+ position: absolute;
		22	+ bottom: 0px;
		23	+ background-color: black;
		24	+ font-size: 1em;
		25	+ text-color: white;
		26	+}
		27	+
		28	+.video-title{
		29	+ width: 100%;
		30	+ overflow: hidden;
		31	+ text-overflow: ellipsis;
		32	+}
		33	+
		34	+.video-author{
		35	+ display: none;
		36	+ overflow: hidden;
		37	+ text-overflow: ellipsis;
		38	+}
		39	+
		40	+.video-gallery-thumbnail:hover div{
		41	+ display: inline-block;
		42	+}
		43	+
		44	+.video-gallery-table-big{
		45	+ width: 100%;
		46	+ overflow: hidden;
		47	+}
		48	+
		49	+.video-gallery-left-column-big{
		50	+ width: 350px;
		51	+ float: left;
		52	+}
		53	+
		54	+.video-gallery-right-column-big{
		55	+ margin-left: 370px;
		56	+}
		57	+
		58	+.video-title-big{
		59	+ font-size: 2em;
		60	+}
		61	+
		62	+.video-block-center{
		63	+ width: 100%;
		64	+ margin-left: auto;
		65	+ margin-right: auto;
		66	+}
0	\ No newline at end of file	67	\ No newline at end of file
	@@ -18,9 +18,9 @@ class EnvironmentDesignControllerTest < ActionController::TestCase		@@ -18,9 +18,9 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
18	@environment.enabled_plugins = ['VideoPlugin']	18	@environment.enabled_plugins = ['VideoPlugin']
19	@environment.save!	19	@environment.save!
20		20
21	- VideoBlock.delete_all	21	+ VideoPlugin::VideoBlock.delete_all
22		22
23	- @block = VideoBlock.new	23	+ @block = VideoPlugin::VideoBlock.new
24	@block.box = @environment.boxes.first	24	@block.box = @environment.boxes.first
25	@block.save!	25	@block.save!
26	end	26	end