rouge 1.2.0 → 1.3.0

data/bin/rougify

@@ -2,7 +2,6 @@
 
 require 'pathname'
 ROOT_DIR = Pathname.new(__FILE__).dirname.parent
-$:.push(ROOT_DIR.join('lib').to_s)
 load ROOT_DIR.join('lib/rouge.rb')
 load ROOT_DIR.join('lib/rouge/cli.rb')
 

data/lib/rouge/cli.rb

@@ -75,10 +75,14 @@ module Rouge
     def initialize(options={})
     end
 
-    def error!(msg, status=1)
+    def self.error!(msg, status=1)
       raise Error.new(msg, status)
     end
 
+    def error!(*a)
+      self.class.error!(*a)
+    end
+
     def self.class_from_arg(arg)
       case arg
       when 'version', '--version'
@@ -237,20 +241,18 @@ module Rouge
         @lexer_opts = opts[:lexer_opts]
 
         formatter_class = Formatter.find(opts[:formatter]) \
-          or error!  "unknown formatter #{opts[:formatter]}"
+          or error! "unknown formatter #{opts[:formatter]}"
 
         @formatter = formatter_class.new(opts[:formatter_opts])
       end
 
       def run
-        formatter.format(lexer.lex(input)) do |chunk|
-          print chunk
-        end
+        formatter.format(lexer.lex(input), &method(:print))
       end
 
     private
       def self.parse_cgi(str)
-        pairs = CGI.parse(str).map { |k, v| v.first }
+        pairs = CGI.parse(str).map { |k, v| [k.to_sym, v.first] }
         Hash[pairs]
       end
     end
@@ -289,7 +291,8 @@ module Rouge
       end
 
       def initialize(opts)
-        theme_class = Theme.find(opts.delete(:theme_name)) \
+        theme_name = opts.delete(:theme_name)
+        theme_class = Theme.find(theme_name) \
           or error! "unknown theme: #{theme_name}"
 
         @theme = theme_class.new(opts)

data/lib/rouge/formatters/html.rb

@@ -69,10 +69,10 @@ module Rouge
         end.join
 
         yield "<div class=#{@css_class.inspect}>" if @wrap
-        yield "<table><tbody><tr>"
+        yield '<table style="border-spacing: 0"><tbody><tr>'
 
         # the "gl" class applies the style for Generic.Lineno
-        yield '<td class="gutter gl">'
+        yield '<td class="gutter gl" style="text-align: right">'
         yield numbers
         yield '</td>'
 

data/lib/rouge/lexers/html.rb

@@ -14,7 +14,7 @@ module Rouge
       state :root do
         rule /[^<&]+/m, Text
         rule /&\S*?;/, Name::Entity
-        rule /<!DOCTYPE .*?>/i, Comment::Preproc
+        rule /<!DOCTYPE .*?>/im, Comment::Preproc
         rule /<!\[CDATA\[.*?\]\]>/m, Comment::Preproc
         rule /<!--/, Comment, :comment
         rule /<\?.*?\?>/m, Comment::Preproc # php? really?

data/lib/rouge/lexers/ocaml.rb

@@ -31,7 +31,7 @@ module Rouge
         @primitives ||= Set.new %w(unit int float bool string char list array)
       end
 
-      operator = %r([\[\];,{}_()!$%&*+./:<=>?@^|~-]+)
+      operator = %r([\[\];,{}_()!$%&*+./:<=>?@^|~#-]+)
       id = /[a-z][\w']*/i
       upper_id = /[A-Z][\w']*/
 

data/lib/rouge/plugins/redcarpet.rb

@@ -15,12 +15,17 @@ module Rouge
           code.gsub! /^    /, "\t"
         end
 
-        formatter = Formatters::HTML.new(
+        formatter = rouge_formatter(
           :css_class => "highlight #{lexer.tag}"
         )
 
         formatter.format(lexer.lex(code))
       end
+
+    protected
+      def rouge_formatter(opts={})
+        Formatters::HTML.new(opts)
+      end
     end
   end
 end

data/lib/rouge/theme.rb

@@ -140,10 +140,8 @@ module Rouge
       return enum_for(:render).to_a.join("\n") unless b
 
       # shared styles for tableized line numbers
-      yield "#{@scope} table { border-spacing: 0; }"
       yield "#{@scope} table td { padding: 5px; }"
       yield "#{@scope} table pre { margin: 0; }"
-      yield "#{@scope} table .gutter { text-align: right; }"
 
       styles.each do |tok, style|
         style.render(css_selector(tok), &b)

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "1.2.0"
+    "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email: