videojs_rails 4.6.1 → 4.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWRiNDk4MmMzNDNjM2I0OGNhMmVjZmJmMTY2ZWUyN2ZjMmNjNmEzYw==
-  data.tar.gz: !binary |-
-    YjdmMTEzNmNjNmQ0OGRjYjU2NTU2MzQ2NDMwMjlhZDY5ZmRkMzg2MA==
+SHA1:
+  metadata.gz: 0819bb260798350cd1325898f1189b7e242922c6
+  data.tar.gz: 751aec8a3168a22203e457ef86a59c30d90bba36
 SHA512:
-  metadata.gz: !binary |-
-    MGE0ZjBiYzEwZDJkMWNmZDY5YjFmOGFjMmYwOWUwMjE0ZWMwMzhiODgwMjYx
-    MDYwMzQ1Nzc4MDU2Y2I4YWZkNWIyZDJhMzk1M2Q1ZmVhN2M3Y2NiNGUwYjE0
-    NzlmNDA0NzhkYWU1MzI5MTU0Nzc4MGQyZDgxNjE4N2RiOWQyM2U=
-  data.tar.gz: !binary |-
-    YjRmOTA2YjRlMjYwYmM4NGE5NjQ3Y2NjYzQwNGI0M2U4ZDBhZDEwYzAwMGVl
-    NGVmNTQ0YmMzMzhjOWJkODQxMGM4NzE0MDgyMzU2ZjIzY2M2NGJkMDdjY2Jm
-    MTUyMDJlOGExNGE4Zjc3YjU5NTY5MzE0MTJiMjBkOGExNGJkODE=
+  metadata.gz: 6e0360175c5797559db8b7454612bf1656b1ba58fd0c6baf81b114dd374cc1f61f2cff7674b3c2e365dfb00463ea494ff7c42fb45cfff72be59620edb9a5a60d
+  data.tar.gz: 4cc0ebffb1130e849161679e4d6b21d4087e89ef80489a8e20c095ff51e45048b18b657b804a5f9ea2c5f498da0d7cd1f86dfe1996c06093833866574d1dee86

data/Rakefile

@@ -1 +1,77 @@
 require 'bundler/gem_tasks'
+
+# Build the version of video.js and tag us to match
+
+VIDEO_JS_RAILS_HOME = File.expand_path(File.dirname(__FILE__))
+VIDEO_JS_HOME = File.expand_path('../video.js', VIDEO_JS_RAILS_HOME)
+
+VIDEO_JS_RAKE_USAGE = "Usage: rake videojs:update TAG=v4.12.5"
+
+namespace :videojs do
+  task :update => [:build, :commit]
+
+  task :build do
+    tag = ENV['TAG'] or abort VIDEO_JS_RAKE_USAGE
+    Dir.chdir(VIDEO_JS_HOME) do
+      puts "* Building video.js #{tag} using grunt"
+      unless ENV['NOBUILD']
+        sh "git checkout -q master"
+        sh "git pull -q"
+        sh "git checkout -q #{tag}"
+        sh "grunt"
+      end
+
+      # Copy files into our Rails structure
+      puts
+      puts "* Copying files to vendor/assets"
+      sh "cp #{VIDEO_JS_HOME}/dist/video-js/font/* #{VIDEO_JS_RAILS_HOME}/vendor/assets/fonts/"
+      sh "cp #{VIDEO_JS_HOME}/dist/video-js/video-js.css #{VIDEO_JS_RAILS_HOME}/vendor/assets/stylesheets/"
+      sh "cp #{VIDEO_JS_HOME}/dist/video-js/video-js.swf #{VIDEO_JS_RAILS_HOME}/vendor/assets/javascripts/"
+      sh "cp #{VIDEO_JS_HOME}/dist/video-js/video.dev.js #{VIDEO_JS_RAILS_HOME}/vendor/assets/javascripts/"
+
+      # Now, perform some asset_path and other substitutions
+      puts
+      puts "* Updating videojs-css.erb for Rails asset pipeline"
+      css = "#{VIDEO_JS_RAILS_HOME}/vendor/assets/stylesheets/video-js.css"
+      File.open("#{css}.erb", 'w') do |out|
+        File.foreach(css) do |line|
+          # Handle fonts => url('<%= asset_path('vjs.woff') %>') format('woff')
+          out <<
+            line.gsub(/url\(('*)font\/(vjs[^\)]+)\)(\s+format[^\)]+\))?/, 'url(<%= asset_path(\1\2) %>)\3')
+        end
+      end
+      sh "rm -f #{css}"
+
+      puts
+      puts "* Updating video.js.erb for Rails asset pipeline"
+      jsdev = "#{VIDEO_JS_RAILS_HOME}/vendor/assets/javascripts/video.dev.js"
+      jserb = "#{VIDEO_JS_RAILS_HOME}/vendor/assets/javascripts/video.js.erb"
+      File.open(jserb, 'w') do |out|
+        File.foreach(jsdev) do |line|
+          # Handle swf => asset_path('video-js.swf')
+          out <<
+            line.sub(/(videojs\.options\['flash'\]\['swf'\]\s*=\s*).*/, %q(\1"<%= asset_path('video-js.swf') %>";))
+        end
+      end
+      sh "rm -f #{jsdev}"
+      sh "rm -f #{VIDEO_JS_RAILS_HOME}/vendor/assets/javascripts/video.js"
+    end
+  end
+
+  task :commit do
+    tag = ENV['TAG'] or abort VIDEO_JS_RAKE_USAGE
+
+    # Update the gem version
+    version_file = "#{VIDEO_JS_RAILS_HOME}/lib/videojs_rails/version.rb"
+    lines = File.read(version_file)
+    File.open(version_file, 'w') do |out|
+      version_num = tag.sub(/^v/,'')  # lose the "v" from the tag
+      puts "* Setting gem version = #{version_num}"
+      out << lines.sub(/(VERSION\s*=\s*)\S+/, "\\1'#{version_num}'")
+    end
+
+    sh "git add ."
+    sh "git commit -m 'Update to video.js #{tag}'"
+    puts "* Done.  Now run 'rake release' to push to rubygems."
+  end
+end

data/app/views/videojs_rails/_videojs_rails.html.erb

@@ -1,16 +1,33 @@
-<div class="video-js-box">
-  <video id="<%=@options[:id]%>" class="<%= @options[:classes] %> video-js vjs-default-skin" controls preload="auto" width="<%=@options[:width]%>" height="<%=@options[:height]%>" poster="<%= @options[:poster] %>" data-setup="{}">
-		<% if @options[:sources] %>
-			<%- @options[:sources].each do |type, source| %>
-				<source src="<%= source %>" type='video/<%= type %>' />
-			<%- end %>
-		<%- end %>
+<%= content_tag(:video,
+  id: options[:id],
+  class: "#{ options[:classes] } vide-js vjs-default-skin",
+  controls: options[:controls],
+  loop: options[:loop],
+  autoplay: options[:autoplay],
+  preload: options[:preload],
+  width: options[:width],
+  height: options[:height],
+  poster: options[:poster],
+  'data-setup' => options[:setup]) do 
+    if options[:sources]
+      options[:sources].each do |type, source|
+        concat tag(:source, src: source, type: "video/#{ type }")
+      end
+    end
 
-		<%# TODO: Add some function to change ISO country code to name %>
-		<% if @options[:captions] %>
-			<%- @options[:captions].each do |lang, caption| %>
-				<track kind="captions" src="<%= caption %>" srclang="<%= lang %>" label="<%= lang %>"></track>
-			<%- end %>
-		<%- end %>
-  </video>
-</div>
+    if options[:captions]
+      options[:captions].each do |lang, caption|
+        if caption.is_a?(Hash)
+          caption_src = caption[:src]
+          caption_label = caption[:label]
+        else
+          caption_src = caption
+        end
+
+        concat tag(:track, kind: :captions, src: caption_src, srclang: lang, label: caption_label, default: (options[:default_caption_language].present? && options[:default_caption_language].to_sym == lang.to_sym))
+      end
+    end
+
+    concat content_tag(:p, class: 'vjs-no-js') { yield }
+  end
+%>

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = "4.6.1"
+  VERSION = '4.6.2'
 end

data/lib/videojs_rails/view_helpers.rb

@@ -1,9 +1,12 @@
 module VideojsRails
   module ViewHelpers
-    def videojs_rails(*options)
-      @options = options.extract_options!
-      render "videojs_rails/videojs_rails"
+    def videojs_rails(*options, &blk)
+      default_options = {
+        controls: true,
+        preload: "auto"
+      }
+      options = default_options.merge(options.extract_options!)
+      render partial: 'videojs_rails/videojs_rails', locals: { options: options }, &blk
     end
   end
 end
-

data/readme.md

@@ -1,4 +1,6 @@
-# VideoJS for Asset Pipeline
+# VideoJS for Rails Asset Pipeline
+
+Supports Rails 3.x and 4.x
 
 ## Installation
 
@@ -30,51 +32,99 @@ And that resource to application.css file
 */
 ```
 
-_currently skins are not implemented (after migrate to 4.1 version)_
-
 And to production.rb add this line
 
 ```ruby
 config.assets.precompile += %w( video-js.swf vjs.eot vjs.svg vjs.ttf vjs.woff )
 ```
 
+In Rails > 4.1
+Add this line to config/initializers/assets.rb
+
+```ruby
+Rails.application.config.assets.precompile += %w( video-js.swf vjs.eot vjs.svg vjs.ttf vjs.woff )
+```
+
 ## Usage
 
 ```erb
-<%= videojs_rails sources: { mp4: "http://domain.com/path/to/video.mp4", webm: "http://another.com/path/to/video.webm" }, width:"400" %>
+<%= videojs_rails sources: { mp4: "http://domain.com/path/to/video.mp4", webm: "http://another.com/path/to/video.webm"}, setup: "{}", controls: false, width:"400" %>
+```
+
+If you want add a callback if user don't support JavaScript use block with displayed html code:
+
+```erb
+<%= videojs_rails sources: { mp4: "http://domain.com/path/to/video.mp4", webm: "http://another.com/path/to/video.webm" }, width:"400" do %>
+	Please enable <b>JavaScript</b> to see this content.
+<%- end %>
 ```
 
 ## Captions
 
-This is currently experimental function.
+This is currently an experimental function.
 
 ```erb
-<%= videojs_rails sources: { mp4: "http://domain.com/path/to/video.mp4" }, width:"400", captions: { en: "http://domain.com/path/to/captions.vvt" } %>
+<%= videojs_rails sources: { mp4: "http://domain.com/path/to/video.mp4" }, width:"400", captions: { en: { src: "http://domain.com/path/to/captions.vvt", label: "English" }, default_caption_language: :en } %>
 ```
 
+## Turbolinks
+
+Some of you might want to use VideoJS with Turbolinks. [andrkrn](https://github.com/andrkrn) provided CoffeeScript that he use:
+
+```coffeescript
+change = ->
+    for player in document.getElementsByClassName 'video-js'
+        video = videojs('example_video')
+
+before_change = ->
+    for player in document.getElementsByClassName 'video-js'
+        video = videojs('example_video')
+        video.dispose()
+
+$(document).on('page:before-change', before_change)
+$(document).on('page:change', change)
+```
 
 ## Resources
 http://videojs.com/
 http://videojs.com/#getting-started
 
 
-## Update from video.js release
+## Updating this gem to the latest video.js release
+
+### Clone this repository
+
+    git clone https://github.com/seanbehan/videojs_rails.git
+
+### Clone video.js repository
 
-### Generate video.js distribution files
+    git clone https://github.com/videojs/video.js.git
 
-* Checkout release tag e.g. `git checkout v4.6.1`.
-* Run the build i.e. `grunt`.
 
-### Copy video.js files into videojs_rails
+### Run the rake videojs:update task with the tag
 
-    $ cp $VIDEO_JS_HOME/dist/video-js/video-js.swf $VIDEO_JS_RAILS_HOME/vendor/assets/flash/
-    $ cp $VIDEO_JS_HOME/dist/video-js/font/* $VIDEO_JS_RAILS_HOME/vendor/assets/fonts/
-    $ cp $VIDEO_JS_HOME/dist/video-js/video.dev.js $VIDEO_JS_RAILS_HOME/vendor/assets/javascripts/video.js.erb
-    $ cp $VIDEO_JS_HOME/dist/video-js/video-js.css $VIDEO_JS_RAILS_HOME/vendor/assets/stylesheets/video-js.css.erb
+    TAG=v4.12.5
+    rake videojs:update
 
-### Update video.js files with ERB from previous version of videojs_rails
+Note: The build will fail if you don't have `grunt` installed.  To install it:
 
-The following files need to be modified to use the Rails `asset_path` helper e.g. for the location of the Flash player SWF file and for the location of the various font files:
+    cd ../video.js
+    npm install -g grunt
+
+### Make sure everything is added to git
+
+    git add .
+    git ci -m "Update to $TAG"
+
+### Push to rubygems
 
 * $VIDEO_JS_RAILS_HOME/vendor/assets/javascripts/video.js.erb
 * $VIDEO_JS_RAILS_HOME/vendor/assets/stylesheets/video-js.css.erb
+
+Alternatively, you can set the Flash player SWF file in your web view with the `videojs.options.flash.swf` command:
+```
+<script>
+  videojs.options.flash.swf = "http://example.com/path/to/video-js.swf"
+</script>
+```
+As the instructions here suggests: https://github.com/videojs/video.js/blob/stable/docs/guides/setup.md#self-hosted

data/vendor/assets/javascripts/video.js.erb

@@ -111,7 +111,7 @@ vjs.options = {
 // Set CDN Version of swf
 // The added (+) blocks the replace from changing this 4.6 string
 if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') {
-  videojs.options['flash']['swf'] = vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/'+vjs.CDN_VERSION+'/video-js.swf';
+  videojs.options['flash']['swf'] = "<%= asset_path('video-js.swf') %>";
 }
 
 /**
@@ -3205,20 +3205,6 @@ vjs.Player = vjs.Component.extend({
     // see enableTouchActivity in Component
     options.reportTouchActivity = false;
 
-    // Make sure the event listeners are the first things to happen when
-    // the player is ready. See #1208
-    // If not, the tech might fire events before the listeners are attached.
-    this.ready(function(){
-      this.on('loadstart', this.onLoadStart);
-      this.on('ended', this.onEnded);
-      this.on('play', this.onPlay);
-      this.on('firstplay', this.onFirstPlay);
-      this.on('pause', this.onPause);
-      this.on('progress', this.onProgress);
-      this.on('durationchange', this.onDurationChange);
-      this.on('fullscreenchange', this.onFullscreenChange);
-    });
-
     // Run base component initializing with new options.
     // Builds the element through createEl()
     // Inits and embeds any child components in opts
@@ -3377,6 +3363,22 @@ vjs.Player.prototype.createEl = function(){
   }
   vjs.insertFirst(tag, el); // Breaks iPhone, fixed in HTML5 setup.
 
+  // The event listeners need to be added before the children are added
+  // in the component init because the tech (loaded with mediaLoader) may
+  // fire events, like loadstart, that these events need to capture.
+  // Long term it might be better to expose a way to do this in component.init
+  // like component.initEventListeners() that runs between el creation and
+  // adding children
+  this.el_ = el;
+  this.on('loadstart', this.onLoadStart);
+  this.on('ended', this.onEnded);
+  this.on('play', this.onPlay);
+  this.on('firstplay', this.onFirstPlay);
+  this.on('pause', this.onPause);
+  this.on('progress', this.onProgress);
+  this.on('durationchange', this.onDurationChange);
+  this.on('fullscreenchange', this.onFullscreenChange);
+
   return el;
 };
 
@@ -3555,30 +3557,44 @@ vjs.Player.prototype.stopTrackingCurrentTime = function(){
  * @event loadstart
  */
 vjs.Player.prototype.onLoadStart = function() {
-  // remove any first play listeners that weren't triggered from a previous video.
-  this.off('play', initFirstPlay);
-  this.one('play', initFirstPlay);
+  // TODO: Update to use `emptied` event instead. See #1277.
 
-  if (this.error()) {
-    this.error(null);
-  }
+  // reset the error state
+  this.error(null);
 
-  vjs.removeClass(this.el_, 'vjs-has-started');
+  // If it's already playing we want to trigger a firstplay event now.
+  // The firstplay event relies on both the play and loadstart events
+  // which can happen in any order for a new source
+  if (!this.paused()) {
+    this.trigger('firstplay');
+  } else {
+    // reset the hasStarted state
+    this.hasStarted(false);
+    this.one('play', function(){
+      this.hasStarted(true);
+    });
+  }
 };
 
- // Need to create this outside the scope of onLoadStart so it
- // can be added and removed (to avoid piling first play listeners).
-function initFirstPlay(e) {
-  var fpEvent = { type: 'firstplay', target: this.el_ };
-  // Using vjs.trigger so we can check if default was prevented
-  var keepGoing = vjs.trigger(this.el_, fpEvent);
+vjs.Player.prototype.hasStarted_ = false;
 
-  if (!keepGoing) {
-    e.preventDefault();
-    e.stopPropagation();
-    e.stopImmediatePropagation();
+vjs.Player.prototype.hasStarted = function(hasStarted){
+  if (hasStarted !== undefined) {
+    // only update if this is a new value
+    if (this.hasStarted_ !== hasStarted) {
+      this.hasStarted_ = hasStarted;
+      if (hasStarted) {
+        this.addClass('vjs-has-started');
+        // trigger the firstplay event if this newly has played
+        this.trigger('firstplay');
+      } else {
+        this.removeClass('vjs-has-started');
+      }
+    }
+    return this;
   }
-}
+  return this.hasStarted_;
+};
 
 /**
  * Fired when the player has initial duration and dimension information
@@ -5907,10 +5923,7 @@ vjs.Html5 = vjs.MediaTechController.extend({
     // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
     // We don't want to set the source again and interrupt playback.
     if (source && this.el_.currentSrc === source.src && this.el_.networkState > 0) {
-      // wait for the player to be ready so the player listeners are attached
-      player.ready(function(){
-        player.trigger('loadstart');
-      });
+      player.trigger('loadstart');
     // Otherwise set the source if one was provided.
     } else if (source) {
       this.el_.src = source.src;
@@ -8042,5 +8055,3 @@ vjs.autoSetupTimeout(1);
 vjs.plugin = function(name, init){
   vjs.Player.prototype[name] = init;
 };
-
-videojs.options.flash.swf = "<%= asset_path( "video-js.swf") %>";

data/vendor/assets/stylesheets/video-js.css.erb

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.6.1
+Version 4.6.2
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN
@@ -20,10 +20,8 @@ The control icons are from a custom font. Each icon corresponds to a character
 */
 @font-face {
   font-family: 'VideoJS';
-  src: url('<%= asset_path('vjs.eot') %>');
-  src: url('<%= asset_path('vjs.eot?#iefix') %>') format('embedded-opentype'),
-  url('<%= asset_path('vjs.woff') %>') format('woff'),
-  url('<%= asset_path('vjs.ttf') %>') format('truetype');
+  src: url(<%= asset_path('vjs.eot') %>);
+  src: url(<%= asset_path('vjs.eot?#iefix') %>) format('embedded-opentype'), url(<%= asset_path('vjs.woff') %>) format('woff'), url(<%= asset_path('vjs.ttf') %>) format('truetype');
   font-weight: normal;
   font-style: normal;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: videojs_rails
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Sean Behan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies: []
 description: HTML5 VideoJS plugin
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Rakefile
 - app/views/videojs_rails/_videojs_rails.html.erb
@@ -32,6 +32,7 @@ files:
 - vendor/assets/fonts/vjs.svg
 - vendor/assets/fonts/vjs.ttf
 - vendor/assets/fonts/vjs.woff
+- vendor/assets/javascripts/video-js.swf
 - vendor/assets/javascripts/video.js.erb
 - vendor/assets/stylesheets/video-js.css.erb
 - videojs_rails.gemspec
@@ -44,19 +45,18 @@ 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: videojs_rails
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: VideoJS plugin for Rails 3.1 Asset Pipeline
 test_files: []
-has_rdoc: