markdown_media 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b202847889838e4504a79dff4f67f3288a090977
-  data.tar.gz: 6d0c91d5491b9441b341b06286ab579322fbaae0
+  metadata.gz: a490d07fc7560f46e187a7588e28314974a34a8b
+  data.tar.gz: 698f8634725452bae019b5d1c1e48d3aa26068ef
 SHA512:
-  metadata.gz: '00030559c43bf3c266bdfee95458fd25ed25fb8485a7c7a3df5a941bc410849186c6a4ec6763154a255b6f01bc11e63c85376d19d81ae149043ada0204815d2d'
-  data.tar.gz: 1660b6e3c930161669c0c8fb7e839dcf1139c58704a80e191ae64732cc00c1872ef271b572e260cea4fa9cff862fd1a0c8d216b7b1d098ea5caec78a940431b8
+  metadata.gz: 34caf289ccf17469ecdc0153ea6764796be4de4499acd2cac78f680b0e739a86947df8a709106ff0cf6a722d80442565782b9a996b7b34e30ccefc324de4134e
+  data.tar.gz: 78be0c9cc7858d908285c939e7fdf368baf5ad504d0a912318b75a18936b097d1596e088261b577f6472f3442737926494a298e6a0e5bfc7eb4545dd052b3ead

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/veganstraightedge/markdown_media.svg?branch=master)](https://travis-ci.org/veganstraightedge/markdown_media)
 [![Code Climate](https://codeclimate.com/github/veganstraightedge/markdown_media/badges/gpa.svg)](https://codeclimate.com/github/veganstraightedge/markdown_media)
-![Version 1.0.0](https://img.shields.io/badge/VERSION-1.1.0-green.svg)
+![Version 1.0.0](https://img.shields.io/badge/VERSION-1.2.0-green.svg)
 
 This syntax uses doubles square brackets on each side of a URL and optional options.
 It expands into the current preferred embed code for that site's media or raw media.
@@ -150,12 +150,18 @@ YouTube's short URL format also works.
 [[https://youtu.be/YX40hbAHx3s]]
 ```
 
-A Daily Motion video.
+A video from Daily Motion.
 
 ```
 [[http://www.dailymotion.com/video/x5gwr1v_anarchists-in-rojava-announce-irpgf_news]]
 ```
 
+A video from Twitter.
+
+```
+[[https://twitter.com/Breaking911/status/900211169734131713 type:video]]
+```
+
 #### Audio
 
 A simple audio.

data/lib/markdown_media/version.rb

@@ -1,3 +1,3 @@
 module MarkdownMedia
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/markdown_media.rb

@@ -17,6 +17,7 @@ module MarkdownMedia
           url     = embed_tag_pieces.shift
           id      = remove_id(embed_tag_pieces)
           klass   = remove_class(embed_tag_pieces)
+          type    = remove_type(embed_tag_pieces)
 
           link    = unless embed_tag_pieces.to_s.empty?
             embed_tag_pieces.pop if url_or_path?(embed_tag_pieces.last)
@@ -24,7 +25,7 @@ module MarkdownMedia
 
           caption = embed_tag_pieces.join(" ")
 
-          expanded_embed(url, caption: caption, link: link, id: id, klass: klass)
+          expanded_embed(url, caption: caption, link: link, id: id, type: type, klass: klass)
         end
       end
 
@@ -61,7 +62,20 @@ module MarkdownMedia
       end
     end
 
-    def expanded_embed(url, caption: nil, link: nil, id: nil, klass: nil)
+    def remove_type(pieces)
+      return if pieces.to_s.empty?
+
+      type_string = pieces.detect { |piece| piece =~ /type:\S+/ }
+
+      if type_string
+        type = type_string.split(":").last
+        pieces.delete(type_string)
+
+        type
+      end
+    end
+
+    def expanded_embed(url, caption: nil, link: nil, id: nil, type: nil, klass: nil)
       url  = URI.parse(url)
 
       case url.host
@@ -90,6 +104,10 @@ module MarkdownMedia
 
       when "twitter.com"
         slug     = "twitter"
+        type   ||= "tweet"
+
+      when /instagram/
+        slug     = "instagram"
 
       else
         slug = case url.path
@@ -105,7 +123,7 @@ module MarkdownMedia
         end
       end
 
-      render_erb slug, { embed_id: embed_id || url.to_s, caption: caption, link: link, id: id, klass: klass }
+      render_erb slug, { embed_id: embed_id || url.to_s, caption: caption, link: link, id: id, type: type, klass: klass }
     end
 
     def render_erb(template_slug, locals)
@@ -116,6 +134,7 @@ module MarkdownMedia
       caption  = locals[:caption]
       link     = locals[:link]
       id       = locals[:id]
+      type     = locals[:type]
       klass    = locals[:klass]
 
       erb = ERB.new(template)

data/lib/templates/image.erb

@@ -4,7 +4,7 @@
     <% if link.to_s.empty? %>
       <img src="<%= embed_id %>" />
     <% else %>
-      <a href="<%= link %>"><img src=<%= embed_id %> /></a>
+      <a href="<%= link %>"><img src="<%= embed_id %>" /></a>
     <% end %>
   </figure>
 

data/lib/templates/instagram.erb

@@ -0,0 +1,14 @@
+<blockquote class="instagram-media <%= klass %>" id="<%= id %>" data-instgrm-version="7" style=" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);">
+  <div style="padding:8px;">
+    <div style=" background:#F8F8F8; line-height:0; margin-top:40px; padding:50.0% 0; text-align:center; width:100%;">
+      <div style=" background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAMUExURczMzPf399fX1+bm5mzY9AMAAADiSURBVDjLvZXbEsMgCES5/P8/t9FuRVCRmU73JWlzosgSIIZURCjo/ad+EQJJB4Hv8BFt+IDpQoCx1wjOSBFhh2XssxEIYn3ulI/6MNReE07UIWJEv8UEOWDS88LY97kqyTliJKKtuYBbruAyVh5wOHiXmpi5we58Ek028czwyuQdLKPG1Bkb4NnM+VeAnfHqn1k4+GPT6uGQcvu2h2OVuIf/gWUFyy8OWEpdyZSa3aVCqpVoVvzZZ2VTnn2wU8qzVjDDetO90GSy9mVLqtgYSy231MxrY6I2gGqjrTY0L8fxCxfCBbhWrsYYAAAAAElFTkSuQmCC); display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px; width:44px;"></div>
+    </div>
+
+    <p style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px; margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center; text-overflow:ellipsis; white-space:nowrap;">
+      <a href="<%= embed_id.to_s %>" style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px; text-decoration:none;" target="_blank">
+        <%= embed_id.to_s %>
+      </a>
+    </p>
+  </div>
+</blockquote>
+<script async defer src="https://platform.instagram.com/en_US/embeds.js"></script>

data/lib/templates/twitter.erb

@@ -1,4 +1,4 @@
-<blockquote class="twitter-tweet <%= klass %>" data-lang="en" id="<%= id %>">
+<blockquote class="twitter-<%=type %> <%= klass %>" <%= 'data-status="hidden"' if type == "video" %> data-lang="en" id="<%= id %>">
   <a href="<%= embed_id.to_s %>"><%= embed_id.to_s %></a>
 </blockquote>
 <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_media
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Shane Becker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/templates/audio.erb
 - lib/templates/dailymotion.erb
 - lib/templates/image.erb
+- lib/templates/instagram.erb
 - lib/templates/link.erb
 - lib/templates/twitter.erb
 - lib/templates/video.erb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A [[ URL ]] syntax to embed media into views.