optimize parser

ZMediumToMarkdown.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
     gem.files         = Dir['lib/**/*.*']
     gem.executables   = ['ZMediumToMarkdown']
     gem.name          = 'ZMediumToMarkdown'
-    gem.version       = '1.6.1'
+    gem.version       = '1.6.2'
 
     gem.license       = "MIT"
 

ZMediumToMarkdown_Github.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
     gem.files         = Dir['lib/**/*.*']
     gem.executables   = ['ZMediumToMarkdown']
     gem.name          = 'zmediumtomarkdown'
-    gem.version       = '1.6.1'
+    gem.version       = '1.6.2'
 
     gem.license       = "MIT"
 

lib/Helper.rb

@@ -164,12 +164,12 @@ def self.createWatermark(postURL)
         text += "+-----------------------------------------------------------------------------------+"
         text += "\r\n"
         text += "\r\n"
-        text += "| **[View original post on Medium](#{postURL}) - Converted by [ZhgChgLi](https://blog.zhgchg.li)/[ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)** |"
+        text += "| **[View original post on Medium](#{postURL}) - Converted by [ZhgChgLi](https://zhgchg.li)/[ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)** |"
         text += "\r\n"
         text += "\r\n"
         text += "+-----------------------------------------------------------------------------------+"
         text += "\r\n"
 
         text
     end
-end
+end

lib/Parsers/CodeBlockParser.rb

@@ -10,8 +10,16 @@ def self.getTypeString()
         'CODE_BLOCK'
     end
 
+    def self.isCodeBlock(paragraph)
+        if paragraph.nil? 
+            false
+        else
+            paragraph.type == CodeBlockParser.getTypeString()
+        end
+    end
+
     def parse(paragraph)
-        if paragraph.type == CodeBlockParser.getTypeString()
+        if CodeBlockParser.isCodeBlock(paragraph)
             "```\n#{paragraph.text}\n```"
         else
             if !nextParser.nil?

lib/Parsers/LinkParser.rb

@@ -23,19 +23,7 @@ def parse(markdownString, markupLinks)
 
                         postPath = link.split("/").last
                         if !usersPostURLs.find { |usersPostURL| usersPostURL.split("/").last.split("-").last == postPath.split("-").last }.nil?
-                            markdownString = markdownString.sub! link, postPath
-                        end
-                    else
-                        if !(link =~ /\A#{URI::regexp(['http', 'https'])}\z/)
-                            # medium will give you an relative path if url is medium's post (due to we use html to markdown render)
-                            # e.g. /zrealm-ios-dev/visitor-pattern-in-ios-swift-ba5773a7bfea
-                            # it's not a vaild url
-
-                            # fullfill url from markup attribute
-                            match = markupLinks.find{ |markupLink| markupLink.include? link }
-                            if !match.nil?
-                                markdownString = markdownString.sub! link, match
-                            end
+                            markdownString = markdownString.sub! link, "../#{postPath}"
                         end
                     end
                 end

lib/ZMediumFetcher.rb

@@ -231,8 +231,11 @@ def downloadPost(postURL, pathPolicy)
 
                 index = 0
                 paragraphs.each do |paragraph|
-                    markupParser = MarkupParser.new(paragraph)
-                    paragraph.text = markupParser.parse()
+                    if !(CodeBlockParser.isCodeBlock(paragraph) || PREParser.isPRE(paragraph))
+                        markupParser = MarkupParser.new(paragraph)
+                        paragraph.text = markupParser.parse()
+                    end
+
                     result = startParser.parse(paragraph)
 
                     if !linkParser.nil?