ZMediumToMarkdown 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64bc954d4d11fa995f0d5249e133523e97da81e38bfc009faf071daa86d888bc
-  data.tar.gz: e8fc95d50ab0681f0fb31974b3aa3ca0ecc0ebe05515bf0c7635e8a4596742e8
+  metadata.gz: 411d9f653e728ad8708bfdd0738e181de68085865a3860e5d5272125236e856c
+  data.tar.gz: 94c713a02a605b480bf63e1022a4ee53dcfca3fe4355daf401b2253354f6f194
 SHA512:
-  metadata.gz: 97ad008929638d94bc79abfe5a22162cd476688d53851759f44892d50349af7d43c3a6fae3c9e6c2454fe75d387223df24e92597ff4e3d63a97b11d5ec8c7d3e
-  data.tar.gz: a3f9ce9bb64780c15fdf8d3e2402d0ce884ca184c1994024ec7b0867be472bd831d7ccd3ca2373540744b17b33c98221887a02691659d35ea9162443cb8093f5
+  metadata.gz: 1b90384c75f6de2b1fcaaac3fcc1f3885ec6bf223698ce677c7cd621eec479eabead53794eb66d7ce2367867ef187468c733473e1e42a711eadf360a249a5803
+  data.tar.gz: 89c9ec47b56b047042a060716f923ad1924722d17c842ccce954252976d8112cac0c3d610f7626caadd1a4eaada5031dea17ca26dea4349e2b8e9e2ca1431b1c

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

@@ -193,7 +193,7 @@ class MarkupStyleRender
                     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}/)"

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.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,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