jekyll-commonmark-ghpages 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c780cb17633fa27a1f3886464808fd5e86fae540
-  data.tar.gz: 9a1e6f8304237daeb268971d26be53eee813ab8c
+  metadata.gz: ac80a98f74de18d13c9b303f8229ae3bd098e6a2
+  data.tar.gz: 2135a7a930e6a7c6b2e28653664fd4a14473f288
 SHA512:
-  metadata.gz: 4929460a719c3245cb06cd51e688e534782f4d2c103e00a10e8c590cb3bfa4eca0c82b9968531869e6d9224434dec75a03468c51a2d32a4e1cd36ba7a01163b4
-  data.tar.gz: b3fdf15208da60ad54a024905fd75b1a2726f624e7126add1cce14fdff499b417dc7b3a9e880a9b5dabcd3af3652bf611e52c02267acf0f51f7b512d23a35a0d
+  metadata.gz: bc2ea6be7b6bfc484b19166b8033d15c6e7b65e32faa54b5527e61e598f3bb5a09034eb5fd2e6aaeb5bbbed9229ab81a70725f366f76ecaebfaef71ecb428e3a
+  data.tar.gz: cfcd1c2e6db80661c50c146fac8cecb7415db2286e28550011172399820c2653b7669bbe94ce7a85099c99f21575ec79cbbb163fee0c40c1b624ecf47cd53bf8

data/jekyll-commonmark-ghpages.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-commonmark-ghpages"
   spec.summary       = "CommonMark generator for Jekyll"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Ashe Connor"]
   spec.email         = "kivikakk@github.com"
   spec.homepage      = "https://github.com/github/jekyll-commonmark-ghpages"
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "jekyll-commonmark", "~> 1"
   spec.add_runtime_dependency "commonmarker", "~> 0.17.6"
+  spec.add_runtime_dependency "rouge", "~> 2"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake"

data/lib/jekyll-commonmark-ghpages.rb

@@ -4,9 +4,11 @@
 require "commonmarker"
 require "jekyll"
 require "jekyll-commonmark"
+require "rouge"
 
-# A customized version of CommonMarker::HtmlRenderer which outputs
-# Kramdown-style header IDs.
+# A customized version of CommonMarker::HtmlRenderer which:
+# - outputs Kramdown-style header IDs.
+# - performs syntax highlighting in code blocks.
 class JekyllCommonMarkCustomRenderer < ::CommonMarker::HtmlRenderer
   def header(node)
     block do
@@ -22,6 +24,35 @@ class JekyllCommonMarkCustomRenderer < ::CommonMarker::HtmlRenderer
     end
   end
 
+  def code_block(node)
+    lang = if node.fence_info && !node.fence_info.empty?
+             node.fence_info.split(/\s+/)[0]
+           end
+
+    content = node.string_content
+
+    if lang && lexer = ::Rouge::Lexer.find_fancy(lang, content)
+      block do
+        out("<div class=\"language-#{lang} highlighter-rouge\">")
+        out(::Rouge::Formatters::HTMLLegacy.new(css_class: 'highlight').format(lexer.lex(content)))
+        out("</div>")
+      end
+      return
+    end
+
+    if option_enabled?(:GITHUB_PRE_LANG)
+      out("<pre#{sourcepos(node)}")
+      out(' lang="', lang, '"') if lang
+      out('><code>')
+    else
+      out("<pre#{sourcepos(node)}><code")
+      out(' class="language-', lang, '">') if lang
+      out('>')
+    end
+    out(escape_html(content))
+    out('</code></pre>')
+  end
+
   private
 
   def generate_id(str)

data/spec/test_spec.rb

@@ -2,11 +2,19 @@ require "spec_helper"
 
 describe JekyllCommonMarkCustomRenderer do
   let(:renderer) { JekyllCommonMarkCustomRenderer.new }
-  let(:doc) { CommonMarker.render_doc("# Hello\n\n## Hi, world!") }
   subject { renderer.render(doc) }
 
-  it { is_expected.to match %r{<h1 id="hello">Hello</h1>} }
-  it { is_expected.to match %r{<h2 id="hi-world">Hi, world!</h2>} }
+  context "headers" do
+    let(:doc) { CommonMarker.render_doc("# Hello\n\n## Hi, world!") }
+    it { is_expected.to match %r{<h1 id="hello">Hello</h1>} }
+    it { is_expected.to match %r{<h2 id="hi-world">Hi, world!</h2>} }
+  end
+
+  context "code blocks" do
+    let(:doc) { CommonMarker.render_doc("```ruby\nputs \"Hi!\"\n```\n") }
+    it { is_expected.to match %r{<div class="language-ruby highlighter-rouge">} }
+    it { is_expected.to match %r{<code><span class=".*?">puts</span> <span class=".*?">"Hi!"</span>} }
+  end
 end
 
 describe Jekyll::Converters::Markdown::CommonMarkGhPages do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-commonmark-ghpages
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ashe Connor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-commonmark
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.6
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement