martile 0.6.31 → 0.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41448a9a72bef7a0b5e53a5713cfeb9a65359398
-  data.tar.gz: 8494bc55ced4cb4734d3d46c53d6cd498b9eae7a
+  metadata.gz: 9f2923ea96d408824def1ebffedd006f6f5e1a60
+  data.tar.gz: 7c870c715b34ef66dce979418fad4198a443c2b7
 SHA512:
-  metadata.gz: 7272cfa72e8c80e55aca395234f2b63be9fde6ce080298940e9350d023ed913381fa478b59afdf5d1895fc30dee3e376c10e4947b1864c019703cfbeb2aa0270
-  data.tar.gz: adcafa313630728c10b95776148a5cc4274acd37003724aa3986392bc7e9f49734d20cb26716990b00d1882e82d9745b64deb04d5eedddbec55f3593d4554a21
+  metadata.gz: 7f5e18ef28c75eab6bac5d79f0f1d21c927d18c2b91ca9167c891b6c0b561c069b2693cc5d2d3aafe767339cd1be49a2ef4750ae095b251b49ef7ad7e5e3776b
+  data.tar.gz: fa842dfcc0e79e25c688c242cf9ffd407dfeffac7da600e458bd0b174ce0ab0900366712c426c0dae35e7469974dc1cecc7af88ee2424258bdd47f6835f9b323

data/lib/martile.rb

@@ -9,6 +9,8 @@ require 'rdiscount'
 require 'kvx'
 
 
+# minor feature:
+#            3-Feb-2017  a video smartlink can now include options e.g. loop: true
 # bug fix:  29-Jan-2017  2 or more code listings should now be parsed correctly
 # feature:  24-Jun-2016  links containing a right parenthesis at the 
 #                        end are no longer cropped
@@ -545,21 +547,27 @@ class Martile
   
   def videotag(s)
     
-    s.gsub(/\B!v\[\]\((https?:\/\/[^\)]+)\)\B/) do |x|
-      
+    s.gsub(/\B!v\[\]\((https?:\/\/[^\)]+)\)(\{[^\}]+\})?/) do |match|
+
       files = ($1).split
+      attr = ($2)
+
+      h = attr ? attr.scan(/(\w+):\s+(\w+)/).to_h : {}
+      attributes = h.any? ? (' ' + 
+                             h.map {|k,v| "%s='%s'" % [k,v]}.join(' ')) : ''
 
-      h = {
+      h2 = {
         /\.og[gv]$/ => 'ogg', /\.mp4$/ => 'mp4', /\.mov$/ => 'mov', 
         /\.webm$/ => 'webm' 
       }
 
       sources = files.map do |file|
-        type = h.detect{|k,v| file[k] }.last
+
+        type = h2.detect{|k,v| file[k] }.last
         "  <source src='%s' type='video/%s'/>" % [file, type]
       end
 
-      "<video controls='controls'>\n%s\n</video>" % [sources.join("\n")]
+      "<video controls='controls'%s>\n%s\n</video>" % [attributes, sources.join("\n")]
     end    
   
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.6.32
 platform: ruby
 authors:
 - James Robertson

metadata.gz.sig

@@ -1,3 +1,2 @@
-g]د�j��	ۯ��b
-C��yحð���!|Wo)j�6R�2��uY������^ғ�9��i.���n�u����h�* M��� }Pj�`�;�ƲL(Z�HbgFޣ�Ϳ9�$�X���`g����Da��5��Z�J��L"��n�
-2(��v*���Q_�d��Tiޔf		�֞)B�E��EY��qO�xD���K\�$�����7�-�d��!�`�.�	�0��vZ� ��{�7�����U-F�B��jr
+�==�HV��8x��-:�#m�ɐ�ԑ�(�p8
+&�nQ	�O�AȄ���B��P���"N��JQQJ�)���Jz��En��,w|��[*���˕����CEkt܌�39�(���,)�i�d�Y+�d��?���F�(�{|��G��o���x��W��^dq����|p�6X�tёZ-�ܿ�U�cͣ�,�Ɣ�r�����#Җ{���`L9IX(�$�G�QhFv��t_`&��3W-F��n�O&�V