markdown-highlight-extended-filter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfc3f9e711fe9a402d79542c5d48653ea8fdc66
-  data.tar.gz: 2939f157d44ef9b3d8f14adf5f67f05c41d778c2
+  metadata.gz: 37014d563b618e84739abc540414494a42cc2733
+  data.tar.gz: 76593026f18aa8d40546425c37bb958796fc0cc7
 SHA512:
-  metadata.gz: 1878404d04e588fe1e8dcf451aa5965cf804d4ee7748dd06e8c207f0501c72c2595ed6c62d06502d723fc4b42ed6820ae2ad17736ad86b257df129618c8c0916
-  data.tar.gz: 5c40dc8591e79150656c6c9745b72ff03e26521c6d48ada68e79bd44eb332cc3c28ae503f7cdcab8c1506741185c951fc502d3f1c11753f338e34177f4b1ce99
+  metadata.gz: b047ee7c8c010edf13b66e276ee9662377635e770599dc6c1e5b484ebf8fb424eb173de3749cdde49c2493d1eb670a65b2f98aadda23cbf98c4eaad1d017d4f6
+  data.tar.gz: 9f15397b350afd7cef9c2ab60e167c1cc16d02bc33bb6127fa1f3bfc2dc4f52817b5ac0ad16ee7ef4e0fa16f34677b48ac67ba3f72123034444dcd1aa68ff59c

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.DS_Store

data/lib/markdown-highlight-extended-filter.rb

@@ -1,6 +1,5 @@
 require "html/pipeline"
-require "pygments.rb"
-require "linguist"
+require "rouge"
 
 # Stolen from https://github.com/imathis/octopress/blob/master/plugins/backtick_code_block.rb
 # (MIT License)
@@ -45,15 +44,18 @@ class MarkdownHighlightExtendedFilter < HTML::Pipeline::TextFilter
   end
 
   def highlight_code(code, lang)
-    if lexer = lexer_for(lang)
-      lexer.highlight(code, :options => { :cssclass => "highlight highlight-#{lang}" })
+    if lexer = lexer_for(lang, code)
+      # XXX: Rouge wrapper `<pre css_class><code>` is different from
+      # what pygments generates `<div css_class><pre>`.
+      # To keep compatibility, we don't use Rouge's warp, and wrap it manually.
+      html = Rouge::Formatters::HTML.format(lexer.lex(code), :wrap => false)
+      %Q{<div class="highlight highlight-#{lexer.tag}"><pre>#{html}\n</pre></div>}
     else
       "<pre>#{code}</pre>"
     end
   end
 
-  # https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/syntax_highlight_filter.rb#L38
-  def lexer_for(lang)
-    (Linguist::Language[lang] && Linguist::Language[lang].lexer) || Pygments::Lexer[lang]
+  def lexer_for(lang, code)
+    Rouge::Lexer.find(lang)
   end
 end

data/markdown-highlight-extended-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "markdown-highlight-extended-filter"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Yu-Cheng Chuang"]
   spec.email         = ["ducksteven@gmail.com"]
   spec.summary       = %q{HTML::Pipeline filter for Octopress-flavored syntax highlighting}
@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "html-pipeline"
-  spec.add_dependency "pygments.rb"
-  spec.add_dependency "github-linguist"
+  spec.add_dependency "rouge"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/markdown-highlight-extended-filter_spec.rb

@@ -119,7 +119,7 @@ TEXT
 
     it "renders correctly" do
       expect(rendered).to eq <<-HTML
-<figure class='code'><figcaption><span></span></figcaption><div class="highlight highlight-html"><pre><span class="nt">&lt;input</span> <span class="na">name=</span><span class="s">&quot;test&quot;</span> <span class="na">value=</span><span class="s">&quot;hello&quot;</span> <span class="nt">/&gt;</span>
+<figure class='code'><figcaption><span></span></figcaption><div class="highlight highlight-html"><pre><span class="nt">&lt;input</span> <span class="na">name=</span><span class="s">"test"</span> <span class="na">value=</span><span class="s">"hello"</span> <span class="nt">/&gt;</span>
 </pre></div></figure>
 HTML
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown-highlight-extended-filter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yu-Cheng Chuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github-linguist
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="