ZMediumToMarkdown 2.0.8 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f4bb468ab40811678a1a7b38dc51aa6e442b28a8da0b3835dce158f6d90fd4
-  data.tar.gz: 67715feec8e9e7c9f798a61e61529e7846b2db42c86d0c8bd9dd43f3d2de971d
+  metadata.gz: 3605356973101df17419ca4232f870a0bab0062f04409c78b0a267c1b799a911
+  data.tar.gz: 10506a2d7f3a699059869ecc7e070c63939a361ccf13007308acb7596d73b130
 SHA512:
-  metadata.gz: 84f8eece59e468fb75768af6ed756dd96812ea81d8c6e6ecaeabf2c090db5f5bea10c39e8fc8693720322681f5ec902966371d4a95476f6f30ac8ada0782702e
-  data.tar.gz: 66c66d9b514fd8b0c81776e3dff2a466e91d291ebd9c466de8f6ca8ad19e7ba1d89aa154fa768e746194031805bf8722dbb8f0569b143e2700d04b550c0ce35f
+  metadata.gz: 950325be2b1088bef87a36ceffdabce9be5d9800a9ba5d47fbeb09f2d8ff90c2a01a827b7272af5ef4ac9285a06b4de86cea2ea03e81b0984aa2a49f78a269ff
+  data.tar.gz: 3a448256e99ad7eb6da7a28b89be0e6984430466b04b3d0eec25a9eed24026f6b29f90f25a226f487ce0639d49192fd41e0045b597d2ef1129f505fab67a65de

data/bin/ZMediumToMarkdown

@@ -76,7 +76,7 @@ end
 begin 
     puts "#https://github.com/ZhgChgLi/ZMediumToMarkdown"
     puts "You have read and agree with the Disclaimer."
-    #Main.new()
+    Main.new()
     puts "Execute Successfully!!!"
     puts "#https://github.com/ZhgChgLi/ZMediumToMarkdown"
     puts "#Thanks for using this tool."
@@ -86,9 +86,4 @@ rescue => e
     puts e.backtrace
     puts "#Please feel free to open an Issue or submit a fix/contribution via Pull Request on:\n"
     puts "#https://github.com/ZhgChgLi/ZMediumToMarkdown\n"
-end
-
-obj = JSON.parse('{ "id": "e41429008434_63", "name": "35a0", "type": "ULI", "href": null, "layout": null, "metadata": null, "text": "[New] Customer reviews", "hasDropCap": null, "dropCapImage": null, "markups": [ { "type": "A", "start": 6, "end": 22, "href": "https://developer.apple.com/documentation/appstoreconnectapi/app_store/customer_reviews", "anchorType": "LINK", "userId": null, "linkMetadata": null, "__typename": "Markup" }, { "type": "STRONG", "start": 0, "end": 6, "href": null, "anchorType": null, "userId": null, "linkMetadata": null, "__typename": "Markup" } ], "__typename": "Paragraph", "iframe": null, "mixtapeMetadata": null }')
-p = Paragraph.new(obj, "100")
-r = MarkupParser.new(p, false)
-puts r.parse()
+end

data/lib/Parsers/MarkupStyleRender.rb

@@ -48,6 +48,51 @@ class MarkupStyleRender
     end
 
     def optimize(chars) 
+
+        # remove style in codeblock e.g. `hello world **bold**` (markdown not allow style in codeblock)
+
+        while true
+    
+            hasExcute = false
+            inCodeBlock = false
+            index = 0
+
+            chars.each do |char|
+                if char.chars.join() == "`"
+                    if char.type == "TagStart"
+                        inCodeBlock = true
+                    elsif char.type == "TagEnd"
+                        inCodeBlock = false
+                    end
+                elsif inCodeBlock
+                    if char.type == "TagStart" or char.type == "TagEnd"
+                        chars.delete_at(index)
+                        hasExcute = true
+                        break
+                    end
+                end
+                
+                index += 1
+            end
+
+            if !hasExcute
+                break
+            end
+        end
+
+        # treat escape tag as normal text
+        index = 0
+        chars.each do |char|
+            if char.type == "TagEnd" && char.chars.join() == ""
+                chars.delete_at(index)
+            elsif char.type == "TagStart" && char.chars.join() == "\\"
+                chars[index] = TextChar.new("\\".chars, "Text")
+            end
+
+            index += 1
+        end
+
+        # append space between tag and text
         while true
             hasExcute = false
             
@@ -126,37 +171,6 @@ class MarkupStyleRender
             end
         end
 
-        # remove style in codeblock e.g. `hello world **bold**` (markdown not allow style in codeblock)
-        
-        while true
-            
-            hasExcute = false
-            inCodeBlock = false
-            index = 0
-
-            chars.each do |char|
-                if char.chars.join() == "`"
-                    if char.type == "TagStart"
-                        inCodeBlock = true
-                    elsif char.type == "TagEnd"
-                        inCodeBlock = false
-                    end
-                elsif inCodeBlock
-                    if char.type == "TagStart" or char.type == "TagEnd"
-                        chars.delete_at(index)
-                        hasExcute = true
-                        break
-                    end
-                end
-                
-                index += 1
-            end
-
-            if !hasExcute
-                break
-            end
-        end
-
         chars
     end
 
@@ -175,11 +189,7 @@ class MarkupStyleRender
                 elsif markup.type == "STRONG"
                     tag = TagChar.new(2, markup.start, markup.end, "**", "**")
                 elsif markup.type == "ESCAPE"
-                    escapeTagChar = TagChar.new(999,markup.start, markup.end,'','')
-                    escapeTagChar.startChars = TextChar.new('\\'.chars,'Text')
-                    escapeTagChar.endChars = TextChar.new([],'Text')
-
-                    tag = escapeTagChar
+                    tag = TagChar.new(999, markup.start, markup.end, "\\", "")
                 elsif markup.type == "A"
                     url = markup.href
                     if markup.anchorType == "LINK"
@@ -224,16 +234,6 @@ class MarkupStyleRender
             stack = []
 
             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
@@ -250,19 +250,32 @@ class MarkupStyleRender
 
                 startTags = tags.select { |tag| tag.startIndex == index }.sort_by(&:sort)
                 if !startTags.nil?
+                    hasCodeBlockTag = false
                     startTags.each do |tag|
-                        response.append(tag.startChars)
+                        if !hasCodeBlockTag 
+                            response.append(tag.startChars)
+                        end
+                        
                         stack.append(tag)
+
+                        if tag.startChars.chars.join() == "`"
+                            hasCodeBlockTag = true
+                        end
                     end
                 end
 
                 if char.chars.join() != "\n"
-                    resultChar = char.chars.join()
-                    if isForJekyll 
-                        resultChar = Helper.escapeHTML(resultChar)
+                    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"))
                     end
-
-                    response.append(TextChar.new(resultChar.chars, "Text"))
                 end
 
                 endTags = tags.select { |tag| tag.endIndex == index }

data/lib/ZMediumFetcher.rb

@@ -233,7 +233,7 @@ class ZMediumFetcher
             if lines.first.start_with?("---")
                 dateLine = lines.select { |line| line.start_with?("last_modified_at:") }.first
                 if !dateLine.nil?
-                    #fileLatestPublishedAt = Time.parse(dateLine[/^(last_modified_at:)\s+(\S*)/, 2]).to_i
+                    fileLatestPublishedAt = Time.parse(dateLine[/^(last_modified_at:)\s+(\S*)/, 2]).to_i
                 end
             end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.11
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri