coderay 0.7.4.215 → 0.8.260

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

@@ -34,9 +34,12 @@ module Encoders
     private
 
       CSS_CLASS_PATTERN = /
-        ( (?:                # $1 = classes
-          \s* \. [-\w]+
-        )+ )
+        (                    # $1 = selectors
+          (?:
+            (?: \s* \. [-\w]+ )+
+            \s* ,?
+          )+
+        )
         \s* \{ \s*
         ( [^\}]+ )?          # $2 = style
         \s* \} \s*
@@ -44,12 +47,14 @@ module Encoders
         ( . )                # $3 = error
       /mx
       def parse stylesheet
-        stylesheet.scan CSS_CLASS_PATTERN do |classes, style, error|
+        stylesheet.scan CSS_CLASS_PATTERN do |selectors, style, error|
           raise "CSS parse error: '#{error.inspect}' not recognized" if error
-          styles = classes.scan(/[-\w]+/)
-          cl = styles.pop
-          @classes[cl] ||= Hash.new
-          @classes[cl][styles] = style.to_s.strip
+          for selector in selectors.split(',')
+            classes = selector.scan(/[-\w]+/)
+            cl = classes.pop
+            @classes[cl] ||= Hash.new
+            @classes[cl][classes] = style.to_s.strip.delete(' ').chomp(';')
+          end
         end
       end
 

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

@@ -51,12 +51,12 @@ module Encoders
         case mode
         when :inline
           max_width = (start + line_count).to_s.size
-          line = start
+          line_number = start
           gsub!(/^/) do
-            line_number = bolding.call line
-            indent = ' ' * (max_width - line.to_s.size)
-            res = "<span class=\"no\">#{indent}#{line_number}</span> "
-            line += 1
+            line_number_text = bolding.call line_number
+            indent = ' ' * (max_width - line_number.to_s.size)  # TODO: Optimize (10^x)
+            res = "<span class=\"no\">#{indent}#{line_number_text}</span> "
+            line_number += 1
             res
           end
 
@@ -71,6 +71,7 @@ module Encoders
           line_numbers.gsub!(/\n/) { "<tt>\n</tt>" }
 
           line_numbers_table_tpl = TABLE.apply('LINE_NUMBERS', line_numbers)
+          gsub!(/<\/div>\n/) { '</div>' }
           gsub!(/\n/) { "<tt>\n</tt>" }
           wrap_in! line_numbers_table_tpl
           @wrapped_in = :div
@@ -90,8 +91,9 @@ module Encoders
             end
             close = '</span>' * opened_tags.size
 
-            "<li>#{open}#{line}#{close}</li>"
+            "<li>#{open}#{line}#{close}</li>\n"
           end
+          chomp!("\n")
           wrap_in! LIST
           @wrapped_in = :div
 

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

@@ -166,7 +166,9 @@ module Encoders
       # title="double click to expand"
 
       LIST = <<-`LIST`
-<ol class="CodeRay"><%CONTENT%></ol>
+<ol class="CodeRay">
+<%CONTENT%>
+</ol>
       LIST
 
       PAGE = <<-`PAGE`

data/lib/coderay/encoders/statistic.rb

@@ -28,17 +28,13 @@ module Encoders
       @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 block_token action, kind
-      #@content_type = kind
-      @type_stats['open/close'].count += 1
-    end
-
-    def token text, kind
-      super
       @type_stats['TOTAL'].count += 1
+      @type_stats['open/close'].count += 1
     end
 
     STATS = <<-STATS

data/lib/coderay/encoders/text.rb

@@ -14,13 +14,12 @@ module Encoders
 
   protected
     def setup options
-      super
+      @out = ''
       @sep = options[:separator]
     end
 
     def token text, kind
-      return unless text.respond_to? :to_str
-      @out << text + @sep
+      @out << text + @sep if text.is_a? ::String
     end
 
     def finish options

data/lib/coderay/encoders/tokens.rb

@@ -33,9 +33,9 @@ module Encoders
 
     FILE_EXTENSION = 'tok'
 
-    protected
-    def token *args
-      @out << CodeRay::Tokens.write_token(*args)
+  protected
+    def token text, kind
+      @out << CodeRay::Tokens.write_token(text, kind)
     end
 
   end

data/lib/coderay/encoders/xml.rb

@@ -22,7 +22,6 @@ module Encoders
   protected
 
     def setup options
-      @out = ''
       @doc = REXML::Document.new
       @doc << REXML::XMLDecl.new
       @tab_width = options[:tab_width]
@@ -33,7 +32,7 @@ module Encoders
       @doc.write @out, options[:pretty], options[:transitive], true
       @out
     end
-
+    
     def text_token text, kind
       if kind == :space
         token = @node

data/lib/coderay/for_redcloth.rb

@@ -0,0 +1,72 @@
+module CodeRay  # :nodoc:
+  
+  # A little hack to enable CodeRay highlighting in RedCloth.
+  # 
+  # Usage:
+  #  require 'coderay'
+  #  require 'coderay/for_redcloth'
+  #  RedCloth.new('@[ruby]puts "Hello, World!"@').to_html
+  # 
+  # Make sure you have RedCloth 4.0.3 activated, for example by calling
+  #  require 'rubygems'
+  # before RedCloth is loaded and before calling CodeRay.for_redcloth.
+  module ForRedCloth
+    
+    def self.install
+      gem 'RedCloth', '>= 4.0.3' rescue nil
+      require 'redcloth'
+      raise 'CodeRay.for_redcloth needs RedCloth 4.0.3 or later.' unless RedCloth::VERSION.to_s >= '4.0.3'
+      RedCloth::TextileDoc.send :include, ForRedCloth::TextileDoc
+      RedCloth::Formatters::HTML.module_eval do
+        def unescape(html)
+          replacements = {
+            '&' => '&',
+            '"' => '"',
+            '>' => '>',
+            '&lt;' => '<',
+          }
+          html.gsub(/&(?:amp|quot|[gl]t);/) { |entity| replacements[entity] }
+        end
+        undef_method :code, :bc_open, :bc_close, :escape_pre
+        def code(opts)  # :nodoc:
+          opts[:block] = true
+          if opts[:lang] && !filter_coderay
+            require 'coderay'
+            @in_bc ||= nil
+            format = @in_bc ? :div : :span
+            highlighted_code = CodeRay.encode opts[:text], opts[:lang], format, :stream => true
+            highlighted_code.sub!(/\A<(span|div)/) { |m| m + pba(@in_bc || opts) }
+            highlighted_code = unescape(highlighted_code) unless @in_bc
+            highlighted_code
+          else
+            "<code#{pba(opts)}>#{opts[:text]}</code>"
+          end
+        end
+        def bc_open(opts)  # :nodoc:
+          opts[:block] = true
+          @in_bc = opts
+          opts[:lang] ? '' : "<pre#{pba(opts)}>"
+        end
+        def bc_close(opts)  # :nodoc:
+          @in_bc = nil
+          opts[:lang] ? '' : "</pre>\n"
+        end
+        def escape_pre(text)
+          if @in_bc ||= nil
+            text
+          else
+            html_esc(text, :html_escape_preformatted)
+          end
+        end
+      end
+    end
+
+    module TextileDoc  # :nodoc:
+      attr_accessor :filter_coderay
+    end
+    
+  end
+  
+end
+
+CodeRay::ForRedCloth.install

data/lib/coderay/helpers/file_type.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+module CodeRay
+
 # = FileType
 #
 # A simple filetype recognizer.
@@ -31,12 +34,12 @@ module FileType
     # That means you can get filetypes from files that don't exist.
     def [] filename, read_shebang = false
       name = File.basename filename
-      ext = File.extname name
-      ext.sub!(/^\./, '')  # delete the leading dot
+      ext = File.extname(name).sub(/^\./, '')  # from last dot, delete the leading dot
+      ext2 = filename[/\.(.*)/, 1]  # from first dot
 
       type =
-        TypeFromExt[ext] ||
         TypeFromExt[ext.downcase] ||
+        (TypeFromExt[ext2.downcase] if ext2) ||
         TypeFromName[name] ||
         TypeFromName[name.downcase]
       type ||= shebang(filename) if read_shebang
@@ -47,8 +50,11 @@ module FileType
     def shebang filename
       begin
         File.open filename, 'r' do |f|
-          first_line = f.gets
-          first_line[TypeFromShebang]
+          if first_line = f.gets
+            if type = first_line[TypeFromShebang]
+              type.to_sym
+            end
+          end
         end
       rescue IOError
         nil
@@ -78,15 +84,20 @@ module FileType
     'rb' => :ruby,
     'rbw' => :ruby,
     'rake' => :ruby,
+    'mab' => :ruby,
     'cpp' => :c,
     'c' => :c,
     'h' => :c,
+    'js' => :java_script,
     'xml' => :xml,
     'htm' => :html,
     'html' => :html,
     'xhtml' => :xhtml,
     'raydebug' => :debug,
     'rhtml' => :rhtml,
+    'html.erb' => :rhtml,
+    'ss' => :scheme,
+    'sch' => :scheme,
     'yaml' => :yaml,
     'yml' => :yaml,
   }
@@ -100,17 +111,20 @@ module FileType
 
 end
 
+end
+
 if $0 == __FILE__
   $VERBOSE = true
-  eval DATA.read, nil, $0, __LINE__+4
+  eval DATA.read, nil, $0, __LINE__ + 4
 end
 
 __END__
-
 require 'test/unit'
 
 class TC_FileType < Test::Unit::TestCase
-
+  
+  include CodeRay
+  
   def test_fetch
     assert_raise FileType::UnknownFileType do
       FileType.fetch ''
@@ -161,6 +175,7 @@ class TC_FileType < Test::Unit::TestCase
     assert_equal :xhtml, FileType['test.xhtml']
     assert_equal :xhtml, FileType['test.html.xhtml']
     assert_equal :rhtml, FileType['_form.rhtml']
+    assert_equal :rhtml, FileType['_form.html.erb']
   end
 
   def test_yaml
@@ -170,7 +185,7 @@ class TC_FileType < Test::Unit::TestCase
     assert_not_equal :yaml, FileType['YAML']
   end
 
-  def test_shebang
+  def test_no_shebang
     dir = './test'
     if File.directory? dir
       Dir.chdir dir do
@@ -178,5 +193,19 @@ class TC_FileType < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_shebang_empty_file
+    require 'tmpdir'
+    tmpfile = File.join(Dir.tmpdir, 'bla')
+    File.open(tmpfile, 'w') { }  # touch
+    assert_equal nil, FileType[tmpfile]
+  end
+  
+  def test_shebang
+    require 'tmpdir'
+    tmpfile = File.join(Dir.tmpdir, 'bla')
+    File.open(tmpfile, 'w') { |f| f.puts '#!/usr/bin/env ruby' }
+    assert_equal :ruby, FileType[tmpfile, true]
+  end
 
 end

data/lib/coderay/helpers/gzip_simple.rb

@@ -46,6 +46,7 @@ module GZip
   end
 end
 
+
 # String extensions to use the GZip module.
 #
 # The methods gzip and gunzip provide an even more simple

data/lib/coderay/helpers/plugin.rb

@@ -1,6 +1,8 @@
+module CodeRay
+  
 # = PluginHost
 #
-# $Id: plugin.rb 188 2006-10-17 11:18:01Z murphy $
+# $Id: plugin.rb 255 2008-09-21 16:25:44Z murphy $
 #
 # A simple subclass plugin system.
 #
@@ -20,7 +22,7 @@
 #
 #    Generators[:fancy]  #-> FancyGenerator
 #    # or
-#    require_plugin 'Generators/fancy'
+#    CodeRay.require_plugin 'Generators/fancy'
 module PluginHost
 
   # Raised if Encoders::[] fails because:
@@ -133,9 +135,13 @@ module PluginHost
   #    map :navy => :dark_blue
   #    default :gray
   #  end
-  def default id
-    id = validate_id id
-    plugin_hash[nil] = id
+  def default id = nil
+    if id
+      id = validate_id id
+      plugin_hash[nil] = id
+    else
+      plugin_hash[nil]
+    end
   end
 
   # Every plugin must register itself for one or more
@@ -310,17 +316,18 @@ module Plugin
 
 end
 
-
 # Convenience method for plugin loading.
 # The syntax used is:
 #
-#  require_plugin '<Host ID>/<Plugin ID>'
+#  CodeRay.require_plugin '<Host ID>/<Plugin ID>'
 #
 # Returns the loaded plugin.
-def require_plugin path
+def self.require_plugin path
   host_id, plugin_id = path.split '/', 2
   host = PluginHost.host_by_id(host_id)
   raise PluginHost::HostNotFound,
     "No host for #{host_id.inspect} found." unless host
   host.load plugin_id
 end
+
+end

data/lib/coderay/helpers/word_list.rb

@@ -1,3 +1,5 @@
+module CodeRay
+
 # = WordList
 # 
 # <b>A Hash subclass designed for mapping word lists to token types.</b>
@@ -117,3 +119,5 @@ class CaseIgnoringWordList < WordList
   end
 
 end
+
+end

data/lib/coderay/scanner.rb

@@ -4,7 +4,7 @@ module CodeRay
 
   # = Scanners
   #
-  # $Id: scanner.rb 174 2006-10-15 09:08:50Z murphy $
+  # $Id: scanner.rb 253 2008-09-16 22:07:44Z murphy $
   #
   # This module holds the Scanner class and its subclasses.
   # For example, the Ruby scanner is named CodeRay::Scanners::Ruby
@@ -66,7 +66,17 @@ module CodeRay
         end
 
         def normify code
-          code = code.to_s.to_unix
+          code = code.to_s
+          code.force_encoding 'binary' if code.respond_to? :force_encoding
+          code.to_unix
+        end
+        
+        def file_extension extension = nil
+          if extension
+            @file_extension = extension.to_s
+          else
+            @file_extension ||= plugin_id.to_s
+          end
         end
 
       end
@@ -117,9 +127,6 @@ module CodeRay
         setup
       end
 
-      # More mnemonic accessor name for the input string.
-      alias code string
-
       def reset
         super
         reset_instance
@@ -131,6 +138,10 @@ module CodeRay
         reset_instance
       end
 
+      # More mnemonic accessor name for the input string.
+      alias code string
+      alias code= string=
+
       # Scans the code and returns all tokens in a Tokens object.
       def tokenize new_string=nil, options = {}
         options = @options.merge(options)
@@ -148,6 +159,11 @@ module CodeRay
       def tokens
         @cached_tokens ||= tokenize
       end
+      
+      # Whether the scanner is in streaming mode.
+      def streaming?
+        !!@options[:stream]
+      end
 
       # Traverses the tokens.
       def each &block
@@ -195,7 +211,7 @@ module CodeRay
         raise ScanError, <<-EOE % [
 
 
-***ERROR in %s: %s
+***ERROR in %s: %s (after %d tokens)
 
 tokens:
 %s
@@ -211,13 +227,14 @@ surrounding code:
 ***ERROR***
 
         EOE
-        File.basename(caller[0]),
-        msg,
-        tokens.last(10).map { |t| t.inspect }.join("\n"),
-        line, pos,
-        matched, state, bol?, eos?,
-        string[pos-ambit,ambit],
-        string[pos,ambit],
+          File.basename(caller[0]),
+          msg,
+          tokens.size,
+          tokens.last(10).map { |t| t.inspect }.join("\n"),
+          line, pos,
+          matched, state, bol?, eos?,
+          string[pos-ambit,ambit],
+          string[pos,ambit],
         ]
       end