coderay 1.0.0.835rc1 → 1.0.0.846rc2

data/bin/coderay

@@ -2,7 +2,7 @@
 require 'coderay'
 
 $options, args = ARGV.partition { |arg| arg[/^-[hv]$|--\w+/] }
-subcommand = args.detect { |arg| arg[/^\w/] }
+subcommand = args.first if /^\w/ === args.first
 subcommand = nil if subcommand && File.exist?(subcommand)
 args.delete subcommand
 
@@ -105,7 +105,7 @@ when 'highlight', nil
     if output_file
       output_filetype ||= CodeRay::FileType[output_file]
     else
-      output_filetype ||= :term
+      output_filetype ||= :terminal
     end
     
     output_filetype = :page if output_filetype.to_s == 'html'

data/lib/coderay/helpers/file_type.rb

@@ -88,6 +88,7 @@ module CodeRay
       'groovy'   => :groovy,
       'gvy'      => :groovy,
       'h'        => :c,
+      'haml'     => :haml,
       'htm'      => :page,
       'html'     => :page,
       'html.erb' => :erb,

data/lib/coderay/scanners/diff.rb

@@ -69,11 +69,8 @@ module Scanners
             next unless match = scan(/.+/)
             encoder.text_token match, :plain
             state = :added
-          elsif match = scan(/\\ /)
-            encoder.begin_line line_kind = :change
-            encoder.text_token match, :change
-            next unless match = scan(/.+/)
-            encoder.text_token match, :plain
+          elsif match = scan(/\\ .*/)
+            encoder.text_token match, :comment
           elsif match = scan(/@@(?>[^@\n]*)@@/)
             content_scanner.state = :initial unless match?(/\n\+/)
             content_scanner_entry_state = nil

data/lib/coderay/scanners/erb.rb

@@ -13,15 +13,15 @@ module Scanners
     KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
     
     ERB_RUBY_BLOCK = /
-      <%(?!%)[=-]?
-      (?>
+      (<%(?!%)[-=\#]?)
+      ((?>
         [^\-%]*    # normal*
         (?>        # special
           (?: %(?!>) | -(?!%>) )
           [^\-%]*  # normal*
         )*
-      )
-      (?: -?%> )?
+      ))
+      ((?: -?%> )?)
     /x  # :nodoc:
     
     START_OF_ERB = /
@@ -48,21 +48,25 @@ module Scanners
           @html_scanner.tokenize match, :tokens => encoder
           
         elsif match = scan(/#{ERB_RUBY_BLOCK}/o)
-          start_tag = match[/\A<%[-=#]?/]
-          end_tag = match[/-?%?>?\z/]
+          start_tag = self[1]
+          code = self[2]
+          end_tag = self[3]
+          
           encoder.begin_group :inline
           encoder.text_token start_tag, :inline_delimiter
-          code = match[start_tag.size .. -1 - end_tag.size]
-          if start_tag[/\A<%#/]
+          
+          if start_tag == '<%#'
             encoder.text_token code, :comment
           else
             @ruby_scanner.tokenize code, :tokens => encoder
           end unless code.empty?
+          
           encoder.text_token end_tag, :inline_delimiter unless end_tag.empty?
           encoder.end_group :inline
           
         else
           raise_inspect 'else-case reached!', encoder
+          
         end
         
       end

data/lib/coderay/scanners/haml.rb

@@ -0,0 +1,168 @@
+module CodeRay
+module Scanners
+  
+  load :ruby
+  load :html
+  load :java_script
+  
+  class HAML < Scanner
+    
+    register_for :haml
+    title 'HAML Template'
+    
+    KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
+    
+  protected
+    
+    def setup
+      super
+      @ruby_scanner          = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true
+      @embedded_ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true, :state => @ruby_scanner.interpreted_string_state
+      @html_scanner          = CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true
+    end
+    
+    def scan_tokens encoder, options
+      
+      match = nil
+      code = ''
+      
+      until eos?
+        
+        if bol?
+          if match = scan(/!!!.*/)
+            encoder.text_token match, :doctype
+            next
+          end
+          
+          if match = scan(/(?>( *)(\/(?!\[if)|-\#|:javascript|:ruby|:\w+) *)(?=\n)/)
+            encoder.text_token match, :comment
+            
+            code = self[2]
+            if match = scan(/(?:\n+#{self[1]} .*)+/)
+              case code
+              when '/', '-#'
+                encoder.text_token match, :comment
+              when ':javascript'
+                # TODO: recognize #{...} snippets inside JavaScript
+                @java_script_scanner ||= CodeRay.scanner :java_script, :tokens => @tokens, :keep_tokens => true
+                @java_script_scanner.tokenize match, :tokens => encoder
+              when ':ruby'
+                @ruby_scanner.tokenize match, :tokens => encoder
+              when /:\w+/
+                encoder.text_token match, :comment
+              else
+                raise 'else-case reached: %p' % [code]
+              end
+            end
+          end
+          
+          if match = scan(/ +/)
+            encoder.text_token match, :space
+          end
+          
+          if match = scan(/\/.*/)
+            encoder.text_token match, :comment
+            next
+          end
+          
+          if match = scan(/\\/)
+            encoder.text_token match, :plain
+            if match = scan(/.+/)
+              @html_scanner.tokenize match, :tokens => encoder
+            end
+            next
+          end
+          
+          tag = false
+          
+          if match = scan(/%[\w:]+\/?/)
+            encoder.text_token match, :tag
+            # if match = scan(/( +)(.+)/)
+            #   encoder.text_token self[1], :space
+            #   @embedded_ruby_scanner.tokenize self[2], :tokens => encoder
+            # end
+            tag = true
+          end
+          
+          while match = scan(/([.#])[-\w]*\w/)
+            encoder.text_token match, self[1] == '#' ? :constant : :class
+            tag = true
+          end
+          
+          if tag && match = scan(/(\()([^)]+)?(\))?/)
+            # TODO: recognize title=@title, class="widget_#{@widget.number}"
+            encoder.text_token self[1], :plain
+            @html_scanner.tokenize self[2], :tokens => encoder, :state => :attribute if self[2]
+            encoder.text_token self[3], :plain if self[3]
+          end
+          
+          if tag && match = scan(/\{/)
+            encoder.text_token match, :plain
+            
+            code = ''
+            level = 1
+            while true
+              code << scan(/([^\{\},\n]|, *\n?)*/)
+              case match = getch
+              when '{'
+                level += 1
+                code << match
+              when '}'
+                level -= 1
+                if level > 0
+                  code << match
+                else
+                  break
+                end
+              when "\n", ",", nil
+                break
+              end
+            end
+            @ruby_scanner.tokenize code, :tokens => encoder unless code.empty?
+            
+            encoder.text_token match, :plain if match
+          end
+          
+          if tag && match = scan(/(\[)([^\]\n]+)?(\])?/)
+            encoder.text_token self[1], :plain
+            @ruby_scanner.tokenize self[2], :tokens => encoder if self[2]
+            encoder.text_token self[3], :plain if self[3]
+          end
+          
+          if tag && match = scan(/\//)
+            encoder.text_token match, :tag
+          end
+          
+          if scan(/(>?<?[-=]|[&!]=|(& |!)|~)( *)([^,\n\|]+(?:(, *|\|(?=.|\n.*\|$))\n?[^,\n\|]*)*)?/)
+            encoder.text_token self[1] + self[3], :plain
+            if self[4]
+              if self[2]
+                @embedded_ruby_scanner.tokenize self[4], :tokens => encoder
+              else
+                @ruby_scanner.tokenize self[4], :tokens => encoder
+              end
+            end
+          elsif match = scan(/((?:<|><?)(?![!?\/\w]))?(.+)?/)
+            encoder.text_token self[1], :plain if self[1]
+            # TODO: recognize #{...} snippets
+            @html_scanner.tokenize self[2], :tokens => encoder if self[2]
+          end
+          
+        elsif match = scan(/.+/)
+          @html_scanner.tokenize match, :tokens => encoder
+          
+        end
+        
+        if match = scan(/\n/)
+          encoder.text_token match, :space
+        end
+      end
+      
+      encoder
+      
+    end
+    
+  end
+  
+end
+end

data/lib/coderay/scanners/html.rb

@@ -81,7 +81,7 @@ module Scanners
     end
     
     def scan_tokens encoder, options
-      state = @state
+      state = options[:state] || @state
       plain_string_content = @plain_string_content
       in_tag = in_attribute = nil
       
@@ -103,7 +103,7 @@ module Scanners
               encoder.text_token match, :doctype
             elsif match = scan(/<\?xml(?:.*?\?>|.*)/m)
               encoder.text_token match, :preprocessor
-            elsif match = scan(/<\?(?:.*?\?>|.*)|<%(?:.*?%>|.*)/m)
+            elsif match = scan(/<\?(?:.*?\?>|.*)/m)
               encoder.text_token match, :comment
             elsif match = scan(/<\/[-\w.:]*>?/m)
               in_tag = nil

data/lib/coderay/scanners/ruby.rb

@@ -16,6 +16,10 @@ module Scanners
     autoload :Patterns,    'coderay/scanners/ruby/patterns'
     autoload :StringState, 'coderay/scanners/ruby/string_state'
     
+    def interpreted_string_state
+      StringState.new :string, true, '"'
+    end
+    
   protected
     
     def setup
@@ -23,7 +27,7 @@ module Scanners
     end
     
     def scan_tokens encoder, options
-      state, heredocs = @state
+      state, heredocs = options[:state] || @state
       heredocs = heredocs.dup if heredocs.is_a?(Array)
       
       if state && state.instance_of?(StringState)

data/lib/coderay/styles/alpha.rb

@@ -52,7 +52,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .debug { color: white !important; background: blue !important; }
 
 .annotation { color:#007 }
-.attribute-name { color:#f08 }
+.attribute-name { color:#b48 }
 .attribute-value { color:#700 }
 .binary { color:#509 }
 .char .content { color:#D20 }
@@ -97,7 +97,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .octal { color:#40E }
 .operator { }
 .predefined { color:#369; font-weight:bold }
-.predefined-class { color:#069 }
+.predefined-constant { color:#069 }
 .predefined-type { color:#0a5; font-weight:bold }
 .preprocessor { color:#579 }
 .pseudo-class { color:#00C; font-weight:bold }

data/lib/coderay/tokens.rb

@@ -303,31 +303,11 @@ module CodeRay
       @dump = Marshal.load dump
     end
     
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE['rbx']
-      #:nocov:
-      def text_token text, kind
-        self << text << kind
-      end
-      def begin_group kind
-        self << :begin_group << kind
-      end
-      def end_group kind
-        self << :end_group << kind
-      end
-      def begin_line kind
-        self << :begin_line << kind
-      end
-      def end_line kind
-        self << :end_line << kind
-      end
-      #:nocov:
-    else
-      alias text_token push
-      def begin_group kind; push :begin_group, kind end
-      def end_group kind; push :end_group, kind end
-      def begin_line kind; push :begin_line, kind end
-      def end_line kind; push :end_line, kind end
-    end
+    alias text_token push
+    def begin_group kind; push :begin_group, kind end
+    def end_group kind; push :end_group, kind end
+    def begin_line kind; push :begin_line, kind end
+    def end_line kind; push :end_line, kind end
     alias tokens concat
     
   end

metadata

@@ -1,124 +1,129 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: coderay
-version: !ruby/object:Gem::Version
-  version: 1.0.0.835rc1
+version: !ruby/object:Gem::Version 
   prerelease: 9
+  version: 1.0.0.846rc2
 platform: ruby
-authors:
-- Kornelius Kalnbach
+authors: 
+  - Kornelius Kalnbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+
+date: 2011-09-08 00:00:00 Z
 dependencies: []
-description: Fast and easy syntax highlighting for selected languages, written in
-  Ruby. Comes with RedCloth integration and LOC counter.
-email:
-- murphy@rubychan.de
-executables:
-- coderay
+
+description: Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.
+email: 
+  - murphy@rubychan.de
+executables: 
+  - coderay
 extensions: []
-extra_rdoc_files:
-- README_INDEX.rdoc
-files:
-- lib/coderay/duo.rb
-- lib/coderay/encoder.rb
-- lib/coderay/encoders/_map.rb
-- lib/coderay/encoders/comment_filter.rb
-- lib/coderay/encoders/count.rb
-- lib/coderay/encoders/debug.rb
-- lib/coderay/encoders/div.rb
-- lib/coderay/encoders/filter.rb
-- lib/coderay/encoders/html/css.rb
-- lib/coderay/encoders/html/numbering.rb
-- lib/coderay/encoders/html/output.rb
-- lib/coderay/encoders/html.rb
-- lib/coderay/encoders/json.rb
-- lib/coderay/encoders/lines_of_code.rb
-- lib/coderay/encoders/null.rb
-- lib/coderay/encoders/page.rb
-- lib/coderay/encoders/span.rb
-- lib/coderay/encoders/statistic.rb
-- lib/coderay/encoders/terminal.rb
-- lib/coderay/encoders/text.rb
-- lib/coderay/encoders/token_kind_filter.rb
-- lib/coderay/encoders/xml.rb
-- lib/coderay/encoders/yaml.rb
-- lib/coderay/for_redcloth.rb
-- lib/coderay/helpers/file_type.rb
-- lib/coderay/helpers/gzip.rb
-- lib/coderay/helpers/plugin.rb
-- lib/coderay/helpers/word_list.rb
-- lib/coderay/scanner.rb
-- lib/coderay/scanners/_map.rb
-- lib/coderay/scanners/c.rb
-- lib/coderay/scanners/clojure.rb
-- lib/coderay/scanners/cpp.rb
-- lib/coderay/scanners/css.rb
-- lib/coderay/scanners/debug.rb
-- lib/coderay/scanners/delphi.rb
-- lib/coderay/scanners/diff.rb
-- lib/coderay/scanners/erb.rb
-- lib/coderay/scanners/groovy.rb
-- lib/coderay/scanners/html.rb
-- lib/coderay/scanners/java/builtin_types.rb
-- lib/coderay/scanners/java.rb
-- lib/coderay/scanners/java_script.rb
-- lib/coderay/scanners/json.rb
-- lib/coderay/scanners/php.rb
-- lib/coderay/scanners/python.rb
-- lib/coderay/scanners/raydebug.rb
-- lib/coderay/scanners/ruby/patterns.rb
-- lib/coderay/scanners/ruby/string_state.rb
-- lib/coderay/scanners/ruby.rb
-- lib/coderay/scanners/sql.rb
-- lib/coderay/scanners/text.rb
-- lib/coderay/scanners/xml.rb
-- lib/coderay/scanners/yaml.rb
-- lib/coderay/style.rb
-- lib/coderay/styles/_map.rb
-- lib/coderay/styles/alpha.rb
-- lib/coderay/token_kinds.rb
-- lib/coderay/tokens.rb
-- lib/coderay/version.rb
-- lib/coderay.rb
-- Rakefile
-- README_INDEX.rdoc
-- LICENSE
-- test/functional/basic.rb
-- test/functional/examples.rb
-- test/functional/for_redcloth.rb
-- test/functional/suite.rb
-- bin/coderay
+
+extra_rdoc_files: 
+  - README_INDEX.rdoc
+files: 
+  - lib/coderay.rb
+  - lib/coderay/duo.rb
+  - lib/coderay/encoder.rb
+  - lib/coderay/for_redcloth.rb
+  - lib/coderay/scanner.rb
+  - lib/coderay/style.rb
+  - lib/coderay/token_kinds.rb
+  - lib/coderay/tokens.rb
+  - lib/coderay/version.rb
+  - lib/coderay/encoders/_map.rb
+  - lib/coderay/encoders/comment_filter.rb
+  - lib/coderay/encoders/count.rb
+  - lib/coderay/encoders/debug.rb
+  - lib/coderay/encoders/div.rb
+  - lib/coderay/encoders/filter.rb
+  - lib/coderay/encoders/html.rb
+  - lib/coderay/encoders/json.rb
+  - lib/coderay/encoders/lines_of_code.rb
+  - lib/coderay/encoders/null.rb
+  - lib/coderay/encoders/page.rb
+  - lib/coderay/encoders/span.rb
+  - lib/coderay/encoders/statistic.rb
+  - lib/coderay/encoders/terminal.rb
+  - lib/coderay/encoders/text.rb
+  - lib/coderay/encoders/token_kind_filter.rb
+  - lib/coderay/encoders/xml.rb
+  - lib/coderay/encoders/yaml.rb
+  - lib/coderay/encoders/html/css.rb
+  - lib/coderay/encoders/html/numbering.rb
+  - lib/coderay/encoders/html/output.rb
+  - lib/coderay/helpers/file_type.rb
+  - lib/coderay/helpers/gzip.rb
+  - lib/coderay/helpers/plugin.rb
+  - lib/coderay/helpers/word_list.rb
+  - lib/coderay/scanners/_map.rb
+  - lib/coderay/scanners/c.rb
+  - lib/coderay/scanners/clojure.rb
+  - lib/coderay/scanners/cpp.rb
+  - lib/coderay/scanners/css.rb
+  - lib/coderay/scanners/debug.rb
+  - lib/coderay/scanners/delphi.rb
+  - lib/coderay/scanners/diff.rb
+  - lib/coderay/scanners/erb.rb
+  - lib/coderay/scanners/groovy.rb
+  - lib/coderay/scanners/haml.rb
+  - lib/coderay/scanners/html.rb
+  - lib/coderay/scanners/java.rb
+  - lib/coderay/scanners/java_script.rb
+  - lib/coderay/scanners/json.rb
+  - lib/coderay/scanners/php.rb
+  - lib/coderay/scanners/python.rb
+  - lib/coderay/scanners/raydebug.rb
+  - lib/coderay/scanners/ruby.rb
+  - lib/coderay/scanners/sql.rb
+  - lib/coderay/scanners/text.rb
+  - lib/coderay/scanners/xml.rb
+  - lib/coderay/scanners/yaml.rb
+  - lib/coderay/scanners/java/builtin_types.rb
+  - lib/coderay/scanners/ruby/patterns.rb
+  - lib/coderay/scanners/ruby/string_state.rb
+  - lib/coderay/styles/_map.rb
+  - lib/coderay/styles/alpha.rb
+  - Rakefile
+  - README_INDEX.rdoc
+  - LICENSE
+  - test/functional/basic.rb
+  - test/functional/examples.rb
+  - test/functional/for_redcloth.rb
+  - test/functional/suite.rb
+  - bin/coderay
 homepage: http://coderay.rubychan.de
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- -SNw2
-- -mREADME_INDEX.rdoc
-- -t CodeRay Documentation
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+rdoc_options: 
+  - -SNw2
+  - -mREADME_INDEX.rdoc
+  - -t CodeRay Documentation
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
 requirements: []
+
 rubyforge_project: coderay
-rubygems_version: 1.8.8
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Fast syntax highlighting for selected languages.
-test_files:
-- test/functional/basic.rb
-- test/functional/examples.rb
-- test/functional/for_redcloth.rb
-- test/functional/suite.rb
+test_files: 
+  - test/functional/basic.rb
+  - test/functional/examples.rb
+  - test/functional/for_redcloth.rb
+  - test/functional/suite.rb