ZMediumToMarkdown 1.9.3 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0fc52b06f84a2ed70165d88f47432ec7e7eb3a139f3adb91ce1405b5cf69bc
-  data.tar.gz: c57e9ba90accc6f4654176a67851d1eae97e87109e66cf14862f7b3c84f636a3
+  metadata.gz: acc5589c92b8dd859f91b98fe7c2f1073a39af102ee8ebce27f1351824ffcab7
+  data.tar.gz: b14f257296741edd700bf484c37da6b2e386ddfb96dffca540b60cea8c04fecc
 SHA512:
-  metadata.gz: 300208c7b673ccdb46c27b1871ad15b4cf14baa1a5d33260ff779932c4684b7887e03bb4c95c7b623cca302caab85d81b199b7de04e40408f3989d6cc3e86df8
-  data.tar.gz: 6c2bec3f95a1da0e82a86ef917e62fcdc5e880a979821dc2c13dfbe8fae5bc329e38fe8566bf456be9e839ab48904d28ca3b2f939a2057ebcff16979ca5a937d
+  metadata.gz: da41323a9b967724f758535d4ad8bb191cc1c015929b8af49e94851c7ff83b8a45d0ee8eb25298e2712b4acfbe1d3263cf4d327609cfc9f170e16cffadd347a9
+  data.tar.gz: c8a491d922669dd8ac947e658367fcbc093a007bda351ed9f7627213ad635c0d4246d36d09862ae597312147d4627f0314f12547df2c37d95a8bc400064c0897

data/bin/ZMediumToMarkdown

@@ -65,7 +65,6 @@ class Main
 
             opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version & Output Path') do
                 puts "Version:#{Helper.getLocalVersion().to_s}"
-                puts "Output Path:#{outputFilePath.getAbsolutePath(nil)}"
                 
                 Helper.printNewVersionMessageIfExists()
             end

data/lib/Parsers/CodeBlockParser.rb

@@ -4,7 +4,11 @@ require "Parsers/Parser"
 require 'Models/Paragraph'
 
 class CodeBlockParser < Parser
-    attr_accessor :nextParser
+    attr_accessor :nextParser, :isForJekyll
+
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
 
     def self.getTypeString()
         'CODE_BLOCK'
@@ -20,7 +24,17 @@ class CodeBlockParser < Parser
 
     def parse(paragraph)
         if CodeBlockParser.isCodeBlock(paragraph)
-            "```\n#{paragraph.text}\n```"
+            result = "```\n"
+            if isForJekyll
+                result += "{% raw %}\n"
+            end
+            
+            result += paragraph.text
+
+            if isForJekyll
+                result += "\n{% endraw %}"
+            end
+            result += "\n```"
         else
             if !nextParser.nil?
                 nextParser.parse(paragraph)

data/lib/Parsers/IframeParser.rb

@@ -74,7 +74,18 @@ class IframeParser < Parser
                     gistHTML.search('a').each do |a|
                         if a.text == 'view raw'
                             gistRAW = Request.body(Request.URL(a['href']))
-                            result = "```#{lang}\n#{gistRAW}\n```"
+
+                            result = "```#{lang}\n"
+                            if isForJekyll
+                                result += "{% raw %}\n"
+                            end
+
+                            result += gistRAW
+                            
+                            if isForJekyll
+                                result += "\n{% endraw %}"
+                            end
+                            result += "\n```"
                         end
                     end
                 else

data/lib/Parsers/LinkParser.rb

@@ -5,9 +5,9 @@ require 'Models/Paragraph'
 class LinkParser
     attr_accessor :usersPostURLs, :isForJekyll
 
-    def initialize(usersPostURLs, isForJekyll)
-        @usersPostURLs = usersPostURLs
-        @isForJekyll = isForJekyll
+    def initialize()
+        @usersPostURLs = nil
+        @isForJekyll = false
     end
 
     def parse(markdownString, markupLinks)
@@ -17,6 +17,13 @@ class LinkParser
 
                 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
@@ -30,12 +37,16 @@ class LinkParser
                         
                         if !usersPostURLs.find { |usersPostURL| usersPostURL.split("/").last.split("-").last == postPath.split("-").last }.nil?
                             if isForJekyll
-                                markdownString = markdownString.sub! link, "../#{postPath}"
+                                newLinkMarkdown = "(../#{postPath})"
                             else
-                                markdownString = markdownString.sub! link, "#{postPath}"
+                                newLinkMarkdown = "(#{postPath})"
                             end
                         end
                     end
+
+                    if linkMarkdown != newLinkMarkdown
+                        markdownString = markdownString.sub! linkMarkdown, newLinkMarkdown
+                    end
                 end
             end
         end

data/lib/Parsers/PREParser.rb

@@ -4,7 +4,11 @@ require "Parsers/Parser"
 require 'Models/Paragraph'
 
 class PREParser < Parser
-    attr_accessor :nextParser
+    attr_accessor :nextParser, :isForJekyll
+
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
 
     def self.isPRE(paragraph)
         if paragraph.nil? 
@@ -17,10 +21,19 @@ class PREParser < Parser
     def parse(paragraph)
         if PREParser.isPRE(paragraph)
             result = "```\n"
+            if isForJekyll
+                result += "{% raw %}\n"
+            end
+            
             paragraph.text.each_line do |p|
                 result += p
             end
+
+            if isForJekyll
+                result += "\n{% endraw %}"
+            end
             result += "\n```"
+
             result
         else
             if !nextParser.nil?

data/lib/ZMediumFetcher.rb

@@ -71,7 +71,7 @@ class ZMediumFetcher
 
     def initialize
         @progress = Progress.new()
-        @linkParser = LinkParser.new(nil, false)
+        @linkParser = LinkParser.new()
         @isForJekyll = false
     end
 
@@ -101,9 +101,9 @@ class ZMediumFetcher
             iframeParser.setNext(imgParser)
         bqParser = BQParser.new()
             imgParser.setNext(bqParser)
-        preParser = PREParser.new()
+        preParser = PREParser.new(isForJekyll)
             bqParser.setNext(preParser)
-        codeBlockParser = CodeBlockParser.new()
+        codeBlockParser = CodeBlockParser.new(isForJekyll)
             preParser.setNext(codeBlockParser)
         fallbackParser = FallbackParser.new()
             codeBlockParser.setNext(fallbackParser)
@@ -223,6 +223,8 @@ class ZMediumFetcher
         progress.message = "Converting Post..."
         progress.printLog()
 
+        linkParser.isForJekyll = isForJekyll
+
         postWithDatePath = "#{postInfo.firstPublishedAt.strftime("%Y-%m-%d")}-#{postPath}"
 
         absolutePath = postPathPolicy.getAbsolutePath("#{postWithDatePath}.md")
@@ -248,10 +250,7 @@ class ZMediumFetcher
                     end
 
                     result = startParser.parse(paragraph)
-    
-                    if !linkParser.nil?
-                        result = linkParser.parse(result, paragraph.markupLinks)
-                    end
+                    result = linkParser.parse(result, paragraph.markupLinks)
                     
                     file.puts(result)
     
@@ -295,7 +294,7 @@ class ZMediumFetcher
             nextID = postPageInfo["nextID"]
         end while !nextID.nil?
 
-        @linkParser = LinkParser.new(postURLS, isForJekyll)
+        linkParser.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: 1.9.3
+  version: 1.9.6
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri