ZMediumToMarkdown 1.9.0 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc5867264a6441b236d54340f34e507ef4308f99b6908f21fd975a9061c81483
-  data.tar.gz: 00d61d0b23a23afe0e445f5a6d98533dd41a02cc41e6ea55168a12620860203f
+  metadata.gz: 7f0fc52b06f84a2ed70165d88f47432ec7e7eb3a139f3adb91ce1405b5cf69bc
+  data.tar.gz: c57e9ba90accc6f4654176a67851d1eae97e87109e66cf14862f7b3c84f636a3
 SHA512:
-  metadata.gz: 23e6f4244d5c291872bcfcedfe961b30e377638e812dade41a9ade68c9e83d66dfe7e1061e2131d106b2605f61014cacc632e4a6984c09b1089e458d0d88cfda
-  data.tar.gz: b5577f2dd3cec3ce63f15e531b0b9a0574ff74fef8981d21d32badac236a562d1a4ad3cf14757aee8073da9877119b7f3fe64b5ef4a37abf94cbcbcdc1f409f1
+  metadata.gz: 300208c7b673ccdb46c27b1871ad15b4cf14baa1a5d33260ff779932c4684b7887e03bb4c95c7b623cca302caab85d81b199b7de04e40408f3989d6cc3e86df8
+  data.tar.gz: 6c2bec3f95a1da0e82a86ef917e62fcdc5e880a979821dc2c13dfbe8fae5bc329e38fe8566bf456be9e839ab48904d28ca3b2f939a2057ebcff16979ca5a937d

data/lib/Parsers/IMGParser.rb

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

data/lib/Parsers/IframeParser.rb

@@ -6,7 +6,7 @@ require "Request"
 require "Parsers/Parser"
 require 'Models/Paragraph'
 require 'nokogiri'
-
+require 'Helper'
 require 'ImageDownloader'
 require 'PathPolicy'
 
@@ -19,12 +19,15 @@ class IframeParser < Parser
 
     def parse(paragraph)
         if paragraph.type == 'IFRAME'
+            
             if !paragraph.iframe.src.nil? && paragraph.iframe.src != ""
                 url = paragraph.iframe.src
             else
                 url = "https://medium.com/media/#{paragraph.iframe.id}"
             end
 
+            result = "[#{paragraph.iframe.title}](#{url})"
+
             if !url[/(www\.youtube\.com)/].nil?
                 # is youtube
                 youtubeURL = URI(URI.decode(url)).query
@@ -38,12 +41,16 @@ class IframeParser < Parser
                     imagePathPolicy = PathPolicy.new(pathPolicy.getAbsolutePath(nil), paragraph.postID)
                     absolutePath = imagePathPolicy.getAbsolutePath(fileName)
                     title = paragraph.iframe.title
+                    if title.nil? or title == ""
+                        title = "Youtube"
+                    end
+
                     if  ImageDownloader.download(absolutePath, imageURL)
                         relativePath = "#{pathPolicy.getRelativePath(nil)}/#{imagePathPolicy.getRelativePath(fileName)}"
                         if isForJekyll
-                            result = "\r\n[![#{title}](/#{relativePath} \"#{title}\")](#{params["url"]})\r\n"
+                            result = "\r\n\r\n[![#{title}](/#{relativePath} \"#{title}\")](#{params["url"]})\r\n\r\n"
                         else
-                            result = "\r\n[![#{title}](#{relativePath} \"#{title}\")](#{params["url"]})\r\n"
+                            result = "\r\n\r\n[![#{title}](#{relativePath} \"#{title}\")](#{params["url"]})\r\n\r\n"
                         end
                     else
                         result = "\r\n[#{title}](#{params["url"]})\r\n"
@@ -71,18 +78,29 @@ class IframeParser < Parser
                         end
                     end
                 else
-                    ogImageURL = Helper.fetchOGImage(url)
+                    ogURL = url
+                    if !url[/(cdn\.embedly\.com)/].nil?
+                        params = URI::decode_www_form(URI(URI.decode(url)).query).to_h
+                        if !params["url"].nil?
+                            ogURL = params["url"]
+                        end
+                    end
+                    ogImageURL = Helper.fetchOGImage(ogURL)
+
+                    title = paragraph.iframe.title
+                    if title.nil? or title == ""
+                        title = Helper.escapeMarkdown(ogURL)
+                    end
+                    
                     if !ogImageURL.nil?
-                        result = "\r\n[![#{paragraph.iframe.title}](#{ogImageURL} \"#{paragraph.iframe.title}\")](#{url})\r\n"
+                        result = "\r\n\r\n[![#{title}](#{ogImageURL} \"#{title}\")](#{ogURL})\r\n\r\n"
+                    else
+                        result = "[#{title}](#{ogURL})"
                     end
                 end
             end
 
-            if result.nil?
-                "[#{paragraph.iframe.title}](#{url})"
-            else
-                result
-            end
+            result
         else
             if !nextParser.nil?
                 nextParser.parse(paragraph)

data/lib/Parsers/MIXTAPEEMBEDParser.rb

@@ -11,7 +11,7 @@ class MIXTAPEEMBEDParser < Parser
             if !paragraph.mixtapeMetadata.nil? && !paragraph.mixtapeMetadata.href.nil?
                 ogImageURL = Helper.fetchOGImage(paragraph.mixtapeMetadata.href)
                 if !ogImageURL.nil?
-                    "\r\n[![#{paragraph.orgTextWithEscape}](#{ogImageURL} \"#{paragraph.orgTextWithEscape}\")](#{paragraph.mixtapeMetadata.href})\r\n"
+                    "\r\n\r\n[![#{paragraph.orgTextWithEscape}](#{ogImageURL} \"#{paragraph.orgTextWithEscape}\")](#{paragraph.mixtapeMetadata.href})\r\n\r\n"
                 else
                     "\n[#{paragraph.orgTextWithEscape}](#{paragraph.mixtapeMetadata.href})"
                 end

data/lib/Parsers/MarkupStyleRender.rb

@@ -16,14 +16,13 @@ class MarkupStyleRender
     end
 
     class TagChar < TextChar
-        attr_accessor :sort, :startIndex, :endIndex, :startChars, :endChars, :isCodeBlock
-        def initialize(sort, startIndex, endIndex, startChars, endChars, isCodeBlock = false)
+        attr_accessor :sort, :startIndex, :endIndex, :startChars, :endChars
+        def initialize(sort, startIndex, endIndex, startChars, endChars)
             @sort = sort
             @startIndex = startIndex
             @endIndex = endIndex - 1
             @startChars = TextChar.new(startChars.chars, 'TagStart')
             @endChars = TextChar.new(endChars.chars, 'TagEnd')
-            @isCodeBlock = isCodeBlock
         end
     end
 
@@ -127,6 +126,37 @@ 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
 
@@ -141,7 +171,7 @@ class MarkupStyleRender
                 if markup.type == "EM"
                     tag = TagChar.new(2, markup.start, markup.end, "_", "_")
                 elsif markup.type == "CODE"
-                    tag = TagChar.new(3, markup.start, markup.end, "`", "`", true)
+                    tag = TagChar.new(3, markup.start, markup.end, "`", "`")
                 elsif markup.type == "STRONG"
                     tag = TagChar.new(2, markup.start, markup.end, "**", "**")
                 elsif markup.type == "A"
@@ -167,9 +197,6 @@ class MarkupStyleRender
             response = []
             stack = []
 
-            # markdown unsupoort style in code block
-            inCodeBlock = false
-
             chars.each do |index, char|
 
                 if char.chars.join() == "\n"
@@ -189,18 +216,13 @@ class MarkupStyleRender
                 startTags = tags.select { |tag| tag.startIndex == index }.sort_by(&:sort)
                 if !startTags.nil?
                     startTags.each do |tag|
-                        if inCodeBlock == false
-                            response.append(tag.startChars)
-                            stack.append(tag)
-                        end
-                        if tag.isCodeBlock
-                            inCodeBlock = true
-                        end
+                        response.append(tag.startChars)
+                        stack.append(tag)
                     end
                 end
 
                 if char.chars.join() != "\n"
-                    if inCodeBlock
+                    if !stack.select { |tag| tag.startChars.chars.join() == "`" }.nil?
                         # is in code block
                         response.append(char)
                     else
@@ -223,17 +245,9 @@ class MarkupStyleRender
                             # as expected
                             endTags.delete_at(stackTagInEndTagsIndex)
                         else
-                            if inCodeBlock == false or stackTag.isCodeBlock == true
-                                mismatchTags.append(stackTag)
-                            end
-                        end
-                        if inCodeBlock == false or stackTag.isCodeBlock == true
-                            response.append(stackTag.endChars)
-                        end
-
-                        if stackTag.isCodeBlock 
-                            inCodeBlock = false
+                            mismatchTags.append(stackTag)
                         end
+                        response.append(stackTag.endChars)
                     end
 
                     while mismatchTags.length > 0

data/lib/Parsers/OLIParser.rb

@@ -4,7 +4,7 @@ require "Parsers/Parser"
 require 'Models/Paragraph'
 
 class OLIParser < Parser
-    attr_accessor :nextParser, :oliIndex
+    attr_accessor :nextParser
 
     def self.isOLI(paragraph)
         if paragraph.nil? 
@@ -16,7 +16,7 @@ class OLIParser < Parser
 
     def parse(paragraph)
         if OLIParser.isOLI(paragraph)
-            "#{oliIndex}. #{paragraph.text}"
+            "#{paragraph.oliIndex}. #{paragraph.text}"
         else
             if !nextParser.nil?
                 nextParser.parse(paragraph)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.3
 platform: ruby
 authors:
 - ZhgChgLi