ZMediumToMarkdown 1.7.6 → 1.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d93a8c503846adfc16a522538443ff0d7cccdac9f762e1820c6a126577ae01
-  data.tar.gz: ea3da670c30cb61dd06035f8a39983ff6d2e54a45273d0cc0da547e85102f47c
+  metadata.gz: 278127b85a3a3d48cf145dc4fdec065b51eb95c89808c2c0d6940a0e74e8433c
+  data.tar.gz: 19ad4fa053fa88a66a38e44468a955d9f6262cbbcd2677f5cf9df96af2566fb5
 SHA512:
-  metadata.gz: 855b53acb24236730b4812e48af9b4126efd925a154e72247a69a3fc8204f10f2ac8b1a7021a56b20eeef64e6b64d19822df9dd9f35a935ce7f238140f5ddbe2
-  data.tar.gz: 3fb8201543caee6f2e6621492db112a951863f5c93b9f6a0f5ac7c592aebbcabfbfdbdbf5d57329d6bfafe3611ce84c2225ef78236248dd020b13efd952f2990
+  metadata.gz: 2f8e83735cfefddc59cab54833be99f542ec05141dc060ed8e84932738836e3ab378e0fce6de405297d214563f74cb01db32a2a9c77fe9c8463b66e69420e880
+  data.tar.gz: d1af70e780fa70c549777e33e8c28fccf255a9972497b827d70eb85f8322c86e54b1912d7fe0c4a4bf26efbf514f4aedfd94058b2e0401bc115a598480a45f23

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

@@ -25,19 +25,19 @@ class IMGParser < Parser
             
             result = ""
             alt = ""
-            if paragraph.orgText != "" 
-                alt = " \"#{paragraph.orgText}\""
+            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}#{alt})\r\n"
+                    result = "\r\n![#{paragraph.orgTextWithEscape}](/#{relativePath}#{alt})\r\n"
                 else
-                    result = "\r\n![#{paragraph.orgText}](#{relativePath}#{alt})\r\n"
+                    result = "\r\n![#{paragraph.orgTextWithEscape}](#{relativePath}#{alt})\r\n"
                 end
             else
-                result = "\r\n![#{paragraph.orgText}](#{imageURL}#{alt})\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,17 @@ class MarkupStyleRender
                 end
 
                 if char.chars.join() != "\n"
-                    response.append(TextChar.new(char.chars, 'Text'))
+                    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
                 end
 
                 endTags = tags.select { |tag| tag.endIndex == index }
@@ -220,6 +232,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.9
 platform: ruby
 authors:
 - ZhgChgLi