coderay 1.0.0 → 1.0.0.598.pre

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

@@ -20,7 +20,7 @@ module Encoders
         parse style::TOKEN_COLORS
       end
 
-      def get_style styles
+      def [] *styles
         cl = @classes[styles.first]
         return '' unless cl
         style = ''
@@ -44,7 +44,7 @@ module Encoders
         ( [^\}]+ )?          # $2 = style
         \s* \} \s*
       |
-        ( [^\n]+ )           # $3 = error
+        ( . )                # $3 = error
       /mx
       def parse stylesheet
         stylesheet.scan CSS_CLASS_PATTERN do |selectors, style, error|
@@ -63,3 +63,8 @@ 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 Numbering  # :nodoc:
+    module Output  # :nodoc:
 
-      def self.number! output, mode = :table, options = {}
+      def number! 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 }  # :to_s.to_proc in Ruby 1.8.7+
+            proc { |line| line.to_s }
           end
         
         bold_every = options[:bold_every]
@@ -56,45 +56,37 @@ 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
-          nesting = []
-          output.gsub!(/^.*$\n?/) do |line|
+          opened_tags = []
+          gsub!(/^.*$\n?/) do |line|
             line.chomp!
-            open = nesting.join
+            open = opened_tags.join
             line.scan(%r!<(/)?span[^>]*>?!) do |close,|
               if close
-                nesting.pop
+                opened_tags.pop
               else
-                nesting << $&
+                opened_tags << $&
               end
             end
-            close = '</span>' * nesting.size
+            close = '</span>' * opened_tags.size
             
             line_number_text = bolding.call line_number
             indent = ' ' * (max_width - line_number.to_s.size)  # TODO: Optimize (10^x)
             line_number += 1
-            "<span class=\"line-numbers\">#{indent}#{line_number_text}</span>#{open}#{line}#{close}\n"
+            "<span class=\"no\">#{indent}#{line_number_text}</span>#{open}#{line}#{close}\n"
           end
 
         when :table
-          line_numbers = (start ... start + line_count).map(&bolding).join("\n")
+          line_numbers = (start ... start + line_count).to_a.map(&bolding).join("\n")
           line_numbers << "\n"
-          line_numbers_table_template = Output::TABLE.apply('LINE_NUMBERS', line_numbers)
 
-          output.gsub!(/<\/div>\n/, '</div>')
-          output.wrap_in! line_numbers_table_template
-          output.wrapped_in = :div
+          line_numbers_table_template = TABLE.apply('LINE_NUMBERS', line_numbers)
+          gsub!(/<\/div>\n/) { '</div>' }
+          wrap_in! line_numbers_table_template
+          @wrapped_in = :div
 
         when :list
           raise NotImplementedError, 'The :list option is no longer available. Use :table.'
@@ -104,7 +96,18 @@ module Encoders
             [mode, [:table, :inline]]
         end
 
-        output
+        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
       end
 
     end

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

@@ -3,29 +3,42 @@ module Encoders
 
   class HTML
 
-    # This module is included in the output String of the HTML Encoder.
+    # This module is included in the output String from thew HTML Encoder.
     #
     # It provides methods like wrap, div, page etc.
     #
     # Remember to use #clone instead of #dup to keep the modules the object was
     # extended with.
     #
-    # TODO: Rewrite this without monkey patching.
+    # TODO: more doc.
     module Output
 
       attr_accessor :css
 
       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  # :nodoc:
+        def extended o
           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  # :nodoc:
+        def make_stylesheet css, in_tag = false
           sheet = css.stylesheet
-          sheet = <<-'CSS' if in_tag
+          sheet = <<-CSS if in_tag
 <style type="text/css">
 #{sheet}
 </style>
@@ -33,13 +46,27 @@ module Encoders
           sheet
         end
 
-        def page_template_for_css css  # :nodoc:
+        def page_template_for_css css
           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
@@ -49,6 +76,10 @@ 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
@@ -85,12 +116,14 @@ 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
@@ -112,31 +145,41 @@ module Encoders
           end
         end
 
+        module Simple  # :nodoc:
+          def ` str  #` <-- for stupid editors
+            Template.new str
+          end
+        end
       end
 
-      SPAN = Template.new '<span class="CodeRay"><%CONTENT%></span>'
+      extend Template::Simple
+
+#-- don't include the templates in docu
+
+      SPAN = `<span class="CodeRay"><%CONTENT%></span>`
 
-      DIV = Template.new <<-DIV
+      DIV = <<-`DIV`
 <div class="CodeRay">
   <div class="code"><pre><%CONTENT%></pre></div>
 </div>
       DIV
 
-      TABLE = Template.new <<-TABLE
+      TABLE = <<-`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><%CONTENT%></pre></td>
+  <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 = Template.new <<-PAGE
+      PAGE = <<-`PAGE`
 <!DOCTYPE html>
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title></title>
   <style type="text/css">
-.CodeRay .line-numbers a {
+.CodeRay .line_numbers a, .CodeRay .no a {
   text-decoration: inherit;
   color: inherit;
 }

data/lib/coderay/encoders/json.rb

@@ -1,3 +1,4 @@
+($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
   
@@ -17,67 +18,73 @@ module Encoders
   #  ]
   class JSON < Encoder
     
-    begin
-      require 'json'
-    rescue LoadError
-      begin
-        require 'rubygems' unless defined? Gem
-        gem 'json'
-        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
-      super
-      
-      @first = true
-      @out << '['
-    end
-    
-    def finish options
-      @out << ']'
-    end
-    
-    def append data
-      if @first
-        @first = false
-      else
-        @out << ','
+      begin
+        require 'json'
+      rescue LoadError
+        require 'rubygems'
+        require 'json'
       end
-      
-      @out << data.to_json
+      @out = []
     end
     
-  public
     def text_token text, kind
-      append :type => 'text', :text => text, :kind => kind
+      @out << { :type => 'text', :text => text, :kind => kind }
     end
     
     def begin_group kind
-      append :type => 'block', :action => 'open', :kind => kind
+      @out << { :type => 'block', :action => 'open', :kind => kind }
     end
     
     def end_group kind
-      append :type => 'block', :action => 'close', :kind => kind
+      @out << { :type => 'block', :action => 'close', :kind => kind }
     end
     
     def begin_line kind
-      append :type => 'block', :action => 'begin_line', :kind => kind
+      @out << { :type => 'block', :action => 'begin_line', :kind => kind }
     end
     
     def end_line kind
-      append :type => 'block', :action => 'end_line', :kind => kind
+      @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,3 +1,4 @@
+($:.unshift '../..'; require 'coderay') unless defined? CodeRay
 module CodeRay
 module Encoders
   
@@ -14,7 +15,7 @@ module Encoders
   # 
   # A Scanner class should define the token kinds that are not code in the
   # KINDS_NOT_LOC constant, which defaults to [:comment, :doctype].
-  class LinesOfCode < TokenKindFilter
+  class LinesOfCode < Encoder
     
     register_for :lines_of_code
     
@@ -22,24 +23,70 @@ module Encoders
     
   protected
     
-    def setup options
-      if scanner
+    def compile tokens, options
+      if scanner = tokens.scanner
         kinds_not_loc = scanner.class::KINDS_NOT_LOC
       else
-        warn "Tokens have no associated scanner, counting all nonempty lines." if $VERBOSE
+        warn 'Tokens have no scanner.' if $VERBOSE
         kinds_not_loc = CodeRay::Scanners::Scanner::KINDS_NOT_LOC
       end
-      
-      options[:exclude] = kinds_not_loc
-      
-      super options
+      code = tokens.token_kind_filter :exclude => kinds_not_loc
+      @loc = code.text.scan(NON_EMPTY_LINE).size
     end
     
     def finish options
-      output @tokens.text.scan(NON_EMPTY_LINE).size
+      @loc
     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