coderay 1.0.0.800pre → 1.0.0.815pre

data/lib/coderay/tokens.rb

@@ -73,9 +73,7 @@ module CodeRay
       encoder.encode_tokens self, options
     end
     
-    # Turn into a string using Encoders::Text.
-    #
-    # +options+ are passed to the encoder if given.
+    # Turn tokens into a string by concatenating them.
     def to_s
       encode CodeRay::Encoders::Encoder.new
     end

data/test/functional/basic.rb

@@ -1,21 +1,12 @@
 # encoding: utf-8
 require 'test/unit'
+require File.expand_path('../../lib/assert_warning', __FILE__)
+
+$:.unshift File.expand_path('../../../lib', __FILE__)
 require 'coderay'
 
 class BasicTest < Test::Unit::TestCase
   
-  def assert_warning expected_warning
-    require 'stringio'
-    oldstderr = $stderr
-    $stderr = StringIO.new
-    yield
-    $stderr.rewind
-    given_warning = $stderr.read.chomp
-    assert_equal expected_warning, given_warning
-  ensure
-    $stderr = oldstderr
-  end
-  
   def test_version
     assert_nothing_raised do
       assert_match(/\A\d\.\d\.\d?\z/, CodeRay::VERSION)
@@ -135,13 +126,9 @@ more code  # and another comment, in-line.
     assert_equal 0, CodeRay.scan(rHTML, :html).lines_of_code
     assert_equal 0, CodeRay.scan(rHTML, :php).lines_of_code
     assert_equal 0, CodeRay.scan(rHTML, :yaml).lines_of_code
-    assert_equal 4, CodeRay.scan(rHTML, :rhtml).lines_of_code
+    assert_equal 4, CodeRay.scan(rHTML, :erb).lines_of_code
   end
   
-  def test_rubygems_not_loaded
-    assert_equal nil, defined? Gem
-  end if ENV['check_rubygems'] && RUBY_VERSION < '1.9'
-  
   def test_list_of_encoders
     assert_kind_of(Array, CodeRay::Encoders.list)
     assert CodeRay::Encoders.list.include?(:count)
@@ -243,8 +230,28 @@ more code  # and another comment, in-line.
     scanner = CodeRay::Scanners::Plain.new "foo\nbär+quux"
     assert_equal 0, scanner.pos
     assert_equal 1, scanner.line
-    assert_equal 0, scanner.column
-    scanner.scan(/foo\nbär/)
+    assert_equal 1, scanner.column
+    scanner.scan(/foo/)
+    assert_equal 3, scanner.pos
+    assert_equal 1, scanner.line
+    assert_equal 4, scanner.column
+    scanner.scan(/\n/)
+    assert_equal 4, scanner.pos
+    assert_equal 2, scanner.line
+    assert_equal 1, scanner.column
+    scanner.scan(/b/)
+    assert_equal 5, scanner.pos
+    assert_equal 2, scanner.line
+    assert_equal 2, scanner.column
+    scanner.scan(/a/)
+    assert_equal 5, scanner.pos
+    assert_equal 2, scanner.line
+    assert_equal 2, scanner.column
+    scanner.scan(/ä/)
+    assert_equal 7, scanner.pos
+    assert_equal 2, scanner.line
+    assert_equal 4, scanner.column
+    scanner.scan(/r/)
     assert_equal 8, scanner.pos
     assert_equal 2, scanner.line
     assert_equal 5, scanner.column

data/test/functional/examples.rb

@@ -1,4 +1,6 @@
 require 'test/unit'
+
+$:.unshift File.expand_path('../../../lib', __FILE__)
 require 'coderay'
 
 class ExamplesTest < Test::Unit::TestCase

data/test/functional/for_redcloth.rb

@@ -1,5 +1,7 @@
 require 'test/unit'
-$:.unshift 'lib'
+require File.expand_path('../../lib/assert_warning', __FILE__)
+
+$:.unshift File.expand_path('../../../lib', __FILE__)
 require 'coderay'
 
 begin
@@ -64,15 +66,19 @@ class BasicTest < Test::Unit::TestCase
   # See http://jgarber.lighthouseapp.com/projects/13054/tickets/124-code-markup-does-not-allow-brackets.
   def test_for_redcloth_false_positive
     require 'coderay/for_redcloth'
-    assert_equal '<p><code>[project]_dff.skjd</code></p>',
-      RedCloth.new('@[project]_dff.skjd@').to_html
+    assert_warning 'CodeRay::Scanners could not load plugin :project; falling back to :text' do
+      assert_equal '<p><code>[project]_dff.skjd</code></p>',
+        RedCloth.new('@[project]_dff.skjd@').to_html
+    end
     # false positive, but expected behavior / known issue
     assert_equal "<p><span lang=\"ruby\" class=\"CodeRay\">_dff.skjd</span></p>",
       RedCloth.new('@[ruby]_dff.skjd@').to_html
-    assert_equal <<-BLOCKCODE.chomp,
+    assert_warning 'CodeRay::Scanners could not load plugin :project; falling back to :text' do
+      assert_equal <<-BLOCKCODE.chomp,
 <pre><code>[project]_dff.skjd</code></pre>
-      BLOCKCODE
-      RedCloth.new('bc. [project]_dff.skjd').to_html
+        BLOCKCODE
+        RedCloth.new('bc. [project]_dff.skjd').to_html
+    end
   end
   
 end if defined? RedCloth

data/test/functional/suite.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
-$:.unshift 'lib'
+
+$:.unshift File.expand_path('../../../lib', __FILE__)
 require 'coderay'
 
 mydir = File.dirname(__FILE__)

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: coderay
 version: !ruby/object:Gem::Version 
+  hash: 961912872
   prerelease: 9
-  version: 1.0.0.800pre
+  segments: 
+  - 1
+  - 0
+  - 0
+  - 815
+  - pre
+  version: 1.0.0.815pre
 platform: ruby
 authors: 
 - Kornelius Kalnbach
@@ -10,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 Z
+date: 2011-08-19 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.
@@ -21,7 +29,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README_INDEX.rdoc
 files: 
 - lib/coderay/duo.rb
 - lib/coderay/encoder.rb
@@ -60,21 +68,19 @@ files:
 - 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/nitro_xhtml.rb
 - lib/coderay/scanners/php.rb
 - lib/coderay/scanners/python.rb
 - lib/coderay/scanners/raydebug.rb
-- lib/coderay/scanners/rhtml.rb
 - lib/coderay/scanners/ruby/patterns.rb
 - lib/coderay/scanners/ruby/string_state.rb
 - lib/coderay/scanners/ruby.rb
-- lib/coderay/scanners/scheme.rb
 - lib/coderay/scanners/sql.rb
 - lib/coderay/scanners/text.rb
 - lib/coderay/scanners/xml.rb
@@ -89,20 +95,21 @@ files:
 - lib/coderay/version.rb
 - lib/coderay.rb
 - Rakefile
-- README.rdoc
+- README_INDEX.rdoc
 - LICENSE
 - test/functional/basic.rb
 - test/functional/examples.rb
 - test/functional/for_redcloth.rb
 - test/functional/suite.rb
 - bin/coderay
+has_rdoc: true
 homepage: http://coderay.rubychan.de
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - -SNw2
-- -mREADME.rdoc
+- -mREADME_INDEX.rdoc
 - -t CodeRay Documentation
 require_paths: 
 - lib
@@ -111,17 +118,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: coderay
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Fast syntax highlighting for selected languages.

data/lib/coderay/scanners/nitro_xhtml.rb

@@ -1,136 +0,0 @@
-module CodeRay
-module Scanners
-  
-  load :html
-  load :ruby
-  
-  # Nitro XHTML Scanner
-  # 
-  # Alias: +nitro+
-  class NitroXHTML < Scanner
-    
-    register_for :nitro_xhtml
-    file_extension :xhtml
-    title 'Nitro XHTML'
-    
-    KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
-    
-    NITRO_RUBY_BLOCK = /
-      <\?r
-      (?>
-        [^\?]*
-        (?> \?(?!>) [^\?]* )*
-      )
-      (?: \?> )?
-    |
-      <ruby>
-      (?>
-        [^<]*
-        (?> <(?!\/ruby>) [^<]* )*
-      )
-      (?: <\/ruby> )?
-    |
-      <%
-      (?>
-        [^%]*
-        (?> %(?!>) [^%]* )*
-      )
-      (?: %> )?
-    /mx  # :nodoc:
-    
-    NITRO_VALUE_BLOCK = /
-      \#
-      (?:
-        \{
-        [^{}]*
-        (?>
-          \{ [^}]* \}
-          (?> [^{}]* )
-        )*
-        \}?
-      | \| [^|]* \|?
-      | \( [^)]* \)?
-      | \[ [^\]]* \]?
-      | \\ [^\\]* \\?
-      )
-    /x  # :nodoc:
-    
-    NITRO_ENTITY = /
-      % (?: \#\d+ | \w+ ) ;
-    /  # :nodoc:
-    
-    START_OF_RUBY = /
-      (?=[<\#%])
-      < (?: \?r | % | ruby> )
-    | \# [{(|]
-    | % (?: \#\d+ | \w+ ) ;
-    /x  # :nodoc:
-    
-    CLOSING_PAREN = Hash.new { |h, p| h[p] = p }  # :nodoc:
-    CLOSING_PAREN.update( {
-      '(' => ')',
-      '[' => ']',
-      '{' => '}',
-    } )
-    
-  protected
-    
-    def setup
-      @ruby_scanner = CodeRay.scanner :ruby, :tokens => @tokens, :keep_tokens => true
-      @html_scanner = CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true, :keep_state => true
-    end
-    
-    def reset_instance
-      super
-      @html_scanner.reset
-    end
-    
-    def scan_tokens encoder, options
-      
-      until eos?
-        
-        if (match = scan_until(/(?=#{START_OF_RUBY})/o) || scan_rest) and not match.empty?
-          @html_scanner.tokenize match
-          
-        elsif match = scan(/#{NITRO_VALUE_BLOCK}/o)
-          start_tag = match[0,2]
-          delimiter = CLOSING_PAREN[start_tag[1,1]]
-          end_tag = match[-1,1] == delimiter ? delimiter : ''
-          encoder.begin_group :inline
-          encoder.text_token start_tag, :inline_delimiter
-          code = match[start_tag.size .. -1 - end_tag.size]
-          @ruby_scanner.tokenize code, :tokens => encoder
-          encoder.text_token end_tag, :inline_delimiter unless end_tag.empty?
-          encoder.end_group :inline
-          
-        elsif match = scan(/#{NITRO_RUBY_BLOCK}/o)
-          start_tag = '<?r'
-          end_tag = match[-2,2] == '?>' ? '?>' : ''
-          encoder.begin_group :inline
-          encoder.text_token start_tag, :inline_delimiter
-          code = match[start_tag.size .. -(end_tag.size)-1]
-          @ruby_scanner.tokenize code, :tokens => encoder
-          encoder.text_token end_tag, :inline_delimiter unless end_tag.empty?
-          encoder.end_group :inline
-          
-        elsif entity = scan(/#{NITRO_ENTITY}/o)
-          encoder.text_token entity, :entity
-          
-        elsif scan(/%/)
-          encoder.text_token matched, :error
-          
-        else
-          raise_inspect 'else-case reached!', encoder
-          
-        end
-        
-      end
-      
-      encoder
-      
-    end
-    
-  end
-  
-end
-end

data/lib/coderay/scanners/scheme.rb

@@ -1,136 +0,0 @@
-module CodeRay
-  module Scanners
-
-    # Scheme scanner for CodeRay (by closure).
-    # 
-    # Thanks to murphy for putting CodeRay into public.
-    class Scheme < Scanner
-      
-      # TODO: function defs
-      # TODO: built-in functions
-      
-      register_for :scheme
-      file_extension 'scm'
-
-      CORE_FORMS = %w[
-        lambda let let* letrec syntax-case define-syntax let-syntax
-        letrec-syntax begin define quote if or and cond case do delay
-        quasiquote set! cons force call-with-current-continuation call/cc
-      ]  # :nodoc:
-      
-      IDENT_KIND = CaseIgnoringWordList.new(:ident).
-        add(CORE_FORMS, :keyword)  # :nodoc:
-      
-      #IDENTIFIER_INITIAL = /[a-z!@\$%&\*\/\:<=>\?~_\^]/i
-      #IDENTIFIER_SUBSEQUENT = /#{IDENTIFIER_INITIAL}|\d|\.|\+|-/
-      #IDENTIFIER = /#{IDENTIFIER_INITIAL}#{IDENTIFIER_SUBSEQUENT}*|\+|-|\.{3}/
-      IDENTIFIER = /[a-zA-Z!@$%&*\/:<=>?~_^][\w!@$%&*\/:<=>?~^.+\-]*|[+-]|\.\.\./  # :nodoc:
-      DIGIT = /\d/  # :nodoc:
-      DIGIT10 = /\d/  # :nodoc:
-      DIGIT16 = /[0-9a-f]/i  # :nodoc:
-      DIGIT8 = /[0-7]/  # :nodoc:
-      DIGIT2 = /[01]/  # :nodoc:
-      RADIX16 = /\#x/i  # :nodoc:
-      RADIX8 = /\#o/i  # :nodoc:
-      RADIX2 = /\#b/i  # :nodoc:
-      RADIX10 = /\#d/i  # :nodoc:
-      EXACTNESS = /#i|#e/i  # :nodoc:
-      SIGN = /[\+-]?/  # :nodoc:
-      EXP_MARK = /[esfdl]/i  # :nodoc:
-      EXP = /#{EXP_MARK}#{SIGN}#{DIGIT}+/  # :nodoc:
-      SUFFIX = /#{EXP}?/  # :nodoc:
-      PREFIX10 = /#{RADIX10}?#{EXACTNESS}?|#{EXACTNESS}?#{RADIX10}?/  # :nodoc:
-      PREFIX16 = /#{RADIX16}#{EXACTNESS}?|#{EXACTNESS}?#{RADIX16}/  # :nodoc:
-      PREFIX8 = /#{RADIX8}#{EXACTNESS}?|#{EXACTNESS}?#{RADIX8}/  # :nodoc:
-      PREFIX2 = /#{RADIX2}#{EXACTNESS}?|#{EXACTNESS}?#{RADIX2}/  # :nodoc:
-      UINT10 = /#{DIGIT10}+#*/  # :nodoc:
-      UINT16 = /#{DIGIT16}+#*/  # :nodoc:
-      UINT8 = /#{DIGIT8}+#*/  # :nodoc:
-      UINT2 = /#{DIGIT2}+#*/  # :nodoc:
-      DECIMAL = /#{DIGIT10}+#+\.#*#{SUFFIX}|#{DIGIT10}+\.#{DIGIT10}*#*#{SUFFIX}|\.#{DIGIT10}+#*#{SUFFIX}|#{UINT10}#{EXP}/  # :nodoc:
-      UREAL10 = /#{UINT10}\/#{UINT10}|#{DECIMAL}|#{UINT10}/  # :nodoc:
-      UREAL16 = /#{UINT16}\/#{UINT16}|#{UINT16}/  # :nodoc:
-      UREAL8 = /#{UINT8}\/#{UINT8}|#{UINT8}/  # :nodoc:
-      UREAL2 = /#{UINT2}\/#{UINT2}|#{UINT2}/  # :nodoc:
-      REAL10 = /#{SIGN}#{UREAL10}/  # :nodoc:
-      REAL16 = /#{SIGN}#{UREAL16}/  # :nodoc:
-      REAL8 = /#{SIGN}#{UREAL8}/  # :nodoc:
-      REAL2 = /#{SIGN}#{UREAL2}/  # :nodoc:
-      IMAG10 = /i|#{UREAL10}i/  # :nodoc:
-      IMAG16 = /i|#{UREAL16}i/  # :nodoc:
-      IMAG8 = /i|#{UREAL8}i/  # :nodoc:
-      IMAG2 = /i|#{UREAL2}i/  # :nodoc:
-      COMPLEX10 = /#{REAL10}@#{REAL10}|#{REAL10}\+#{IMAG10}|#{REAL10}-#{IMAG10}|\+#{IMAG10}|-#{IMAG10}|#{REAL10}/  # :nodoc:
-      COMPLEX16 = /#{REAL16}@#{REAL16}|#{REAL16}\+#{IMAG16}|#{REAL16}-#{IMAG16}|\+#{IMAG16}|-#{IMAG16}|#{REAL16}/  # :nodoc:
-      COMPLEX8 = /#{REAL8}@#{REAL8}|#{REAL8}\+#{IMAG8}|#{REAL8}-#{IMAG8}|\+#{IMAG8}|-#{IMAG8}|#{REAL8}/  # :nodoc:
-      COMPLEX2 = /#{REAL2}@#{REAL2}|#{REAL2}\+#{IMAG2}|#{REAL2}-#{IMAG2}|\+#{IMAG2}|-#{IMAG2}|#{REAL2}/  # :nodoc:
-      NUM10 = /#{PREFIX10}?#{COMPLEX10}/  # :nodoc:
-      NUM16 = /#{PREFIX16}#{COMPLEX16}/  # :nodoc:
-      NUM8 = /#{PREFIX8}#{COMPLEX8}/  # :nodoc:
-      NUM2 = /#{PREFIX2}#{COMPLEX2}/  # :nodoc:
-      NUM = /#{NUM10}|#{NUM16}|#{NUM8}|#{NUM2}/  # :nodoc:
-      
-    protected
-      
-      def scan_tokens encoder, options
-        
-        state = :initial
-        ident_kind = IDENT_KIND
-        
-        until eos?
-          
-          case state
-          when :initial
-            if match = scan(/ \s+ | \\\n /x)
-              encoder.text_token match, :space
-            elsif match = scan(/['\(\[\)\]]|#\(/)
-              encoder.text_token match, :operator
-            elsif match = scan(/;.*/)
-              encoder.text_token match, :comment
-            elsif match = scan(/#\\(?:newline|space|.?)/)
-              encoder.text_token match, :char
-            elsif match = scan(/#[ft]/)
-              encoder.text_token match, :predefined_constant
-            elsif match = scan(/#{IDENTIFIER}/o)
-              encoder.text_token match, ident_kind[matched]
-            elsif match = scan(/\./)
-              encoder.text_token match, :operator
-            elsif match = scan(/"/)
-              encoder.begin_group :string
-              encoder.text_token match, :delimiter
-              state = :string
-            elsif match = scan(/#{NUM}/o) and not matched.empty?
-              encoder.text_token match, :integer
-            else
-              encoder.text_token getch, :error
-            end
-            
-          when :string
-            if match = scan(/[^"\\]+|\\.?/)
-              encoder.text_token match, :content
-            elsif match = scan(/"/)
-              encoder.text_token match, :delimiter
-              encoder.end_group :string
-              state = :initial
-            else
-              raise_inspect "else case \" reached; %p not handled." % peek(1),
-                encoder, state
-            end
-            
-          else
-            raise 'else case reached'
-            
-          end
-          
-        end
-        
-        if state == :string
-          encoder.end_group state
-        end
-        
-        encoder
-        
-      end
-    end
-  end
-end