ZMediumToMarkdown 2.0.4 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5ce4efab5975e6c870bacec7f2a480bbf0f938dfdaa9fe6f050e0c99254f646
-  data.tar.gz: c6bd9f40a681d5f75213604bdbf4e1678d78401e2403d0808cbfe9cb748d554c
+  metadata.gz: 411d9f653e728ad8708bfdd0738e181de68085865a3860e5d5272125236e856c
+  data.tar.gz: 94c713a02a605b480bf63e1022a4ee53dcfca3fe4355daf401b2253354f6f194
 SHA512:
-  metadata.gz: 2e221e9785da97d866daa114ca1dee36b9ad94f89434b2b88dc8b8ea34f3c2fbd50e85fcac1046a272f518da89ac6534d3b3975bb9513a8f05ee9195b2c623bb
-  data.tar.gz: 9710e3fdb0076085770f516865dd7c30fdcd0ddcc6240521516025f53c66993cf49c9972637230dfd02b52a16d75cf7d5ddeeeb972fd86330ad028b8d210d4ec
+  metadata.gz: 1b90384c75f6de2b1fcaaac3fcc1f3885ec6bf223698ce677c7cd621eec479eabead53794eb66d7ce2367867ef187468c733473e1e42a711eadf360a249a5803
+  data.tar.gz: 89c9ec47b56b047042a060716f923ad1924722d17c842ccce954252976d8112cac0c3d610f7626caadd1a4eaada5031dea17ca26dea4349e2b8e9e2ca1431b1c

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"
@@ -185,9 +189,14 @@ class Helper
     end
 
         
-    def self.createWatermark(postURL)
+    def self.createWatermark(postURL, isForJekyll)
+        jekyllOpen = ""
+        if isForJekyll
+            jekyllOpen = "{:target=\"_blank\"}"
+        end
+
         text = "\r\n\r\n\r\n"
-        text += "_Converted [Medium Post](#{postURL}) by [ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)._"
+        text += "_Converted [Medium Post](#{postURL})#{jekyllOpen} by [ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)#{jekyllOpen}._"
         text += "\r\n"
 
         text

data/lib/Models/Paragraph.rb

@@ -96,14 +96,23 @@ class Paragraph
             end
         end
 
-        i = 0
-        while i = orgText.index(/(\*|_|`|\||\\|\{|\}|\[|\]|\(|\)|#|\+|\-|\.|\!)/, i + 1)
-            escapeMarkup = {
-                "type" => 'ESCAPE',
-                "start" => i,
-                "end" => i + 1
-            }
-            markups.append(Markup.new(escapeMarkup))
+        index = 0
+        orgText.each_char do |char|
+            
+            if char.chars.join()  =~ /(\*|_|`|\||\\|\{|\}|\[|\]|\(|\)|#|\+|\-|\.|\!)/
+                escapeMarkup = {
+                    "type" => 'ESCAPE',
+                    "start" => index,
+                    "end" => index + 1
+                }
+                markups.append(Markup.new(escapeMarkup))
+            end
+            
+            index += 1
+            if char.bytes.length >= 4
+                # some emoji need more space (in Medium)
+                index += 1
+            end
         end
 
         @markups = markups

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/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
@@ -274,7 +271,7 @@ class ZMediumFetcher
                     progress.printLog()
                 end
     
-                postWatermark = Helper.createWatermark(postURL)
+                postWatermark = Helper.createWatermark(postURL, isForJekyll)
                 if !postWatermark.nil?
                     file.puts(postWatermark)
                 end
@@ -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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.7
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -74,7 +74,6 @@ files:
 - lib/Parsers/H4Parser.rb
 - lib/Parsers/IMGParser.rb
 - lib/Parsers/IframeParser.rb
-- lib/Parsers/LinkParser.rb
 - lib/Parsers/MIXTAPEEMBEDParser.rb
 - lib/Parsers/MarkupParser.rb
 - lib/Parsers/MarkupStyleRender.rb

data/lib/Parsers/LinkParser.rb

@@ -1,54 +0,0 @@
-$lib = File.expand_path('../', File.dirname(__FILE__))
-
-require 'Models/Paragraph'
-
-class LinkParser
-    attr_accessor :usersPostURLs, :isForJekyll
-
-    def initialize()
-        @usersPostURLs = nil
-        @isForJekyll = false
-    end
-
-    def parse(markdownString)
-        matchLinks = markdownString.scan(/\[[^\]]*\]\(([^\)]*)\)/m)
-        if !matchLinks.nil?
-
-            matchLinks.each do |matchLink|
-                link = matchLink[0]
-                linkMarkdown = "(#{link})"
-                newLinkMarkdown = linkMarkdown
-
-                if isForJekyll
-                    newLinkMarkdown = "(#{link}){:target=\"_blank\"}"
-                end
-                
-
-                if !usersPostURLs.nil?
-                    # if have provide user's post urls
-                    # find & replace medium url to local post url if matched
-
-                    if isForJekyll
-                        postPath = link.split("/").last.split("-").last
-                    else
-                        postPath = link.split("/").last
-                    end
-                    
-                    if !usersPostURLs.find { |usersPostURL| usersPostURL.split("/").last.split("-").last == postPath.split("-").last }.nil?
-                        if isForJekyll
-                            newLinkMarkdown = "(../#{postPath}/)"
-                        else
-                            newLinkMarkdown = "(#{postPath})"
-                        end
-                    end
-                end
-
-                if linkMarkdown != newLinkMarkdown
-                    markdownString = markdownString.sub! linkMarkdown, newLinkMarkdown
-                end
-            end
-        end
-
-        markdownString
-    end
-end