coderay 1.0.0.598.pre → 1.0.0.738.pre

data/lib/coderay/encoders/html/css.rb

@@ -20,7 +20,7 @@ module Encoders
         parse style::TOKEN_COLORS
       end
 
-      def [] *styles
+      def get_style styles
         cl = @classes[styles.first]
         return '' unless cl
         style = ''
@@ -63,8 +63,3 @@ module Encoders
 
 end
 end
-
-if $0 == __FILE__
-  require 'pp'
-  pp CodeRay::Encoders::HTML::CSS.new
-end

data/lib/coderay/encoders/html/numbering.rb

@@ -3,9 +3,9 @@ module Encoders
 
   class HTML
 
-    module Output  # :nodoc:
+    module Numbering  # :nodoc:
 
-      def number! mode = :table, options = {}
+      def self.number! output, mode = :table, options = {}
         return self unless mode
 
         options = DEFAULT_OPTIONS.merge options
@@ -26,7 +26,7 @@ module Encoders
               "<a href=\"##{anchor}\" name=\"#{anchor}\">#{line}</a>"
             end
           else
-            proc { |line| line.to_s }
+            proc { |line| line.to_s }  # :to_s.to_proc in Ruby 1.8.7+
           end
         
         bold_every = options[:bold_every]
@@ -56,12 +56,20 @@ module Encoders
             raise ArgumentError, 'Invalid value %p for :bolding; false or Integer expected.' % bold_every
           end
         
+        line_count = output.count("\n")
+        position_of_last_newline = output.rindex(RUBY_VERSION >= '1.9' ? /\n/ : ?\n)
+        if position_of_last_newline
+          after_last_newline = output[position_of_last_newline + 1 .. -1]
+          ends_with_newline = after_last_newline[/\A(?:<\/span>)*\z/]
+          line_count += 1 if not ends_with_newline
+        end
+        
         case mode
         when :inline
           max_width = (start + line_count).to_s.size
           line_number = start
           opened_tags = []
-          gsub!(/^.*$\n?/) do |line|
+          output.gsub!(/^.*$\n?/) do |line|
             line.chomp!
             open = opened_tags.join
             line.scan(%r!<(/)?span[^>]*>?!) do |close,|
@@ -80,13 +88,13 @@ module Encoders
           end
 
         when :table
-          line_numbers = (start ... start + line_count).to_a.map(&bolding).join("\n")
+          line_numbers = (start ... start + line_count).map(&bolding).join("\n")
           line_numbers << "\n"
+          line_numbers_table_template = Output::TABLE.apply('LINE_NUMBERS', line_numbers)
 
-          line_numbers_table_template = TABLE.apply('LINE_NUMBERS', line_numbers)
-          gsub!(/<\/div>\n/) { '</div>' }
-          wrap_in! line_numbers_table_template
-          @wrapped_in = :div
+          output.gsub!(/<\/div>\n/, '</div>')
+          output.wrap_in! line_numbers_table_template
+          output.wrapped_in = :div
 
         when :list
           raise NotImplementedError, 'The :list option is no longer available. Use :table.'
@@ -96,18 +104,7 @@ module Encoders
             [mode, [:table, :inline]]
         end
 
-        self
-      end
-
-      def line_count
-        line_count = count("\n")
-        position_of_last_newline = rindex(?\n)
-        if position_of_last_newline
-          after_last_newline = self[position_of_last_newline + 1 .. -1]
-          ends_with_newline = after_last_newline[/\A(?:<\/span>)*\z/]
-          line_count += 1 if not ends_with_newline
-        end
-        line_count
+        output
       end
 
     end

data/lib/coderay/encoders/html/output.rb

@@ -17,26 +17,13 @@ module Encoders
 
       class << self
 
-        # This makes Output look like a class.
-        #
-        # Example:
-        #
-        #  a = Output.new '<span class="co">Code</span>'
-        #  a.wrap! :page
-        def new string, css = CSS.new, element = nil
-          output = string.clone.extend self
-          output.wrapped_in = element
-          output.css = css
-          output
-        end
-
         # Raises an exception if an object that doesn't respond to to_str is extended by Output,
         # to prevent users from misuse. Use Module#remove_method to disable.
-        def extended o
+        def extended o  # :nodoc:
           warn "The Output module is intended to extend instances of String, not #{o.class}." unless o.respond_to? :to_str
         end
 
-        def make_stylesheet css, in_tag = false
+        def make_stylesheet css, in_tag = false  # :nodoc:
           sheet = css.stylesheet
           sheet = <<-CSS if in_tag
 <style type="text/css">
@@ -46,27 +33,13 @@ module Encoders
           sheet
         end
 
-        def page_template_for_css css
+        def page_template_for_css css  # :nodoc:
           sheet = make_stylesheet css
           PAGE.apply 'CSS', sheet
         end
 
-        # Define a new wrapper. This is meta programming.
-        def wrapper *wrappers
-          wrappers.each do |wrapper|
-            define_method wrapper do |*args|
-              wrap wrapper, *args
-            end
-            define_method "#{wrapper}!".to_sym do |*args|
-              wrap! wrapper, *args
-            end
-          end
-        end
-
       end
 
-      wrapper :div, :span, :page
-
       def wrapped_in? element
         wrapped_in == element
       end
@@ -76,16 +49,13 @@ module Encoders
       end
       attr_writer :wrapped_in
 
-      def wrap_in template
-        clone.wrap_in! template
-      end
-
       def wrap_in! template
         Template.wrap! self, template, 'CONTENT'
         self
       end
       
       def apply_title! title
+        # FIXME: This may change the output!
         self.sub!(/(<title>)(<\/title>)/) { $1 + title + $2 }
         self
       end
@@ -116,14 +86,12 @@ module Encoders
         self
       end
 
-      def wrap *args
-        clone.wrap!(*args)
-      end
-
       def stylesheet in_tag = false
         Output.make_stylesheet @css, in_tag
       end
 
+#-- don't include the templates in docu
+
       class Template < String  # :nodoc:
 
         def self.wrap! str, template, target
@@ -145,34 +113,24 @@ module Encoders
           end
         end
 
-        module Simple  # :nodoc:
-          def ` str  #` <-- for stupid editors
-            Template.new str
-          end
-        end
       end
 
-      extend Template::Simple
-
-#-- don't include the templates in docu
-
-      SPAN = `<span class="CodeRay"><%CONTENT%></span>`
+      SPAN = Template.new '<span class="CodeRay"><%CONTENT%></span>'
 
-      DIV = <<-`DIV`
+      DIV = Template.new <<-DIV
 <div class="CodeRay">
   <div class="code"><pre><%CONTENT%></pre></div>
 </div>
       DIV
 
-      TABLE = <<-`TABLE`
+      TABLE = Template.new <<-TABLE
 <table class="CodeRay"><tr>
   <td class="line_numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><%LINE_NUMBERS%></pre></td>
   <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }"><%CONTENT%></pre></td>
 </tr></table>
       TABLE
-      # title="double click to expand"
 
-      PAGE = <<-`PAGE`
+      PAGE = Template.new <<-PAGE
 <!DOCTYPE html>
 <html>
 <head>

data/lib/coderay/encoders/json.rb

@@ -1,4 +1,3 @@
-($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
   
@@ -18,20 +17,33 @@ module Encoders
   #  ]
   class JSON < Encoder
     
+    begin
+      require 'json'
+    rescue LoadError
+      begin
+        require 'rubygems'
+        gem "json#{'-jruby' if defined? JRUBY_VERSION}"
+        require 'json'
+      rescue LoadError
+        $stderr.puts "The JSON encoder needs the JSON library.\n" \
+          "Please gem install json."
+        raise
+      end
+    end
+    
     register_for :json
     FILE_EXTENSION = 'json'
     
   protected
     def setup options
-      begin
-        require 'json'
-      rescue LoadError
-        require 'rubygems'
-        require 'json'
-      end
       @out = []
     end
     
+    def finish options
+      @out.to_json
+    end
+    
+  public
     def text_token text, kind
       @out << { :type => 'text', :text => text, :kind => kind }
     end
@@ -52,39 +64,7 @@ module Encoders
       @out << { :type => 'block', :action => 'end_line', :kind => kind }
     end
     
-    def finish options
-      @out.to_json
-    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'
-$:.delete '.'
-require 'rubygems' if RUBY_VERSION < '1.9'
-
-class JSONEncoderTest < Test::Unit::TestCase
-  
-  def test_json_output
-    json = CodeRay.scan('puts "Hello world!"', :ruby).json
-    assert_equal [
-      {"type"=>"text", "text"=>"puts", "kind"=>"ident"},
-      {"type"=>"text", "text"=>" ", "kind"=>"space"},
-      {"type"=>"block", "action"=>"open", "kind"=>"string"},
-      {"type"=>"text", "text"=>"\"", "kind"=>"delimiter"},
-      {"type"=>"text", "text"=>"Hello world!", "kind"=>"content"},
-      {"type"=>"text", "text"=>"\"", "kind"=>"delimiter"},
-      {"type"=>"block", "action"=>"close", "kind"=>"string"},
-    ], JSON.load(json)
-  end
-  
-end

data/lib/coderay/encoders/lines_of_code.rb

@@ -1,4 +1,3 @@
-($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
   
@@ -23,70 +22,26 @@ module Encoders
     
   protected
     
+    def setup options
+      @out = 0
+    end
+    
     def compile tokens, options
       if scanner = tokens.scanner
         kinds_not_loc = scanner.class::KINDS_NOT_LOC
       else
-        warn 'Tokens have no scanner.' if $VERBOSE
+        warn "Tokens have no associated scanner, counting all nonempty lines." if $VERBOSE
         kinds_not_loc = CodeRay::Scanners::Scanner::KINDS_NOT_LOC
       end
       code = tokens.token_kind_filter :exclude => kinds_not_loc
-      @loc = code.text.scan(NON_EMPTY_LINE).size
+      @out = code.to_s.scan(NON_EMPTY_LINE).size
     end
     
     def finish options
-      @loc
+      @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 LinesOfCodeTest < Test::Unit::TestCase
-  
-  def test_creation
-    assert CodeRay::Encoders::LinesOfCode < CodeRay::Encoders::Encoder
-    filter = nil
-    assert_nothing_raised do
-      filter = CodeRay.encoder :loc
-    end
-    assert_kind_of CodeRay::Encoders::LinesOfCode, filter
-    assert_nothing_raised do
-      filter = CodeRay.encoder :lines_of_code
-    end
-    assert_kind_of CodeRay::Encoders::LinesOfCode, filter
-  end
-  
-  def test_lines_of_code
-    tokens = CodeRay.scan <<-RUBY, :ruby
-#!/usr/bin/env ruby
-
-# a minimal Ruby program
-puts "Hello world!"
-    RUBY
-    assert_equal 1, CodeRay::Encoders::LinesOfCode.new.encode_tokens(tokens)
-    assert_equal 1, tokens.lines_of_code
-    assert_equal 1, tokens.loc
-  end
-  
-  def test_filtering_block_tokens
-    tokens = CodeRay::Tokens.new
-    tokens.concat ["Hello\n", :world]
-    tokens.concat ["Hello\n", :space]
-    tokens.concat ["Hello\n", :comment]
-    assert_equal 2, CodeRay::Encoders::LinesOfCode.new.encode_tokens(tokens)
-    assert_equal 2, tokens.lines_of_code
-    assert_equal 2, tokens.loc
-  end
-  
-end

data/lib/coderay/encoders/null.rb

@@ -1,25 +1,18 @@
 module CodeRay
 module Encoders
-
+  
   # = Null Encoder
   #
   # Does nothing and returns an empty string.
   class Null < Encoder
-
+    
     register_for :null
-
-    # Defined for faster processing.
-    def to_proc
-      proc {}
-    end
-
-  protected
-
-    def token(*)
+    
+    def text_token text, kind
       # do nothing
     end
-
+    
   end
-
+  
 end
 end

data/lib/coderay/encoders/statistic.rb

@@ -1,4 +1,3 @@
-($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
 
@@ -24,37 +23,7 @@ module Encoders
       @tokens = tokens
       super
     end
-
-    def text_token text, kind
-      @real_token_count += 1 unless kind == :space
-      @type_stats[kind].count += 1
-      @type_stats[kind].size += text.size
-      @type_stats['TOTAL'].size += text.size
-      @type_stats['TOTAL'].count += 1
-    end
-
-    # TODO Hierarchy handling
-    def begin_group kind
-      block_token 'begin_group'
-    end
-
-    def end_group kind
-      block_token 'end_group'
-    end
-
-    def begin_line kind
-      block_token 'begin_line'
-    end
-
-    def end_line kind
-      block_token 'end_line'
-    end
-    
-    def block_token action
-      @type_stats['TOTAL'].count += 1
-      @type_stats[action].count += 1
-    end
-
+  
     STATS = <<-STATS  # :nodoc:
 
 Code Statistics
@@ -89,71 +58,39 @@ Token Types (%d):
       ]
     end
 
-  end
-
-end
-end
-
-if $0 == __FILE__
-  $VERBOSE = true
-  $: << File.join(File.dirname(__FILE__), '..')
-  eval DATA.read, nil, $0, __LINE__ + 4
-end
+  public
+    
+    def text_token text, kind
+      @real_token_count += 1 unless kind == :space
+      @type_stats[kind].count += 1
+      @type_stats[kind].size += text.size
+      @type_stats['TOTAL'].size += text.size
+      @type_stats['TOTAL'].count += 1
+    end
 
-__END__
-require 'test/unit'
+    # TODO Hierarchy handling
+    def begin_group kind
+      block_token 'begin_group'
+    end
 
-class StatisticEncoderTest < Test::Unit::TestCase
-  
-  def test_creation
-    assert CodeRay::Encoders::Statistic < CodeRay::Encoders::Encoder
-    stats = nil
-    assert_nothing_raised do
-      stats = CodeRay.encoder :statistic
+    def end_group kind
+      block_token 'end_group'
     end
-    assert_kind_of CodeRay::Encoders::Encoder, stats
-  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'
 
-Code Statistics
+    def begin_line kind
+      block_token 'begin_line'
+    end
 
-Tokens                  11
-  Non-Whitespace         4
-Bytes Total             20
+    def end_line kind
+      block_token 'end_line'
+    end
+    
+    def block_token action
+      @type_stats['TOTAL'].count += 1
+      @type_stats[action].count += 1
+    end
 
-Token Types (5):
-  type                     count     ratio    size (average)
--------------------------------------------------------------
-  TOTAL                       11  100.00 %     1.8
-  space                        3   27.27 %     3.0
-  begin_group                  1    9.09 %     0.0
-  begin_line                   1    9.09 %     0.0
-  content                      1    9.09 %     4.0
-  end_group                    1    9.09 %     0.0
-  end_line                     1    9.09 %     0.0
-  integer                      1    9.09 %     2.0
-  method                       1    9.09 %     2.0
-  operator                     1    9.09 %     3.0
-
-  DEBUG
-  
-  def test_filtering_text_tokens
-    assert_equal TEST_OUTPUT, CodeRay::Encoders::Statistic.new.encode_tokens(TEST_INPUT)
-    assert_equal TEST_OUTPUT, TEST_INPUT.statistic
   end
-  
-end
+
+end
+end