ZMediumToMarkdown 2.0.6 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64bc954d4d11fa995f0d5249e133523e97da81e38bfc009faf071daa86d888bc
-  data.tar.gz: e8fc95d50ab0681f0fb31974b3aa3ca0ecc0ebe05515bf0c7635e8a4596742e8
+  metadata.gz: 9c5da608d284269b0674c80fdd4fd6d93c825937a8eff28669993b623b5fa414
+  data.tar.gz: 17c83bf6c50f8e35b1defe2b4ac8c212d038ab148e174f863bfff370effeb927
 SHA512:
-  metadata.gz: 97ad008929638d94bc79abfe5a22162cd476688d53851759f44892d50349af7d43c3a6fae3c9e6c2454fe75d387223df24e92597ff4e3d63a97b11d5ec8c7d3e
-  data.tar.gz: a3f9ce9bb64780c15fdf8d3e2402d0ce884ca184c1994024ec7b0867be472bd831d7ccd3ca2373540744b17b33c98221887a02691659d35ea9162443cb8093f5
+  metadata.gz: 315bf2b11ce127d096dfa981c306f6882b8bcb0db975ccc7c36c5365b579b157bf9322649495410177cdad8894e3201aa1fadc392b6bd492cd490049b1c48e9e
+  data.tar.gz: c2455da2a611863c1735eadd0f3a02005804228fcdaa3b588b98c75fcf80a362c609fbdaea684eb085559cd32e679c6a59a250f3fb7e116bb4217957a6dfe230

data/lib/Helper.rb

@@ -189,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/MarkupStyleRender.rb

@@ -171,11 +171,11 @@ class MarkupStyleRender
                 if markup.type == "EM"
                     tag = TagChar.new(2, markup.start, markup.end, "_", "_")
                 elsif markup.type == "CODE"
-                    tag = TagChar.new(3, markup.start, markup.end, "`", "`")
+                    tag = TagChar.new(0, markup.start, markup.end, "`", "`")
                 elsif markup.type == "STRONG"
                     tag = TagChar.new(2, markup.start, markup.end, "**", "**")
                 elsif markup.type == "ESCAPE"
-                    escapeTagChar = TagChar.new(0,markup.start, markup.end,'','')
+                    escapeTagChar = TagChar.new(999,markup.start, markup.end,'','')
                     escapeTagChar.startChars = TextChar.new('\\'.chars,'Text')
                     escapeTagChar.endChars = TextChar.new([],'Text')
 

data/lib/ZMediumFetcher.rb

@@ -271,7 +271,7 @@ class ZMediumFetcher
                     progress.printLog()
                 end
     
-                postWatermark = Helper.createWatermark(postURL)
+                postWatermark = Helper.createWatermark(postURL, isForJekyll)
                 if !postWatermark.nil?
                     file.puts(postWatermark)
                 end
@@ -308,7 +308,7 @@ class ZMediumFetcher
             nextID = postPageInfo["nextID"]
         end while !nextID.nil?
 
-        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.6
+  version: 2.0.9
 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,53 +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