burr 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f849154fa08f4e730346d3f7568008af38b5a0d4
-  data.tar.gz: 04056ac1475498bcfa8afd2eeb8d4313f96b2bf2
+  metadata.gz: f58fa5ed863368020b2943b77cae90a09bdc70ba
+  data.tar.gz: 17bb05a58a6e84a1bbcf7c84758bd3bd0611a084
 SHA512:
-  metadata.gz: 0d046ab33e9dbe39a8a04eb2741a92777be18e3f2b4ae8be5be847d26b1df564452b47fb96d952aa39037ad00dfb445f75ca1164eed3b955954c8d55169ef06e
-  data.tar.gz: 1d1fd65b40f58bc4333c0a93d42ae136cd4e182d3575bdc81e95198db184df88ab733881a6c0de05ddac8c2d50949490c6713be85ac64ec855571eddbc95cd8a
+  metadata.gz: 5313792ed6328c5190d8f725623f0fec04a3808d377a7360f6b89b9279da0f7b9e366b6ce512900949b902b420b260466cd08d22615bb910e68796ef1d92816e
+  data.tar.gz: dfbb7b83f60facec45fb897d44162161f942b18b2cb671fc9da275be74f7227d84f427cb25e87abeeda375e6d48ca6b8de59182b2e28f96db1ea87b3aca7f132

data/README.md

@@ -67,7 +67,7 @@ burr 是一个 Ruby gem，可以像其他 gem 一样安装。但是由于没有
 在项目的 `Gemfile` 中加入以下代码：
 
 ```ruby
-gem 'burr', github: 'andorchen/burr'
+gem 'burr'
 ```
 
 然后执行 `bundle` 命令安装。
@@ -159,7 +159,7 @@ kramdown 原生支持的代码块由 `~~~` 分隔，但我更习惯使用 GitHub
 	```
 	{:caption="Ruby 方法定义示例" file="/path/to/file.rb"}
 
-代码高亮通过 [pygments.rb](https://github.com/tmm1/pygments.rb) 实现。
+代码高亮通过 [rouge](http://rubygems.org/gems/rouge) 实现。
 
 ### 图片题注
 

data/burr.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE.md]
 
   s.add_runtime_dependency('nokogiri',    '~> 1.6.0')
-  s.add_runtime_dependency('thor',        '~> 0.18.1')
-  s.add_runtime_dependency('liquid',      '~> 2.5.4')
-  s.add_runtime_dependency('kramdown',    '~> 1.2.0')
-  s.add_runtime_dependency('pygments.rb', '~> 0.5.4')
+  s.add_runtime_dependency('thor',        '~> 0.19.0')
+  s.add_runtime_dependency('liquid',      '~> 2.6.1')
+  s.add_runtime_dependency('kramdown',    '~> 1.3.3')
+  s.add_runtime_dependency('rouge',       '~> 1.3.3')
   s.add_runtime_dependency('eeepub',      '~> 0.8.1')
 
   s.files = `git ls-files`.split($/)

data/lib/burr/kramdown_ext/converter.rb

@@ -1,5 +1,5 @@
 require 'burr/kramdown_ext/parser'
-require 'pygments'
+require 'burr/rouge_ext/html_formatter'
 
 module Kramdown
   module Converter
@@ -27,15 +27,10 @@ module Kramdown
       def convert_codeblock(el, indent)
         attr = el.attr.dup
         lang = extract_code_language!(attr)
-        lang = 'text' if lang.blank?
 
-        pyg_opts = {
-          :encoding => 'utf-8',
-          :cssclass => "highlight type-#{lang}"
-        }
         caption = attr['caption']
         file    = attr['file']
-        code = ::Pygments.highlight(el.value, :lexer => lang, :options => pyg_opts).chomp << "\n"
+        code = rouge_highlight(el.value, lang)
         output = '<div class="codeblock'
         output << ' has-caption' if caption
         output << '">'
@@ -140,6 +135,15 @@ module Kramdown
         "<div class=\"figure\">#{img_html}<p class=\"caption\">#{caption_html}</p></div>"
       end
 
+      def rouge_highlight(text, lexer, &b)
+        lexer = ::Rouge::Lexer.find(lexer) unless lexer.respond_to? :lex
+        lexer = ::Rouge::Lexers::PlainText unless lexer
+
+        formatter = ::Rouge::Formatters::BHTML.new(css_class: "highlight type-#{lexer.tag}")
+
+        formatter.format(lexer.lex(text), &b)
+      end
+
     end
   end
 end

data/lib/burr/rouge_ext/html_formatter.rb

@@ -0,0 +1,113 @@
+require 'cgi'
+require 'rouge'
+
+module Rouge
+  module Formatters
+    # Transforms a token stream into HTML output.
+    class BHTML < Formatter
+      tag 'bhtml'
+
+      # @option opts [String] :css_class ('highlight')
+      # @option opts [true/false] :line_numbers (false)
+      # @option opts [Rouge::CSSTheme] :inline_theme (nil)
+      # @option opts [true/false] :wrap (true)
+      #
+      # Initialize with options.
+      #
+      # If `:inline_theme` is given, then instead of rendering the
+      # tokens as <span> tags with CSS classes, the styles according to
+      # the given theme will be inlined in "style" attributes.  This is
+      # useful for formats in which stylesheets are not available.
+      #
+      # Content will be wrapped in a tag
+      # with the given `:css_class` unless `:wrap` is set to `false`.
+      def initialize(opts={})
+        @css_class = opts.fetch(:css_class, 'highlight')
+        @line_numbers = opts.fetch(:line_numbers, false)
+        @inline_theme = opts.fetch(:inline_theme, nil)
+        @wrap = opts.fetch(:wrap, true)
+      end
+
+      # @yield the html output.
+      def stream(tokens, &b)
+        if @line_numbers
+          stream_tableized(tokens, &b)
+        else
+          stream_untableized(tokens, &b)
+        end
+      end
+
+    private
+      def stream_untableized(tokens, &b)
+        yield "<div class=#{@css_class.inspect}><pre>" if @wrap
+        tokens.each do |tok, val|
+          span(tok, val, &b)
+        end
+        yield "</pre></div>\n" if @wrap
+      end
+
+      def stream_tableized(tokens)
+        num_lines = 0
+        last_val = ''
+        formatted = ''
+
+        tokens.each do |tok, val|
+          last_val = val
+          num_lines += val.scan(/\n/).size
+          span(tok, val) { |str| formatted << str }
+        end
+
+        # add an extra line for non-newline-terminated strings
+        if last_val[-1] != "\n"
+          num_lines += 1
+          span(Token::Tokens::Text::Whitespace, "\n") { |str| formatted << str }
+        end
+
+        # generate a string of newline-separated line numbers for the gutter
+        numbers = num_lines.times.map do |x|
+          %<<pre class="lineno">#{x+1}</pre>>
+        end.join
+
+        yield "<div class=#{@css_class.inspect}>" if @wrap
+        yield '<table style="border-spacing: 0"><tbody><tr>'
+
+        # the "gl" class applies the style for Generic.Lineno
+        yield '<td class="gutter gl" style="text-align: right">'
+        yield numbers
+        yield '</td>'
+
+        yield '<td class="code">'
+        yield '<pre>'
+        yield formatted
+        yield '</pre>'
+        yield '</td>'
+
+        yield "</tr></tbody></table>\n"
+        yield "</div>\n" if @wrap
+      end
+
+      TABLE_FOR_ESCAPE_HTML = {
+        '&' => '&amp;',
+        '<' => '&lt;',
+        '>' => '&gt;',
+      }
+
+      def span(tok, val)
+        val = val.gsub(/[&<>]/, TABLE_FOR_ESCAPE_HTML)
+        shortname = tok.shortname or raise "unknown token: #{tok.inspect} for #{val.inspect}"
+
+        if shortname.empty?
+          yield val
+        else
+          if @inline_theme
+            rules = @inline_theme.style_for(tok).rendered_rules
+
+            yield "<span style=\"#{rules.to_a.join(';')}\">#{val}</span>"
+          else
+            yield "<span class=\"#{shortname}\">#{val}</span>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/burr/version.rb

@@ -2,7 +2,7 @@ module Burr
   module Version
     MAJOR = '0'
     MINOR = '0'
-    PATCH = '2'
+    PATCH = '3'
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: burr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andor Chen
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: eeepub
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - lib/burr/plugins/parser_plugin.rb
 - lib/burr/plugins/table.rb
 - lib/burr/plugins/toc.rb
+- lib/burr/rouge_ext/html_formatter.rb
 - lib/burr/ruby_version_check.rb
 - lib/burr/server.rb
 - lib/burr/ui.rb