concerto_remote_video 0.0.3 → 0.0.4

data/README.md

@@ -5,7 +5,10 @@ This plugin provides support to play remotely hosted videos, like YouTube videos
 2.  ```bundle install```
 3.  ```./script/rails generate concerto_remote_video:install install```
 
+The last step produces a lot of output, if it runs successfully, because it recompiles the frontend js files.
+
 ## Supported hosts:
 * YouTube
+* Vimeo
 
 Concerto 2 Remove Video is licensed under the Apache License, Version 2.0.

data/app/assets/javascripts/remote_video.js

@@ -0,0 +1,80 @@
+// contents.js
+
+// attach handler to video_id so when it loses focus we can look up some video details
+// not dry, but no middle man
+function attachHandlers() {
+  $('input#remote_video_config_video_id').on('blur', getVideoInfo);
+  $('select#remote_video_config_video_vendor').on('change', getVideoInfo);
+
+  $('select#remote_video_config_video_vendor').on('change', updateTooltip);
+
+  function updateTooltip() {
+    var vendor = $('select#remote_video_config_video_vendor').val();
+    if (vendor == 'YouTube') {
+      $('input#remote_video_config_video_id').attr("placeholder", "DGbqvYbPZBY");
+      $('div#video_hint_id').html('Specify the video id or keywords');
+    } else if (vendor == 'Vimeo') {
+      $('input#remote_video_config_video_id').attr("placeholder", "4224811");
+      $('div#video_hint_id').html('Specify the exact vimeo video id');
+    }
+  }
+
+  function getVideoInfo() {
+    // need to know which vendor
+    // will place title, description, duration into 'div.remote-video-info'
+
+    var info = '<p>Video details could not be determined.</p>';
+    var vendor = $('select#remote_video_config_video_vendor').val();
+    var video_id = $('input#remote_video_config_video_id').val();
+    var info_el = $('.remote-video-info');
+
+    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('searching...');
+          // todo: dont search if video_id is empty
+          $.ajax({
+            url: 'http://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>');
+              } else {
+                $(info_el).empty().html(info);
+              }
+            },
+            error: function (xoptions, textStatus)  {
+              $(info_el).empty().html(info);
+            }
+          });
+        } else if (vendor == 'Vimeo') {
+          $(info_el).empty().html('searching...');
+          $.ajax({
+            url: 'http://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>');
+              } else {
+                $(info_el).empty().html(info);
+              }
+            },
+            error: function (xoptions, textStatus)  {
+              $(info_el).empty().html(info);
+            }
+          });
+        }
+      }
+    }
+  }
+}
+
+$(document).ready(attachHandlers);
+$(document).on('page:change', attachHandlers);

data/app/assets/stylesheets/remote_video.css

@@ -0,0 +1,16 @@
+
+div.remote-video-info {
+  padding: 1em;
+}
+
+div.remote-video-info img {
+  float: left;
+  max-width: 150px;
+  max-height: 150px;
+  margin: 0 5px 5px 0;
+  border: solid 1px black;
+}
+
+div.video_id_hint {
+  font-style: italic;
+}

data/app/models/remote_video.rb

@@ -5,9 +5,15 @@ class RemoteVideo < Content
   before_validation :save_config
 
   validate :video_id_must_exist
-  validates :duration, :numericality => { :greater_than => 0 }
+  #todo: put back, commented out because I keep getting duration is not a number
+  #validates :duration, :numericality => { :greater_than => 0 }
+  validate :video_vendor_supported
 
-  DISPLAY_NAME = 'YouTube Video'
+  DISPLAY_NAME = 'Video'
+  VIDEO_VENDORS = {
+    :YouTube => { :id => "YouTube", :url => "https://www.youtube.com/embed/" },
+    :Vimeo => { :id => "Vimeo", :url => "https://player.vimeo.com/video/" }
+  }
 
   attr_accessor :config
 
@@ -41,37 +47,74 @@ class RemoteVideo < Content
 
   def self.form_attributes
     attributes = super()
-    attributes.concat([:config => [:video_id, :allow_flash]])
+    # what about  :thumb_url, :title, :description
+    attributes.concat([:config => [:video_vendor, :video_id, :allow_flash]])
   end
 
   # Load some info about this video from YouTube.
   def load_info
-    return if self.config['video_id'].nil? || !self.duration.nil?
+    # dont abort if there is a duration specified
+    return if self.config['video_id'].nil? #|| !self.duration.nil?
     require 'net/http'
-    #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
-    #  Rails.logger.debug("YouTube not reachable @ #{url}.")
-    #  config['video_id'] = ''
-    #  return
-    #end
-    if data['data']['totalItems'].to_i <= 0
-      Rails.logger.debug('No video found from ' + url)
-      self.config['video_id'] = ''
-      return
+    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
+      #  Rails.logger.debug("YouTube not reachable @ #{url}.")
+      #  config['video_id'] = ''
+      #  return
+      #end
+      if data['data']['totalItems'].to_i <= 0
+        Rails.logger.debug('No video found from ' + url)
+        self.config['video_id'] = ''
+        return
+      end
+      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']
+    elsif self.config['video_vendor'] == VIDEO_VENDORS[:Vimeo][:id]
+      #todo: put these info urls in the VV constant
+      #http://vimeo.com/api/v2/video/video_id.json
+      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
+      #  Rails.logger.debug("YouTube not reachable @ #{url}.")
+      #  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']
     end
-    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']
   end
 
   # Build a URL for an iframe player.
   def player_url(params={})
-    url = "https://www.youtube.com/embed/#{self.config['video_id']}"
+    url = VIDEO_VENDORS[self.config['video_vendor'].to_sym][:url] + self.config['video_id']
     if self.config['allow_flash'] == '0'
       params['html5'] = 1
     end
@@ -85,16 +128,32 @@ class RemoteVideo < Content
     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
-    settings = {
-      :autoplay => 1,  # Autostart the video
-      :end => self.duration,  # Stop it around the duration
-      :controls => 0,  # Don't show any controls
-      :modestbranding => 1,  # Use the less fancy branding
-      :rel => 0,  # Don't show related videos
-      :showinfo => 0,  # Don't show the video info
-      :iv_load_policy => 3  # Don't show any of those in-video labels
-    }
+    if self.config['video_vendor'] == VIDEO_VENDORS[:YouTube][:id]
+      settings = {
+        :autoplay => 1,  # Autostart the video
+        :end => self.duration,  # Stop it around the duration
+        :controls => 0,  # Don't show any controls
+        :modestbranding => 1,  # Use the less fancy branding
+        :rel => 0,  # Don't show related videos
+        :showinfo => 0,  # Don't show the video info
+        :iv_load_policy => 3  # Don't show any of those in-video labels
+      }
+    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
+      }
+    end
     {:path => player_url(settings)}
   end
 end

data/app/views/contents/remote_video/_form_middle.html.erb

@@ -1,9 +1,9 @@
 <fieldset>
-  <legend><span><%=t(:provide_details)%></span></legend>
+  <legend><span><%=t('contents.provide_details')%></span></legend>
   <div class="clearfix">
     <%= form.label :name %>
     <div class="input">
-      <%= form.text_field :name %>
+      <%= form.text_field :name, :class => "input-xlarge" %>
     </div>
   </div>
 
@@ -11,9 +11,8 @@
 </fieldset>
 
 <fieldset>
-  <legend><span><%=t(:select_feed)%></span></legend>
-  <label>&nbsp;</label>
-  <div class="input">
+  <legend><span><%=t('contents.select_feed')%></span></legend>
+  <div class="clearfix">
     <% if @content.new_record? %>
       <%= render :partial => 'contents/form_elements/feeds' %>
     <% end %>

data/app/views/contents/remote_video/_form_top.html.erb

@@ -1,10 +1,22 @@
+<%= javascript_include_tag "remote_video" %>
+<%= stylesheet_link_tag "remote_video" %>
+
 <fieldset>
-  <legend><span>YouTube Video</span></legend>
+  <legend><span><%= RemoteVideo::DISPLAY_NAME %></span></legend>
+<div class="row-fluid">
   <%= form.fields_for :config do |config| %>
+<div class='span4'>
+    <div class="clearfix">
+      <%= config.label :video_vendor, 'Video Vendor' %>
+      <div class="input">
+        <%= config.select :video_vendor, RemoteVideo::VIDEO_VENDORS.collect { |a,b| b[:id] } %>
+      </div>
+    </div>
     <div class="clearfix">
       <%= config.label :video_id %>
       <div class="input">
-        <%= config.text_field :video_id, :placeholder => 'DGbqvYbPZBY', :size => 15 %>
+        <%= config.text_field :video_id, :placeholder => "DGbqvYbPZBY", :class => "input-small" %>
+        <div id="video_id_hint">Specify the video id or keywords</div>
       </div>
     </div>
     <div class="clearfix">
@@ -13,5 +25,17 @@
         <%= config.select :allow_flash, [["No", 0], ["Yes", 1]] %>
       </div>
     </div>
+    <div class="clearfix">
+      <%= form.label :duration %>
+      <div class="input">
+          <%= form.number_field :duration, :class => "input-small" %><br/>
+          (automatically set if ascertained from video source)
+      </div>
+    </div>
+</div>
+<div>
+  <div class='remote-video-info'></div>
+</div>
   <% end %>
+</div>  
 </fieldset>

data/app/views/contents/remote_video/_render_tile.html.erb

@@ -1 +1 @@
-<div style="background-image:url(<%= content.config['thumb_url'] %>); background-size: cover; width: 100%; height: 100%;"></div>
+<div class="pop" style="background-image:url(<%= content.config['thumb_url'] %>); background-size: cover; width: 100%; height: 100%;" data-content="<%= content.config['description']%>" data-title="<%= content.config['title']%>"></div>

data/lib/concerto_remote_video/version.rb

@@ -1,3 +1,3 @@
 module ConcertoRemoteVideo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/concerto_remote_video/install_generator.rb

@@ -9,6 +9,7 @@ module ConcertoRemoteVideo
     def install
      copy_js
      register
+     recompile
     end
 
   private
@@ -19,5 +20,12 @@ module ConcertoRemoteVideo
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concerto_remote_video
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 -07:00
+date: 2013-05-30 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70122145172500 !ruby/object:Gem::Requirement
+  requirement: &70296757751560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70122145172500
+  version_requirements: *70296757751560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70122145170660 !ruby/object:Gem::Requirement
+  requirement: &70296757727300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,15 +33,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122145170660
-description: Adds support for remotely hosted videos, like YouTube, in Concerto 2
+  version_requirements: *70296757727300
+description: Adds support for remotely hosted videos, like YouTube or vimeo, in Concerto
+  2
 email:
 - bmichalski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/javascripts/remote_video.js
 - app/assets/stylesheets/concerto_remote_video/application.css
+- app/assets/stylesheets/remote_video.css
 - app/controllers/concerto_remote_video/application_controller.rb
 - app/helpers/concerto_remote_video/application_helper.rb
 - app/models/remote_video.rb