octopress-video-tag 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645e8f6db5255d2289f6866db44bf4c2d40d597f
-  data.tar.gz: 8ccc182de25e86c1ac7d5e9f0489b9fc010403c3
+  metadata.gz: 6ebabbd607b450a0c46542c4646f25c3fa4dba6d
+  data.tar.gz: 58df246681b740999e7bbfda111477975dedbb1b
 SHA512:
-  metadata.gz: 6a058f9063a78d5da710858e3dd75bbb6b7aad577ae73f913a0c995827a18be8ced928f12651e64043f56fcbc9fc61750aaf49498f5ad2dcce93be7f05be8eae
-  data.tar.gz: cd7eb9f28978b8014e6e654c626d33c75f2b6fe7ec49c6501f60e764350c217dca11d7b613aa5779645807694363dad236e36b72240fc12d35669e8cdf6b51b0
+  metadata.gz: ad4cda3fd9a36fb720ee3829747b84267dedfbf85a5c2f38b232cd849d1ea04ecec3a54116b693402291e53127831a055a9a13b5ce03876943ed60610ce0249b
+  data.tar.gz: c8f755880570c3b422dc272631dda8b1b5b5cbc4e0f83950de699c86991cf4f25345c82ef0b868b8f9efc60a708c0fd8d2f81470d56e606bfdf1127eee163677

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+### 1.1.0 (2015-01-08)
+- New: Liquid can be processed in tag.
+
+### 1.0.0 (2015-01-08)
+- Initial release

data/README.md

@@ -56,16 +56,15 @@ Each video is embedded with a minuscule bit of javascript which plays videos whe
 ## Examples:
 
 ```
-{% video /videos/clouds.mp4 %}
+{% video {{ site.cdn }}/videos/clouds.mp4 %}
 {% video featured wide /images/clouds.jpg /videos/clouds.mp4 /videos/clouds.webm /videos/clouds.ogv 1080px 608px preload:auto %}
 ```
 
 This would output the following HTML
 
 ```html
-<video controls poster='' width='' height='' preload='metadata'
-  onclick='(function(el){ if(el.paused) el.play(); else el.pause() })(this)'>
-  <source src='/videos/clouds.mp4' type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
+<video controls preload='metadata' onclick='(function(el){ if(el.paused) el.play(); else el.pause() })(this)'>
+  <source src='https://cdn.com/video/clouds.mp4' type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
 </video>
 
 <video class='featured wide' controls poster='/images/clouds.jpg' width='1080px' height='608px' preload='auto'

data/lib/octopress-video-tag.rb

@@ -11,55 +11,78 @@ module Octopress
         Preload  = /(:?preload: *(:?\S+))/i
         Size     = /\s(auto|\d\S+)\s?(auto|\d\S+)?/i
         URLs     = /((https?:\/)?\/\S+)/i
+        Types    = {
+          '.mp4' => "type='video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"'",
+          '.ogv' => "type='video/ogg; codecs=\"theora, vorbis\"'",
+          '.webm' => "type='video/webm; codecs=\"vp8, vorbis\"'"
+        }
 
         def initialize(tag_name, tag_markup, tokens)
           @markup = tag_markup
-          markup = tag_markup.dup
+          super
+        end
 
-          @preload = markup.scan(Preload).flatten.compact.last || "metadata"
-          markup.sub!(Preload, '')
+        def render(context)
+          @markup = process_liquid(context)
 
-          @sizes = markup.scan(Size).flatten.compact
-          markup.sub!(Size, '')
+          if sources.size > 0
+            video =  "<video #{classes} controls #{poster} #{sizes} #{preload} #{click_to_play(context)}>"
+            video += sources
+            video += "</video>"
+          else
+            raise "No video mp4, ogv, or webm urls found in {% video #{@markup} %}"
+          end
+        end
+
+        def click_to_play(context)
+          if context.environments.first['site']['click_to_play_video'] != false
+            "onclick='(function(el){ if(el.paused) el.play(); else el.pause() })(this)'"
+          end
+        end
 
-          urls = markup.scan(URLs).map{ |m| m.first }
-          @videos = urls.select {|u| u.match /mp4|ogv|webm/i}
-          @poster = urls.select {|u| u.match /jpe?g|png|gif/i}.first
-          markup.gsub!(URLs, '')
+        def sources
+          @sources ||= begin 
+            vids = urls.select {|u| u.match /mp4|ogv|webm/i}
 
-          if !(@classes = markup.strip).empty?
-            @classes = "class='#{@classes}' "
+            vids.collect do |v|
+              "<source src='#{v}' #{Types[File.extname(v)]}>"
+            end.join('')
           end
+        end
 
-          super
+        def poster
+          p = urls.select {|u| u.match /jpe?g|png|gif/i}.first
+          "poster='#{p}'" if p
         end
 
-        def render(context)
+        def urls
+          @markup.scan(URLs).map{ |m| m.first }
+        end
 
-          output = super
-          type = {
-            'mp4' => "type='video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"'",
-            'ogv' => "type='video/ogg; codecs=\"theora, vorbis\"'",
-            'webm' => "type='video/webm; codecs=\"vp8, vorbis\"'"
-          }
+        def sizes
+          s = @markup.scan(Size).flatten.compact
+          attrs = "width='#{s[0]}'" if s[0]
+          attrs += "height='#{s[1]}'" if s[1]
+          attrs
+        end
 
-          if context.environments.first['site']['click_to_play_video'] != false
-            clickToPlay = "onclick='(function(el){ if(el.paused) el.play(); else el.pause() })(this)'"
-          else
-            clickToPlay = ''
+        def preload
+          if p = @markup.scan(Preload).flatten.compact.last || "metadata"
+            "preload='#{p}'"
           end
+        end
 
-          if @videos && @videos.size > 0
-            video =  "<video #{@classes}controls poster='#{@poster}' width='#{@sizes[0]}' height='#{@sizes[1]}' preload='#{@preload}' #{clickToPlay}>"
-            @videos.each do |v|
-              t = v.match(/([^\.]+)$/)[1]
-              video += "<source src='#{v}' #{type[t]}>"
-            end
-            video += "</video>"
-          else
-            raise "No video mp4, ogv, or webm urls found in {% video #{@markup} %}"
+        def classes
+          leftovers = @markup.sub(Preload, '').sub(Size, '').gsub(URLs, '')
+
+          if !(classes = leftovers.strip).empty?
+            "class='#{classes}'"
           end
         end
+
+        def process_liquid(context)
+          Liquid::Template.parse(@markup).render!(context.environments.first)
+        end
       end
     end
   end

data/lib/octopress-video-tag/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module VideoTag
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-video-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/octopress-video-tag.rb