markdown_media 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7675d6eedf2b85caf8d19d019146537850c81849226a140a3657bd9a01153e
-  data.tar.gz: 1698bf31d6f72b52c91b4d52282b5411eeab673d9adf55a068896f6944b33cad
+  metadata.gz: 28522f52f3bc0e47973dc525eb6010f9a9c2ac9014221d475c6dc1b563e2811f
+  data.tar.gz: 4eb451f801e81e089d01d87dffac196d58773e13c40a6d01e9c245ec9327e80f
 SHA512:
-  metadata.gz: e61f516f97f94789df00f463099f29829bf171aaca41663706dbfb70693f3ed11936e39dbfa3a81c3dc0227e4a6a39feb6802617706bc7f8ae3101beff51e74e
-  data.tar.gz: c8811cf2218c7be4b0715bde37d6f4fbc3a3386120b701e51cf2967d3ad0b71ec96a92e0a39d6f034843acd7cea860a7d7a54841ddd2dbc8bdd9fdd196d35f7c
+  metadata.gz: 171b43f7ec618ca14ed15fe76a586f5325cd15f396e55617831d832b00a1ddede281919b92cc23686f4fa8408d5fc0b1b005d177522038217f50a3100ded285f
+  data.tar.gz: 4c4a1b4a256e16588d7eac0ebe91a4b702e3aefc1f1d93183d36b5afd3af152cadf05ae8d8fd2c9cc88ce098b291fbe1018ad293715fcbdd9242c09aff1bd5ee

data/lib/markdown_media.rb

@@ -7,7 +7,7 @@ module MarkdownMedia
   EMBED_REGEX = /\[\[\s*(http[^\]\s]+(?:\s.+)?)\s*\]\]/
 
   class << self
-    def parse(text)
+    def parse(text, include_media: true)
       output = text.gsub(EMBED_REGEX) do
         embed_tag = $1
 
@@ -25,7 +25,13 @@ module MarkdownMedia
 
           caption = embed_tag_pieces.join(" ")
 
-          expanded_embed(url, caption: caption, link: link, id: id, type: type, klass: klass)
+          expanded_embed(url,
+                         caption:       caption,
+                         link:          link,
+                         id:            id,
+                         type:          type,
+                         klass:         klass,
+                         include_media: include_media)
         end
       end
 
@@ -75,9 +81,28 @@ module MarkdownMedia
       end
     end
 
-    def expanded_embed(url, caption: nil, link: nil, id: nil, type: nil, klass: nil)
+    def expanded_embed(url, caption: nil, link: nil, id: nil, type: nil, klass: nil, include_media: true)
       url  = URI.parse(url)
 
+      options    = extract_options(url: url, include_media: include_media)
+      slug       = options[:slug]
+      embed_id   = options[:embed_id]
+      type     ||= options[:type]
+
+      render_erb slug, {
+        embed_id: embed_id || url.to_s,
+        caption:  caption,
+        link:     link,
+        id:       id,
+        type:     type,
+        klass:    klass
+      }
+    end
+
+    # TODO: there’s got to be a better way, refactor to classes
+    def extract_options url:, include_media: true
+      type = nil
+
       case url.host
       when /youtube.com/
         slug     = "youtube"
@@ -114,20 +139,22 @@ module MarkdownMedia
         embed_id = url.path.split("/").last.split('-').last
 
       else
-        slug = case url.path
-
-        when /\.mp3|\.aac|\.wav|\.ogg|\.oga|\.m4a/
-          "audio"
-        when /\.mp4|\.avi|\.mov|\.ogv|\.webm|\.m4v|\.3gp|\.m3u8/
-          "video"
-        when /\.png|\.jpeg|\.jpg|\.gif|\.svg/
-          "image"
-        else
-          "link"
-        end
+        slug =
+          case url.path
+          when /\.mp3|\.aac|\.wav|\.ogg|\.oga|\.m4a/
+            "audio"
+          when /\.mp4|\.avi|\.mov|\.ogv|\.webm|\.m4v|\.3gp|\.m3u8/
+            "video"
+          when /\.png|\.jpeg|\.jpg|\.gif|\.svg/
+            "image"
+          else
+            "link"
+          end
       end
 
-      render_erb slug, { embed_id: embed_id || url.to_s, caption: caption, link: link, id: id, type: type, klass: klass }
+      slug = 'link' if include_media == false
+
+      { slug: slug, embed_id: embed_id, type: type }
     end
 
     def render_erb(template_slug, locals)

data/lib/markdown_media/version.rb

@@ -1,3 +1,3 @@
 module MarkdownMedia
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/lib/templates/link.erb

@@ -1 +1,3 @@
-<a href="<%= embed_id.to_s %>" id="<%= id %>" class="<%= klass %>"><%= caption.to_s.empty? ? embed_id.to_s.sub(/^https*:\/\//, "").sub(/\/$/, "") : caption %></a>
+<a href="<%= embed_id.to_s %>" id="<%= id %>" class="<%= klass %>">
+  <%= caption.to_s.empty? ? embed_id.to_s.sub(/^https*:\/\//, "").sub(/\/$/, "") : caption %>
+</a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_media
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Shane Becker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler