mastalk 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7321942f219953dc7187860cf070e6c87159c7f4
-  data.tar.gz: b636486637b21c9e04f024d9f3d37b466bc5c015
+  metadata.gz: 142542ba7114af62f17ff07bce33fed666fb13f4
+  data.tar.gz: 65302ae5e6b40ab47424c74952c3150819e492ef
 SHA512:
-  metadata.gz: 7cbb3acc7300f4f1cc7dcd22ebe9c8a5c23a9497459b7480a21cf0d92da9ac7cf61d7ccee293e20dc2fb87cbd5fbfe74b0b16005f41ea1526575c3145207bfe3
-  data.tar.gz: b8764593907b93a106b62127bf6a10f0048ffdbf1a3fb8a6e4e94cc8a76b9a37ee5e598fe304a07231b818b89db6ce1fd8e0f206d58f0712213ad344c429217e
+  metadata.gz: 9a3daed5e8da337a5aeea8d3a685031ea6917c0dac163b1a4ac81567a0c1bf5fac2728a2c1bf004d3b44e550bf12fdedf3116ee41c89ed086696ac20d498834b
+  data.tar.gz: 36b9ccec884afa53fa692e6d8c3c87b6f30dd88ca900e28a77c51d35b2c72d00c28025d7f6b70b16c1a7d8defe03ad2b3e0d4e455d92b6e492cf3ce1caeda0fb

data/README.md

@@ -138,9 +138,52 @@ Outputs:
 
 `.video-wrapper`
 
+Embedding a YouTube video:
+
 ```
-({5n1nixLSrQI})
+$~youtube_video
+  5n1nixLSrQI
+~$
 
+```
+Outputs:
+
+```
+<iframe
+  frameborder="0"
+  height="413"
+  width="680"
+  src= "https://www.youtube.com/embed/5n1nixLSrQI"
+  title="Video">
+</iframe>
+```
+
+Or with a custom title:
+
+```
+$~youtube_video
+  5n1nixLSrQI
+  The title of this video
+~$
+
+```
+Outputs:
+
+```
+<iframe
+  frameborder="0"
+  height="413"
+  width="680"
+  src= "https://www.youtube.com/embed/5n1nixLSrQI"
+  title="The title of this video">
+</iframe>
+```
+
+Alternatively there is also this legacy format (just here for backward
+compatibility):
+
+```
+({5n1nixLSrQI})
 ```
 
 Outputs:
@@ -155,17 +198,41 @@ Outputs:
 </iframe>
 ```
 
+Embedding a Brightcove video:
+
 ```
 $~brightcove_video
   3739688349001
 ~$
+```
+
+Outputs:
 
+```
+<iframe src='//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=3739688349001'
+  frameBorder="0"
+  allowfullscreen=""
+  webkitallowfullscreen=""
+  mozallowfullscreen=""
+  height="413"
+  width="680" >
+</iframe>
+```
+
+Or with a custom title:
+
+```
+$~brightcove_video
+  3739688349001
+  The title of this video
+~$
 ```
 
 Outputs:
 
 ```
 <iframe src='//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=3739688349001'
+  title="The title of this video"
   frameBorder="0"
   allowfullscreen=""
   webkitallowfullscreen=""
@@ -175,9 +242,31 @@ Outputs:
 </iframe>
 ```
 
+Embedding a Vimeo video:
+
+```
+$~vimeo_video
+  146226360
+~$
+```
+
+Outputs:
+
+```
+<iframe src="https://player.vimeo.com/video/146226360?portrait=0&title=0&byline=0"
+  frameborder="0"
+  webkitallowfullscreen
+  mozallowfullscreen
+  allowfullscreen>
+</iframe>
+```
+
+Or with a custom title:
+
 ```
 $~vimeo_video
   146226360
+  The title of this video
 ~$
 
 ```
@@ -185,6 +274,7 @@ Outputs:
 
 ```
 <iframe src="https://player.vimeo.com/video/146226360?portrait=0&title=0&byline=0"
+  title="The title of this video"
   frameborder="0"
   webkitallowfullscreen
   mozallowfullscreen

data/lib/mastalk/extensions.rb

@@ -27,6 +27,7 @@ module Mastalk
         content = File.read(File.join(SNIPPETS_FOLDER, file))
         start, stop = args(content)
         extension(start, stop) do |body|
+          body_lines = body.strip.gsub(/(\n|\r)+/, "\n").split(/\n/)
           ERB.new(remove_syntax_from(content)).result(binding)
         end
       end

data/lib/mastalk/snippets/bright_video.html.erb

@@ -1,7 +1,8 @@
 # $~brightcove_video, ~$
 
 <div class="video-wrapper">
-  <iframe src='//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=<%= body.strip %>'
+  <iframe src='//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=<%= body_lines[0].strip %>'
+          title="<%= (body_lines[1] || 'Video').strip %>"
           frameBorder="0"
           allowfullscreen=""
           webkitallowfullscreen=""

data/lib/mastalk/snippets/vimeo_video.html.erb

@@ -1,7 +1,8 @@
 # $~vimeo_video, ~$
 
 <div class="video-wrapper">
-  <iframe src="https://player.vimeo.com/video/<%= body.strip %>?portrait=0&title=0&byline=0"
+  <iframe src="https://player.vimeo.com/video/<%= body_lines[0].strip %>?portrait=0&title=0&byline=0"
+          title="<%= (body_lines[1] || 'Video').strip %>"
           frameborder="0"
           webkitallowfullscreen
           mozallowfullscreen

data/lib/mastalk/snippets/youtube_video.html.erb

@@ -0,0 +1,9 @@
+# $~youtube_video, ~$
+
+<iframe
+  frameborder="0"
+  height="413"
+  width="680"
+  src= "<%= "https://www.youtube.com/embed/#{body_lines[0].strip}?rel=0" %>"
+  title="<%= (body_lines[1] || 'Video').strip %>">
+</iframe>

data/mastalk.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'mastalk'
-  s.version     = '0.5.9'
+  s.version     = '0.6.0'
   s.summary     = 'mastalk'
   s.description = 'Mastalk markdown extension language'
   s.authors     = ['Douglas Roper', 'Justin Perry']

data/spec/mastalk_spec.rb

@@ -142,11 +142,32 @@ describe Mastalk::Document do
     end
   end
 
-  context 'bright video' do
-    let(:source) { "$~brightcove_video3739688349001~$" }
+  context 'when brightcove video' do
+    let(:video_id) { '3739688349001' }
 
-    it 'pre-processes correctly' do
-      expect(subject.to_html).to include('//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=3739688349001')
+    context 'without a title' do
+      let(:source) { "$~brightcove_video#{video_id}~$" }
+
+      it 'outputs the brightcove embed video' do
+        expect(subject.to_html).to include("src=\"//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=#{video_id}\"")
+      end
+
+      it 'outputs sets a default title on the iframe' do
+        expect(subject.to_html).to include('title="Video"')
+      end
+    end
+
+    context 'without a custom title' do
+      let(:title) { 'a custom video title'}
+      let(:source) { "$~brightcove_video#{video_id}\n#{title}~$" }
+
+      it 'outputs the brightcove embed video' do
+        expect(subject.to_html).to include("src=\"//players.brightcove.net/3608769895001/b15c0e6a-51da-4bb1-b717-bccae778670d_default/index.html?videoId=#{video_id}\"")
+      end
+
+      it 'outputs sets a default title on the iframe' do
+        expect(subject.to_html).to include("title=\"#{title}\"")
+      end
     end
   end
 
@@ -158,7 +179,7 @@ describe Mastalk::Document do
     end
   end
 
-  context 'when youtube video' do
+  context 'when youtube video (legacy format)' do
     let(:source) { '({oZ0_U108aZw})' }
 
     it 'outputs the youtube embed video' do
@@ -166,11 +187,61 @@ describe Mastalk::Document do
     end
   end
 
-  context 'vimeo video' do
-    let(:source) { "$~vimeo_video145743834~$" }
+  context 'when youtube video (new format)' do
+    let(:video_id) { 'oZ0_U108aZw' }
 
-    it 'pre-processes correctly' do
-      expect(subject.to_html).to include('https://player.vimeo.com/video/145743834?portrait=0&title=0&byline=0')
+    context 'without a title' do
+      let(:source) { "$~youtube_video#{video_id}~$" }
+
+      it 'outputs the youtube embed video' do
+        expect(subject.to_html).to include("src=\"https://www.youtube.com/embed/#{video_id}?rel=0\"")
+      end
+
+      it 'outputs sets a default title on the iframe' do
+        expect(subject.to_html).to include('title="Video"')
+      end
+    end
+
+    context 'without a custom title' do
+      let(:title) { 'a custom video title' }
+      let(:source) { "$~youtube_video#{video_id}\n#{title}~$" }
+
+      it 'outputs the youtube embed video' do
+        expect(subject.to_html).to include("src=\"https://www.youtube.com/embed/#{video_id}?rel=0\"")
+      end
+
+      it 'outputs sets a default title on the iframe' do
+        expect(subject.to_html).to include("title=\"#{title}\"")
+      end
+    end
+  end
+
+  context 'when vimeo video' do
+    let(:video_id) { '145743834' }
+
+    context 'without a title' do
+      let(:source) { "$~vimeo_video#{video_id}~$" }
+
+      it 'outputs the vimeo embed video' do
+        expect(subject.to_html).to include("src=\"https://player.vimeo.com/video/#{video_id}?portrait=0&title=0&byline=0\"")
+      end
+
+      it 'outputs sets a default title on the iframe' do
+        expect(subject.to_html).to include('title="Video"')
+      end
+    end
+
+    context 'without a custom title' do
+      let(:title) { 'a custom video title' }
+      let(:source) { "$~vimeo_video#{video_id}\n#{title}~$" }
+
+      it 'outputs the vimeo embed video' do
+        expect(subject.to_html).to include("src=\"https://player.vimeo.com/video/#{video_id}?portrait=0&title=0&byline=0\"")
+      end
+
+      it 'outputs sets a default title on the iframe' do
+        expect(subject.to_html).to include("title=\"#{title}\"")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastalk
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Douglas Roper
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -123,10 +123,11 @@ files:
 - lib/mastalk/snippets/points.html.erb
 - lib/mastalk/snippets/ticks.html.erb
 - lib/mastalk/snippets/tool.html.erb
-- lib/mastalk/snippets/video.html.erb
 - lib/mastalk/snippets/vimeo_video.html.erb
 - lib/mastalk/snippets/why.html.erb
 - lib/mastalk/snippets/yes.html.erb
+- lib/mastalk/snippets/youtube_video.html.erb
+- lib/mastalk/snippets/youtube_video_legacy.html.erb
 - mastalk.gemspec
 - spec/mastalk_spec.rb
 - spec/spec_helper.rb