refinerycms-videojs 0.5.5.1 → 0.6.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8b996ff7fcb1ec1b299df986ec76b766514fcb9ff6ea6db55d25eda5f59cc4fe
+  data.tar.gz: bd3ddcebad019508716737dd332f6c5680ec095fab4bae861923d913eaef9dcf
+SHA512:
+  metadata.gz: 9d71b935cd38ee61a619a49c0e3b0805771572e9c7ea558163ac9f7101dec46881b5ec32e3e4492d5e59a8507cd76ba484c030a9dbd83cfc3d8455fc1ad563fa
+  data.tar.gz: eb4ae7f9a08dc151a9afbb6c3c62c9bdec529b6ddbad1903278854c51a19b036482a5b48963edb8fc2b80b1ed6e4be5a417049e2e7711afe9e0743f6733624dd

data/app/assets/javascripts/refinery/admin/wymeditor_monkeypatch.js.erb

@@ -0,0 +1,27 @@
+<%#encoding: UTF-8 %>
+wymeditor_boot_options.toolsItems.push({'name': 'AddVideo', 'title': 'Add_Video', 'css': 'wym_tools_add_video'});
+
+<% locales = %w(en es sk pt-BR zh-CN)%>
+<% locales.each do |locale| %>
+  if (WYMeditor.STRINGS['<%=locale%>']) WYMeditor.STRINGS['<%=locale%>']['Video'] = WYMeditor.STRINGS['<%=locale%>']['Add_Video'] = '<%= I18n.t(:add_video, :scope => :wym_tools, :locale => locale) %>';
+<% end %>
+
+onCloseDialog = function(){
+   $('iframe#dialog_iframe').attr('src', '');
+};
+
+WYMeditor.editor.prototype.exec_without_video = WYMeditor.editor.prototype.exec;
+WYMeditor.editor.prototype.exec = function(cmd) {
+	if (cmd == 'AddVideo') {
+		this.dialog('Video');
+	} else this.exec_without_video(cmd);
+}
+
+<% Refinery::Wymeditor.whitelist_tags.each do |tag, attrs| %>
+  WYMeditor.XhtmlValidator._tags['<%=tag%>'] = WYMeditor.XhtmlValidator._tags['<%=tag%>'] || {};
+  <% attrs['attributes'].values.each do |attr| %>
+  WYMeditor.XhtmlValidator._tags['<%=tag%>'].attributes = WYMeditor.XhtmlValidator._tags['<%=tag%>'].attributes || {};
+    WYMeditor.XhtmlValidator._tags['<%=tag%>'].attributes[Object.keys(WYMeditor.XhtmlValidator._tags['<%=tag%>'].attributes).length + 1] = '<%=attr%>'
+  <% end %>
+<% end %>
+

data/app/assets/stylesheets/refinery/admin/video.css

@@ -1,95 +1,99 @@
-#add_video {
-    padding-top: 3px;
-    padding-left: 10px
+.wym_skin_refinery .wym_section li.wym_tools_add_video a {
+  height: 24px;
+  background-image: url('/assets/refinery/admin/add_video_icon.png');
+  background-repeat: no-repeat;
+  padding-left: 24px;
 }
 
-#add_video li a{
-    height: 20px;
-    background-image: url('/assets/refinery/admin/add_video_icon.png');
-    background-repeat: no-repeat;
-    padding-left: 20px;
+label.inline {
+  display: inline-block;
+  margin-bottom: 10px;
+  margin-top: 0;
 }
 
-label.inline{
-    display: inline-block;
-    margin-bottom: 10px;
-    margin-top: 0
+div.inline {
+  display: inline-block;
+  vertical-align: top;
+  margin: 1px 10px 0 0;
+  padding-left: 5px;
 }
 
-div.inline{
-    display: inline-block;
-    vertical-align: top;
-    margin: 1px 10px 0 0;
-    padding-left: 5px
+div.parent {
+  margin-bottom: 20px;
 }
 
-div.parent{
-    margin-bottom: 20px
+div.video_container {
+  margin: 10px;
 }
 
-div.video_container{
-    margin: 10px;
+div.tips {
+  margin: 10px 0 10px 0;
+  font-style: italic;
 }
 
-div.tips{
-    margin: 10px 0 10px 0;
-    font-style: italic;
+div.use_file {
+  padding-bottom: 5px;
+  padding-top: 2px;
 }
-
-div.use_file{
-    padding-bottom: 5px;
-    padding-top: 2px;
-}
-a.select_video_type{
-    font-size: 12px;
-    margin: 10px 10px 10px 0
+a.select_video_type {
+  font-size: 12px;
+  margin: 10px 10px 10px 0;
 }
 
-a.select_video_type.selected{
-    font-weight: bold;}
+a.select_video_type.selected {
+  font-weight: bold;
+}
 
 
-textarea.embed_tag{
-    height: 100px
+textarea.embed_tag {
+  height: 100px;
 }
 
-span.short_info{
-    color: grey
+span.short_info {
+  color: grey;
 }
 
-div.add_remove_buttons{
-    margin-top: 10px
+div.add_remove_buttons {
+  margin-top: 10px;
 }
 
-div#dialog_list{
-    width: 60%; float: left; min-height: 300px
+div#dialog_list {
+  width: 60%;
+  float: left;
+  min-height: 300px;
 }
 
-div#dialog_list li.selected{
-    border: 4px solid #22A7F2
+div#dialog_list li.selected {
+  border: 4px solid #22A7F2;
 }
 
-div#dialog_preview{
-    width:35%; float: right
+div#dialog_preview {
+  width:35%;
+  float: right;
 }
 
-div#preview_form{
-    width:35%; float: right
+div#preview_form {
+  width:35%;
+  float: right;
 }
 
-div#preview_form div.dimensions{
-    width:50%; float:left;
+div#preview_form div.dimensions {
+  width:50%;
+  float:left;
 }
 
-div#preview_form div.dimensions input{
-    width:70%;
+div#preview_form div.dimensions input {
+  width:70%;
 }
 
-div#preview_form div.options{
-    width:50%; float:right;
+div#preview_form div.options {
+  width:50%; float:right;
 }
 
-div#dialog_list #records{
-    width: 100%
+div#dialog_list #records {
+  width: 100%;
 }
 
+#actions a {
+  position: relative; // fix capybara tests
+}

data/app/controllers/refinery/videos/admin/videos_controller.rb

@@ -9,7 +9,7 @@ module Refinery
                 :order => 'position ASC',
                 :sortable => true
 
-        before_filter :set_embedded, :only => [:new, :create]
+        before_action :set_embedded, :only => [:new, :create]
 
         def show
           @video = Video.find(params[:id])
@@ -28,7 +28,7 @@ module Refinery
 
         def append_to_wym
           @video = Video.find(params[:video_id])
-          params['video'].each do |key, value|
+          video_params.each do |key, value|
             @video.config[key.to_sym] = value
           end
           @html_for_wym = @video.to_html
@@ -53,6 +53,14 @@ module Refinery
           @embedded = true if params['embedded']
         end
 
+        def video_params
+          params.require(:video).permit(
+            :title, :poster_id, :position, :config, :embed_tag, :use_shared,
+            *Video::CONFIG_OPTIONS.keys,
+            :video_files_attributes => [
+              :file, :position, :use_external, :external_url
+            ])
+        end
       end
     end
   end

data/app/models/refinery/videos/video.rb

@@ -5,28 +5,24 @@ module Refinery
     class Video < Refinery::Core::BaseModel
 
       self.table_name = 'refinery_videos'
-      acts_as_indexed :fields => [:title]
+      acts_as_indexed fields: [:title]
 
-      validates :title, :presence => true
+      validates :title, presence: true
       validate :one_source
 
-      has_many :video_files, :dependent => :destroy
+      has_many :video_files, dependent: :destroy
       accepts_nested_attributes_for :video_files
 
-      belongs_to :poster, :class_name => '::Refinery::Image'
+      belongs_to :poster, class_name: '::Refinery::Image', optional: true
       accepts_nested_attributes_for :poster
 
       ################## Video config options
       serialize :config, Hash
       CONFIG_OPTIONS = {
-          :autoplay => "false", :width => "400", :height => "300",
-          :controls => "true", :preload => "true", :loop => "true"
+        autoplay: "false", width: "400", height: "300",
+        controls: "true", preload: "true", loop: "true"
       }
 
-      attr_accessible :title, :poster_id, :video_files_attributes,
-                      :position, :config, :embed_tag, :use_shared,
-                      *CONFIG_OPTIONS.keys
-
       # Create getters and setters
       CONFIG_OPTIONS.keys.each do |option|
         define_method option do
@@ -61,11 +57,10 @@ module Refinery
           if file.use_external
             sources << ["<source src='#{file.external_url}' type='#{file.file_mime_type}'/>"]
           else
-            sources << ["<source src='#{file.url}' type='#{file.file_mime_type}'/>"]
+            sources << ["<source src='#{file.remote_url}' type='#{file.mime_type}'/>"]
           end if file.exist?
         end
         html = %Q{<video id="video_#{self.id}" class="video-js #{Refinery::Videos.skin_css_class}" width="#{config[:width]}" height="#{config[:height]}" data-setup=' {#{data_setup.join(',')}}'>#{sources.join}</video>}
-
         html.html_safe
       end
 

data/app/models/refinery/videos/video_file.rb

@@ -5,27 +5,25 @@ module Refinery
     class VideoFile < Refinery::Core::BaseModel
 
       self.table_name = 'refinery_video_files'
-      acts_as_indexed :fields => [:file_name, :file_ext]
-      attr_accessible :file, :file_mime_type, :position, :use_external, :external_url
-      belongs_to :video
+      acts_as_indexed fields: [:file_name, :file_ext]
+      belongs_to :video, optional: true
 
       MIME_TYPES = {'.mp4' => 'mp4', '.flv' => 'flv', '.webm' => 'webm', '.ogg' => 'ogg', '.ogv' => 'ogg'}
 
       ############################ Dragonfly
       ::Refinery::Videos::Dragonfly.setup!
-      video_accessor :file
-
-      delegate :ext, :size, :mime_type, :url,
-               :to        => :file,
-               :allow_nil => true
+      dragonfly_accessor :file, app: :refinery_videos
 
+      delegate :ext, :size, :mime_type, :remote_url,
+               to:        :file,
+               allow_nil: true
       #######################################
 
       ########################### Validations
-      validates :file, :presence => true, :unless => :use_external?
-      validates :mime_type, :inclusion => { :in =>  Refinery::Videos.config[:whitelisted_mime_types],
-                                            :message => "Wrong file mime_type" }, :if => :file_name?
-      validates :external_url, :presence => true, :if => :use_external?
+      validates :file, presence: true, unless: :use_external?
+      validates :mime_type, inclusion: { in: Refinery::Videos.config[:whitelisted_mime_types],
+                                            message: "Wrong file mime_type" }, if: :file_name?
+      validates :external_url, presence: true, if: :use_external?
       #######################################
 
       before_save :set_mime_type
@@ -54,10 +52,8 @@ module Refinery
             self.file_mime_type = 'video/mp4'
           end
         end
-
       end
 
-
     end
   end
 end

data/app/views/refinery/videos/admin/videos/_file_fields.html.erb

@@ -13,7 +13,7 @@
         </label>
 
         <div class='field'>
-          <div class="use_file" <%= "style='display: none;'" if v.object.use_external %>>
+          <div class="use_file" <%= raw "style='display: none;'" if v.object.use_external %>>
             <% if v.object.file.present? %>
                 <% if v.object.url %>
                     <%= link_to(t('.download_current'), v.object.url,
@@ -28,7 +28,7 @@
                 <%= v.file_field :file, {}.merge(v.object.use_external ? {} : {:required => true}) %>
             <% end %>
           </div>
-          <div class="use_external" <%= "style='display: none;'" unless v.object.use_external %>>
+          <div class="use_external" <%= raw "style='display: none;'" unless v.object.use_external %>>
             <span><%= t('.link_to_source') %></span>
             <%= v.text_field :external_url, {}.merge(v.object.use_external ? {:required => true} : {}) %>
           </div>
@@ -37,20 +37,19 @@
           <% if f.object.video_files.count > 1 %>
               <% if f.object.persisted? %>
                   <%= link_to(refinery.videos_admin_video_file_path(v.object),
-                              :class => "cancel confirm-delete",
+                              :class => "cancel confirm-delete fa fa-minus",
                               :title => t('.delete'),
                               :confirm => t('message', :scope => 'refinery.admin.delete', :title => 'file'),
                               :method => :delete) do %>
-                      <%= refinery_icon_tag("delete.png") %>
                       <div class="inline"><%= t('.delete_source') %></div>
                   <% end %>
               <% else %>
-                  <a href='#' onclick="remove_field($(this)); return false" class="remove_field" style='display: none'><%= refinery_icon_tag("delete.png")%>
-                    <div class="inline"><%= t('.delete_source') %></div>
-                  </a>
+                <a href='#' onclick="remove_field($(this)); return false" class="remove_field fa fa-minus" style='display: none'>
+                  <div class="inline"><%= t('.delete_source') %></div>
+                </a>
               <% end %>
           <% end  %>
-          <a href='#' onclick="add_field($(this)); return false" class="add_field" style='display: none'><%= refinery_icon_tag("add.png") %>
+          <a href='#' onclick="add_field($(this)); return false" class="add_field fa fa-plus" style='display: none'>
             <div class="inline"><%= t('.add_source') %></div>
           </a>
         </div>
@@ -91,4 +90,4 @@
     }
 
 
-</script>
+</script>

data/app/views/refinery/videos/admin/videos/_new_file_field.html.erb

@@ -19,10 +19,10 @@
         </div>
       </div>
       <div class='add_remove_buttons'>
-        <a href='#' onclick="remove_field($(this)); return false" class="remove_field"><%= refinery_icon_tag("delete.png")%>
+        <a href='#' onclick="remove_field($(this)); return false" class="remove_field fa fa-trash">
           <div class="inline"><%= t('.delete_source') %></div>
         </a>
-        <a href='#' onclick="add_field($(this)); return false" class="add_field"><%= refinery_icon_tag("add.png") %>
+        <a href='#' onclick="add_field($(this)); return false" class="add_field fa fa-plus">
           <div class="inline"><%= t('.add_source') %></div>
         </a>
       </div>

data/app/views/refinery/videos/admin/videos/_preview_form.html.erb

@@ -1,5 +1,5 @@
 <%=  render "videojs_dependencies" unless @embedded%>
-<%= form_for @video, url: refinery.videos_admin_video_append_to_wym_path(@video.id), :remote => true, :method => :post do |f| %>
+<%= form_for @video, :url => refinery.videos_admin_video_append_to_wym_path(@video.id), :remote => true, :method => :post do |f| %>
     <div class='dimensions'>
     <div class='field'>
       <%= f.label t('.width') %>

data/app/views/refinery/videos/admin/videos/_video.html.erb

@@ -8,13 +8,15 @@
   </span>
   <% unless action_name =~ /insert/   %>
   <span class='actions'>
-    <%= link_to refinery_icon_tag('eye.png'), refinery.videos_admin_video_path(video, :dialog => true),
+    <%= link_to '', refinery.videos_admin_video_path(video, :dialog => true),
+                :class => 'preview_icon',
                 :title => t('.view_live_html'),
                 :target => "_blank" %>
-    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_videos_admin_video_path(video),
+    <%= link_to '', refinery.edit_videos_admin_video_path(video),
+                :class => 'edit_icon',
                 :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), refinery.videos_admin_video_path(video),
-                :class => "cancel confirm-delete",
+    <%= link_to '', refinery.videos_admin_video_path(video),
+                :class => "cancel confirm-delete delete_icon",
                 :title => t('.delete'),
                 :confirm => t('message', :scope => 'refinery.admin.delete', :title => video.title),
                 :method => :delete %>

data/app/views/refinery/videos/admin/videos/append_to_wym.js.erb

@@ -1,4 +1,15 @@
-wym = parent.$.wymeditors(0);
-wym.html(wym.html() + '<%= escape_javascript(@html_for_wym) %>');
+parent.$.fn.getIndex = function(){
+    var $p=$(this).parent().children();
+    return $p.index(this);
+}
+selectedPart = parent.$('#page_parts .ui-tabs-active').getIndex();
+wym = parent.$.wymeditors(selectedPart);
+selectedBlock = wym.selected();
+if (selectedBlock !== null) {
+   $(selectedBlock).append('<%= escape_javascript(@html_for_wym) %>');
+} else {
+   wym.html(wym.html() + '<%= escape_javascript(@html_for_wym) %>');
+}
 wym.update();
 close_dialog();
+wym.close_dialog();

data/config/initializers/refinery/core.rb

@@ -1,11 +1,7 @@
 Refinery::Core.configure do |config|
-
-  # Add extra tags to the wymeditor whitelist e.g. = {'tag' => {'attributes' => {'1' => 'href'}}} or just {'tag' => {}}
-  config.wymeditor_whitelist_tags = {'video' => {'attributes' => {'1' => 'poster', '2' => 'width', '3' => 'height', '4' => 'source', '5' => 'controls'} },
-                                     'source' => {'attributes' => {'1' => 'src', '2' => 'type'}}}
   # Register extra javascript for backend
   config.register_javascript "refinery/admin/wymeditor_monkeypatch.js"
 
   #Register extra stylesheet for backend (optional options)
   config.register_stylesheet "refinery/admin/video.css"
-end
+end

data/config/initializers/refinery/wymeditor.rb

@@ -0,0 +1,5 @@
+Refinery::Wymeditor.configure do |config|
+  # Add extra tags to the wymeditor whitelist e.g. = {'tag' => {'attributes' => {'1' => 'href'}}} or just {'tag' => {}}
+  config.whitelist_tags = {'video' => {'attributes' => {'1' => 'poster', '2' => 'width', '3' => 'height', '4' => 'source', '5' => 'controls'} },
+                           'source' => {'attributes' => {'1' => 'src', '2' => 'type'}}}
+end

data/config/locales/en.yml

@@ -1,4 +1,6 @@
 en:
+  wym_tools:
+    add_video: Add Video 
   refinery:
     admin:
       dashboard:
@@ -19,7 +21,7 @@ en:
             sorry_no_results: Sorry! There are no results found.
             no_items_yet: There are no Videos yet. Click "Add New Video" to add your first video.
           video:
-            view_live_html: View this video live <br/><em>(opens in a new window)</em>
+            view_live_html: View this video live
             edit: Edit this video
             delete: Remove this video forever
             file: File
@@ -73,4 +75,4 @@ en:
       'refinery/videos/video':
         file_name: File Name
         file_size: File Size
-        file_ext: File Ext
+        file_ext: File Ext

data/config/locales/es.yml

@@ -0,0 +1,79 @@
+es:
+  wym_tools:
+    add_video: Video 
+  refinery:
+    admin:
+      dashboard:
+        additional_dashboard_menu_items:
+          create_new: Añadir nuevo video
+    plugins:
+      videos:
+        title: Videos
+    videos:
+      admin:
+        videos:
+          actions:
+            create_new: Añadir nuevo video
+            reorder: Reordenar Videos
+            reorder_done: Reordenación de videos completada
+          records:
+            title: Videos
+            sorry_no_results: No se han encontrado resultados.
+            no_items_yet: Aún no hay videos. Haga click en "Añadir Nuevo Video" para insertar el primero.
+          video:
+            view_live_html: Ver este video en directo
+            edit: Editar este video
+            delete: Eliminar este video para siempre
+            file: Archivo
+            link: Enlace
+            shared_source: Embebido
+          new:
+            use_files: Usar archivos
+            use_embedded_video: Usar video embebido
+          form:
+            title: Título
+            poster: Poster
+            width: Ancho
+            height: Alto
+            page: Seleccionar como video al cargar una página
+          file_fields:
+            files: Archivos
+            file_tip: Añadir archivos (o enlaces a los archivos) tipos 'mp4', 'webm', 'flv', 'ogg' para compatibilidad total con el navegador
+            use_file: Usar archivo
+            use_external_source: Usar archivo externo
+            add_file: Añadir archivo
+            add_source: Añadir fuente
+            delete_source: Borrar fuente
+            link_to_source: Enlace a la fuente
+            download_current: Usar video actual
+            or: o
+            replace: remplazar con este
+            maximum_file_size: "Tamaño máximo de archivo: %{bytes}"
+          new_file_field:
+            use_file: Usar archivo
+            use_external_source: Usar fuente externa
+            add_file: Añadir archivo
+            add_source: Añadir fuente
+            delete_source: Borrar fuente
+          embed_video_fields:
+            copy_embed_tag_here: Copiar HTML aquí
+          form_option_fields:
+            options: Opciones
+            autoplay: Auto-arranque
+            show_ontrols: Mostrar controles
+            preload_video: Precargar video
+            loop_video: Repetir video
+          insert:
+            insert: Insertar
+          preview_form:
+            width: Ancho
+            height: Alto
+      videos:
+        show:
+          other: Otros Videos
+  activerecord:
+    attributes:
+      'refinery/videos/video':
+        file_name: Nombre de archivo
+        file_size: Tamaño de archivo
+        file_ext: Extensión de archivo

data/config/locales/pt-BR.yml

@@ -0,0 +1,78 @@
+pt-BR:
+  wym_tools:
+    add_video: Vídeo 
+  refinery:
+    admin:
+      dashboard:
+        additional_dashboard_menu_items:
+          create_new: Adicionar novo vídeo
+    plugins:
+      videos:
+        title: Vídeos
+    videos:
+      admin:
+        videos:
+          actions:
+            create_new: Adicionar novo vídeo
+            reorder: Reordenar vídeos
+            reorder_done: Finalizar Reordenação
+          records:
+            title: Vídeos
+            sorry_no_results: Nenhum resultado encontrado.
+            no_items_yet: Não existem vídeos ainda. Clique em  "Adicionar novo vídeo" para adicionar seu primeiro vídeo.
+          video:
+            view_live_html: Veja esse vídeo
+            edit: Editar esse vídeo
+            delete: Remover esse vídeo definitivamente
+            file: Arquivo
+            link: Link
+            shared_source: Embutido
+          new:
+            use_files: Usar arquivo
+            use_embedded_video: Usar vídeo embutido
+          form:
+            title: Título
+            poster: Poster
+            width: Largura
+            height: Altura
+          file_fields:
+            files: Arquivos
+            file_tip: Adicione arquivos (ou links para arquivos) 'mp4', 'webm', 'flv', 'ogg' para manter a compatibilidade com os navegadores
+            use_file: Usar arquivo
+            use_external_source: Usar fonte externa
+            add_file: Adicionar arquivo
+            add_source: Adicionar fonte
+            delete_source: Remover fonte
+            link_to_source: Link para fonte
+            download_current: Usar vídeo atual
+            or: ou
+            replace: substituir com esse
+            maximum_file_size: "Tamanho máximo do arquivo: %{bytes}"
+          new_file_field:
+            use_file: Usar arquivo
+            use_external_source: Usar fonte externa
+            add_file: Adicionar arquivo
+            add_source: Adicionar fonte
+            delete_source: Remover fonte
+          embed_video_fields:
+            copy_embed_tag_here: Copie o HTML aqui
+          form_option_fields:
+            options: Opções
+            autoplay: Iniciar automaticamente
+            show_ontrols: Mostrar controles
+            preload_video: Pre-carregar o vídeo
+            loop_video: Executar novamente após o final
+          insert:
+            insert: Inserir
+          preview_form:
+            width: Largura
+            height: Altura
+      videos:
+        show:
+          other: Outros vídeos
+  activerecord:
+    attributes:
+      'refinery/videos/video':
+        file_name: Nome do arquivo
+        file_size: Tamanho do arquivo
+        file_ext: Extensão do arquivo

data/config/locales/ru.yml

@@ -19,7 +19,7 @@ ru:
             sorry_no_results: Извините, ничего не найдено.
             no_items_yet: Видео отсутствуют. Нажмине "Добавить видео"
           video:
-            view_live_html: Предварительный просмотр <br/><em>(открывается в новом окне)</em>
+            view_live_html: Предварительный просмотр
             edit: Редактировать видео
             delete: Удалить видео
             file: Файл
@@ -74,4 +74,4 @@ ru:
       'refinery/videos/video':
         file_name: Имя файла
         file_size: Размер файла
-        file_ext: Расширение файла
+        file_ext: Расширение файла

data/config/locales/sk.yml

@@ -1,4 +1,6 @@
 sk:
+  wym_tools:
+    add_video: Video
   refinery:
     admin:
       dashboard:
@@ -19,7 +21,7 @@ sk:
             sorry_no_results: Prepáč! Nenašli sa žiadne záznamy.
             no_items_yet: Zatiaľ neboli pridané žiadne videá. Klikni na "Pridať nové video" pre pridanie prvého videa.
           video:
-            view_live_html: Pozrieť toto video live <br/><em>(otvorí sa v novom okne)</em>
+            view_live_html: Pozrieť toto video live
             edit: Upraviť toto video
             delete: Permanentne odstrániť toto video
             file: Súbor
@@ -74,4 +76,3 @@ sk:
         file_name: Názov súboru
         file_size: Veľkosť súboru
         file_ext: Prípona súboru
-

data/config/locales/zh-CN.yml

@@ -0,0 +1,79 @@
+zh-CN:
+  wym_tools:
+    add_video: 添加视频 
+  refinery:
+    admin:
+      dashboard:
+        additional_dashboard_menu_items:
+          create_new: 添加新视频
+    plugins:
+      videos:
+        title: 视频
+    videos:
+      admin:
+        videos:
+          actions:
+            create_new: 添加新视频
+            reorder: 重新编排视频顺序
+            reorder_done: 完成编排
+          records:
+            title: 视频
+            sorry_no_results: 对不起, 没有找到结果
+            no_items_yet: 这里还没有视频. 点击 "添加新视频" 去添加您的第一张视频.
+          video:
+            view_live_html: 查看此视频
+            edit: 编辑此视频
+            delete: 永久删除此视频
+            file: 文件
+            link: 链接
+            shared_source: 内嵌
+          new:
+            use_files: 上传文件
+            use_embedded_video: 使用内嵌视频
+          form:
+            title: 标题
+            poster: 上传者
+            width: 宽度
+            height: 高度
+          file_fields:
+            files: 文件
+            file_tip: 为了适应浏览器兼容性, 请添加'mp4', 'webm', 'flv', 'ogg'格式的文件 (或文件链接).
+            use_file: 上传文件
+            use_external_source: 使用文件链接
+            add_file: 添加文件
+            add_source: 继续添加视频
+            delete_source: 删除视频
+            link_to_source: 文件链接
+            download_current: 使用当前视频
+            or: 或
+            replace: 替换当前视频
+            maximum_file_size: "最大的视频大小为 %{bytes}"
+          new_file_field:
+            use_file: 上传文件
+            use_external_source: 使用文件链接
+            add_file: 添加文件
+            add_source: 继续添加视频
+            delete_source: 删除视频
+            link_to_source: 文件链接
+          embed_video_fields:
+            copy_embed_tag_here: 拷贝 HTML 代码到这里
+          form_option_fields:
+            options: 选项
+            autoplay: 自动播放
+            show_ontrols: 显示控制器
+            preload_video: 预加载视频
+            loop_video: 循环播放视频
+          insert:
+            insert: 插入
+          preview_form:
+            width: 宽度
+            height: 高度
+      videos:
+        show:
+          other: 其他视频
+  activerecord:
+    attributes:
+      'refinery/videos/video':
+        file_name: 文件名
+        file_size: 文件大小
+        file_ext: 文件Ext

data/config/routes.rb

@@ -1,5 +1,5 @@
-Refinery::Core::Engine.routes.append do
-  match '/system/videos/*dragonfly', :to => Dragonfly[:refinery_videos]
+Refinery::Core::Engine.routes.prepend do
+  match '/system/videos/*dragonfly', :to => Dragonfly.app(:refinery_videos), via: [:get, :post]
 
   # Frontend routes
   namespace :videos do

data/db/migrate/1_create_videos_videos.rb

@@ -1,4 +1,4 @@
-class CreateVideosVideos < ActiveRecord::Migration
+class CreateVideosVideos < ActiveRecord::Migration[4.2]
 
   def up
     create_table "refinery_videos", :force => true do |t|

data/db/migrate/2_create_video_file.rb

@@ -1,4 +1,4 @@
-class CreateVideoFile < ActiveRecord::Migration
+class CreateVideoFile < ActiveRecord::Migration[4.2]
 
   def up
     create_table "refinery_video_files", :force => true do |t|
@@ -13,13 +13,10 @@ class CreateVideoFile < ActiveRecord::Migration
       t.string   "external_url"
       t.boolean  "use_external"
     end
-
   end
 
   def down
-
-    drop_table :refinery_videos
-
+    drop_table :refinery_video_files
   end
 
 end

data/lib/generators/refinery/videos/templates/assets/javascripts/videojs_loader.js

@@ -1,7 +1,17 @@
-window.onload = function ()
-{
-    if ($('video').is('*')) {
-        $('body').append('<link href="http://vjs.zencdn.net/c/video-js.css" rel="stylesheet">')
-        $('body').append('<script src="http://vjs.zencdn.net/c/video.js"></script>')
-    }
-};
+window.onload = function () {
+  var video = document.getElementsByTagName('video')[0];
+
+  if (!video) return;
+
+  var head = document.getElementsByTagName('head')[0];
+  var link = document.createElement('link');
+  var script = document.createElement('script');
+
+  link.rel = 'stylesheet';
+  link.type = 'text/css';
+  link.href = 'https://vjs.zencdn.net/7.6.6/video-js.css';
+  script.src = 'https://vjs.zencdn.net/7.6.6/video.js';
+
+  head.appendChild(link);
+  head.appendChild(script);
+};

data/lib/generators/refinery/videos/templates/config/initializers/refinery/videos.rb.erb

@@ -7,17 +7,15 @@ Refinery::Videos.configure do |config|
 
     # Configure white-listed mime types for validation
     #config.whitelisted_mime_types = <%= Refinery::Videos.whitelisted_mime_types %>
-	
+
     # Configure skin. Put css class name to activate skin. For YouTube like skin put tubecss and add css with images to assets path.
     # config.skin_css_class = <%= Refinery::Videos.skin_css_class %>
 
     # Configure Dragonfly
     # This is where in the middleware stack to insert the Dragonfly middleware
     # config.dragonfly_insert_before = <%= Refinery::Videos.dragonfly_insert_before %>
-    # config.dragonfly_secret = <%= Refinery::Videos.dragonfly_secret %>
     # If you decide to trust file extensions replace :ext below with :format
-    # config.dragonfly_url_format = <%= Refinery::Videos.dragonfly_url_format %>
+    # config.dragonfly_server_root = <%= Refinery::Videos.dragonfly_server_root %>
     # config.datastore_root_path = <%= Refinery::Videos.datastore_root_path %>
     # config.trust_file_extensions = <%= Refinery::Videos.trust_file_extensions %>
-
 end

data/lib/refinery/videos/configuration.rb

@@ -2,15 +2,15 @@ module Refinery
   module Videos
     include ActiveSupport::Configurable
 
-    config_accessor :dragonfly_insert_before, :dragonfly_secret, :dragonfly_url_format,
+    config_accessor :dragonfly_insert_before, :dragonfly_secret, :dragonfly_server_root,
                     :max_file_size, :pages_per_dialog, :pages_per_admin_index,
                     :s3_backend, :s3_bucket_name, :s3_region,
                     :s3_access_key_id, :s3_secret_access_key,
                     :datastore_root_path, :trust_file_extensions, :whitelisted_mime_types, :skin_css_class
 
     self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
-    self.dragonfly_secret = Refinery::Core.dragonfly_secret
-    self.dragonfly_url_format = '/system/videos/:job/:basename.:format'
+    self.dragonfly_secret = Refinery::Dragonfly.secret
+    self.dragonfly_server_root = 'public'
     self.trust_file_extensions = false
     self.max_file_size = 524288000
     self.pages_per_dialog = 7
@@ -20,11 +20,11 @@ module Refinery
 
     class << self
       def datastore_root_path
-        config.datastore_root_path || (Rails.root.join('public', 'system', 'refinery', 'videos').to_s if Rails.root)
+        config.datastore_root_path || Rails.root.join('public', 'system', 'refinery', 'videos').to_s
       end
 
       def s3_backend
-        config.s3_backend.nil? ? Refinery::Core.s3_backend : config.s3_backend
+        config.s3_backend.nil? ? Refinery::Core.config.s3_backend : config.s3_backend
       end
 
       def s3_bucket_name

data/lib/refinery/videos/dialogs_controller.rb

@@ -0,0 +1,14 @@
+module DialogsControllerFindVideoIframeSrc
+  def find_iframe_src
+    if @dialog_type == 'video'
+      @iframe_src = refinery.insert_videos_admin_videos_path url_params.merge(:dialog => true)
+    else
+      super
+    end
+  end
+end
+
+Refinery::Admin::DialogsController.class_eval do
+  Refinery::Admin::DialogsController::TYPES << 'video'
+  prepend(DialogsControllerFindVideoIframeSrc)
+end

data/lib/refinery/videos/dragonfly.rb

@@ -1,4 +1,5 @@
 require 'dragonfly'
+require 'dragonfly/s3_data_store'
 
 module Refinery
   module Videos
@@ -6,45 +7,31 @@ module Refinery
 
       class << self
         def setup!
-          app_videos = ::Dragonfly[:refinery_videos]
-
-          app_videos.define_macro(::Refinery::Videos::VideoFile, :video_accessor)
-
-          app_videos.analyser.register(::Dragonfly::Analysis::FileCommandAnalyser)
-          app_videos.content_disposition = :attachment
+          app_videos = ::Dragonfly.app(:refinery_videos)
         end
 
         def configure!
-          app_videos = ::Dragonfly[:refinery_videos]
-          app_videos.configure_with(:rails) do |c|
-            #c.datastore = ::Dragonfly::DataStorage::MongoDataStore.new(:db => MongoMapper.database)
-            c.datastore.root_path = Refinery::Videos.datastore_root_path
-            c.url_format = Refinery::Videos.dragonfly_url_format
-            c.secret = Refinery::Videos.dragonfly_secret
+          app_videos = ::Dragonfly.app(:refinery_videos)
+          app_videos.configure do
+            datastore :file,
+              root_path: Refinery::Videos.datastore_root_path,
+              server_root: Refinery::Videos.dragonfly_server_root,
+              secret: Refinery::Videos.dragonfly_secret
           end
 
           if ::Refinery::Videos.s3_backend
-            app_videos.datastore = ::Dragonfly::DataStorage::S3DataStore.new
-            app_videos.datastore.configure do |s3|
-              s3.bucket_name = Refinery::Videos.s3_bucket_name
-              s3.access_key_id = Refinery::Videos.s3_access_key_id
-              s3.secret_access_key = Refinery::Videos.s3_secret_access_key
-              # S3 Region otherwise defaults to 'us-east-1'
-              s3.region = Refinery::Videos.s3_region if Refinery::Videos.s3_region
+            app_videos.configure do
+              datastore :s3,
+                bucket_name: Refinery::Videos.s3_bucket_name,
+                access_key_id: Refinery::Videos.s3_access_key_id,
+                secret_access_key: Refinery::Videos.s3_secret_access_key,
+                # S3 Region otherwise defaults to 'us-east-1'
+                region: Refinery::Videos.s3_region if Refinery::Videos.s3_region
             end
           end
         end
 
         def attach!(app)
-          ### Extend active record ###
-          app.config.middleware.insert_before Refinery::Videos.dragonfly_insert_before,
-                                              'Dragonfly::Middleware', :refinery_videos
-
-          app.config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
-              :verbose     => Rails.env.development?,
-              :metastore   => "file:#{URI.encode(Rails.root.join('tmp', 'dragonfly', 'cache', 'meta').to_s)}",
-              :entitystore => "file:#{URI.encode(Rails.root.join('tmp', 'dragonfly', 'cache', 'body').to_s)}"
-          }
         end
       end
 

data/lib/refinery/videos/engine.rb

@@ -6,7 +6,7 @@ module Refinery
 
       engine_name :refinery_videos
 
-      initializer 'attach-refinery-videos-with-dragonfly', :after => :load_config_initializers do |app|
+      initializer 'attach-refinery-videos-with-dragonfly', after: :load_config_initializers do |app|
         ::Refinery::Videos::Dragonfly.configure!
         ::Refinery::Videos::Dragonfly.attach!(app)
       end
@@ -16,14 +16,14 @@ module Refinery
           plugin.name = "videos"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.videos_admin_videos_path }
           plugin.pathname = root
-          plugin.activity = {
-            :class_name => :'refinery/videos/video',
-            :title => 'title'
-          }
-
         end
       end
 
+      config.to_prepare do
+        require 'refinery/videos/dialogs_controller'
+
+        Rails.application.config.assets.precompile << %w(refinery/admin/wymeditor_monkeypatch.js refinery/admin/video.css)
+      end
       config.after_initialize do
         Refinery.register_extension(Refinery::Videos)
       end

data/lib/refinery/videos.rb

@@ -1,6 +1,5 @@
 require 'refinerycms-core'
 require 'dragonfly'
-require 'rack/cache'
 
 
 module Refinery

metadata

@@ -1,138 +1,204 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-videojs
 version: !ruby/object:Gem::Version
-  version: 0.5.5.1
-  prerelease: 
+  version: 0.6.0.0
 platform: ruby
 authors:
 - Anton Mishchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: rack-cache
+  name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
-  name: refinerycms-core
+  name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.1
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.24
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.24
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Manage videos in RefineryCMS. Use HTML5 Video.js player.
-email: amishchuk@adexin.com
+        version: 4.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.9.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+- !ruby/object:Gem::Dependency
+  name: refinerycms-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+description: Manage videos in RefineryCMS using Video.js player for playback
+email: admin@adexin.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/models/refinery/videos/video_file.rb
-- app/models/refinery/videos/video.rb
 - app/assets/images/refinery/admin/add_video_icon.png
-- app/assets/javascripts/refinery/admin/wymeditor_monkeypatch.js
+- app/assets/javascripts/refinery/admin/wymeditor_monkeypatch.js.erb
 - app/assets/stylesheets/refinery/admin/video.css
 - app/controllers/refinery/videos/admin/video_files_controller.rb
 - app/controllers/refinery/videos/admin/videos_controller.rb
-- app/views/sitemap/index.xml.builder
+- app/models/refinery/videos/video.rb
+- app/models/refinery/videos/video_file.rb
+- app/views/refinery/admin/dashboard/_additional_dashboard_menu_items.html.erb
 - app/views/refinery/videos/admin/videos/_actions.html.erb
+- app/views/refinery/videos/admin/videos/_embed_video_fields.html.erb
 - app/views/refinery/videos/admin/videos/_file_fields.html.erb
+- app/views/refinery/videos/admin/videos/_form.html.erb
+- app/views/refinery/videos/admin/videos/_form_option_fields.html.erb
 - app/views/refinery/videos/admin/videos/_new_file_field.html.erb
+- app/views/refinery/videos/admin/videos/_preview_form.html.erb
 - app/views/refinery/videos/admin/videos/_records.html.erb
-- app/views/refinery/videos/admin/videos/new.html.erb
-- app/views/refinery/videos/admin/videos/insert.html.erb
-- app/views/refinery/videos/admin/videos/_videos.html.erb
+- app/views/refinery/videos/admin/videos/_sortable_list.html.erb
 - app/views/refinery/videos/admin/videos/_video.html.erb
-- app/views/refinery/videos/admin/videos/index.html.erb
+- app/views/refinery/videos/admin/videos/_videojs_dependencies.html.erb
+- app/views/refinery/videos/admin/videos/_videos.html.erb
 - app/views/refinery/videos/admin/videos/append_to_wym.js.erb
+- app/views/refinery/videos/admin/videos/dialog_preview.js.erb
 - app/views/refinery/videos/admin/videos/edit.html.erb
-- app/views/refinery/videos/admin/videos/_form.html.erb
-- app/views/refinery/videos/admin/videos/_videojs_dependencies.html.erb
-- app/views/refinery/videos/admin/videos/_form_option_fields.html.erb
-- app/views/refinery/videos/admin/videos/_preview_form.html.erb
-- app/views/refinery/videos/admin/videos/_sortable_list.html.erb
+- app/views/refinery/videos/admin/videos/index.html.erb
+- app/views/refinery/videos/admin/videos/insert.html.erb
+- app/views/refinery/videos/admin/videos/new.html.erb
 - app/views/refinery/videos/admin/videos/show.html.erb
-- app/views/refinery/videos/admin/videos/dialog_preview.js.erb
-- app/views/refinery/videos/admin/videos/_embed_video_fields.html.erb
-- app/views/refinery/admin/dashboard/_additional_dashboard_menu_items.html.erb
+- app/views/sitemap/index.xml.builder
+- config/initializers/refinery/core.rb
+- config/initializers/refinery/wymeditor.rb
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sk.yml
-- config/initializers/refinery/core.rb
+- config/locales/zh-CN.yml
 - config/routes.rb
-- db/migrate/2_create_video_file.rb
 - db/migrate/1_create_videos_videos.rb
+- db/migrate/2_create_video_file.rb
+- lib/generators/refinery/videos/templates/assets/javascripts/videojs_loader.js
+- lib/generators/refinery/videos/templates/config/initializers/refinery/videos.rb.erb
+- lib/generators/refinery/videos_generator.rb
+- lib/refinery/videos.rb
 - lib/refinery/videos/configuration.rb
+- lib/refinery/videos/dialogs_controller.rb
 - lib/refinery/videos/dragonfly.rb
+- lib/refinery/videos/engine.rb
 - lib/refinery/videos/validators.rb
 - lib/refinery/videos/validators/file_size_validator.rb
-- lib/refinery/videos/engine.rb
-- lib/refinery/videos.rb
 - lib/refinerycms-videojs.rb
-- lib/generators/refinery/videos/templates/config/initializers/refinery/videos.rb.erb
-- lib/generators/refinery/videos/templates/assets/javascripts/videojs_loader.js
-- lib/generators/refinery/videos_generator.rb
 homepage: http://www.adexin.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: refinerycms-videojs
-rubygems_version: 1.8.24
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Videos extension for Refinery CMS
 test_files: []

data/app/assets/javascripts/refinery/admin/wymeditor_monkeypatch.js

@@ -1,13 +0,0 @@
-$insert_video_link = "<ul id='add_video'><li><a href='/refinery/videos/insert?dialog=true'>Add Video</a></li></ul>";
-window.onload = function ()
-{
-    if ($.wymeditors(0)) {
-        $('.wym_area_top').append($insert_video_link);
-        init_modal_dialogs();
-    }
-};
-
-onCloseDialog = function(){
-   $('iframe#dialog_iframe').attr('src', '');
-};
-