raldred-coderay 0.9.3431 → 0.9.3551

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.8.1
+Version: 0.9.0
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]

data/lib/coderay/encoder.rb

@@ -1,5 +1,3 @@
-require "stringio"
-
 module CodeRay
 
   # This module holds the Encoder class and its subclasses.
@@ -132,7 +130,7 @@ module CodeRay
       # By default, it calls text_token or block_token, depending on
       # whether +text+ is a String.
       def token text, kind
-        out =
+        encoded_token =
           if text.is_a? ::String
             text_token text, kind
           elsif text.is_a? ::Symbol
@@ -140,12 +138,18 @@ module CodeRay
           else
             raise 'Unknown token text type: %p' % text
           end
-        @out << out if defined?(@out) && @out
+        append_encoded_token_to_output encoded_token
       end
-
+      
+      def append_encoded_token_to_output encoded_token
+        @out << encoded_token if encoded_token && defined?(@out) && @out
+      end
+      
+      # Called for each text token ([text, kind]), where text is a String.
       def text_token text, kind
       end
-
+      
+      # Called for each block (non-text) token ([action, kind]), where action is a Symbol.
       def block_token action, kind
         case action
         when :open
@@ -160,6 +164,22 @@ module CodeRay
           raise 'unknown block action: %p' % action
         end
       end
+      
+      # Called for each block token at the start of the block ([:open, kind]).
+      def open_token kind
+      end
+      
+      # Called for each block token end of the block ([:close, kind]).
+      def close_token kind
+      end
+      
+      # Called for each line token block at the start of the line ([:begin_line, kind]).
+      def begin_line kind
+      end
+      
+      # Called for each line token block at the end of the line ([:end_line, kind]).
+      def end_line kind
+      end
 
       # Called with merged options after encoding starts.
       # The return value is the result of encoding, typically @out.

data/lib/coderay/encoders/div.rb

@@ -9,10 +9,9 @@ module Encoders
 
     register_for :div
 
-    DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge({
+    DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
       :css => :style,
-      :wrap => :div,
-    })
+      :wrap => :div
 
   end
 

data/lib/coderay/encoders/page.rb

@@ -9,11 +9,10 @@ module Encoders
 
     register_for :page
 
-    DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge({
+    DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
       :css => :class,
       :wrap => :page,
       :line_numbers => :table
-    })
 
   end
 

data/lib/coderay/encoders/span.rb

@@ -9,10 +9,9 @@ module Encoders
 
     register_for :span
 
-    DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge({
+    DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
       :css => :style,
-      :wrap => :span,
-    })
+      :wrap => :span
 
   end
 

data/lib/coderay/encoders/text.rb

@@ -14,16 +14,16 @@ module Encoders
 
   protected
     def setup options
-      @out = ''
+      super
       @sep = options[:separator]
     end
 
-    def token text, kind
-      @out << text + @sep if text.is_a? ::String
+    def text_token text, kind
+      text + @sep
     end
 
     def finish options
-      @out.chomp @sep
+      super.chomp @sep
     end
 
   end

data/lib/coderay/for_redcloth.rb

@@ -15,7 +15,9 @@ module CodeRay
     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'
+      unless RedCloth::VERSION.to_s >= '4.0.3'
+        raise 'CodeRay.for_redcloth needs RedCloth version 4.0.3 or later.'
+      end
       RedCloth::TextileDoc.send :include, ForRedCloth::TextileDoc
       RedCloth::Formatters::HTML.module_eval do
         def unescape(html)
@@ -30,6 +32,11 @@ module CodeRay
         undef_method :code, :bc_open, :bc_close, :escape_pre
         def code(opts)  # :nodoc:
           opts[:block] = true
+          if !opts[:lang] && RedCloth::VERSION.to_s >= '4.2.0'
+            # simulating pre-4.2 behavior
+            opts[:text].sub!(/\A\[(\w+)\]/, '')
+            opts[:lang] = $1
+          end
           if opts[:lang] && !filter_coderay
             require 'coderay'
             @in_bc ||= nil

data/lib/coderay/helpers/file_type.rb

@@ -85,6 +85,7 @@ module FileType
     'cpp' => :c,
     'css' => :css,
     'diff' => :diff,
+    'dpr' => :delphi,
     'groovy' => :groovy,
     'gvy' => :groovy,
     'h' => :c,
@@ -95,6 +96,7 @@ module FileType
     'js' => :java_script,
     'json' => :json,
     'mab' => :ruby,
+    'pas' => :delphi,
     'patch' => :diff,
     'php' => :php,
     'php3' => :php,
@@ -108,6 +110,7 @@ module FileType
     'rb' => :ruby,
     'rbw' => :ruby,
     'rhtml' => :rhtml,
+    'rxml' => :ruby,
     'sch' => :scheme,
     'sql' => :sql,
     'ss' => :scheme,

data/lib/coderay/helpers/plugin.rb

@@ -281,6 +281,14 @@ module Plugin
     plugin_host.register self, *ids
   end
 
+  def title title = nil
+    if title
+      @title = title.to_s
+    else
+      @title ||= name[/([^:]+)$/, 1]
+    end
+  end
+
   # The host for this Plugin class.
   def plugin_host host = nil
     if host and not host.is_a? PluginHost

data/lib/coderay/scanners/debug.rb

@@ -7,6 +7,7 @@ module Scanners
     include Streamable
     register_for :debug
     file_extension 'raydebug'
+    title 'CodeRay Token Dump'
 
   protected
     def scan_tokens tokens, options

data/lib/coderay/scanners/diff.rb

@@ -4,6 +4,7 @@ module Scanners
   class Diff < Scanner
     
     register_for :diff
+    title 'diff output'
     
     def scan_tokens tokens, options
       

data/lib/coderay/scanners/nitro_xhtml.rb

@@ -10,6 +10,7 @@ module Scanners
     include Streamable
     register_for :nitro_xhtml
     file_extension :xhtml
+    title 'Nitro XHTML'
 
     NITRO_RUBY_BLOCK = /
       <\?r

data/lib/coderay/scanners/plaintext.rb

@@ -4,6 +4,7 @@ module Scanners
   class Plaintext < Scanner
 
     register_for :plaintext, :plain
+    title 'Plain text'
     
     include Streamable
 

data/lib/coderay/scanners/python.rb

@@ -70,7 +70,7 @@ module Scanners
       [,;:()\[\]{}] |   # simple delimiters
       \/\/=? | \*\*=? | # special math
       [-+*\/%&|^]=? |   # ordinary math and binary logic
-      ~ |               # binary complement
+      [~`] |            # binary complement and inspection
       <<=? | >>=? | [<>=]=? | !=  # comparison and assignment
     /x
     
@@ -82,10 +82,16 @@ module Scanners
       h[delimiter] = / [^\\\n]+? (?= \\ | $ | #{Regexp.escape(delimiter)} ) /x
     end
     
+    DEF_NEW_STATE = WordList.new(:initial).
+      add(%w(def), :def_expected).
+      # add(%w(import from), :include_expected).
+      add(%w(class), :class_expected)
+    
     def scan_tokens tokens, options
       
       state = :initial
       string_delimiter = nil
+      string_raw = false
       import_clause = class_name_follows = last_token_dot = false
       unicode = string.respond_to?(:encoding) && string.encoding.name == 'UTF-8'
       
@@ -94,19 +100,41 @@ module Scanners
         kind = nil
         match = nil
         
-        case state
-        
-        when :initial
-          
-          if match = scan(/ [ \t]+ | \\?\n /x)
-            tokens << [match, :space]
-            next
-          
-          elsif match = scan(/ \# [^\n]* /mx)
-            tokens << [match, :comment]
+        if state == :string
+          if scan(STRING_DELIMITER_REGEXP[string_delimiter])
+            tokens << [matched, :delimiter]
+            tokens << [:close, :string]
+            state = :initial
             next
+          elsif string_delimiter.size == 3 && scan(/\n/)
+            kind = :content
+          elsif scan(STRING_CONTENT_REGEXP[string_delimiter])
+            kind = :content
+          elsif !string_raw && scan(/ \\ #{ESCAPE} /ox)
+            kind = :char
+          elsif scan(/ \\ #{UNICODE_ESCAPE} /ox)
+            kind = :char
+          elsif scan(/ \\ . /x)
+            kind = :content
+          elsif scan(/ \\ | $ /x)
+            tokens << [:close, :string]
+            kind = :error
+            state = :initial
+          else
+            raise_inspect "else case \" reached; %p not handled." % peek(1), tokens, state
+          end
+        
+        elsif match = scan(/ [ \t]+ | \\?\n /x)
+          tokens << [match, :space]
+          next
+        
+        elsif match = scan(/ \# [^\n]* /mx)
+          tokens << [match, :comment]
+          next
+        
+        elsif state == :initial
           
-          elsif scan(/#{OPERATOR}/o)
+          if scan(/#{OPERATOR}/o)
             kind = :operator
           
           elsif match = scan(/(u?r?|b)?("""|"|'''|')/i)
@@ -122,14 +150,20 @@ module Scanners
             state = :string
             kind = :delimiter
           
-          elsif match = (unicode && scan(/[[:alpha:]_]\w*/ux)) ||
-                                    scan(/[[:alpha:]_]\w*/x)
+          # TODO: backticks
+          
+          elsif match = scan(unicode ? /[[:alpha:]_]\w*/ux : /[[:alpha:]_]\w*/x)
             kind = IDENT_KIND[match]
-            # TODO: handle class, def, from, import
+            # TODO: from, import
             # TODO: keyword arguments
             kind = :ident if last_token_dot
-            kind = check(/\(/) ? :ident : :keyword if kind == :old_keyword
-            kind = :ident if kind == :predefined && check(/=/)
+            if kind == :old_keyword
+              kind = check(/\(/) ? :ident : :keyword
+            elsif kind == :predefined && check(/ *=/)
+              kind = :ident
+            elsif kind == :keyword
+              state = DEF_NEW_STATE[match]
+            end
           
           elsif scan(/@[a-zA-Z0-9_.]+[lL]?/)
             kind = :decorator
@@ -162,51 +196,36 @@ module Scanners
             kind = :error
           
           end
-        
-        when :string
-          if scan(STRING_DELIMITER_REGEXP[string_delimiter])
-            tokens << [matched, :delimiter]
-            tokens << [:close, :string]
-            state = :initial
-            next
-          elsif string_delimiter.size == 3 && scan(/\n/)
-            kind = :content
-          elsif scan(STRING_CONTENT_REGEXP[string_delimiter])
-            kind = :content
-          elsif !string_raw && scan(/ \\ #{ESCAPE} /ox)
-            kind = :char
-          elsif scan(/ \\ #{UNICODE_ESCAPE} /ox)
-            kind = :char
-          elsif scan(/ \\ . /x)
-            kind = :content
-          elsif scan(/ \\ | $ /x)
-            tokens << [:close, :string]
-            kind = :error
-            state = :initial
+            
+        elsif state == :def_expected
+          state = :initial
+          if match = scan(unicode ? /[[:alpha:]_]\w*/ux : /[[:alpha:]_]\w*/x)
+            kind = :method
           else
-            raise_inspect "else case \" reached; %p not handled." % peek(1), tokens, state
+            next
           end
         
-        when :include_expected
-          if scan(/<[^>\n]+>?|"[^"\n\\]*(?:\\.[^"\n\\]*)*"?/)
-            kind = :include
-            state = :initial
-          
-          elsif match = scan(/\s+/)
-            kind = :space
-            state = :initial if match.index ?\n
-          
+        elsif state == :class_expected
+          state = :initial
+          if match = scan(unicode ? /[[:alpha:]_]\w*/ux : /[[:alpha:]_]\w*/x)
+            kind = :class
           else
-            getch
-            kind = :error
+            next
+          end
           
+        elsif state == :include_expected
+          state = :initial
+          if match = scan(unicode ? /[[:alpha:]_]\w*/ux : /[[:alpha:]_]\w*/x)
+            kind = :include
+          else
+            next
           end
           
         else
           raise_inspect 'Unknown state', tokens, state
-        
+          
         end
-
+        
         match ||= matched
         if $DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %

data/lib/coderay/scanners/rhtml.rb

@@ -9,6 +9,7 @@ module Scanners
 
     include Streamable
     register_for :rhtml
+    title 'HTML.ERB'
 
     ERB_RUBY_BLOCK = /
       <%(?!%)[=-]?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: raldred-coderay
 version: !ruby/object:Gem::Version 
-  version: 0.9.3431
+  version: 0.9.3551
 platform: ruby
 authors: 
 - murphy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -90,6 +90,7 @@ files:
 - TODO
 has_rdoc: true
 homepage: http://coderay.rubychan.de
+licenses: 
 post_install_message: 
 rdoc_options: 
 - -SNw2
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: coderay
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: CodeRay is a fast syntax highlighter engine for many languages.