ZMediumToMarkdown 1.9.1 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f15b01478e2f941c658c49359b921f152df549fc32778b8305ccd65f05578fbe
-  data.tar.gz: 5707c63e3c917c8598a009b9a49952bb10f50281e085ec75f2c664e2fd6d5bb2
+  metadata.gz: 4d35b81935c45082bfc47c94cb990ceffb37292c4b2d535a384451341196dc37
+  data.tar.gz: 85817b58a2acda2a7ede68e87e29e0adb73d7bc2e8e90b1623f30886c978a346
 SHA512:
-  metadata.gz: 1db021ec2a782ea9da912b18b78ec99295813ddc1aa64555f7026eddaf43bc42823cbc287486f2bc8ca03ccbc05022e7aa1085abdb0ae2a9af1b026661412c3f
-  data.tar.gz: bf7bb9132809a5361a7911667cc889adf239d9322ad1fb9e8df0a325b49875fc358530d80be43450d5dccef2c5032512f37b8b81f208544c40bbc244ab5c841e
+  metadata.gz: ab2b7cf2f122a8458dfcee583b992e5f928d42b38fb1948c5d1204258e476106dc4b3c0097819b02ceb98a917bfffa6c4edc6bd304196d10c488bd04e7ee49f8
+  data.tar.gz: 4153f9e6403d7877713693f238dc6752e1c53fb20f3279b1de220c8e09ab03c462c0118f4a0ff72902262c2a462eef8bbcb91f5b165806a11cb3f716f0b1aa27

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/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,14 @@ class LinkParser
 
                 matchLinks.each do |matchLink|
                     link = matchLink[0]
+                    linkMarkdown = "(#{link})"
+                    newLinkMarkdown = linkMarkdown
+
+                    if isForJekyll
+                        newLinkMarkdown = "(#{link}){:target=\"_blank\"}"
+                        puts newLinkMarkdown
+                    end
+                    
 
                     if !usersPostURLs.nil?
                         # if have provide user's post urls
@@ -30,12 +38,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/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/MarkupParser.rb

@@ -19,12 +19,12 @@ class MarkupParser
         if !paragraph.markups.nil? && paragraph.markups.length > 0
             markupRender = MarkupStyleRender.new(paragraph, isForJekyll)
 
-            #begin
+            begin
                 result = markupRender.parse()
-            #rescue => e
-            #    puts e.backtrace
-            #    Helper.makeWarningText("Error occurred during render markup text, please help to open an issue on github.")
-            #end
+            rescue => e
+                puts e.backtrace
+                Helper.makeWarningText("Error occurred during render markup text, please help to open an issue on github.")
+            end
         end
 
         result

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)

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
 
@@ -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.1
+  version: 1.9.4
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri