commonmarker-rouge 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6385d54bdf3c2d595f470e8a1bd57026a42dcb9f
-  data.tar.gz: 6e8eec71ae524fcb564c8f3f720941ec64b54766
+  metadata.gz: 4f2d7482d2e0c5a47e20eb907765080128f91ab3
+  data.tar.gz: 60f42f343d12babbb9e7c13d21ae5d207d969c1c
 SHA512:
-  metadata.gz: 8486f0ea6304f14b6d6498d53b1a1dc6d7e49730c7966e289c10f389aa7838494b5db67fd043268210d210cf9319de989399c4720de6cd1e8658947abddb12d1
-  data.tar.gz: 6ef30167e5f636925a5d938d883fc1e03129006d08e472115774d14c989ba4d5a463bb15b3b90ebfd419bea76761ae330d985dd93766433e6fc6406d9d3ac791
+  metadata.gz: a9a4b020662d975972b57b6c21e3af6ae2675ab02b56ac4764feda4ed3c920fa6ad8bb45bb7ed15276693867220d4c5a163a948b1867de9e1813abd689557bdc
+  data.tar.gz: 8d3e11e5a0327f07348755afd339ae2afa2cfe5dd1144f6286746942cbe18e50604cb79e89c8a65aa55003488def04fe487145a334836f53398b7b64be062316

data/README.md

@@ -32,11 +32,20 @@ CommonMarker::Rouge.render_html(content, [:SAFE, :SOURCEPOS])
 # use custom CommonMarker wrapper (must provide compatible render_doc)
 CommonMarker::Rouge.render_html(content, cmark_class: CommonMarkerWrapper)
 
-# use custom Rouge formatter
-CommonMarker::Rouge.render_html(content, formatter: Rouge::Formatters::HTMLLinewise)
+# use custom Rouge formatter by class
+CommonMarker::Rouge.render_html(content, formatter_class: Rouge::Formatters::HTMLLinewise)
+# or by instance
+CommonMarker::Rouge.render_html(content, formatter: Rouge::Formatters::HTMLTable.new(
+  Rouge::Formatters::HTML.new
+))
 
 # pass some options to Rouge
 CommonMarker::Rouge.render_html(content, options: { css_class: 'custom-class' })
+# or
+CommonMarker::Rouge.render_html(content, formatter: Rouge::Formatters::HTMLTable.new(
+  Rouge::Formatters::HTML.new, code_class: 'rouge-code'
+))
+
 ```
 
 ## License

data/lib/commonmarker/rouge.rb

@@ -8,19 +8,19 @@ module CommonMarker
   module Rouge
     module_function
 
-    def render_doc(text, cmark_options = :DEFAULT, **highmark_options)
-      cmark = highmark_options[:cmark_class] || ::CommonMarker
+    def render_doc(text, cmark_options = :DEFAULT, **cmr_options)
+      cmark = cmr_options[:cmark_class] || ::CommonMarker
 
       ast = cmark.render_doc(text, cmark_options)
-      process_ast(ast, highmark_options)
+      process_ast(ast, cmr_options)
       ast
     end
 
-    def render_html(text, cmark_options = :DEFAULT)
-      render_doc(text, cmark_options).to_html
+    def render_html(text, cmark_options = :DEFAULT, **cmr_options)
+      render_doc(text, cmark_options, **cmr_options).to_html
     end
 
-    def process_ast(ast, highmark_options)
+    def process_ast(ast, cmr_options)
       ast.walk do |node|
         if node.type == :code_block
           next if node.fence_info == ''
@@ -29,7 +29,18 @@ module CommonMarker
 
           lexer = ::Rouge::Lexer.find_fancy(node.fence_info) || ::Rouge::Lexers::PlainText.new
 
-          formatter = (highmark_options[:formatter] || ::Rouge::Formatters::HTML).new(highmark_options[:options] || {})
+          formatter_class = cmr_options[:formatter_class]
+          formatter       = cmr_options[:formatter]
+
+          # support format accepting class for a time being
+          if formatter.is_a? Class
+            formatter_class ||= formatter
+            formatter = nil
+          end
+
+          formatter_class ||= ::Rouge::Formatters::HTML
+
+          formatter ||= formatter_class.new(cmr_options[:options] || {})
 
           html = '<div class="highlighter-rouge language-' + CGI.escapeHTML(node.fence_info) + '">' + formatter.format(lexer.lex(source)) + '</div>'
 

data/lib/commonmarker/rouge/version.rb

@@ -1,5 +1,5 @@
 module CommonMarker
   module Rouge
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker-rouge
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Anton Smirnov