markdown-highlight-extended-filter 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88313f99954a78e53e1f65616998b2e3792e22e
-  data.tar.gz: a7415ff36c3382cd06e25a668dd71292c7b7ea17
+  metadata.gz: 7dfc3f9e711fe9a402d79542c5d48653ea8fdc66
+  data.tar.gz: 2939f157d44ef9b3d8f14adf5f67f05c41d778c2
 SHA512:
-  metadata.gz: 537a2d2c1e3138716b9b046e289d005252427179fe0da4177f038f0efa48c59806db871178b14cbc4496dbfade8bd771ccb07289d285f4948152916700a0c195
-  data.tar.gz: eaee3434f304cf1325b7c35d3a431d5e9054801f602868a07d98d4a5137b0a3a0392b3f1e064e77096ac2cecac646949e3048628bdc0166e166b0916842db2ef
+  metadata.gz: 1878404d04e588fe1e8dcf451aa5965cf804d4ee7748dd06e8c207f0501c72c2595ed6c62d06502d723fc4b42ed6820ae2ad17736ad86b257df129618c8c0916
+  data.tar.gz: 5c40dc8591e79150656c6c9745b72ff03e26521c6d48ada68e79bd44eb332cc3c28ae503f7cdcab8c1506741185c951fc502d3f1c11753f338e34177f4b1ce99

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

@@ -1,5 +1,6 @@
 require "html/pipeline"
 require "pygments.rb"
+require "linguist"
 
 # Stolen from https://github.com/imathis/octopress/blob/master/plugins/backtick_code_block.rb
 # (MIT License)
@@ -7,10 +8,6 @@ class MarkdownHighlightExtendedFilter < HTML::Pipeline::TextFilter
   AllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
   LangCaption = /([^\s]+)\s*(.+)?/i
 
-  PIPELINE = HTML::Pipeline.new [
-    HTML::Pipeline::SyntaxHighlightFilter
-  ]
-
   def call
     format_syntax(@text)
   end
@@ -48,6 +45,15 @@ class MarkdownHighlightExtendedFilter < HTML::Pipeline::TextFilter
   end
 
   def highlight_code(code, lang)
-    PIPELINE.call("<pre lang='#{lang}'>#{code}</pre>")[:output].to_s
+    if lexer = lexer_for(lang)
+      lexer.highlight(code, :options => { :cssclass => "highlight highlight-#{lang}" })
+    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]
   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       = "0.0.1"
+  spec.version       = "1.0.0"
   spec.authors       = ["Yu-Cheng Chuang"]
   spec.email         = ["ducksteven@gmail.com"]
   spec.summary       = %q{HTML::Pipeline filter for Octopress-flavored syntax highlighting}
@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "pry-byebug"
+
 end

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

@@ -1,4 +1,5 @@
 require 'markdown-highlight-extended-filter'
+require 'pry-byebug'
 
 RSpec.describe "MarkdownHighlightExtendedFilter" do
   let(:pipeline) {
@@ -21,7 +22,7 @@ TEXT
 
     it "renders correctly" do
       expect(rendered).to eq <<-HTML
-<figure class='code'><pre lang="plain">def abc
+<figure class='code'><pre>def abc
   123
 end</pre></figure>
 HTML
@@ -104,6 +105,22 @@ TEXT
   <span class="mi">123</span>
 <span class="k">end</span>
 </pre></div></figure>
+HTML
+    end
+  end
+
+  describe "no sanitization" do
+    let(:text) { <<-TEXT
+```html
+<input name="test" value="hello" />
+```
+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>
+</pre></div></figure>
 HTML
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown-highlight-extended-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Yu-Cheng Chuang
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HTML::Pipeline filter for Octopress-flavored syntax highlighting
 email:
 - ducksteven@gmail.com