coderay 1.0.0.598.pre → 1.0.0.738.pre

data/lib/coderay/encoders/debug.rb

@@ -1,7 +1,6 @@
-($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
-
+  
   # = Debug Encoder
   #
   # Fast encoder producing simple debug output.
@@ -14,32 +13,31 @@ module Encoders
   # 
   # See also: Scanners::Debug
   class Debug < Encoder
-
+    
     register_for :debug
-
+    
     FILE_EXTENSION = 'raydebug'
     
     def initialize options = {}
       super
       @opened = []
     end
-
-  public
-  
+    
     def text_token text, kind
       if kind == :space
         @out << text
       else
+        # FIXME: Escape (
         text = text.gsub(/[)\\]/, '\\\\\0')  # escape ) and \
         @out << kind.to_s << '(' << text << ')'
       end
     end
-
+    
     def begin_group kind
       @opened << kind
       @out << kind.to_s << '<'
     end
-
+    
     def end_group kind
       if @opened.last != kind
         puts @out
@@ -48,63 +46,16 @@ module Encoders
       @opened.pop
       @out << '>'
     end
-
+    
     def begin_line kind
       @out << kind.to_s << '['
     end
-
+    
     def end_line kind
       @out << ']'
     end
-
-  end
-
-end
-end
-
-if $0 == __FILE__
-  $VERBOSE = true
-  $: << File.join(File.dirname(__FILE__), '..')
-  eval DATA.read, nil, $0, __LINE__ + 4
-end
-
-__END__
-require 'test/unit'
-
-class DebugEncoderTest < Test::Unit::TestCase
-  
-  def test_creation
-    assert CodeRay::Encoders::Debug < CodeRay::Encoders::Encoder
-    debug = nil
-    assert_nothing_raised do
-      debug = CodeRay.encoder :debug
-    end
-    assert_kind_of CodeRay::Encoders::Encoder, debug
-  end
-  
-  TEST_INPUT = CodeRay::Tokens[
-    ['10', :integer],
-    ['(\\)', :operator],
-    [:begin_group, :string],
-    ['test', :content],
-    [:end_group, :string],
-    [:begin_line, :test],
-    ["\n", :space],
-    ["\n  \t", :space],
-    ["   \n", :space],
-    ["[]", :method],
-    [:end_line, :test],
-  ].flatten
-  TEST_OUTPUT = <<-'DEBUG'.chomp
-integer(10)operator((\\\))string<content(test)>test[
-
-  	   
-method([])]
-  DEBUG
-  
-  def test_filtering_text_tokens
-    assert_equal TEST_OUTPUT, CodeRay::Encoders::Debug.new.encode_tokens(TEST_INPUT)
-    assert_equal TEST_OUTPUT, TEST_INPUT.debug
+    
   end
   
 end
+end

data/lib/coderay/encoders/filter.rb

@@ -1,4 +1,3 @@
-($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
   
@@ -51,48 +50,3 @@ module Encoders
   
 end
 end
-
-if $0 == __FILE__
-  $VERBOSE = true
-  $: << File.join(File.dirname(__FILE__), '..')
-  eval DATA.read, nil, $0, __LINE__ + 4
-end
-
-__END__
-require 'test/unit'
-
-class FilterTest < Test::Unit::TestCase
-  
-  def test_creation
-    assert CodeRay::Encoders::Filter < CodeRay::Encoders::Encoder
-    filter = nil
-    assert_nothing_raised do
-      filter = CodeRay.encoder :filter
-    end
-    assert_kind_of CodeRay::Encoders::Encoder, filter
-  end
-  
-  def test_filtering_text_tokens
-    tokens = CodeRay::Tokens.new
-    10.times do |i|
-      tokens.text_token i.to_s, :index
-    end
-    assert_equal tokens, CodeRay::Encoders::Filter.new.encode_tokens(tokens)
-    assert_equal tokens, tokens.filter
-  end
-  
-  def test_filtering_block_tokens
-    tokens = CodeRay::Tokens.new
-    10.times do |i|
-      tokens.begin_group :index
-      tokens.text_token i.to_s, :content
-      tokens.end_group :index
-      tokens.begin_line :index
-      tokens.text_token i.to_s, :content
-      tokens.end_line :index
-    end
-    assert_equal tokens, CodeRay::Encoders::Filter.new.encode_tokens(tokens)
-    assert_equal tokens, tokens.filter
-  end
-  
-end

data/lib/coderay/encoders/html.rb

@@ -2,7 +2,7 @@ require 'set'
 
 module CodeRay
 module Encoders
-
+  
   # = HTML Encoder
   #
   # This is CodeRay's most important highlighter:
@@ -88,42 +88,43 @@ module Encoders
   #
   # Default: false
   class HTML < Encoder
-
+    
     register_for :html
-
+    
     FILE_EXTENSION = 'html'
-
+    
     DEFAULT_OPTIONS = {
       :tab_width => 8,
-
+      
       :css => :class,
-
       :style => :alpha,
       :wrap => nil,
       :title => 'CodeRay output',
-
+      
       :line_numbers => nil,
       :line_number_anchors => 'n',
       :line_number_start => 1,
       :bold_every => 10,
       :highlight_lines => nil,
-
+      
       :hint => false,
     }
-
-    helper :output, :numbering, :css
-
+    
+    autoload :Output,    'coderay/encoders/html/output'
+    autoload :CSS,       'coderay/encoders/html/css'
+    autoload :Numbering, 'coderay/encoders/html/numbering'
+    
     attr_reader :css
-
+    
   protected
-
+    
     HTML_ESCAPE = {  #:nodoc:
       '&' => '&amp;',
       '"' => '&quot;',
       '>' => '&gt;',
       '<' => '&lt;',
     }
-
+    
     # This was to prevent illegal HTML.
     # Strange chars should still be avoided in codes.
     evil_chars = Array(0x00...0x20) - [?\n, ?\t, ?\s]
@@ -133,21 +134,21 @@ module Encoders
     # \x9 (\t) and \xA (\n) not included
     #HTML_ESCAPE_PATTERN = /[\t&"><\0-\x8\xB-\x1f\x7f-\xff]/
     HTML_ESCAPE_PATTERN = /[\t"&><\0-\x8\xB-\x1f]/
-
+    
     TOKEN_KIND_TO_INFO = Hash.new do |h, kind|
       h[kind] =
         case kind
-        when :pre_constant
+        when :pre_constant  # FIXME: rename to :predefined_constant
           'Predefined constant'
         else
           kind.to_s.gsub(/_/, ' ').gsub(/\b\w/) { $&.capitalize }
         end
     end
-
-    TRANSPARENT_TOKEN_KINDS = [
+    
+    TRANSPARENT_TOKEN_KINDS = Set[
       :delimiter, :modifier, :content, :escape, :inline_delimiter,
-    ].to_set
-
+    ]
+    
     # Generate a hint about the given +kinds+ in a +hint+ style.
     #
     # +hint+ may be :info, :info_long or :debug.
@@ -161,7 +162,7 @@ module Encoders
       title =
         case hint
         when :info
-          TOKEN_KIND_TO_INFO[kinds.first]
+          TOKEN_KIND_TO_INFO[Array(kinds).first]
         when :info_long
           kinds.map { |kind| TOKEN_KIND_TO_INFO[kind] }.join('/')
         when :debug
@@ -169,71 +170,68 @@ module Encoders
         end
       title ? " title=\"#{title}\"" : ''
     end
-
+    
     def setup options
       super
       
       @HTML_ESCAPE = HTML_ESCAPE.dup
       @HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
       
-      @opened = [nil]
+      @opened = []
+      @last_opened = nil
       @css = CSS.new options[:style]
       
       hint = options[:hint]
-      if hint and not [:debug, :info, :info_long].include? hint
+      if hint && ![:debug, :info, :info_long].include?(hint)
         raise ArgumentError, "Unknown value %p for :hint; \
           expected :info, :debug, false, or nil." % hint
       end
-
+      
+      css_classes = TokenKinds
       case options[:css]
-
       when :class
-        @css_style = Hash.new do |h, k|
-          c = Tokens::AbbreviationForKind[k.first]
-          h[k.dup] = 
-            if c != :NO_HIGHLIGHT or (hint && k.first != :space)
-              if hint
-                title = HTML.token_path_to_hint hint, k
-              end
-              if c == :NO_HIGHLIGHT
-                '<span%s>' % [title]
-              else
-                '<span%s class="%s">' % [title, c]
-              end
-            end
+        @span_for_kind = Hash.new do |h, k|
+          if k.is_a? ::Symbol
+            kind = k_dup = k
+          else
+            kind = k.first
+            k_dup = k.dup
+          end
+          if kind != :space && (hint || css_class = css_classes[kind])
+            title = HTML.token_path_to_hint hint, k if hint
+            css_class ||= css_classes[kind]
+            h[k_dup] = "<span#{title}#{" class=\"#{css_class}\"" if css_class}>"
+          else
+            h[k_dup] = nil
+          end
         end
-
       when :style
-        @css_style = Hash.new do |h, k|
-          classes = k.map { |c| Tokens::AbbreviationForKind[c] }
-          h[k.dup] =
-            if classes.first != :NO_HIGHLIGHT or (hint && k.first != :space)
-              if hint
-                title = HTML.token_path_to_hint hint, k
-              end
-              style = @css[*classes]
-              if style
-                '<span%s style="%s">' % [title, style]
-              end
+        @span_for_kind = Hash.new do |h, k|
+          kind = k.is_a?(Symbol) ? k : k.first
+          h[k.is_a?(Symbol) ? k : k.dup] =
+            if kind != :space && (hint || css_classes[kind])
+              title = HTML.token_path_to_hint hint, k if hint
+              style = @css.get_style Array(k).map { |c| css_classes[c] }
+              "<span#{title}#{" style=\"#{style}\"" if style}>"
             end
         end
-
       else
         raise ArgumentError, "Unknown value %p for :css." % options[:css]
-
       end
     end
-
+    
     def finish options
-      not_needed = @opened.shift
       unless @opened.empty?
         warn '%d tokens still open: %p' % [@opened.size, @opened]
-        @out << '</span>' * @opened.size
+        @out << '</span>' while @opened.pop
+        @last_opened = nil
       end
       
       @out.extend Output
       @out.css = @css
-      @out.number! options[:line_numbers], options
+      if options[:line_numbers]
+        Numbering.number! @out, options[:line_numbers], options
+      end
       @out.wrap! options[:wrap]
       @out.apply_title! options[:title]
       
@@ -246,64 +244,58 @@ module Encoders
       if text =~ /#{HTML_ESCAPE_PATTERN}/o
         text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }
       end
-      @opened[0] = kind
-      @out <<
-        if style = @css_style[@opened]
-          style + text + '</span>'
-        else
-          text
-        end
+      if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
+        @out << style << text << '</span>'
+      else
+        @out << text
+      end
     end
     
     # token groups, eg. strings
     def begin_group kind
-      @opened[0] = kind
+      @out << (@span_for_kind[@last_opened ? [kind, *@opened] : kind] || '<span>')
       @opened << kind
-      @out << (@css_style[@opened] || '<span>')
+      @last_opened = kind if @options[:css] == :style
     end
     
     def end_group kind
-      if $CODERAY_DEBUG and (@opened.size == 1 or @opened.last != kind)
+      if $CODERAY_DEBUG && (@opened.empty? || @opened.last != kind)
         warn 'Malformed token stream: Trying to close a token (%p) ' \
           'that is not open. Open are: %p.' % [kind, @opened[1..-1]]
       end
-      @out << 
-        if @opened.empty?
-          '' # nothing to close
-        else
-          @opened.pop
-          '</span>'
-        end
+      if @opened.pop
+        @out << '</span>'
+        @last_opened = @opened.last if @last_opened
+      end
     end
     
     # whole lines to be highlighted, eg. a deleted line in a diff
     def begin_line kind
-      @opened[0] = kind
-      style = @css_style[@opened]
-      @opened << kind
-      @out <<
-        if style
-          style.sub '<span', '<div'
+      if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
+        if style['class="']
+          @out << style.sub('class="', 'class="line ')
         else
-          '<div>'
+          @out << style.sub('>', ' class="line">')
         end
+      else
+        @out << '<span class="line">'
+      end
+      @opened << kind
+      @last_opened = kind if @options[:css] == :style
     end
     
     def end_line kind
-      if $CODERAY_DEBUG and (@opened.size == 1 or @opened.last != kind)
+      if $CODERAY_DEBUG && (@opened.empty? || @opened.last != kind)
         warn 'Malformed token stream: Trying to close a line (%p) ' \
           'that is not open. Open are: %p.' % [kind, @opened[1..-1]]
       end
-      @out <<
-        if @opened.empty?
-          ''  # nothing to close
-        else
-          @opened.pop
-          '</div>'
-        end
+      if @opened.pop
+        @out << '</span>'
+        @last_opened = @opened.last if @last_opened
+      end
     end
-
+    
   end
-
+  
 end
 end