Merge branch 'I4-Video-Gallery-Plugin' into stable

Evandro Jr
2 parents 85002c49 3d67fa30
Showing 23 changed files with 419 additions and 400 deletions Show diff stats
plugins/video/lib/ext/article.rb
plugins/video/lib/video.rb
plugins/video/lib/video_block.rb
plugins/video/lib/video_gallery.rb
plugins/video/lib/video_gallery_helper.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_helper.rb
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_plugin_test.rb
plugins/video/views/cms/_video.html.erb
plugins/video/views/cms/_video_gallery.html.erb
plugins/video/views/cms/video_plugin/_video.html.erb
plugins/video/views/cms/video_plugin/_video_gallery.html.erb
plugins/video/views/content_viewer/_video.html.erb
plugins/video/views/content_viewer/_video_gallery.html.erb
@@ -2,10 +2,12 @@ require_dependency &#39;article&#39;
 class Article
+  #FIXME This should be done via hotspot
   def self.folder_types_with_video
-    self.folder_types_without_video << 'VideoGallery'
+    self.folder_types_without_video << 'VideoPlugin::VideoGallery'
   end
+  #FIXME This should be done via hotspot
   class << self
     alias_method_chain :folder_types, :video
   end
@@ -1,145 +0,0 @@
-require 'noosfero/translatable_content'
-require 'application_helper'
-require 'net/http'
-
-class 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
-  #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 :detect_video
-
-  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
-
-  include ActionView::Helpers::TagHelper
-  def to_html(options={})
-    article = self
-    proc do
-      render :partial => 'content_viewer/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
-
-  private
-
-  YOUTUBE_ID_FORMAT = '\w-'
-
-  def detect_video
-    if is_youtube?
-      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']
-      url = "http://gdata.youtube.com/feeds/api/videos/#{self.video_id}?alt=json";
-      resp = Net::HTTP.get_response(URI.parse(url))
-      buffer = resp.body
-      vid = JSON.parse(buffer)
-      self.video_duration = vid['entry']['media$group']['media$content'][0]['duration']
-    elsif is_vimeo?
-      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]
-      #raise vid.to_yaml
-      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
-    elsif true
-      self.video_format = detect_format
-      self.video_provider = 'file'
-    end
-  end
-
-  def detect_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 is_youtube?
-    video_url.match(/.*(youtube.com.*v=[#{YOUTUBE_ID_FORMAT}]+|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
-  end
-
-  def is_vimeo?
-    video_url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com|player.vimeo.com\/video)\/([A-z]|\/)*[[:digit:]]+/) ? true : false
-  end
-
-  def is_video_file?
-    video_url.match(/\.(mp4|ogg|ogv|webm)/) ? true : false
-  end
-
-  def extract_youtube_id
-    return nil unless is_youtube?
-    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 extract_vimeo_id
-    return nil unless is_vimeo?
-    vimeo_match = video_url.match('([[:digit:]]*)$')
-    vimeo_match[1] unless vimeo_match.nil?
-  end
-end
 \ No newline at end of file
@@ -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
@@ -1,63 +0,0 @@
-class 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_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
@@ -1,18 +0,0 @@
-module VideoGalleryHelper
-
-  def list_videos(configure={})
-      configure[:recursive] ||= false
-      configure[:list_type] ||= :folder
-      if !configure[:contents].blank?
-        configure[:contents] = configure[:contents].paginate(
-          :order => "updated_at DESC",
-          :per_page => 16,
-          :page => params[:npage]
-        )
-        render :file => 'shared/video_list', :locals => configure
-      else
-        content_tag('em', _('(empty folder)'))
-      end
-  end
-
-end
 \ No newline at end of file
-require_dependency File.dirname(__FILE__) + '/video_block'
-require_dependency File.dirname(__FILE__) + '/video'
-require_dependency File.dirname(__FILE__) + '/video_gallery'
-
 class VideoPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -14,7 +10,7 @@ class VideoPlugin &lt; Noosfero::Plugin
   def self.extra_blocks
   {
-      VideoBlock => {}
+      VideoPlugin::VideoBlock => {}
   }
   end
@@ -44,7 +40,7 @@ class VideoPlugin &lt; Noosfero::Plugin
         content_tag('a', _("New Video"),
         { :id=>"new-video-btn",
           :class=>"button with-text icon-new",
-          :href=>url_for(:action => 'new', :type=>'Video', :controller=>'cms', :parent_id => content.id),
+          :href=>url_for(:action => 'new', :type=>'VideoPlugin::Video', :controller=>'cms', :parent_id => content.id),
           :title=>_("New Video")
         })
       end
@@ -0,0 +1,145 @@
+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
+  #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 :detect_video
+
+  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
+
+  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
+
+  private
+
+  YOUTUBE_ID_FORMAT = '\w-'
+
+  def detect_video
+    if is_youtube?
+      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']
+      url = "http://gdata.youtube.com/feeds/api/videos/#{self.video_id}?alt=json";
+      resp = Net::HTTP.get_response(URI.parse(url))
+      buffer = resp.body
+      vid = JSON.parse(buffer)
+      self.video_duration = vid['entry']['media$group']['media$content'][0]['duration']
+    elsif is_vimeo?
+      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]
+      #raise vid.to_yaml
+      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
+    elsif true
+      self.video_format = detect_format
+      self.video_provider = 'file'
+    end
+  end
+
+  def detect_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 is_youtube?
+    video_url.match(/.*(youtube.com.*v=[#{YOUTUBE_ID_FORMAT}]+|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
+  end
+
+  def is_vimeo?
+    video_url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com|player.vimeo.com\/video)\/([A-z]|\/)*[[:digit:]]+/) ? true : false
+  end
+
+  def is_video_file?
+    video_url.match(/\.(mp4|ogg|ogv|webm)/) ? true : false
+  end
+
+  def extract_youtube_id
+    return nil unless is_youtube?
+    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 extract_vimeo_id
+    return nil unless is_vimeo?
+    vimeo_match = video_url.match('([[:digit:]]*)$')
+    vimeo_match[1] unless vimeo_match.nil?
+  end
+end
@@ -0,0 +1,62 @@
+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?
+    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
@@ -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,18 @@
+module VideoPlugin::VideoGalleryHelper
+
+  def list_videos(configure={})
+      configure[:recursive] ||= false
+      configure[:list_type] ||= :folder
+      if !configure[:contents].blank?
+        configure[:contents] = configure[:contents].paginate(
+          :order => "updated_at DESC",
+          :per_page => 16,
+          :page => params[:npage]
+        )
+        render :file => 'shared/video_list', :locals => configure
+      else
+        content_tag('em', _('(empty folder)'))
+      end
+  end
+
+end
@@ -21,9 +21,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
@@ -18,11 +18,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,94 @@ 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 = VideoPlugin::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/"
     assert !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="
     assert !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"
     assert !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 +99,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"
     assert !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/"
     assert !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"
     assert !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"
     assert !block.is_video_file?
     block.url = "http://www.vmsd.com/98979.oggr"
@@ -215,7 +215,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
     })
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + &#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
@@ -1,12 +0,0 @@
-<%= 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 => 300) %>
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-</div>
-
-
-
@@ -1,6 +0,0 @@
-<%= 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,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 => 300) %>
+<%= 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)) %>
@@ -1,34 +0,0 @@
-<div align="center">
-<%if @page.video_provider=='youtube' %>
-  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
-  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
-    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
-    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"youtube\"], \"src\": \"#{@page.video_url}\" }") %>'>
-    <%= @page.no_browser_support_message %>
-  </video>
-  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
-  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>
- <% elsif  @page.video_provider=='vimeo' %>
-  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
-  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
-    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
-    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"vimeo\"], \"src\": \"#{@page.video_url}\", \"loop\": true, \"autoplay\": false }") %>'>
-    <%= @page.no_browser_support_message %>
-  </video>
-  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
-  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
-<% elsif  @page.video_provider=='file' %>
-  <link href="/plugins/video/css/video-js-4.8.5.css" rel="stylesheet">
-  <script src="/plugins/video/javascripts/videojs/video-4.8.5.js"></script>
-  <video id="embedded_video" class="video-js vjs-default-skin vjs-big-play-centered"
-    height="353" width="499"
-    controls preload="auto"
-    data-setup='<%=CGI::escapeHTML("{ \"example_option\":true}") %>'>
-   <source src="<%= @page.video_url %>" type='<%= @page.video_format %>' />
-   <%= @page.no_browser_support_message %>
-  </video>
-<% end %>
-<br style="clear:both" />
-</div>
-<% _("Description:") %>
-<%= @page.body %>
@@ -1,14 +0,0 @@
-<% 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 %>
 \ No newline at end of file
@@ -0,0 +1,34 @@
+<div align="center">
+<%if @page.video_provider=='youtube' %>
+  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
+  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
+    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
+    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"youtube\"], \"src\": \"#{@page.video_url}\" }") %>'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.youtube.js"></script>
+ <% elsif  @page.video_provider=='vimeo' %>
+  <link type="text/css" rel="stylesheet" href="/plugins/video/css/video-js-4.5.1.css" />
+  <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
+    width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
+    data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"vimeo\"], \"src\": \"#{@page.video_url}\", \"loop\": true, \"autoplay\": false }") %>'>
+    <%= @page.no_browser_support_message %>
+  </video>
+  <script src="/plugins/video/javascripts/videojs/video-4.5.1.js"></script>
+  <script src="/plugins/video/javascripts/videojs/vjs.vimeo.js"></script>
+<% elsif  @page.video_provider=='file' %>
+  <link href="/plugins/video/css/video-js-4.8.5.css" rel="stylesheet">
+  <script src="/plugins/video/javascripts/videojs/video-4.8.5.js"></script>
+  <video id="embedded_video" class="video-js vjs-default-skin vjs-big-play-centered"
+    height="353" width="499"
+    controls preload="auto"
+    data-setup='<%=CGI::escapeHTML("{ \"example_option\":true}") %>'>
+   <source src="<%= @page.video_url %>" type='<%= @page.video_format %>' />
+   <%= @page.no_browser_support_message %>
+  </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 %>
 \ No newline at end of file
@@ -0,0 +1,21 @@
+<h3 class="block-title">
+  <span><%=block.title%></span>
+</h3>
+<div class="video-block-data">
+  <% if block.is_youtube? %>
+    <div class='youtube'>
+      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_youtube, :width => block.width, :height => block.height }%>
+    </div>
+  <% elsif block.is_vimeo? %>
+    <div class='vimeo'>
+      <%= render :partial => 'box_organizer/iframe_video_block', :locals => { :url => block.format_embed_video_url_for_vimeo, :width => block.width, :height => block.height }%>
+    </div>
+  <% elsif block.is_video_file? %>
+    <div class='video'>
+      <%= render :partial => 'box_organizer/html5_video_block', :locals => { :url => block.url, :width => block.width, :height => block.height }%>
+    </div>
+  <% else %>
+    <span class='alert-block'><%= _("Register a valid url (Vimeo, Youtube, video files)") %></span>
+  <% end %>
+
+</div>
	@@ -1,145 +0,0 @@		@@ -1,145 +0,0 @@
1	-require 'noosfero/translatable_content'
2	-require 'application_helper'
3	-require 'net/http'
4	-
5	-class 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	- #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 :detect_video
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	- include ActionView::Helpers::TagHelper
40	- def to_html(options={})
41	- article = self
42	- proc do
43	- render :partial => 'content_viewer/video', :locals => {:article => article}
44	- end
45	- end
46	-
47	- def fitted_width
48	- 499
49	- end
50	-
51	- def fitted_height
52	- ((fitted_width * self.video_height) / self.video_width).to_i
53	- end
54	-
55	- def thumbnail_fitted_width
56	- 80
57	- end
58	-
59	- def thumbnail_fitted_height
60	- ((thumbnail_fitted_width * self.video_thumbnail_height) / self.video_thumbnail_width).to_i
61	- end
62	-
63	- def no_browser_support_message
64	- '<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>'
65	- end
66	-
67	- private
68	-
69	- YOUTUBE_ID_FORMAT = '\w-'
70	-
71	- def detect_video
72	- if is_youtube?
73	- self.video_provider = 'youtube'
74	- self.video_id = extract_youtube_id
75	- url = "http://www.youtube.com/oembed?url=http%3A//www.youtube.com/watch?v%3D#{self.video_id}&format=json"
76	- resp = Net::HTTP.get_response(URI.parse(url))
77	- buffer = resp.body
78	- vid = JSON.parse(buffer)
79	- self.video_thumbnail_url = vid['thumbnail_url']
80	- self.video_width = vid['width']
81	- self.video_height = vid['height']
82	- self.video_thumbnail_width = vid['thumbnail_width']
83	- self.video_thumbnail_height = vid['thumbnail_height']
84	- url = "http://gdata.youtube.com/feeds/api/videos/#{self.video_id}?alt=json";
85	- resp = Net::HTTP.get_response(URI.parse(url))
86	- buffer = resp.body
87	- vid = JSON.parse(buffer)
88	- self.video_duration = vid['entry']['media$group']['media$content'][0]['duration']
89	- elsif is_vimeo?
90	- self.video_provider = 'vimeo'
91	- self.video_id = extract_vimeo_id
92	- url = "http://vimeo.com/api/v2/video/#{self.video_id}.json"
93	- resp = Net::HTTP.get_response(URI.parse(url))
94	- buffer = resp.body
95	- vid = JSON.parse(buffer)
96	- vid = vid[0]
97	- #raise vid.to_yaml
98	- self.video_thumbnail_url = vid['thumbnail_large']
99	- self.video_width = vid['width']
100	- self.video_height = vid['height']
101	- self.video_thumbnail_width = 640
102	- self.video_thumbnail_height = 360
103	- elsif true
104	- self.video_format = detect_format
105	- self.video_provider = 'file'
106	- end
107	- end
108	-
109	- def detect_format
110	- video_type = 'video/unknown'
111	- if /.mp4/i =~ self.video_url or /.mov/i =~ self.video_url
112	- video_type='video/mp4'
113	- elsif /.webm/i =~ self.video_url
114	- video_type='video/webm'
115	- elsif /.og[vg]/i =~ self.video_url
116	- video_type='video/ogg'
117	- end
118	- video_type
119	- end
120	-
121	- def is_youtube?
122	- video_url.match(/.(youtube.com.v=[#{YOUTUBE_ID_FORMAT}]+\|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
123	- end
124	-
125	- def is_vimeo?
126	- video_url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com\|player.vimeo.com\/video)\/([A-z]\|\/)*[[:digit:]]+/) ? true : false
127	- end
128	-
129	- def is_video_file?
130	- video_url.match(/\.(mp4\|ogg\|ogv\|webm)/) ? true : false
131	- end
132	-
133	- def extract_youtube_id
134	- return nil unless is_youtube?
135	- youtube_match = video_url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
136	- youtube_match \|\|= video_url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
137	- youtube_match[1] unless youtube_match.nil?
138	- end
139	-
140	- def extract_vimeo_id
141	- return nil unless is_vimeo?
142	- vimeo_match = video_url.match('([[:digit:]]*)$')
143	- vimeo_match[1] unless vimeo_match.nil?
144	- end
145	-end
146	\ No newline at end of file	0	\ No newline at end of file
	@@ -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,63 +0,0 @@	@@ -1,63 +0,0 @@
1	-class 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_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
	@@ -1,18 +0,0 @@		@@ -1,18 +0,0 @@
1	-module 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	- :order => "updated_at DESC",
9	- :per_page => 16,
10	- :page => params[:npage]
11	- )
12	- render :file => 'shared/video_list', :locals => configure
13	- else
14	- content_tag('em', _('(empty folder)'))
15	- end
16	- end
17	-
18	-end
19	\ No newline at end of file	0	\ No newline at end of file
@@ -0,0 +1,145 @@		@@ -0,0 +1,145 @@
	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	+ #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 :detect_video
	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	+ include ActionView::Helpers::TagHelper
	40	+ def to_html(options={})
	41	+ article = self
	42	+ proc do
	43	+ render :partial => 'content_viewer/video_plugin/video', :locals => {:article => article}
	44	+ end
	45	+ end
	46	+
	47	+ def fitted_width
	48	+ 499
	49	+ end
	50	+
	51	+ def fitted_height
	52	+ ((fitted_width * self.video_height) / self.video_width).to_i
	53	+ end
	54	+
	55	+ def thumbnail_fitted_width
	56	+ 80
	57	+ end
	58	+
	59	+ def thumbnail_fitted_height
	60	+ ((thumbnail_fitted_width * self.video_thumbnail_height) / self.video_thumbnail_width).to_i
	61	+ end
	62	+
	63	+ def no_browser_support_message
	64	+ '<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>'
	65	+ end
	66	+
	67	+ private
	68	+
	69	+ YOUTUBE_ID_FORMAT = '\w-'
	70	+
	71	+ def detect_video
	72	+ if is_youtube?
	73	+ self.video_provider = 'youtube'
	74	+ self.video_id = extract_youtube_id
	75	+ url = "http://www.youtube.com/oembed?url=http%3A//www.youtube.com/watch?v%3D#{self.video_id}&format=json"
	76	+ resp = Net::HTTP.get_response(URI.parse(url))
	77	+ buffer = resp.body
	78	+ vid = JSON.parse(buffer)
	79	+ self.video_thumbnail_url = vid['thumbnail_url']
	80	+ self.video_width = vid['width']
	81	+ self.video_height = vid['height']
	82	+ self.video_thumbnail_width = vid['thumbnail_width']
	83	+ self.video_thumbnail_height = vid['thumbnail_height']
	84	+ url = "http://gdata.youtube.com/feeds/api/videos/#{self.video_id}?alt=json";
	85	+ resp = Net::HTTP.get_response(URI.parse(url))
	86	+ buffer = resp.body
	87	+ vid = JSON.parse(buffer)
	88	+ self.video_duration = vid['entry']['media$group']['media$content'][0]['duration']
	89	+ elsif is_vimeo?
	90	+ self.video_provider = 'vimeo'
	91	+ self.video_id = extract_vimeo_id
	92	+ url = "http://vimeo.com/api/v2/video/#{self.video_id}.json"
	93	+ resp = Net::HTTP.get_response(URI.parse(url))
	94	+ buffer = resp.body
	95	+ vid = JSON.parse(buffer)
	96	+ vid = vid[0]
	97	+ #raise vid.to_yaml
	98	+ self.video_thumbnail_url = vid['thumbnail_large']
	99	+ self.video_width = vid['width']
	100	+ self.video_height = vid['height']
	101	+ self.video_thumbnail_width = 640
	102	+ self.video_thumbnail_height = 360
	103	+ elsif true
	104	+ self.video_format = detect_format
	105	+ self.video_provider = 'file'
	106	+ end
	107	+ end
	108	+
	109	+ def detect_format
	110	+ video_type = 'video/unknown'
	111	+ if /.mp4/i =~ self.video_url or /.mov/i =~ self.video_url
	112	+ video_type='video/mp4'
	113	+ elsif /.webm/i =~ self.video_url
	114	+ video_type='video/webm'
	115	+ elsif /.og[vg]/i =~ self.video_url
	116	+ video_type='video/ogg'
	117	+ end
	118	+ video_type
	119	+ end
	120	+
	121	+ def is_youtube?
	122	+ video_url.match(/.(youtube.com.v=[#{YOUTUBE_ID_FORMAT}]+\|youtu.be\/[#{YOUTUBE_ID_FORMAT}]+).*/) ? true : false
	123	+ end
	124	+
	125	+ def is_vimeo?
	126	+ video_url.match(/^(http[s]?:\/\/)?(www.)?(vimeo.com\|player.vimeo.com\/video)\/([A-z]\|\/)*[[:digit:]]+/) ? true : false
	127	+ end
	128	+
	129	+ def is_video_file?
	130	+ video_url.match(/\.(mp4\|ogg\|ogv\|webm)/) ? true : false
	131	+ end
	132	+
	133	+ def extract_youtube_id
	134	+ return nil unless is_youtube?
	135	+ youtube_match = video_url.match("v=([#{YOUTUBE_ID_FORMAT}]*)")
	136	+ youtube_match \|\|= video_url.match("youtu.be\/([#{YOUTUBE_ID_FORMAT}]*)")
	137	+ youtube_match[1] unless youtube_match.nil?
	138	+ end
	139	+
	140	+ def extract_vimeo_id
	141	+ return nil unless is_vimeo?
	142	+ vimeo_match = video_url.match('([[:digit:]]*)$')
	143	+ vimeo_match[1] unless vimeo_match.nil?
	144	+ end
	145	+end
@@ -0,0 +1,62 @@		@@ -0,0 +1,62 @@
	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	+ 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
@@ -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,18 @@		@@ -0,0 +1,18 @@
	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	+ :order => "updated_at DESC",
	9	+ :per_page => 16,
	10	+ :page => params[:npage]
	11	+ )
	12	+ render :file => 'shared/video_list', :locals => configure
	13	+ else
	14	+ content_tag('em', _('(empty folder)'))
	15	+ end
	16	+ end
	17	+
	18	+end
	@@ -21,9 +21,9 @@ class EnvironmentDesignControllerTest < ActionController::TestCase		@@ -21,9 +21,9 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
21	@environment.enabled_plugins = ['VideoPlugin']	21	@environment.enabled_plugins = ['VideoPlugin']
22	@environment.save!	22	@environment.save!
23		23
24	- VideoBlock.delete_all	24	+ VideoPlugin::VideoBlock.delete_all
25		25
26	- @block = VideoBlock.new	26	+ @block = VideoPlugin::VideoBlock.new
27	@block.box = @environment.boxes.first	27	@block.box = @environment.boxes.first
28	@block.save!	28	@block.save!
29	end	29	end
	@@ -18,11 +18,11 @@ class ProfileDesignControllerTest < ActionController::TestCase		@@ -18,11 +18,11 @@ class ProfileDesignControllerTest < 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	@box1 = Box.create!(:owner => @profile)	22	@box1 = Box.create!(:owner => @profile)
23	@profile.boxes = [@box1]	23	@profile.boxes = [@box1]
24		24
25	- @block = VideoBlock.new	25	+ @block = VideoPlugin::VideoBlock.new
26	@block.box = @box1	26	@block.box = @box1
27	@block.save!	27	@block.save!
28		28