concerto_remote_video 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0057c70e019b24d881176d1cee19c25b2cfbe15f
-  data.tar.gz: 427ad38f5490bf3d9bb97b56613c9b6a90c9d884
+  metadata.gz: caf9e3fc8733e9ce4f3bf12f9106c12ec940bb19
+  data.tar.gz: 45a04bab69ebc87c2b0416853278d26f8607f455
 SHA512:
-  metadata.gz: abf286284ce3481b42daac729849b5d71d41ab0274e2a72a97c558883c0a363a3bc7ddda0cb3e9bae14ef14c25d37f9e07cf123e435e838e777b10452d4cac83
-  data.tar.gz: 6a21256b3c5f55af89a5be869f82c0ecd643c92291e78485e3aa3e8ae218990e7ff32a9c685c3fdbacfd4613d211deaf283e8aa444ac1585822164f2b9919912
+  metadata.gz: fc8385b9186679c85d221bddd20a4d3e94d4120ba91c983abbb4fd10b5ca3cc93014770fc9c7b9dd1c7b22cfe9caa9c0cc1a8d7c1794110a316471341d96f12a
+  data.tar.gz: 194518905108f1541db8f329ecdb7d6209f17530426e2e484ddb84bebe5bf32ef58ca008ac409045c23d5f8fe426553fb8d51295550a7a89a7aa97d34a51f89b

data/app/assets/javascripts/concerto_remote_video/remote_video.js

@@ -2,104 +2,110 @@ var initializedRemoteVideoHandlers = false;
 function initializeRemoteVideoHandlers() {
   if (!initializedRemoteVideoHandlers) {
 
-    function getVideoInfo() {
-      // need to know which vendor
-      // will place title, description, duration into 'div.remote-video-info'
+    function getVideoPreview() {
+      var preview_url = '/concerto-remote-video/preview';
 
-      var info = '<p>Video details could not be determined.</p>';
-      var vendor = $('select#remote_video_config_video_vendor').val();
+      // Form video details
       var video_id = $('input#remote_video_config_video_id').val();
-      var info_el = $('.remote-video-info');
-      var preview_div = $('#preview_div');
-      $(preview_div).empty();
+      var video_vendor = $('select#remote_video_config_video_vendor').val();
+
+      // Loading icon
+      if (video_id.length != 0) {
+        $(preview_div).empty().html('<i class=\"ficon-spinner icon-spin\"></i> searching...');
+        $('.remote-video-info').empty();
+        // Video preview request
+        $.ajax({
+          type: 'POST',
+          url: preview_url,
+          data: { 
+            video_id: video_id,
+            video_vendor: video_vendor
+          },
+          success: function(data) {
+            loadVideoInfo(data);
+            loadVideoPreview(data); 
+          },
+          error: function(e) {
+            loadVideoPreview({video_available: false});
+          }
+        });
+      }
+    }
 
-      if (info_el.length != 0) {
-        // we found the summary box
-        if (typeof vendor != 'undefined') {
-          // we found the vendor selection, call appropriate api
-          if (vendor == 'YouTube') {
-            $(info_el).empty().html('<i class=\"ficon-spinner icon-spin\"></i> searching...');
-            // todo: dont search if video_id is empty
-            $.ajax({
-              url: '//gdata.youtube.com/feeds/api/videos?q='+ encodeURIComponent(video_id) +'&v=2&max-results=1&format=5&alt=jsonc',
-              dataType: 'jsonp',
-              timeout: 4000,
-              success: function (data) {
-                if (parseInt(data['data']['totalItems']) > 0) {
-                  // we got something, repoint data to first item in results
-                  data = data['data']['items'];
-                  $(info_el).empty().html('<img src="' + data[0].thumbnail.hqDefault + '"/><h4>' + data[0].title + '</h4><i>' + data[0].duration + ' secs</i><br/><p>' + data[0].description + '</p>');
-                  previewVideo(data[0].id);
-                } else {
-                  $(info_el).empty().html(info);
-                }
-              },
-              error: function (xoptions, textStatus)  {
-                $(info_el).empty().html(info);
-              }
-            });
-          } else if (vendor == 'Vimeo') {
-            $(info_el).empty().html('<i class=\"ficon-spinner icon-spin\"></i> searching...');
-            $.ajax({
-              url: '//vimeo.com/api/v2/video/' + encodeURIComponent(video_id) + '.json',
-              dataType: 'jsonp',
-              timeout: 4000,
-              success: function (data) {
-                if (data.length > 0) {
-                  // we got something
-                  $(info_el).empty().html('<img src="' + data[0].thumbnail_small + '"/><h4>' + data[0].title + '</h4><i>' + data[0].duration + ' secs</i><br/><p>' + data[0].description + '</p>');
-                  previewVideo();
-                } else {
-                  $(info_el).empty().html(info);
-                }
-              },
-              error: function (xoptions, textStatus)  {
-                $(info_el).empty().html(info);
-              }
-            });
-          } else if (vendor == 'HTTPVideo') {
-            $(info_el).empty();
-            if (video_id != "")
-            {
-              previewVideo();
+    function loadVideoInfo(data) {
+      if (data['video_available']) {
+        // Target elements for setting video info
+        var info_el = $('.remote-video-info');
+        var name_el = $('input#remote_video_name');
+        var duration_el = $('input#remote_video_duration');
+        // Initialize info content
+        var title = '';
+        var description = '<p></p>';
+        var duration = '';
+        var vendor = data['video_vendor'];
+
+        if (vendor == 'HTTPVideo') {
+          $(info_el).empty();
+          return;
+        } else {
+          // YouTube no longer returns these details without an API key
+          if (vendor != 'YouTube') {
+            if (data['description']) {
+              // Preview video description
+              var description = '<p>' + data['description'] + '</p>';
+            } 
+            if (data['title']) {
+              // Set content title to video returned title
+              name_el.val(data['title']);
+            }
+            if (data['duration']) {
+              // Set content duration to video duration
+              duration = '<i>' + data['duration'] + ' secs</i>';
+              duration_el.val(data['duration']);
             }
           }
-        }
+        } 
+
+        // Load video info 
+        var info = '<img src="'+data['thumb_url']+'"/></h4>'+duration+'<br/>'+description; 
+        $(info_el).empty().html(info);
       }
     }
 
-    function previewVideo(video_id) {
-      var url = $('input#remote_video_config_video_id').data('url');
-      if (url) {
-        if (video_id == null) {
-          video_id = $('input#remote_video_config_video_id').val();
-        }
-        $("#preview_div").load(url, { data: { 
-          video_vendor: $('select#remote_video_config_video_vendor').val(), 
-          video_id: video_id, 
-          allow_flash: $('input#remote_video_config_allow_flash').val(),
-          duration: $('input#remote_video_duration').val(),
-          name: $('input#remote_video_name').val()
-        }, type: 'RemoteVideo' });
+    function loadVideoPreview(data) {
+      var preview_el = $('#preview_div');
+      if (data['video_available']) {
+        $(preview_div).empty().html(data['preview_code']);
+      } else {
+        $(preview_div).empty();
       }
     }
 
     function updateTooltip() {
       var vendor = $('select#remote_video_config_video_vendor').val();
+      var hint_el = $('div#video_id_hint');
+      var id_el = $('input#remote_video_config_video_id');
+
       if (vendor == 'YouTube') {
-        $('input#remote_video_config_video_id').attr("placeholder", "DGbqvYbPZBY");
-        $('div#video_id_hint').html('Specify the video id or keywords');
+        id_el.attr('placeholder', 'DGbqvYbPZBY');
+        hint_el.html('Specify the exact YouTube video id');
       } else if (vendor == 'Vimeo') {
-        $('input#remote_video_config_video_id').attr("placeholder", "4224811");
-        $('div#video_id_hint').html('Specify the exact vimeo video id');
+        id_el.attr('placeholder', '4224811');
+        hint_el.html('Specify the exact vimeo video id');
       } else if (vendor == 'HTTPVideo') {
-        $('input#remote_video_config_video_id').attr("placeholder", "http://media.w3.org/2010/05/sintel/trailer.mp4");
-        $('div#video_id_hint').html('Specify the url of the video');
+        id_el.attr('placeholder', 'http://media.w3.org/2010/05/sintel/trailer.mp4');
+        hint_el.html('Specify the url of the video');
+      } else if (vendor == 'Wistia') {
+        id_el.attr('placeholder', 'g5pnf59ala');
+        hint_el.html('Specify the exact Wistia video id');
+      } else if (vendor == 'DailyMotion') {
+        id_el.attr('placeholder', 'x23shps');
+        hint_el.html('Specify the exact DailyMotion video id');
       }
     }
 
-    $('input#remote_video_config_video_id').on('blur', getVideoInfo);
-    $('select#remote_video_config_video_vendor').on('change', getVideoInfo);
+    $('input#remote_video_config_video_id').on('blur', getVideoPreview);
+    $('select#remote_video_config_video_vendor').on('change', getVideoPreview);
     $('select#remote_video_config_video_vendor').on('change', updateTooltip);
 
     initializedRemoteVideoHandlers = true;
@@ -107,4 +113,4 @@ function initializeRemoteVideoHandlers() {
 }
 
 $(document).ready(initializeRemoteVideoHandlers);
-$(document).on('page:change', initializeRemoteVideoHandlers);
+$(document).on('page:change', initializeRemoteVideoHandlers);

data/app/controllers/concerto_remote_video/application_controller.rb

@@ -1,4 +1,4 @@
 module ConcertoRemoteVideo
   class ApplicationController < ActionController::Base
   end
-end
+end

data/app/controllers/concerto_remote_video/remote_video_controller.rb

@@ -0,0 +1,12 @@
+module ConcertoRemoteVideo
+  class RemoteVideoController < ConcertoRemoteVideo::ApplicationController
+    def preview
+      @video_data = RemoteVideo.preview({
+        video_vendor: params[:video_vendor],
+        video_id: params[:video_id]
+      })
+      
+      render json: @video_data
+    end
+  end
+end

data/app/helpers/concerto_remote_video/application_helper.rb

@@ -1,4 +1,4 @@
 module ConcertoRemoteVideo
   module ApplicationHelper
   end
-end
+end

data/app/models/remote_video.rb

@@ -13,9 +13,11 @@ class RemoteVideo < Content
 
   DISPLAY_NAME = 'Video'
   VIDEO_VENDORS = {
-     :HTTPVideo => { :id => "HTTPVideo", :name => "Video URL", :url => ""},
+    :HTTPVideo => { :id => "HTTPVideo", :name => "Self-hosted Video", :url => ""},
     :YouTube => { :id => "YouTube", :name => "YouTube", :url => "https://www.youtube.com/embed/" },
-    :Vimeo => { :id => "Vimeo", :name => "Vimeo", :url => "https://player.vimeo.com/video/" }
+    :Vimeo => { :id => "Vimeo", :name => "Vimeo", :url => "https://player.vimeo.com/video/" },
+    :Wistia => { :id => "Wistia", :name => "Wistia", :url => "https://fast.wistia.net/embed/iframe/" },
+    :DailyMotion => { :id => "DailyMotion", :name => "DailyMotion", :url => "https://www.dailymotion.com/embed/video/" }
   }
 
   attr_accessor :config
@@ -56,111 +58,61 @@ class RemoteVideo < Content
 
   # Load some info about this video from YouTube.
   def load_info
+    require 'video_info'
+
     # dont abort if there is a duration specified
     return if self.config['video_id'].nil? #|| !self.duration.nil?
     return if !self.new_record?
-
-    require 'net/http'
     if self.config['video_vendor'] == VIDEO_VENDORS[:YouTube][:id]
-      begin
-        video_id = URI.escape(self.config['video_id'])
-        url = "http://gdata.youtube.com/feeds/api/videos?q=#{video_id}&v=2&max-results=1&format=5&alt=jsonc"
-        json = Net::HTTP.get_response(URI.parse(url)).body
-        data = ActiveSupport::JSON.decode(json)
-      rescue MultiJson::ParseError => e
-        Rails.logger.error("Could not parse results from YouTube @ #{url}: #{e.message}: #{json}")
-        errors.add(:video_id, "Could not parse results from YouTube")
-        return
-      rescue
-        Rails.logger.error("YouTube not reachable @ #{url}.")
-        errors.add(:video_id, "Could not get information about video from YouTube")
-        return
-      end
-      if data['data']['totalItems'].to_i <= 0
-        Rails.logger.error('No video found from ' + url)
-        self.config['video_id'] = ''
-        return
-      end
-      return if data['data'].nil? || data['data']['items'].nil?
-      video_data = data['data']['items'][0]
-      self.config['video_id'] = video_data['id']
-      self.duration = video_data['duration'].to_i
-      self.config['thumb_url'] = video_data['thumbnail']['hqDefault']
-      self.config['title'] = video_data['title']
-      self.config['description'] = video_data['description']
+      video = VideoInfo.new("http://www.youtube.com/watch?v=#{URI.escape(self.config['video_id'])}")
     elsif self.config['video_vendor'] == VIDEO_VENDORS[:Vimeo][:id]
-      data=[]
-      begin
-        video_id = URI.escape(self.config['video_id'])
-        url = "http://vimeo.com/api/v2/video/#{video_id}.json"
-        uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        request = Net::HTTP::Get.new(uri.request_uri)
-        response = http.request(request)
-        if response.code == '200'  #ok
-          json = response.body
-          data = ActiveSupport::JSON.decode(json)
-        end
-      rescue => e
-        Rails.logger.error("Could not get information about video from Vimeo @ #{url}: #{e.message}")
-        config['video_id'] = ''
-        return
-      end
-      if data.empty?
-        Rails.logger.debug('No video found from ' + url)
-        self.config['video_id'] = ''
-        return
-      end
-      video_data = data[0]
-      # some vimeo videos have zero for their duration, so in that case use what the user supplied
-      self.duration = (video_data['duration'].to_i > 0 ? video_data['duration'].to_i : self.duration.to_i)
-      self.config['thumb_url'] = video_data['thumbnail_small']
-      self.config['title'] = video_data['title']
-      self.config['description'] = video_data['description']
+      video = VideoInfo.new("http://vimeo.com/#{URI.escape(self.config['video_id'])}")
+    elsif self.config['video_vendor'] == VIDEO_VENDORS[:Wistia][:id]
+      video = VideoInfo.new("http://fast.wistia.com/embed/medias/#{URI.escape(self.config['video_id'])}")
+    elsif self.config['video_vendor'] == VIDEO_VENDORS[:DailyMotion][:id]
+      video = VideoInfo.new("http://dailymotion.com/video/#{URI.escape(self.config['video_id'])}")
     elsif self.config['video_vendor'] == VIDEO_VENDORS[:HTTPVideo][:id]
-      self.config['thumb_url'] = ''
-      self.config['title'] = self.name
-      self.config['description'] = ''
-    end
-  end
-
-  # Build a URL for an iframe player.
-  def player_url(params={})
-    url = VIDEO_VENDORS[self.config['video_vendor'].to_sym][:url] + self.config['video_id']
-    if self.config['allow_flash'] == '0'
-      params['html5'] = 1
+      # self hosted video, skip video info gem configuration below 
+      self.config['preview_code'] = "<video preload controls width=\"100%\"><source src=\"#{self.config['video_id']}\" /></video>"
+      self.config['video_available'] = true
+      return
     end
-    url += '?' + URI.escape(params.collect{|k,v| "#{k}=#{v}"}.join('&'))
-    return url
-  end
 
-  def video_id_must_exist
-    if config['video_id'].empty?
-      errors.add(:video_id, 'could not be found')
-    end
-  end
-
-  def video_vendor_supported
-    if config['video_vendor'].empty? || !VIDEO_VENDORS.collect { |a,b| b[:id] }.include?(config['video_vendor'])
-      errors.add(:video_vendor, 'must be ' + VIDEO_VENDORS.collect { |a,b| b[:id] }.join(" or "))
+    # Video info gem details
+    if !video.nil? and video.available?
+      # some vimeo videos have zero for their duration, so in that case use what the user supplied
+      self.duration = (video.duration.to_i > 0 ? video.duration.to_i : self.duration.to_i)
+      self.config['title'] = video.title
+      self.config['description'] = video.description
+      self.config['video_id'] = video.video_id
+      self.config['duration'] = video.duration
+      self.config['preview_url'] = video.embed_url
+      self.config['preview_code'] = video.embed_code
+      # set video thumbnail using video info or using YouTube image url to bypass API restrictions
+      if video.provider == VIDEO_VENDORS[:YouTube][:id]
+        self.config['thumb_url'] = "https://i.ytimg.com/vi/" + video.video_id + "/hqdefault.jpg"
+      else
+        self.config['thumb_url'] = video.thumbnail_large
+      end
     end
+    # Store video availablility to skip preview rendering
+    self.config['video_available'] = video.available?
   end
 
   def self.preview(data)
+    require 'video_info'
+
     begin
       o = RemoteVideo.new()
       o.config['video_id'] = data[:video_id]
       o.config['video_vendor'] = data[:video_vendor]
-      o.config['allow_flash'] = data[:allow_flash]
-      o.name = data[:name]
-      o.duration = data[:duration]
+      o.load_info
 
-      results = o.render_preview
     rescue => e
-      results = "Unable to preview.  #{e.message}"
+      return "Unable to preview.  #{e.message}"
     end
 
-    return results
+    return o.config
   end
 
   def preview
@@ -173,6 +125,28 @@ class RemoteVideo < Content
     return results
   end
 
+  # Build a URL for an iframe player.
+  def player_url(params={})
+    url = VIDEO_VENDORS[self.config['video_vendor'].to_sym][:url] + self.config['video_id']
+    if self.config['allow_flash'] == '0'
+      params['html5'] = 1
+    end
+    url += '?' + URI.escape(params.collect{|k,v| "#{k}=#{v}"}.join('&'))
+    return url
+  end
+
+  def video_id_must_exist
+    if config['video_id'].empty?
+      errors.add(:video_id, 'could not be found')
+    end
+  end
+
+  def video_vendor_supported
+    if config['video_vendor'].empty? || !VIDEO_VENDORS.collect { |a,b| b[:id] }.include?(config['video_vendor'])
+      errors.add(:video_vendor, 'must be ' + VIDEO_VENDORS.collect { |a,b| b[:id] }.join(" or "))
+    end
+  end
+
   def render_details
     if self.config['video_vendor'] == VIDEO_VENDORS[:YouTube][:id]
       settings = {
@@ -186,14 +160,30 @@ class RemoteVideo < Content
       }
     elsif self.config['video_vendor'] == VIDEO_VENDORS[:Vimeo][:id]
       settings = {
-        :api => 1,              # use Javascript API
-        :player_id => 'playerv', #arbitrary id of iframe 
-        :byline => 0,
-        :portrait => 0,
-        :autoplay => 1
+        :api => 1,                # use Javascript API
+        :player_id => 'playerv',  #arbitrary id of iframe
+        :byline => 0,             # Hide video byline
+        :badge => 0,              # Hide vendor logo
+        :portrait => 0,           # Don't show user's portrait
+        :autoplay => 1,           # Autostart the video
+        :title => 0               # Hide video title
+      }
+    elsif self.config['video_vendor'] == VIDEO_VENDORS[:Wistia][:id]
+      settings = {
+        :autoPlay => true,      # Autostart the video
+        :chromeless => true,    # Don't show any controls
+        :playerColor => 'black' # Change player outlines to black
+      }
+    elsif self.config['video_vendor'] == VIDEO_VENDORS[:DailyMotion][:id]
+      settings = {
+        :autoplay => 1,         # Autostart the video 
+        :chromeless => 1,       # Don't show any controls 
+        :info => 0,             # Hide video information
+        :logo => 0,             # Hide vendor logo
+        :related => 0           # Don't show related videos at end
       }
     elsif self.config['video_vendor'] == VIDEO_VENDORS[:HTTPVideo][:id]
-      settings = { 
+      settings = {
         :autoplay => 1,         # Autostart the video
         :end => self.duration,  # Stop it around the duration
         :controls => 0,         # Don't show any controls
@@ -203,11 +193,14 @@ class RemoteVideo < Content
   end
 
   def render_preview
-    if self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:YouTube][:id] || self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:Vimeo][:id]
+    if self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:YouTube][:id] || 
+       self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:Vimeo][:id] ||
+       self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:Wistia][:id] || 
+       self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:DailyMotion][:id]
       player_settings = { :end => self.duration, :rel => 0, :theme => 'light', :iv_load_policy => 3 }
-      results = "<iframe id=\"player\" type=\"text/html\" width=\"100%\" src=\"#{self.player_url(player_settings)}\" frameborder=\"0\"></iframe>"
+      results = self.config['preview_code']
     elsif self.config['video_vendor'] == RemoteVideo::VIDEO_VENDORS[:HTTPVideo][:id]
-      results = "<video preload controls width=\"100%\"><source src=\"#{self.config['video_id']}\" /></video>"
+      results = self.config['preview_code']
     end
 
     results

data/app/views/frontend/_concerto_remote_video.html

@@ -0,0 +1,37 @@
+<!--
+The `concerto-remote-video` element provides embedded video.
+@element concerto-content
+@status alpha
+-->
+<polymer-element name="concerto-remote-video" attributes="path" constructor="ConcertoRemoteVideo" extends="concerto-content">
+  <template>
+    <style>
+      :host {
+        display: block;
+        width: 100%;
+        height: 100%;
+      }
+
+      :host(.core-transition) {
+        overflow: hidden;
+      }
+
+      #video {
+        width: 100%;
+        height: 100%;
+      }
+    </style>
+    <iframe id="video" frameBorder="0"></iframe>
+  </template>
+
+  <script>
+    Polymer({
+      domReady: function() {
+        this.$.video.src = this.path;
+      }
+    });
+  </script>
+</polymer-element>
+<script> 
+  registerContentType("concerto-remote-video", "ConcertoRemoteVideo");
+</script>

data/config/routes.rb

@@ -1,3 +1,7 @@
 Rails.application.routes.draw do
   resources :remote_videos, :controller => :contents, :except => [:index, :show], :path => "content"
 end
+
+ConcertoRemoteVideo::Engine.routes.draw do
+  post "preview", to: ConcertoRemoteVideo::RemoteVideoController.action(:preview)
+end

data/lib/concerto_remote_video/engine.rb

@@ -5,5 +5,13 @@ module ConcertoRemoteVideo
     initializer "register content type" do |app|
       app.config.content_types << RemoteVideo
     end
+
+    # Define plugin information for the Concerto application to read
+    def plugin_info(plugin_info_class)
+      @plugin_info ||= plugin_info_class.new do
+        add_route("concerto-remote-video", ConcertoRemoteVideo::Engine)
+        add_view_hook "frontend/ScreensController", :concerto_frontend_plugins, partial: "frontend/concerto_remote_video.html"
+      end
+    end
   end
-end
+end

data/lib/concerto_remote_video/version.rb

@@ -1,3 +1,3 @@
 module ConcertoRemoteVideo
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/lib/concerto_remote_video.rb

@@ -1,4 +1,4 @@
 require "concerto_remote_video/engine"
 
 module ConcertoRemoteVideo
-end
+end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: concerto_remote_video
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: video_info
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds support for remotely hosted videos, like YouTube or vimeo, in Concerto
@@ -32,11 +46,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/concerto_remote_video/application.js
 - app/assets/javascripts/concerto_remote_video/remote_video.js
 - app/assets/stylesheets/concerto_remote_video/application.css
 - app/assets/stylesheets/concerto_remote_video/remote_video.css
 - app/controllers/concerto_remote_video/application_controller.rb
+- app/controllers/concerto_remote_video/remote_video_controller.rb
 - app/helpers/concerto_remote_video/application_helper.rb
 - app/models/remote_video.rb
 - app/views/contents/remote_video/_form_middle.html.erb
@@ -45,22 +63,20 @@ files:
 - app/views/contents/remote_video/_render_grid.html.erb
 - app/views/contents/remote_video/_render_tile.html.erb
 - app/views/contents/remote_video/_tab_icon.html.erb
+- app/views/frontend/_concerto_remote_video.html
 - config/routes.rb
+- lib/concerto_remote_video.rb
 - lib/concerto_remote_video/engine.rb
 - lib/concerto_remote_video/version.rb
-- lib/concerto_remote_video.rb
-- lib/generators/concerto_remote_video/install_generator.rb
-- lib/tasks/concerto_remote_video_tasks.rake
-- public/frontend_js/contents/remote_video.js
-- LICENSE
-- Rakefile
-- README.md
 - test/concerto_remote_video_test.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -76,13 +92,10 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/fixtures/concerto_remote_video/remote_videos.yml
 - test/integration/navigation_test.rb
@@ -98,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Remotely hosted video for Concerto 2

data/lib/generators/concerto_remote_video/install_generator.rb

@@ -1,31 +0,0 @@
-require 'rails/generators'
-
-module ConcertoRemoteVideo
-  class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path('../../../../', __FILE__)
-
-    desc 'Copy the RemoteVideo JavaScript to the frontend and register it.'
-
-    def install
-     copy_js
-     register
-     recompile
-    end
-
-  private
-    def copy_js
-      copy_file 'public/frontend_js/contents/remote_video.js', 'public/frontend_js/contents/remote_video.js'
-    end
-
-    def register
-      append_file 'public/frontend_js/content_types.js', "goog.require('concerto.frontend.Content.RemoteVideo');\n"
-    end
-
-    def recompile
-      inside 'public/frontend_js' do 
-        run('/bin/bash compile.sh', {:verbose => true})
-      end
-    end
-
-  end
-end

data/lib/tasks/concerto_remote_video_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :concerto_remote_video do
-#   # Task goes here
-# end

data/public/frontend_js/contents/remote_video.js

@@ -1,97 +0,0 @@
-goog.provide('concerto.frontend.Content.RemoteVideo');
-
-goog.require('concerto.frontend.Content');
-goog.require('concerto.frontend.ContentTypeRegistry');
-goog.require('goog.Uri');
-goog.require('goog.dom');
-goog.require('goog.events');
-goog.require('goog.events.EventType');
-goog.require('goog.style');
-
-
-
-/**
- * Remote Video.
- *
- * @param {Object} data Properties for this piece of content.
- * @constructor
- * @extends {concerto.frontend.Content}
- */
-concerto.frontend.Content.RemoteVideo = function(data) {
-  concerto.frontend.Content.call(this, data);
-
-  /**
-   * The height of the field the image is being shown in.
-   * @type {number}
-   * @private
-   */
-  this.field_height_ = parseFloat(data['field']['size']['height']);
-
-  /**
-   * The width of the field the image is being shown in.
-   * @type {number}
-   * @private
-   */
-  this.field_width_ = parseFloat(data['field']['size']['width']);
-
-  /**
-   * The iframe being displayed.
-   * @type {Object}
-   */
-  this.iframe = null;
-
-  /**
-   * The URL for the video / iframe.
-   * @type {string}
-   */
-  this.video_url = data['render_details']['path'];
-
-  /**
-   * Extra parameters to include in the URL.
-   * @type {?string}
-   * @private
-   */
-  this.url_parms_ = (data['field']['config'] ? data['field']['config']['url_parms'] : null);
-  if (goog.isDefAndNotNull(this.url_parms_)) {
-    this.url_parms_ = this.url_parms_.trim();
-    if (goog.string.startsWith(this.url_parms_, '?'))
-      this.url_parms_ = goog.string.remove(this.url_parms_, '?');
-    if (goog.string.startsWith(this.url_parms_, '&'))
-      this.url_parms_ = goog.string.remove(this.url_parms_, '&');
-    if (goog.string.contains(this.video_url, '?')) {
-      this.url_parms_ = '&' + this.url_parms_;
-    } else {
-      this.url_parms_ = '?' + this.url_parms_;
-    }
-  } else {
-    this.url_parms_ = '';
-  }
-
-  /**
-   * Bump the duration of this content by 1 second.
-   * This attempts to account for 1 second of load time and should be
-   * improved in the future.
-   */
-  this.duration = this.duration + 1;
-};
-goog.inherits(concerto.frontend.Content.RemoteVideo, concerto.frontend.Content);
-
-// Register the content type.
-concerto.frontend.ContentTypeRegistry['RemoteVideo'] =
-    concerto.frontend.Content.RemoteVideo;
-
-
-/**
- * Build the embed iframe and signal that we're ready to use it.
- * @private
- */
-concerto.frontend.Content.RemoteVideo.prototype.load_ = function() {
-  this.iframe = goog.dom.createElement('iframe');
-  this.iframe.src = this.video_url + this.url_parms_;
-  this.iframe.frameborder = 0;
-  goog.style.setSize(this.iframe, '100%', '100%');
-  goog.style.setSize(this.div_, '100%', '100%');
-  goog.style.setStyle(this.iframe, 'border', 0);
-  goog.dom.appendChild(this.div_, this.iframe);
-  this.finishLoad();
-};