videojs_rails 4.12.14 → 4.12.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd34c01c47f8f64b5a861de2989f953edb3e25e7
-  data.tar.gz: 90aa8d52c51fd060280dc1f6c564d7103a0b07bd
+  metadata.gz: a4bace1ee88ca2b58be1fa239cf90e397db30376
+  data.tar.gz: d1368fa459853c9349577f31ef5230815bf7329c
 SHA512:
-  metadata.gz: 901dcfb2c667406f6c4c7a1ea312a7980ee4bec6d86db5226c76a265d1b83d858802c03d5cc9f1b06db8d864fb45261317f531fce9f14060f420ba63af5aa296
-  data.tar.gz: 6d76ee49a2f05621e443c18e76d11f8e94506acd8ea255393ec65b0c4cd3ae9a19ab135a3e8d23442060b2c6df77f2ce4c8ca2fc8393e29139111f9523e29aa4
+  metadata.gz: 18223a3310e310112df9fe1624eed4514bc70c0342f472a21ccb86803ccb399c700fc7bec7d94f19f8d962f277d9a2199fc716f3ea41e62d37ea2d828885d30b
+  data.tar.gz: db4e99e053818a473c592919ced475c30be9c86992dbc6d2ea7d627c305a01e45378a91d0128fc1a396c5eac98dd8b0505a39c7be6302aa8190c981f4f5aad6b

data/lib/videojs_rails.rb

@@ -1,2 +1,3 @@
+require 'videojs_rails/tags'
 require 'videojs_rails/railtie'
 require 'videojs_rails/engine' if defined?(Rails && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >=1)

data/lib/videojs_rails/tags.rb

@@ -0,0 +1,9 @@
+require 'videojs_rails/tags/tag'
+require 'videojs_rails/tags/video'
+require 'videojs_rails/tags/caption'
+require 'videojs_rails/tags/source'
+
+module VideojsRails
+  module Tags
+  end
+end

data/lib/videojs_rails/tags/caption.rb

@@ -0,0 +1,45 @@
+module VideojsRails
+  module Tags
+    class Caption < Tag
+      def initialize(lang, default_language, options)
+        @lang = lang.to_sym
+        @default_language = default_language
+        parse_options(options)
+      end
+
+      def to_html
+        tag :track, attributes
+      end
+
+      private
+
+      attr_reader :src, :label, :lang, :default_language
+
+      def default?
+        default_language == lang
+      end
+
+      def parse_options(options)
+        case options
+        when String, Symbol
+          @src = options
+        when Hash
+          @src, @label = options.values_at(:src, :label)
+        else
+          raise ArgumentError
+        end
+      end
+
+      def attributes
+        {
+          kind: :captions,
+          src: src,
+          srclang: lang,
+          label: label,
+          default: default?
+        }
+      end
+    end
+
+  end
+end

data/lib/videojs_rails/tags/source.rb

@@ -0,0 +1,36 @@
+module VideojsRails
+  module Tags
+    class Source < Tag
+      def initialize(video_type, options)
+        @video_type = video_type
+        @attributes = parse_options(options)
+      end
+
+      def to_html
+        tag :source, @attributes
+      end
+
+      private
+
+      attr_reader :video_type
+
+      def parse_options(options)
+        case options
+        when String, Symbol
+          {
+            src: options,
+            type: type
+          }
+        when Hash
+          options
+        else
+          raise ArgumentError
+        end
+      end
+
+      def type
+        "video/#{video_type}"
+      end
+    end
+  end
+end

data/lib/videojs_rails/tags/tag.rb

@@ -0,0 +1,9 @@
+module VideojsRails
+  module Tags
+    class Tag
+      include ActionView::Helpers::TagHelper
+      include ActionView::Context
+      include ActionView::Helpers::TextHelper
+    end
+  end
+end

data/lib/videojs_rails/tags/video.rb

@@ -0,0 +1,42 @@
+module VideojsRails
+  module Tags
+    class Video < Tag
+      DEFAULT_LANGUAGE_KEY = :default_caption_language
+      DEFAULT_OPTIONS = {
+        controls: true,
+        preload: :auto
+      }.freeze
+
+      def initialize(options, &no_js)
+        @no_js = no_js
+        prepare_options(options)
+      end
+
+      def to_html
+        content_tag(:video, options) do
+          sources.each {|type, options| concat Source.new(type, options).to_html }
+          captions.each {|lang, options| concat Caption.new(lang, default_caption_language, options).to_html }
+          generate_no_js
+        end
+      end
+
+      private
+
+      attr_reader :no_js, :sources, :captions, :options, :default_caption_language
+
+      def prepare_options(user_options)
+        @sources = user_options.delete(:sources) || []
+        @captions = user_options.delete(:captions) || []
+        @default_caption_language = user_options.delete(DEFAULT_LANGUAGE_KEY)
+        @options = DEFAULT_OPTIONS.merge(user_options)
+        options[:'data-setup'] = options.delete(:setup) if options.key?(:setup)
+        options[:class] = [:'video-js', :'vjs-default-skin', *options[:class]]
+      end
+
+      def generate_no_js
+        return if no_js.nil?
+        concat content_tag(:p, no_js.call(), class: :'vjs-no-js')
+      end
+    end
+  end
+end

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = '4.12.14'
+  VERSION = '4.12.15'
 end

data/lib/videojs_rails/view_helpers.rb

@@ -1,72 +1,7 @@
 module VideojsRails
   module ViewHelpers
-      DEFAULT_OPTIONS = {
-        controls: true,
-        preload: :auto
-      }.freeze
-
     def videojs_rails(user_options, &blk)
-      sources, captions, options = prepare_options(user_options)
-      generate_tag(options, sources, captions, &blk)
-    end
-
-    private
-
-    def prepare_options(user_options)
-      options = DEFAULT_OPTIONS.merge(user_options)
-      options[:'data-setup'] = options.delete(:setup) if options.key?(:setup)
-      options[:class] = [options[:class], "video-js vjs-default-skin"].join(' ')
-
-      [options.delete(:sources), options.delete(:captions), options]
-    end
-
-    def generate_sources(sources)
-      return if sources.blank?
-      sources.each do |type, source|
-        concat tag(:source, src: source, type: "video/#{ type }")
-      end
-    end
-
-    def generate_captions(captions, options)
-      return if captions.blank?
-      captions.each do |lang, caption|
-        src, label = extract_caption_information(caption)
-        caption_options = prepare_caption_options(src, lang, label, options)
-
-        concat tag(:track, caption_options)
-      end
-    end
-
-    def extract_caption_information(caption)
-      if caption.is_a?(Hash)
-        caption.values_at(:src, :label)
-      else
-        caption
-      end
-    end
-
-    def prepare_caption_options(src, lang, label, options)
-      default_caption_language = options[:default_caption_language].try(:to_sym)
-      {
-        kind: :captions,
-        src: src,
-        srclang: lang,
-        label: label,
-        default: default_caption_language == lang.to_sym
-      }
-    end
-
-    def generate_tag(options, sources, captions, &blk)
-      content_tag(:video, options) do
-        generate_sources(sources)
-        generate_captions(captions, options)
-        generate_no_js(&blk)
-      end
-    end
-
-    def generate_no_js
-      return unless block_given?
-      concat content_tag(:p, yield, class: :'vjs-no-js')
+      VideojsRails::Tags::Video.new(user_options, &blk).to_html
     end
   end
 end

data/readme.md

@@ -81,7 +81,7 @@ before_change = ->
         video = videojs('example_video')
         video.dispose()
 
-$(document).on('page:before-change', before_change)
+$(document).on('page:before-unload', before_change)
 $(document).on('page:change', change)
 ```
 

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

@@ -80,7 +80,7 @@ vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'ht
 * Full player version
 * @type {string}
 */
-vjs['VERSION'] = '4.12.14';
+vjs['VERSION'] = '4.12.15';
 
 /**
  * Global Player instance options, surfaced from vjs.Player.prototype.options_
@@ -7882,6 +7882,10 @@ vjs.Flash.prototype.dispose = function(){
 };
 
 vjs.Flash.prototype.play = function(){
+  if (this.ended()) {
+    this['setCurrentTime'](0);
+  }
+
   this.el_.vjs_play();
 };
 
@@ -9896,7 +9900,7 @@ vjs.plugin = function(name, init){
   vjs.Player.prototype[name] = init;
 };
 
-/* vtt.js - v0.11.11 (https://github.com/mozilla/vtt.js) built on 22-01-2015 */
+/* vtt.js - v0.12.1 (https://github.com/mozilla/vtt.js) built on 08-07-2015 */
 
 (function(root) {
   var vttjs = root.vttjs = {};
@@ -10246,7 +10250,7 @@ vjs.plugin = function(name, init){
 
   var scrollSetting = {
     "": true,
-    "up": true,
+    "up": true
   };
 
   function findScrollSetting(value) {
@@ -11162,7 +11166,7 @@ vjs.plugin = function(name, init){
     if (cue.vertical === "") {
       this.applyStyles({
         left:  this.formatStyle(textPos, "%"),
-        width: this.formatStyle(cue.size, "%"),
+        width: this.formatStyle(cue.size, "%")
       });
     // Vertical box orientation; textPos is the distance from the top edge of the
     // area to the top edge of the box and cue.size is the height extending
@@ -11181,7 +11185,7 @@ vjs.plugin = function(name, init){
         left: this.formatStyle(box.left, "px"),
         right: this.formatStyle(box.right, "px"),
         height: this.formatStyle(box.height, "px"),
-        width: this.formatStyle(box.width, "px"),
+        width: this.formatStyle(box.width, "px")
       });
     };
   }

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

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.12.14
+Version 4.12.15
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: videojs_rails
 version: !ruby/object:Gem::Version
-  version: 4.12.14
+  version: 4.12.15
 platform: ruby
 authors:
 - Sean Behan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies: []
 description: HTML5 VideoJS plugin
 email:
@@ -23,6 +23,11 @@ files:
 - lib/videojs_rails.rb
 - lib/videojs_rails/engine.rb
 - lib/videojs_rails/railtie.rb
+- lib/videojs_rails/tags.rb
+- lib/videojs_rails/tags/caption.rb
+- lib/videojs_rails/tags/source.rb
+- lib/videojs_rails/tags/tag.rb
+- lib/videojs_rails/tags/video.rb
 - lib/videojs_rails/version.rb
 - lib/videojs_rails/view_helpers.rb
 - readme.md
@@ -54,8 +59,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: videojs_rails
-rubygems_version: 2.4.5
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: VideoJS plugin for Rails 3.1 Asset Pipeline
 test_files: []
+has_rdoc: