coderay 0.9.1 → 0.9.2

data/Rakefile

@@ -0,0 +1,35 @@
+require 'rake/rdoctask'
+
+ROOT = '.'
+LIB_ROOT = File.join ROOT, 'lib'
+EXTRA_RDOC_FILES = %w(lib/README FOLDERS)
+
+task :default => :test
+
+if File.directory? 'rake_tasks'
+  
+  # load rake tasks from subfolder
+  for task_file in Dir['rake_tasks/*.rake'].sort
+    load task_file
+  end
+  
+else
+  
+  # fallback tasks when rake_tasks folder is not present
+  desc 'Run CodeRay tests (basic)'
+  task :test do
+    ruby './test/functional/suite.rb'
+    ruby './test/functional/for_redcloth.rb'
+  end
+  
+  desc 'Generate documentation for CodeRay'
+  Rake::RDocTask.new :doc do |rd|
+    rd.title = 'CodeRay Documentation'
+    rd.main = 'lib/README'
+    rd.rdoc_files.add Dir['lib']
+    rd.rdoc_files.add 'lib/README'
+    rd.rdoc_files.add 'FOLDERS'
+    rd.rdoc_dir = 'doc'
+  end
+  
+end

data/lib/README

@@ -18,7 +18,7 @@ And with line numbers.
 * is what everybody should have on their website
 * solves all your problems and makes the girls run after you
 
-Version: 0.9.1
+Version: 0.9.2
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]
@@ -82,14 +82,18 @@ Please report errors in this documentation to <murphy rubychan de>.
 * Andreas Schwarz for finding out that CaseIgnoringWordList was not case
   ignoring! Such things really make you write tests.
 * closure for the first version of the Scheme scanner.
-* Stefan Walk for the first version of the JavaScript scanner.
-* Josh Goebel for another version of the JavaScript scanner and a Diff scanner.
+* Stefan Walk for the first version of the JavaScript and PHP scanners.
+* Josh Goebel for another version of the JavaScript scanner, a SQL and a Diff scanner.
 * Jonathan Younger for pointing out the licence confusion caused by wrong LICENSE file.
 * Jeremy Hinegardner for finding the shebang-on-empty-file bug in FileType.
 * Charles Oliver Nutter and Yehuda Katz for helping me benchmark CodeRay on JRuby.
 * Andreas Neuhaus for pointing out a markup bug in coderay/for_redcloth.
 * 0xf30fc7 for the FileType patch concerning Delphi file extensions.
 * The folks at redmine.org - thank you for using and fixing CodeRay!
+* Keith Pitt for his SQL scanners
+* Rob Aldred for the terminal encoder
+* Trans for pointing out $DEBUG dependencies
+* Flameeyes for finding that Term::ANSIColor was obsolete
 * matz and all Ruby gods and gurus
 * The inventors of: the computer, the internet, the true color display, HTML &
   CSS, VIM, Ruby, pizza, microwaves, guitars, scouting, programming, anime, 

data/lib/coderay.rb

@@ -14,7 +14,7 @@
 # 
 # Here's a fancy graphic to light up this gray docu:
 # 
-# http://rd.cYcnus.de/coderay/scheme.png
+# http://cycnus.de/raindark/coderay/scheme.png
 # 
 # == Documentation
 #
@@ -126,13 +126,15 @@
 # If you want to re-use scanners and encoders (because that is faster), see
 # CodeRay::Duo for the most convenient (and recommended) interface.
 module CodeRay
-
+  
+  $CODERAY_DEBUG ||= false
+  
   # Version: Major.Minor.Teeny[.Revision]
   # Major: 0 for pre-stable, 1 for stable
   # Minor: feature milestone
   # Teeny: development state, 0 for pre-release
   # Revision: Subversion Revision number (generated on rake gem:make)
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 
   require 'coderay/tokens'
   require 'coderay/token_classes'

data/lib/coderay/encoders/_map.rb

@@ -5,6 +5,7 @@ module Encoders
     :loc => :lines_of_code,
     :plain => :text,
     :stats => :statistic,
+    :terminal => :term,
     :tex => :latex
 
 end

data/lib/coderay/encoders/html.rb

@@ -264,7 +264,7 @@ module Encoders
         if @opened.empty?
           # nothing to close
         else
-          if $DEBUG and (@opened.size == 1 or @opened.last != type)
+          if $CODERAY_DEBUG and (@opened.size == 1 or @opened.last != type)
             raise 'Malformed token stream: Trying to close a token (%p) \
               that is not open. Open are: %p.' % [type, @opened[1..-1]]
           end
@@ -285,7 +285,7 @@ module Encoders
         if @opened.empty?
           # nothing to close
         else
-          if $DEBUG and (@opened.size == 1 or @opened.last != type)
+          if $CODERAY_DEBUG and (@opened.size == 1 or @opened.last != type)
             raise 'Malformed token stream: Trying to close a line (%p) \
               that is not open. Open are: %p.' % [type, @opened[1..-1]]
           end

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

@@ -27,7 +27,7 @@ module Encoders
         1.upto(styles.size) do |offset|
           break if style = cl[styles[offset .. -1]]
         end
-        $stderr.puts 'Style not found: %p' % [styles] if $DEBUG and style.empty?
+        # warn 'Style not found: %p' % [styles] if style.empty?
         return style
       end
 

data/lib/coderay/encoders/lines_of_code.rb

@@ -25,7 +25,7 @@ module Encoders
       if scanner = tokens.scanner
         kinds_not_loc = scanner.class::KINDS_NOT_LOC
       else
-        warn ArgumentError, 'Tokens have no scanner.' if $DEBUG
+        warn ArgumentError, 'Tokens have no scanner.' if $VERBOSE
         kinds_not_loc = CodeRay::Scanners::Scanner::KINDS_NOT_LOC
       end
       code = tokens.token_class_filter :exclude => kinds_not_loc

data/lib/coderay/encoders/term.rb

@@ -12,6 +12,7 @@ module CodeRay
       register_for :term
 
       TOKEN_COLORS = {
+        :annotation => '35',
         :attribute_name => '33',
         :attribute_name_fat => '33',
         :attribute_value => '31',
@@ -22,10 +23,13 @@ module CodeRay
         :class_variable => '36',
         :color => '32',
         :comment => '37',
+        :complex => '34',
         :constant => ['34', '4'],
+        :decoration => '35',
         :definition => '1;32',
         :directive => ['32', '4'],
         :doc => '46',
+        :doctype => '1;30',
         :doc_string => ['31', '4'],
         :entity => '33',
         :error => ['1;33', '41'],
@@ -34,9 +38,11 @@ module CodeRay
         :function => '1;34',
         :global_variable => '42',
         :hex => '1;36',
+        :important => '1;31',
         :include => '33',
         :integer => '1;34',
         :interpreted => '1;35',
+        :key => '35',
         :label => '1;4',
         :local_variable => '33',
         :oct => '1;35',
@@ -45,6 +51,7 @@ module CodeRay
         :pre_type => '1;30',
         :predefined => ['4', '1;34'],
         :preprocessor => '36',
+        :pseudo_class => '34',
         :regexp => {
           :content => '31',
           :delimiter => '1;29',
@@ -52,16 +59,32 @@ module CodeRay
           :function => '1;29'
         },
         :reserved => '1;31',
-        :shell => {:self => '42', :content => '1;29'},
-        :string => '32',
+        :shell => {
+          :self => '42',
+          :content => '1;29',
+          :delimiter => '37',
+        },
+        :string => {
+          :self => '32',
+          :modifier => '1;32',
+          :escape => '1;36',
+          :delimiter => '1;32',
+        },
         :symbol => '1;32',
         :tag => '34',
         :tag_fat => '1;34',
         :tag_special => ['34', '4'],
         :type => '1;34',
-        :variable => '34'
+        :value => '36',
+        :variable => '34',
+        :insert => '42',
+        :delete => '41',
+        :change => '44',
+        :head => '45',
       }
-      TOKEN_COLORS[:procedure] = TOKEN_COLORS[:method] = TOKEN_COLORS[:function]
+      TOKEN_COLORS[:keyword] = TOKEN_COLORS[:reserved]
+      TOKEN_COLORS[:method] = TOKEN_COLORS[:function]
+      TOKEN_COLORS[:imaginary] = TOKEN_COLORS[:complex]
       TOKEN_COLORS[:open] = TOKEN_COLORS[:close] = TOKEN_COLORS[:nesting_delimiter] = TOKEN_COLORS[:escape] = TOKEN_COLORS[:delimiter]
 
       protected
@@ -110,9 +133,7 @@ module CodeRay
           if @opened.empty?
             # nothing to close
           else
-            if (@subcolors || {})[:self]
-              @out << col(0)
-            end
+            @out << col(0) if (@subcolors || {})[:self]
             @subcolors = nil
             @opened.pop
           end

data/lib/coderay/for_redcloth.rb

@@ -13,10 +13,20 @@ module CodeRay
   module ForRedCloth
     
     def self.install
-      gem 'RedCloth', '>= 4.0.3' rescue nil
+      gem 'RedCloth', '>= 4.0.3' if defined? gem
       require 'redcloth'
       unless RedCloth::VERSION.to_s >= '4.0.3'
-        raise 'CodeRay.for_redcloth needs RedCloth version 4.0.3 or later.'
+        if defined? gem
+          raise 'CodeRay.for_redcloth needs RedCloth version 4.0.3 or later. ' +
+            "You have #{RedCloth::VERSION}. Please gem install RedCloth."
+        else
+          $".delete 'redcloth.rb'  # sorry, but it works
+          require 'rubygems'
+          return install  # retry
+        end
+      end
+      unless RedCloth::VERSION.to_s >= '4.2.2'
+        warn 'CodeRay.for_redcloth works best with RedCloth version 4.2.2 or later.'
       end
       RedCloth::TextileDoc.send :include, ForRedCloth::TextileDoc
       RedCloth::Formatters::HTML.module_eval do

data/lib/coderay/helpers/plugin.rb

@@ -214,7 +214,7 @@ protected
     mapfile = path_to '_map'
     if File.exist? mapfile
       require mapfile
-    elsif $DEBUG
+    elsif $VERBOSE
       warn 'no _map.rb found for %s' % name
     end
   end

data/lib/coderay/scanner.rb

@@ -69,11 +69,14 @@ module CodeRay
         def normify code
           code = code.to_s
           if code.respond_to? :force_encoding
+            debug, $DEBUG = $DEBUG, false
             begin
               code.force_encoding 'utf-8'
               code[/\z/]  # raises an ArgumentError when code contains a non-UTF-8 char
             rescue ArgumentError
               code.force_encoding 'binary'
+            ensure
+              $DEBUG = debug
             end
           end
           code.to_unix
@@ -200,7 +203,7 @@ module CodeRay
         return 0 if pos <= 0
         string = string()
         if string.respond_to?(:bytesize) && (defined?(@bin_string) || string.bytesize != string.size)
-          @bin_string ||= string.dup.force_encoding(:binary)
+          @bin_string ||= string.dup.force_encoding('binary')
           string = @bin_string
         end
         pos - (string.rindex(?\n, pos) || 0)

data/lib/coderay/scanners/c.rb

@@ -180,7 +180,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/cpp.rb

@@ -205,7 +205,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/css.rb

@@ -191,7 +191,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/debug.rb

@@ -32,8 +32,8 @@ module Scanners
             opened_tokens << kind
             match = :open
             
-          elsif scan(/ > /x)
-            kind = opened_tokens.pop
+          elsif !opened_tokens.empty? && scan(/ > /x)
+            kind = opened_tokens.pop || :error
             match = :close
             
           else
@@ -43,7 +43,7 @@ module Scanners
           end
                   
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/delphi.rb

@@ -130,7 +130,7 @@ module Scanners
         end
         
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens, state
         end

data/lib/coderay/scanners/diff.rb

@@ -86,7 +86,7 @@ module Scanners
         end
         
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/groovy.rb

@@ -123,6 +123,7 @@ module Scanners
                 next
               end
             end
+            kind = :operator
           
           elsif check(/[\d.]/)
             after_def = value_expected = false
@@ -238,7 +239,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/html.rb

@@ -159,7 +159,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens, state
         end

data/lib/coderay/scanners/java.rb

@@ -151,7 +151,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/java_script.rb

@@ -190,7 +190,7 @@ module Scanners
         end
 
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/json.rb

@@ -89,7 +89,7 @@ module Scanners
         end
         
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens
         end

data/lib/coderay/scanners/php.rb

@@ -212,6 +212,7 @@ module Scanners
         \.(?!\d)=? |      # dot that is not decimal point, string concatenation
         && | \|\| |       # logic
         :: | -> | => |    # scope, member, dictionary
+        \\(?!\n) |        # namespace
         \+\+ | -- |       # increment, decrement
         [,;?:()\[\]{}] |  # simple delimiters
         [-+*\/%&|^]=? |   # ordinary math, binary logic, assignment shortcuts
@@ -507,7 +508,7 @@ module Scanners
         end
         
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens, states
         end

data/lib/coderay/scanners/python.rb

@@ -260,7 +260,7 @@ module Scanners
         end
         
         match ||= matched
-        if $DEBUG and not kind
+        if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
             [[match, kind], line], tokens, state
         end