jekyll-gfm-admonitions 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9856856fa9908d633101b625732baafbb7f3c0cf73cfcbef406dc7b8632e9789
-  data.tar.gz: 20e2d07f90fbcfb6d497fbb4b4253b1a8cc42822a9ae37a382cd9a32dab7e002
+  metadata.gz: 7f4d88903b4f39d857f537e963c51676d129aa64a1b01b1347384d450f1c715b
+  data.tar.gz: 27f1bb25919a5de02325aa0000fff47840ef0a96fdcccde1f55527cf4b1d2d7c
 SHA512:
-  metadata.gz: cb773040f974fe2e1e6da8ef9b2964b621c1641fbbfc5b4ec4c744cf422d13734829784f798eec6e4549a3fa0b0e302ebb493c3412c2812094cd6b159f4ec908
-  data.tar.gz: ae50729c18a1c4084d0e333282b8c7a47025edde3dd7bef466c73378e07b63d82c9fe26ae8e891fdc536b4c05ecca305f1003e0b2f827d9b81bdc279eaae2dac
+  metadata.gz: 8c6a301cf15df7bd44ed11138059799d73c494a092649c0b92bfe9c189c026b8642de86d52d1fc90151b0063f446f8fb56ec4ac625f2e59018a445400459377a
+  data.tar.gz: 90f9cd3ead495506ddc433b2b593286ec8ba1f6e8d3477d992b779b3f2d70d54f4e3b3f55e67a7099bb7ab73b141a84a276661d179e6c395de9e89024bdbc362

data/assets/admonitions.css

@@ -32,7 +32,7 @@
     border-left-color: #4493f8;
 }
 
-.markdown-body .markdown-alert.markdown-alert-note svg path {
+.markdown-body .markdown-alert.markdown-alert-note .markdown-alert-title {
     color: #4493f8;
 }
 

data/lib/jekyll-gfm-admonitions.rb

@@ -2,6 +2,7 @@
 
 require 'octicons'
 require 'cssminify'
+require 'liquid/template'
 
 ADMONITION_ICONS = {
   'important' => 'report',
@@ -22,6 +23,7 @@ module JekyllGFMAdmonitions
   # syntax with HTML markup that includes appropriate iconography and CSS styling.
   class GFMAdmonitionConverter < Jekyll::Generator
     safe true
+    @@admonition_pages = []
 
     def initialize(*args)
       super(*args)
@@ -29,13 +31,21 @@ module JekyllGFMAdmonitions
     end
 
     def generate(site)
+      @markdown = site.converters.find { |c| c.is_a?(Jekyll::Converters::Markdown) }
+      unless @markdown
+        raise "Markdown converter not found. Please ensure that you have a markdown converter configured in your Jekyll site."
+      end
+
       # Process admonitions in posts
       site.posts.docs.each do |doc|
+        Jekyll.logger.debug 'GFMA:', "Processing post '#{doc.path}' (#{doc.content.length} characters)."
         process(doc)
       end
 
       # Process admonitions in pages
       site.pages.each do |page|
+        Jekyll.logger.debug 'GFMA:', "Processing page '#{page.path}' (#{page.content.length} characters)."
+        Jekyll.logger.debug 'GFMA:', "#{page.content.inspect}"
         process(page)
       end
 
@@ -48,27 +58,38 @@ module JekyllGFMAdmonitions
 
       return unless doc.content != original_content
 
-      inject_css(doc)
+      @@admonition_pages << doc
       @converted += 1
     end
 
+    def self.admonition_pages
+      return @@admonition_pages
+    end
+
     def convert_admonitions(doc)
       doc.content.gsub!(/>\s*\[!(IMPORTANT|NOTE|WARNING|TIP|CAUTION)\]\s*\n((?:>.*\n?)*)/) do
         type = ::Regexp.last_match(1).downcase
         title = type.capitalize
         text = ::Regexp.last_match(2).gsub(/^>\s*/, '').strip
         icon = Octicons::Octicon.new(ADMONITION_ICONS[type]).to_svg
+        Jekyll.logger.debug 'GFMA:', "Converting #{type} admonition."
 
         "<div class='markdown-alert markdown-alert-#{type}'>
           <p class='markdown-alert-title'>#{icon} #{title}</p>
-          <p>#{text}</p>
+          <p>#{@markdown.convert(text)}</p>
         </div>"
       end
     end
+  end
+
+  Jekyll::Hooks.register :site, :post_render do |site|
+    Jekyll.logger.info 'GFMA:', "Injecting admonition CSS in #{GFMAdmonitionConverter.admonition_pages.length} page(s)."
 
-    def inject_css(doc)
+    for page in GFMAdmonitionConverter.admonition_pages do
+      Jekyll.logger.debug 'GFMA:', "Appending admonition style to '#{page.path}'."
       css = File.read(File.expand_path('../assets/admonitions.css', __dir__))
-      doc.content += "<style>#{CSSminify.compress(css)}</style>"
+
+      page.output += "<style>#{CSSminify.compress(css)}</style>"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gfm-admonitions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Robin De Schepper