ZMediumToMarkdown 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d39b14b2d274522cbd880b0673012c40b749e693d706d8f6906e8df4f19d640
-  data.tar.gz: 5225ba58b765a96a4894f28cae5cb1394aca8d92dbce5bb7e8bfa74bbe48aa30
+  metadata.gz: 64bc954d4d11fa995f0d5249e133523e97da81e38bfc009faf071daa86d888bc
+  data.tar.gz: e8fc95d50ab0681f0fb31974b3aa3ca0ecc0ebe05515bf0c7635e8a4596742e8
 SHA512:
-  metadata.gz: 2ab477a2f0bb769e53eccc479e3839a7963c98ef97a0d46e51d3bf26f04e8cbd555c4f515d5518dba455754a6e29d20044cc87e60e1ae1a9256d286ebdf455db
-  data.tar.gz: a7ed47c1335ffca2ff33a5a21046c06c5689b6cd4225a4d26854b0ee334eb77aa3c04e5bda8c77d829ad64b55857ccaa14897681859c96a4e6b0dcce1af1b12c
+  metadata.gz: 97ad008929638d94bc79abfe5a22162cd476688d53851759f44892d50349af7d43c3a6fae3c9e6c2454fe75d387223df24e92597ff4e3d63a97b11d5ec8c7d3e
+  data.tar.gz: a3f9ce9bb64780c15fdf8d3e2402d0ce884ca184c1994024ec7b0867be472bd831d7ccd3ca2373540744b17b33c98221887a02691659d35ea9162443cb8093f5

data/lib/Helper.rb

@@ -19,6 +19,10 @@ class Helper
         content
     end
 
+    def self.escapeMarkdown(text)
+        text.gsub(/(\*|_|`|\||\\|\{|\}|\[|\]|\(|\)|#|\+|\-|\.|\!)/){ |x| "\\#{x}" }
+    end
+
     def self.escapeHTML(text)
         if text == "<"
             "&lt;"
@@ -101,8 +105,8 @@ class Helper
         result = "---\n"
         result += "title: #{title}\n"
         result += "author: #{postInfo.creator}\n"
-        result += "date: #{postInfo.firstPublishedAt.strftime('%Y-%m-%dT%H:%M:%S.%LZ')}\n"
-        result += "last_modified_at: #{postInfo.latestPublishedAt.strftime('%Y-%m-%dT%H:%M:%S.%LZ')}\n"
+        result += "date: #{postInfo.firstPublishedAt.strftime('%Y-%m-%dT%H:%M:%S.%L%z')}\n"
+        result += "last_modified_at: #{postInfo.latestPublishedAt.strftime('%Y-%m-%dT%H:%M:%S.%L%z')}\n"
         result += "categories: #{postInfo.collectionName}\n"
         result += "tags: [#{postInfo.tags.join(",")}]\n"
         result += "description: #{postInfo.description}\n"

data/lib/Parsers/BQParser.rb

@@ -16,7 +16,7 @@ class BQParser < Parser
 
     def parse(paragraph)
         if BQParser.isBQ(paragraph)
-            result = "> #{paragraph.text}"
+            result = "> #{paragraph.text} \n\n"
             result
         else
             if !nextParser.nil?

data/lib/Parsers/IframeParser.rb

@@ -19,6 +19,12 @@ class IframeParser < Parser
     end
 
     def parse(paragraph)
+
+        jekyllOpen = ""
+        if isForJekyll
+            jekyllOpen = "{:target=\"_blank\"}"
+        end
+
         if paragraph.type == 'IFRAME'
             
             if !paragraph.iframe.src.nil? && paragraph.iframe.src != ""
@@ -27,7 +33,7 @@ class IframeParser < Parser
                 url = "https://medium.com/media/#{paragraph.iframe.id}"
             end
 
-            result = "[#{paragraph.iframe.title}](#{url})"
+            result = "[#{paragraph.iframe.title}](#{url})#{jekyllOpen}"
 
             if !url[/(www\.youtube\.com)/].nil?
                 # is youtube
@@ -49,12 +55,12 @@ class IframeParser < Parser
                     if  ImageDownloader.download(absolutePath, imageURL)
                         relativePath = imagePathPolicy.getRelativePath(fileName)
                         if isForJekyll
-                            result = "\r\n\r\n[![#{title}](/#{relativePath} \"#{title}\")](#{params["url"]})\r\n\r\n"
+                            result = "\r\n\r\n[![#{title}](/#{relativePath} \"#{title}\")](#{params["url"]})#{jekyllOpen}\r\n\r\n"
                         else
-                            result = "\r\n\r\n[![#{title}](#{relativePath} \"#{title}\")](#{params["url"]})\r\n\r\n"
+                            result = "\r\n\r\n[![#{title}](#{relativePath} \"#{title}\")](#{params["url"]})#{jekyllOpen}\r\n\r\n"
                         end
                     else
-                        result = "\r\n[#{title}](#{params["url"]})\r\n"
+                        result = "\r\n[#{title}](#{params["url"]})#{jekyllOpen}\r\n"
                     end
                 end
             else
@@ -118,9 +124,9 @@ class IframeParser < Parser
                             createdAt = Time.parse(twitterObj["created_at"]).strftime('%Y-%m-%d %H:%M:%S')
                             result = "\n\n"
                             result += "■■■■■■■■■■■■■■ \n"
-                            result += "> **[#{twitterObj["user"]["name"]}](https://twitter.com/#{twitterObj["user"]["screen_name"]}) @ Twitter Says:** \n\n"
+                            result += "> **[#{twitterObj["user"]["name"]}](https://twitter.com/#{twitterObj["user"]["screen_name"]})#{jekyllOpen} @ Twitter Says:** \n\n"
                             result += "> > #{fullText} \n\n"
-                            result += "> **Tweeted at [#{createdAt}](#{ogURL}).** \n\n"
+                            result += "> **Tweeted at [#{createdAt}](#{ogURL})#{jekyllOpen}.** \n\n"
                             result += "■■■■■■■■■■■■■■ \n\n"
                         end
                     else
@@ -132,9 +138,9 @@ class IframeParser < Parser
                         end
                         
                         if !ogImageURL.nil?
-                            result = "\r\n\r\n[![#{title}](#{ogImageURL} \"#{title}\")](#{ogURL})\r\n\r\n"
+                            result = "\r\n\r\n[![#{title}](#{ogImageURL} \"#{title}\")](#{ogURL})#{jekyllOpen}\r\n\r\n"
                         else
-                            result = "[#{title}](#{ogURL})"
+                            result = "[#{title}](#{ogURL})#{jekyllOpen}"
                         end
                     end
                 end

data/lib/Parsers/LinkParser.rb

@@ -6,14 +6,13 @@ class LinkParser
     attr_accessor :usersPostURLs, :isForJekyll
 
     def initialize()
-        @usersPostURLs = []
+        @usersPostURLs = nil
         @isForJekyll = false
     end
 
     def parse(markdownString)
-        matchLinks = markdownString.scan(/\[[^\]]*\]\(([^\)]+)\)/m)
+        matchLinks = markdownString.scan(/\[[^\[|!|\]]*\]\(([^\)]+)\)/m)
         if !matchLinks.nil?
-
             matchLinks.each do |matchLink|
                 link = matchLink[0]
                 linkMarkdown = "(#{link})"

data/lib/Parsers/MIXTAPEEMBEDParser.rb

@@ -5,15 +5,24 @@ require "Parsers/Parser"
 require 'Models/Paragraph'
 
 class MIXTAPEEMBEDParser < Parser
-    attr_accessor :nextParser
+    attr_accessor :nextParser, :isForJekyll
+    
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
+
     def parse(paragraph)
         if paragraph.type == 'MIXTAPE_EMBED'
             if !paragraph.mixtapeMetadata.nil? && !paragraph.mixtapeMetadata.href.nil?
                 ogImageURL = Helper.fetchOGImage(paragraph.mixtapeMetadata.href)
                 if !ogImageURL.nil?
-                    "\r\n\r\n[![#{paragraph.text}](#{ogImageURL} \"#{paragraph.text}\")](#{paragraph.mixtapeMetadata.href})\r\n\r\n"
+                    jekyllOpen = ""
+                    if isForJekyll
+                        jekyllOpen = "{:target=\"_blank\"}"
+                    end
+                    "\r\n\r\n[![](#{ogImageURL})](#{paragraph.mixtapeMetadata.href})#{jekyllOpen}\r\n\r\n"
                 else
-                    "\n[#{paragraph.text}](#{paragraph.mixtapeMetadata.href})"
+                    "\n#{paragraph.text}"
                 end
             else
                 "\n#{paragraph.text}"

data/lib/Parsers/MarkupParser.rb

@@ -7,7 +7,7 @@ require 'securerandom'
 require 'User'
 
 class MarkupParser
-    attr_accessor :body, :paragraph, :isForJekyll
+    attr_accessor :body, :paragraph, :isForJekyll, :usersPostURLs
     
     def initialize(paragraph, isForJekyll)
         @paragraph = paragraph
@@ -18,7 +18,7 @@ class MarkupParser
         result = paragraph.text
         if !paragraph.markups.nil? && paragraph.markups.length > 0
             markupRender = MarkupStyleRender.new(paragraph, isForJekyll)
-
+            markupRender.usersPostURLs = usersPostURLs
             begin
                 result = markupRender.parse()
             rescue => e

data/lib/Parsers/MarkupStyleRender.rb

@@ -5,7 +5,7 @@ require 'Models/Paragraph'
 require 'Helper'
 
 class MarkupStyleRender 
-    attr_accessor :paragraph, :chars, :encodeType, :isForJekyll
+    attr_accessor :paragraph, :chars, :encodeType, :isForJekyll, :usersPostURLs
 
     class TextChar
         attr_accessor :chars, :type
@@ -188,7 +188,27 @@ class MarkupStyleRender
                         url = "https://medium.com/u/#{markup.userId}"
                     end
                     
-                    tag = TagChar.new(1, markup.start, markup.end, "[", "](#{url})")
+                    lastPath = url.split("/").last
+                    lastQuery = nil
+                    if !lastPath.nil?
+                        lastQuery = lastPath.split("-").last
+                    end
+                    
+                    if !usersPostURLs.nil? && !usersPostURLs.find { |usersPostURL| usersPostURL.split("/").last.split("-").last == lastQuery }.nil?
+                        if isForJekyll
+                            url = "(../#{lastQuery}/)"
+                        else
+                            url = "(#{lastPath})"
+                        end
+                    else
+                        if isForJekyll
+                            url = "(#{url}){:target=\"_blank\"}"
+                        else
+                            url = "(#{url})"
+                        end
+                    end
+
+                    tag = TagChar.new(1, markup.start, markup.end, "[", "]#{url}")
                 else
                     Helper.makeWarningText("Undefined Markup Type: #{markup.type}.")
                 end
@@ -205,6 +225,15 @@ class MarkupStyleRender
 
             chars.each do |index, char|
 
+                # is in code block
+                if !stack.last.nil? && stack.last.endChars.chars.join() == "`"
+                    containEndTag = tags.select { |tag| tag.endIndex == index && tag.endChars.chars.join() == "`" }.length > 0
+                    if !containEndTag 
+                        response.append(char)
+                        next
+                    end
+                end
+
                 if char.chars.join() == "\n"
                     brStack = stack.dup
                     while brStack.length > 0
@@ -228,21 +257,16 @@ class MarkupStyleRender
                 end
 
                 if char.chars.join() != "\n"
-                    if !stack.select { |tag| tag.startChars.chars.join() == "`" }.nil?
-                        # is in code block
-                        response.append(char)
-                    else
-                        resultChar = Helper.escapeMarkdown(char.chars.join())
-                        if isForJekyll 
-                            resultChar = Helper.escapeHTML(resultChar)
-                        end
-    
-                        response.append(TextChar.new(resultChar.chars, "Text"))
+                    resultChar = char.chars.join()
+                    if isForJekyll 
+                        resultChar = Helper.escapeHTML(resultChar)
                     end
+
+                    response.append(TextChar.new(resultChar.chars, "Text"))
                 end
 
                 endTags = tags.select { |tag| tag.endIndex == index }
-                if !endTags.nil? && endTags.length > 0
+                if endTags.length > 0
                     mismatchTags = []
                     while endTags.length > 0
                         stackTag = stack.pop
@@ -268,14 +292,14 @@ class MarkupStyleRender
                 tag = stack.pop
                 response.push(tag.endChars)
             end
-            
+
             response = optimize(response)
             result = response.map{ |response| response.chars }.join()
 
         else
             response = []
             chars.each do |index, char|
-                resultChar = escapeMarkdown(char)
+                resultChar = char
                 if isForJekyll 
                     resultChar = escapeHTML(char)
                 end

data/lib/Parsers/PQParser.rb

@@ -9,7 +9,7 @@ class PQParser < Parser
         if paragraph.type == 'PQ'
             result = "\r\n\r\n"
             paragraph.text.each_line do |p|
-                result += "> #{p}"
+                result += "> #{p} \n\n"
             end
             result += "\r\n\r\n"
 

data/lib/ZMediumFetcher.rb

@@ -19,7 +19,6 @@ require "Parsers/MarkupParser"
 require "Parsers/OLIParser"
 require "Parsers/MIXTAPEEMBEDParser"
 require "Parsers/PQParser"
-require "Parsers/LinkParser"
 require "Parsers/CodeBlockParser"
 
 require "PathPolicy"
@@ -30,7 +29,7 @@ require 'date'
 
 class ZMediumFetcher
 
-    attr_accessor :progress, :linkParser, :isForJekyll
+    attr_accessor :progress, :usersPostURLs, :isForJekyll
 
     class Progress
         attr_accessor :username, :postPath, :currentPostIndex, :totalPostsLength, :currentPostParagraphIndex, :totalPostParagraphsLength, :message
@@ -71,7 +70,7 @@ class ZMediumFetcher
 
     def initialize
         @progress = Progress.new()
-        @linkParser = LinkParser.new()
+        @usersPostURLs = nil
         @isForJekyll = false
     end
 
@@ -89,7 +88,7 @@ class ZMediumFetcher
             ppParser.setNext(uliParser)
         oliParser = OLIParser.new()
             uliParser.setNext(oliParser)
-        mixtapeembedParser = MIXTAPEEMBEDParser.new()
+        mixtapeembedParser = MIXTAPEEMBEDParser.new(isForJekyll)
             oliParser.setNext(mixtapeembedParser)
         pqParser = PQParser.new()
             mixtapeembedParser.setNext(pqParser)
@@ -223,8 +222,6 @@ class ZMediumFetcher
         progress.message = "Converting Post..."
         progress.printLog()
 
-        linkParser.isForJekyll = isForJekyll
-
         postWithDatePath = "#{postInfo.firstPublishedAt.strftime("%Y-%m-%d")}-#{postPath}"
 
         absolutePath = postPathPolicy.getAbsolutePath("#{postWithDatePath}.md")
@@ -260,12 +257,12 @@ class ZMediumFetcher
 
                     if !(CodeBlockParser.isCodeBlock(paragraph) || PREParser.isPRE(paragraph))
                         markupParser = MarkupParser.new(paragraph, isForJekyll)
+                        markupParser.usersPostURLs = usersPostURLs
                         paragraph.text = markupParser.parse()
                     end
 
                     result = startParser.parse(paragraph)
-                    result = linkParser.parse(result)
-                    
+
                     file.puts(result)
     
                     index += 1
@@ -311,7 +308,7 @@ class ZMediumFetcher
             nextID = postPageInfo["nextID"]
         end while !nextID.nil?
 
-        linkParser.usersPostURLs = postURLS
+        usersPostURLs = postURLS
 
         progress.totalPostsLength = postURLS.length
         progress.currentPostIndex = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - ZhgChgLi