ZMediumToMarkdown 1.7.5 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c346ebddf4a54f030cce4ea3248ccf3fe9d2f564f02a2d43771224677385f94a
-  data.tar.gz: 5a69488e4d00b56480237693bff409ee8890039ef7e9470df5226882af64a7c1
+  metadata.gz: 38b611d86bc16468f228c710b5b7f2732b49da2178991b676c957e0aa1b8a245
+  data.tar.gz: fcda6c6684aad98c3b00e4d2009f4c7dc9e18a05f5a9b699a9cbee1052a2caa9
 SHA512:
-  metadata.gz: e078b4d7d914cee844222f45dcbbd0fb756d52786e01c15cbcc5495356b35b48dca9c7d303b4fa9c2e1c11e8086f1751b4cc6df8c759573432fd546491c4a60b
-  data.tar.gz: 586e5b2e6b6a9947ff73237edfde4c4786853eac3ec513ef089e12b018c3cc27feca53ca584f9f9ed63d74bb1990dbd3219ff02ca92744a8f142a0827d3b634d
+  metadata.gz: 36400640d1cf148e68b1852076ef0099a8f2100aaab8ad15d20848c081ad7f10db113f7ca18589eda27392d8a006e72c7f6ffe725b0f755b566883801da4fff2
+  data.tar.gz: 4c5341aaf24828956de14b9e4c60d88a98fabd99147069393f1d3695a3423de4cd6a5a75372cc375b8431d9cd418248db19a8c987408dafa1371c7a33d974630

data/lib/Helper.rb

@@ -11,6 +11,20 @@ require 'zip'
 
 class Helper
 
+    def self.escapeMarkdown(text)
+        text.gsub(/(\*|_|`|\||\\|\{|\}\[|\]|\(|\)|#|\+|\-|\.|\!)/){ |x| "\\#{x}" }
+    end
+
+    def self.escapeHTML(text)
+        if text == "<"
+            "&lt;"
+        elsif text == ">"
+            "&gt;"
+        else
+            text
+        end
+    end
+
     def self.createDirIfNotExist(dirPath)
         dirs = dirPath.split("/")
         currentDir = ""

data/lib/Models/Paragraph.rb

@@ -1,10 +1,11 @@
 $lib = File.expand_path('../', File.dirname(__FILE__))
 
+require 'Helper'
 require 'Parsers/PParser'
 require 'securerandom'
 
 class Paragraph
-    attr_accessor :postID, :name, :orgText, :text, :type, :href, :metadata, :mixtapeMetadata, :iframe, :oliIndex, :markups, :markupLinks
+    attr_accessor :postID, :name, :orgText, :orgTextWithEscape, :text, :type, :href, :metadata, :mixtapeMetadata, :iframe, :oliIndex, :markups, :markupLinks
 
     class Iframe
         attr_accessor :id, :title, :type, :src
@@ -65,6 +66,9 @@ class Paragraph
         @href = json['href']
         @postID = postID
 
+        orgTextWithEscape = Helper.escapeMarkdown(json['text'])
+        @orgTextWithEscape = orgTextWithEscape
+
         if json['metadata'].nil?
             @metadata = nil
         else

data/lib/Parsers/IMGParser.rb

@@ -24,16 +24,20 @@ class IMGParser < Parser
             absolutePath = imagePathPolicy.getAbsolutePath(fileName)
             
             result = ""
+            alt = ""
+            if paragraph.orgTextWithEscape != "" 
+                alt = " \"#{paragraph.orgTextWithEscape}\""
+            end
 
             if  ImageDownloader.download(absolutePath, imageURL)
                 relativePath = "#{pathPolicy.getRelativePath(nil)}/#{imagePathPolicy.getRelativePath(fileName)}"
                 if isForJekyll
-                    result = "\r\n![#{paragraph.orgText}](/#{relativePath} \"#{paragraph.orgText}\")\r\n"
+                    result = "\r\n![#{paragraph.orgTextWithEscape}](/#{relativePath}#{alt})\r\n"
                 else
-                    result = "\r\n![#{paragraph.orgText}](#{relativePath} \"#{paragraph.orgText}\")\r\n"
+                    result = "\r\n![#{paragraph.orgTextWithEscape}](#{relativePath}#{alt})\r\n"
                 end
             else
-                result = "\r\n![#{paragraph.orgText}](#{imageURL} \"#{paragraph.orgText}\")\r\n"
+                result = "\r\n![#{paragraph.orgTextWithEscape}](#{imageURL}#{alt})\r\n"
             end
 
             if paragraph.text != ""

data/lib/Parsers/MIXTAPEEMBEDParser.rb

@@ -8,9 +8,9 @@ class MIXTAPEEMBEDParser < Parser
     def parse(paragraph)
         if paragraph.type == 'MIXTAPE_EMBED'
             if !paragraph.mixtapeMetadata.nil? && !paragraph.mixtapeMetadata.href.nil?
-                "\n[#{paragraph.orgText}](#{paragraph.mixtapeMetadata.href})"
+                "\n[#{paragraph.orgTextWithEscape}](#{paragraph.mixtapeMetadata.href})"
             else
-                "\n#{paragraph.orgText}"
+                "\n#{paragraph.text}"
             end
         else
             if !nextParser.nil?

data/lib/Parsers/MarkupParser.rb

@@ -7,16 +7,17 @@ require 'securerandom'
 require 'User'
 
 class MarkupParser
-    attr_accessor :body, :paragraph
-
-    def initialize(paragraph)
+    attr_accessor :body, :paragraph, :isForJekyll
+    
+    def initialize(paragraph, isForJekyll)
         @paragraph = paragraph
+        @isForJekyll = isForJekyll
     end
 
     def parse()
         result = paragraph.text
         if !paragraph.markups.nil? && paragraph.markups.length > 0
-            markupRender = MarkupStyleRender.new(paragraph)
+            markupRender = MarkupStyleRender.new(paragraph, isForJekyll)
 
             begin
                 result = markupRender.parse()

data/lib/Parsers/MarkupStyleRender.rb

@@ -2,9 +2,10 @@
 $lib = File.expand_path('../', File.dirname(__FILE__))
 
 require 'Models/Paragraph'
+require 'Helper'
 
 class MarkupStyleRender 
-    attr_accessor :paragraph, :chars, :encodeType
+    attr_accessor :paragraph, :chars, :encodeType, :isForJekyll
 
     class TextChar
         attr_accessor :chars, :type
@@ -26,8 +27,9 @@ class MarkupStyleRender
     end
 
 
-    def initialize(paragraph)
+    def initialize(paragraph, isForJekyll)
         @paragraph = paragraph
+        @isForJekyll = isForJekyll
 
         chars = {}
         index = 0
@@ -189,7 +191,12 @@ class MarkupStyleRender
                 end
 
                 if char.chars.join() != "\n"
-                    response.append(TextChar.new(char.chars, 'Text'))
+                    resultChar = Helper.escapeMarkdown(char.chars.join())
+                    if isForJekyll 
+                        resultChar = Helper.escapeHTML(resultChar)
+                    end
+
+                    response.append(TextChar.new(resultChar.chars, "Text"))
                 end
 
                 endTags = tags.select { |tag| tag.endIndex == index }
@@ -220,6 +227,20 @@ class MarkupStyleRender
                 response.push(tag.endChars)
             end
             
+            response = optimize(response)
+            result = response.map{ |response| response.chars }.join()
+
+        else
+            response = []
+            chars.each do |index, char|
+                resultChar = escapeMarkdown(char)
+                if isForJekyll 
+                    resultChar = escapeHTML(char)
+                end
+
+                response.append(resultChar)
+            end
+
             response = optimize(response)
             result = response.map{ |response| response.chars }.join()
         end

data/lib/ZMediumFetcher.rb

@@ -186,7 +186,7 @@ class ZMediumFetcher
                                 groupByText += "\n"
                             end
 
-                            markupParser = MarkupParser.new(preTypeParagraph)
+                            markupParser = MarkupParser.new(preTypeParagraph, isForJekyll)
                             groupByText += markupParser.parse()
                         end
                         
@@ -244,7 +244,7 @@ class ZMediumFetcher
                 paragraphs.each do |paragraph|
 
                     if !(CodeBlockParser.isCodeBlock(paragraph) || PREParser.isPRE(paragraph))
-                        markupParser = MarkupParser.new(paragraph)
+                        markupParser = MarkupParser.new(paragraph, isForJekyll)
                         paragraph.text = markupParser.parse()
                     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.8
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri