coderay 0.7.4.215 → 0.8.260

data/lib/coderay/tokens.rb

@@ -115,7 +115,7 @@ module CodeRay
     #   tokens.each_text_token { |text, kind| text.replace html_escape(text) }
     def each_text_token
       each do |text, kind|
-        next unless text.respond_to? :to_str
+        next unless text.is_a? ::String
         yield text, kind
       end
     end
@@ -200,25 +200,29 @@ module CodeRay
     #
     # TODO: Test this!
     def fix
+      tokens = self.class.new
       # Check token nesting using a stack of kinds.
       opened = []
-      for token, kind in self
-        if token == :open
-          opened.push kind
-        elsif token == :close
+      for type, kind in self
+        case type
+        when :open
+          opened.push [:close, kind]
+        when :begin_line
+          opened.push [:end_line, kind]
+        when :close, :end_line
           expected = opened.pop
-          if kind != expected
+          if [type, kind] != expected
             # Unexpected :close; decide what to do based on the kind:
-            # - token was opened earlier: also close tokens in between
-            # - token was never opened: delete the :close (skip with next)
+            # - token was never opened: delete the :close (just skip it)
             next unless opened.rindex expected
-            tokens << [:close, kind] until (kind = opened.pop) == expected
+            # - token was opened earlier: also close tokens in between
+            tokens << token until (token = opened.pop) == expected
           end
         end
-        tokens << [token, kind]
+        tokens << [type, kind]
       end
       # Close remaining opened tokens
-      tokens << [:close, kind] while kind = opened.pop
+      tokens << token while token = opened.pop
       tokens
     end
     
@@ -252,7 +256,7 @@ module CodeRay
     #
     # You can configure the level of compression,
     # but the default value 7 should be what you want
-    # in most cases as it is a good comprimise between
+    # in most cases as it is a good compromise between
     # speed and compression rate.
     #
     # See GZip module.
@@ -267,7 +271,18 @@ module CodeRay
     # Should be equal to the input size before
     # scanning.
     def text_size
-      map { |t, k| t }.join.size
+      size = 0
+      each_text_token do |t, k|
+        size + t.size
+      end
+      size
+    end
+
+    # The total size of the tokens.
+    # Should be equal to the input size before
+    # scanning.
+    def text
+      map { |t, k| t if t.is_a? ::String }.join
     end
 
     # Include this module to give an object an #undump
@@ -342,7 +357,7 @@ module CodeRay
     #
     # Returns self.
     def << token
-      @callback.call token
+      @callback.call(*token)
       @size += 1
       self
     end
@@ -365,4 +380,8 @@ module CodeRay
 
   end
 
+  
+  # Token name abbreviations
+  require 'coderay/token_classes'
+
 end

data/lib/term/ansicolor.rb

@@ -0,0 +1,220 @@
+# = Term::ANSIColor - ANSI escape sequences in Ruby
+#
+# == Description
+#
+# This library can be used to color/uncolor strings using ANSI escape sequences.
+#
+# == Author
+#
+# Florian Frank mailto:flori@ping.de
+#
+# == License
+#
+# This is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License Version 2 as published by the Free
+# Software Foundation: www.gnu.org/copyleft/gpl.html
+#
+# == Download
+#
+# The latest version of this library can be downloaded at
+#
+# * http://rubyforge.org/frs?group_id=391
+#
+# The homepage of this library is located at
+#
+# * http://term-ansicolor.rubyforge.org
+#
+# == Examples
+# 
+# The file examples/example.rb in the source/gem-distribution shows how
+# this library can be used:
+#  require 'term/ansicolor'
+#  
+#  # Use this trick to work around namespace cluttering that
+#  # happens if you just include Term::ANSIColor:
+#  
+#  class Color
+#    class << self
+#      include Term::ANSIColor
+#    end
+#  end
+#  
+#  print Color.red, Color.bold, "No Namespace cluttering:", Color.clear, "\n"
+#  print Color.green + "green" + Color.clear, "\n"
+#  print Color.on_red(Color.green("green")), "\n"
+#  print Color.yellow { Color.on_black { "yellow on_black" } }, "\n\n"
+#  
+#  # Or shortcut Term::ANSIColor by assignment:
+#  c = Term::ANSIColor
+#  
+#  print c.red, c.bold, "No Namespace cluttering (alternative):", c.clear, "\n"
+#  print c.green + "green" + c.clear, "\n"
+#  print c.on_red(c.green("green")), "\n"
+#  print c.yellow { c.on_black { "yellow on_black" } }, "\n\n"
+#  
+#  # Anyway, I don't define any of Term::ANSIColor's methods in this example
+#  # and I want to keep it short:
+#  include Term::ANSIColor
+#  
+#  print red, bold, "Usage as constants:", reset, "\n"
+#  print clear, "clear", reset, reset, "reset", reset,
+#    bold, "bold", reset, dark, "dark", reset,
+#    underscore, "underscore", reset, blink, "blink", reset,
+#    negative, "negative", reset, concealed, "concealed", reset, "|\n",
+#    black, "black", reset, red, "red", reset, green, "green", reset,
+#    yellow, "yellow", reset, blue, "blue", reset, magenta, "magenta", reset,
+#    cyan, "cyan", reset, white, "white", reset, "|\n",
+#    on_black, "on_black", reset, on_red, "on_red", reset,
+#    on_green, "on_green", reset, on_yellow, "on_yellow", reset,
+#    on_blue, "on_blue", reset, on_magenta, "on_magenta", reset,
+#    on_cyan, "on_cyan", reset, on_white, "on_white", reset, "|\n\n"
+#  
+#  print red, bold, "Usage as unary argument methods:", reset, "\n"
+#  print clear("clear"), reset("reset"), bold("bold"), dark("dark"),
+#    underscore("underscore"), blink("blink"), negative("negative"),
+#    concealed("concealed"), "|\n",
+#    black("black"), red("red"), green("green"), yellow("yellow"),
+#    blue("blue"), magenta("magenta"), cyan("cyan"), white("white"), "|\n",
+#    on_black("on_black"), on_red("on_red"), on_green("on_green"),#
+#    on_yellow("on_yellow"), on_blue("on_blue"), on_magenta("on_magenta"),
+#    on_cyan("on_cyan"), on_white("on_white"), "|\n\n"
+#  
+#  print red { bold { "Usage as block forms:" } }, "\n"
+#  print clear { "clear" }, reset { "reset" }, bold { "bold" },
+#    dark { "dark" }, underscore { "underscore" }, blink { "blink" },
+#    negative { "negative" }, concealed { "concealed" }, "|\n",
+#    black { "black" }, red { "red" }, green { "green" },
+#    yellow { "yellow" }, blue { "blue" }, magenta { "magenta" },
+#    cyan { "cyan" }, white { "white" }, "|\n",
+#    on_black { "on_black" }, on_red { "on_red" }, on_green { "on_green" },
+#    on_yellow { "on_yellow" }, on_blue { "on_blue" },
+#    on_magenta { "on_magenta" }, on_cyan { "on_cyan" },
+#    on_white { "on_white" }, "|\n\n"
+#  
+#  # Usage as Mixin into String or its Subclasses
+#  class String
+#    include Term::ANSIColor
+#  end
+#  
+#  print "Usage as String Mixins:".red.bold, "\n"
+#  print "clear".clear, "reset".reset, "bold".bold, "dark".dark,
+#    "underscore".underscore, "blink".blink, "negative".negative,
+#    "concealed".concealed, "|\n",
+#    "black".black, "red".red, "green".green, "yellow".yellow,
+#    "blue".blue, "magenta".magenta, "cyan".cyan, "white".white, "|\n",
+#    "on_black".on_black, "on_red".on_red, "on_green".on_green,
+#    "on_yellow".on_yellow, "on_blue".on_blue, "on_magenta".on_magenta,
+#    "on_cyan".on_cyan, "on_white".on_white, "|\n\n"
+#  
+#  symbols = Term::ANSIColor::attributes
+#  print red { bold { "All supported attributes = " } },
+#    blue { symbols.inspect }, "\n\n"
+#  
+#  print "Send symbols to strings:".send(:red).send(:bold), "\n"
+#  print symbols[12, 8].map { |c| c.to_s.send(c) }, "\n\n"
+#  
+#  print red { bold { "Make strings monochromatic again:" } }, "\n"
+#  print [ "red".red, "not red anymore".red.uncolored,
+#    uncolored { "not red anymore".red }, uncolored("not red anymore".red)
+#      ].map { |x| x + "\n" }
+module Term
+  # The ANSIColor module can be used for namespacing and mixed into your own
+  # classes.
+  module ANSIColor
+    # :stopdoc:
+    ATTRIBUTES = [
+      [ :clear        ,   0 ], 
+      [ :reset        ,   0 ],     # synonym for :clear
+      [ :bold         ,   1 ], 
+      [ :dark         ,   2 ], 
+      [ :italic       ,   3 ],     # not widely implemented
+      [ :underline    ,   4 ], 
+      [ :underscore   ,   4 ],     # synonym for :underline
+      [ :blink        ,   5 ], 
+      [ :rapid_blink  ,   6 ],     # not widely implemented
+      [ :negative     ,   7 ],     # no reverse because of String#reverse
+      [ :concealed    ,   8 ], 
+      [ :strikethrough,   9 ],     # not widely implemented
+      [ :black        ,  30 ], 
+      [ :red          ,  31 ], 
+      [ :green        ,  32 ], 
+      [ :yellow       ,  33 ], 
+      [ :blue         ,  34 ], 
+      [ :magenta      ,  35 ], 
+      [ :cyan         ,  36 ], 
+      [ :white        ,  37 ], 
+      [ :on_black     ,  40 ], 
+      [ :on_red       ,  41 ], 
+      [ :on_green     ,  42 ], 
+      [ :on_yellow    ,  43 ], 
+      [ :on_blue      ,  44 ], 
+      [ :on_magenta   ,  45 ], 
+      [ :on_cyan      ,  46 ], 
+      [ :on_white     ,  47 ], 
+    ]
+
+    ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
+    # :startdoc:
+
+    # Returns true, if the coloring function of this module
+    # is switched on, false otherwise.
+    def self.coloring?
+      @coloring
+    end
+
+    # Turns the coloring on or off globally, so you can easily do
+    # this for example:
+    #  Term::ANSIColor::coloring = STDOUT.isatty
+    def self.coloring=(val)
+      @coloring = val
+    end
+    self.coloring = true
+
+    ATTRIBUTES.each do |c, v|
+      eval %Q{
+          def #{c}(string = nil)
+            result = ''
+            result << "\e[#{v}m" if Term::ANSIColor.coloring?
+            if block_given?
+              result << yield
+            elsif string
+              result << string
+            elsif respond_to?(:to_str)
+              result << self
+            else
+              return result #only switch on
+            end
+            result << "\e[0m" if Term::ANSIColor.coloring?
+            result
+          end
+      }
+    end
+
+    # Regular expression that is used to scan for ANSI-sequences while
+    # uncoloring strings.
+    COLORED_REGEXP = /\e\[([34][0-7]|[0-9])m/
+
+    # Returns an uncolored version of the string, that is all
+    # ANSI-sequences are stripped from the string.
+    def uncolored(string = nil) # :yields:
+      if block_given?
+        yield.gsub(COLORED_REGEXP, '')
+      elsif string
+        string.gsub(COLORED_REGEXP, '')
+      elsif respond_to?(:to_str)
+        gsub(COLORED_REGEXP, '')
+      else
+        ''
+      end
+    end
+
+    module_function
+
+    # Returns an array of all Term::ANSIColor attributes as symbols.
+    def attributes
+      ATTRIBUTE_NAMES
+    end
+    extend self
+  end
+end
+    # vim: set et sw=2 ts=2:

metadata

@@ -1,44 +1,38 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.7.4.215
-date: 2006-10-20 00:00:00 +02:00
-summary: CodeRay is a fast syntax highlighter engine for many languages.
-require_paths: 
-- lib
-email: murphy@cYcnus.de
-homepage: http://coderay.rubychan.de
-rubyforge_project: coderay
-description: "CodeRay is a Ruby library for syntax highlighting. I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete, fast and efficient.  Usage is simple: require 'coderay' code = 'some %q(weird (Ruby) can't shock) me!' puts CodeRay.scan(code, :ruby).html"
-autorequire: coderay
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
+  version: 0.8.260
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - murphy
+autorequire: coderay
+bindir: bin
+cert_chain: []
+
+date: 2008-10-08 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: "CodeRay is a Ruby library for syntax highlighting. I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete, fast and efficient.  Usage is simple: require 'coderay' code = 'some %q(weird (Ruby) can't shock) me!' puts CodeRay.scan(code, :ruby).html"
+email: murphy@cYcnus.de
+executables: 
+- coderay
+- coderay_stylesheet
+extensions: []
+
+extra_rdoc_files: 
+- ./README
+- ./FOLDERS
 files: 
-- ./lib/coderay.rb
 - ./lib/coderay/duo.rb
 - ./lib/coderay/encoder.rb
-- ./lib/coderay/scanner.rb
-- ./lib/coderay/style.rb
-- ./lib/coderay/tokens.rb
 - ./lib/coderay/encoders/_map.rb
 - ./lib/coderay/encoders/count.rb
 - ./lib/coderay/encoders/debug.rb
 - ./lib/coderay/encoders/div.rb
+- ./lib/coderay/encoders/html/css.rb
+- ./lib/coderay/encoders/html/numerization.rb
+- ./lib/coderay/encoders/html/output.rb
 - ./lib/coderay/encoders/html.rb
 - ./lib/coderay/encoders/null.rb
 - ./lib/coderay/encoders/page.rb
@@ -48,47 +42,71 @@ files:
 - ./lib/coderay/encoders/tokens.rb
 - ./lib/coderay/encoders/xml.rb
 - ./lib/coderay/encoders/yaml.rb
-- ./lib/coderay/encoders/html/classes.rb
-- ./lib/coderay/encoders/html/css.rb
-- ./lib/coderay/encoders/html/numerization.rb
-- ./lib/coderay/encoders/html/output.rb
+- ./lib/coderay/for_redcloth.rb
 - ./lib/coderay/helpers/file_type.rb
 - ./lib/coderay/helpers/gzip_simple.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/css.rb
 - ./lib/coderay/scanners/debug.rb
 - ./lib/coderay/scanners/delphi.rb
+- ./lib/coderay/scanners/diff.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/plaintext.rb
 - ./lib/coderay/scanners/rhtml.rb
+- ./lib/coderay/scanners/ruby/patterns.rb
 - ./lib/coderay/scanners/ruby.rb
+- ./lib/coderay/scanners/scheme.rb
+- ./lib/coderay/scanners/sql.Keith.rb
+- ./lib/coderay/scanners/sql.rb
 - ./lib/coderay/scanners/xml.rb
-- ./lib/coderay/scanners/ruby/patterns.rb
+- ./lib/coderay/style.rb
 - ./lib/coderay/styles/_map.rb
 - ./lib/coderay/styles/cycnus.rb
 - ./lib/coderay/styles/murphy.rb
+- ./lib/coderay/token_classes.rb
+- ./lib/coderay/tokens.rb
+- ./lib/coderay.rb
+- ./lib/term/ansicolor.rb
 - ./README
 - ./LICENSE
 - ./FOLDERS
-test_files: []
-
+has_rdoc: true
+homepage: http://coderay.rubychan.de
+post_install_message: 
 rdoc_options: 
 - -SNw2
 - -mREADME
 - -a
 - -t CodeRay Documentation
-extra_rdoc_files: 
-- ./README
-- ./FOLDERS
-executables: 
-- coderay
-- coderay_stylesheet
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.2
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
 - strscan
-dependencies: []
+rubyforge_project: coderay
+rubygems_version: 1.3.0
+signing_key: 
+specification_version: 2
+summary: CodeRay is a fast syntax highlighter engine for many languages.
+test_files: []