coderay 0.5.0.100 → 0.5.0.115

data/README

@@ -24,7 +24,7 @@ Idea:: licenser
 Website:: rd.cYcnus.de/coderay[http://rd.cYcnus.de/coderay]
 Copyright:: (c) 2005 by cYcnus
 License:: GNU LGPL; see LICENSE file in the main directory.
-Subversion:: $Id: README 94 2005-11-10 21:52:03Z murphy $
+Subversion:: $Id: README 111 2006-03-15 22:51:50Z murphy $
 
 -----
 
@@ -45,7 +45,7 @@ CodeRay needs Ruby 1.8 and the strscan[http://www.ruby-doc.org/stdlib/libdoc/str
 
  require 'coderay'
  
- hl = CodeRay.html :line_numbers => :column
+ hl = CodeRay.html :line_numbers => :table
  puts hl.highlight_page "puts 'Hello, world!'", :ruby
 
 

data/demo/demo_server.rb

@@ -3,7 +3,7 @@
 unless ARGV.grep(/-[hv]|--(help|version)/).empty?
 	puts <<-USAGE
 CodeRay Server 0.5
-$Id: demo_server.rb 57 2005-10-22 01:16:34Z murphy $
+$Id: demo_server.rb 113 2006-03-15 23:24:37Z murphy $
 
 Usage:
 	1) Start this and your browser.
@@ -77,7 +77,7 @@ class CodeRayServlet < WEBrick::HTTPServlet::AbstractServlet
 					$".delete_if { |f| f =~ /coderay/ }
 					require 'coderay'
 				end
-				div = CodeRay.scan_file(path).html :tab_width => 8, :wrap => :div
+				div = CodeRay.scan_file(path).html :tab_width => 8, :wrap => :div, :hint => :info
 				div.replace <<-DIV
 	<div #{STYLE}>
 		#{backlinks}

data/lib/coderay/encoders/html.rb

@@ -55,7 +55,7 @@ module Encoders
 	# 
 	# === :hint
 	# Include some information into the output using the title attribute.
-	# Can be :info (show token type on mouse-over) or :debug.
+	# Can be :info (show token type on mouse-over), :info_long (with full path) or :debug (via inspect).
 	# 
 	# Default: false
 	class HTML < Encoder
@@ -109,6 +109,30 @@ module Encoders
 		# \x9 (\t) and \xA (\n) not included
 		HTML_ESCAPE_PATTERN = /[\t&"><\xB-\x1f\x7f-\xff\0-\x8]/
 
+		TOKEN_KIND_TO_INFO = Hash.new do |h, kind|
+			h[kind] =
+				case kind
+				when :pre_constant
+					'Predefined constant'
+				else
+					kind.to_s.gsub(/_/, ' ').gsub(/\b\w/) { $&.capitalize }
+				end
+		end
+
+		def self.token_path_to_hint hint, classes
+			return '' unless hint
+			title =
+				case hint
+				when :info
+					TOKEN_KIND_TO_INFO[classes.first]
+				when :info_long
+					classes.map { |kind| TOKEN_KIND_TO_INFO[kind] }.join('/')
+				when :debug
+					k.inspect
+				end
+			" title=\"#{title}\""
+		end
+
 		def setup options
 			super
 			return if options == @last_options
@@ -138,16 +162,7 @@ module Encoders
 					if c == :NO_HIGHLIGHT and not hint
 						h[k] = false
 					else
-						title = if hint
-							if hint == :debug
-								' title="%p"' % [ k ]
-							elsif hint == :info
-								path = (k[1..-1] << k.first).map { |kind| kind.to_s.gsub(/_/, ' ').gsub(/\b\w/) { $&.capitalize } }
-								" title=\"#{path.join('/')}\""
-							end
-						else
-							''
-						end
+						title = HTML.token_path_to_hint hint, (k[1..-1] << k.first)
 						h[k] = '<span%s class="%s">' % [title, c]
 					end
 				end
@@ -160,20 +175,12 @@ module Encoders
 						styles = [k]
 					end
 					type = styles.first
-					styles.map! { |c| ClassOfKind[c] }
-					if styles.first == :NO_HIGHLIGHT and not hint
+					classes = styles.map { |c| ClassOfKind[c] }
+					if classes.first == :NO_HIGHLIGHT and not hint
 						h[k] = false
 					else
-						title = if hint
-							if hint == :debug
-								' title="%p"' % [ styles ]
-							elsif hint == :info and styles.size == 1
-								" title=\"#{type.to_s.gsub(/_/, " ").capitalize}\""
-							end
-						else
-							''
-						end
-						style = @css[*styles]
+						title = HTML.token_path_to_hint hint, styles
+						style = @css[*classes]
 						h[k] =
 							if style
 								'<span%s style="%s">' % [title, style]

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

@@ -7,7 +7,7 @@ module CodeRay module Encoders
 
 			attr :stylesheet
 
-			def CSS.load_stylesheet style
+			def CSS.load_stylesheet style = :default
 				style = DEFAULT_STYLESHEET_ID if style == :default
 				CodeRay::Styles[style]
 			end

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

@@ -12,9 +12,9 @@ module CodeRay
 			NUMERIZABLE_WRAPPINGS = {
 				:table => [:div, :page],
 				:inline => :all,
-				:list => [:div, :page],
-				nil => :all
+				:list => [:div, :page]
 			}
+			NUMERIZABLE_WRAPPINGS.default = :all
 			
 			def numerize! mode = :table, options = {}
 				return self unless mode

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

@@ -25,7 +25,7 @@ module CodeRay
 				# 
 				#  a = Output.new '<span class="co">Code</span>'
 				#  a.wrap! :page
-				def new string, css, element = nil
+				def new string, css = CSS.new, element = nil
 					output = string.clone.extend self
 					output.wrapped_in = element
 					output.css = css

data/lib/coderay/helpers/plugin.rb

@@ -1,6 +1,6 @@
 # = PluginHost
 #
-# $Id: plugin.rb 100 2005-12-10 04:20:30Z murphy $
+# $Id: plugin.rb 105 2006-02-20 01:41:40Z murphy $
 #
 # A simple subclass plugin system.
 # 
@@ -178,12 +178,13 @@ protected
 
 	# Loads the map file (see map).
 	#
-	# This is done automatically when plaugin_path is called.
+	# This is done automatically when plugin_path is called.
 	def load_map
-		begin
-			require path_to('_map')
-		rescue LoadError
-			warn 'no _map.rb found for %s' % name if $DEBUG
+		mapfile = path_to '_map'
+		if File.exist? mapfile
+			require mapfile
+		elsif $DEBUG
+			warn 'no _map.rb found for %s' % name
 		end
 	end
 
@@ -270,12 +271,23 @@ module Plugin
 		self::PLUGIN_HOST
 	end
 
+	# Require some helper files.
+	#
+	# Example:
+	# 
+	#  class MyPlugin < PluginHost::BaseClass
+	#     register_for :my_id
+	#     helper :my_helper
+	#
+	# The above example loads the file myplugin/my_helper.rb relative to the
+	# file in which MyPlugin was defined.
 	def helper *helpers
 		for helper in helpers
 			self::PLUGIN_HOST.require_helper plugin_id, helper.to_s			
 		end
 	end
 
+	# Returns the pulgin id used by the engine.
 	def plugin_id
 		name[/[\w_]+$/].downcase
 	end

data/lib/coderay/helpers/word_list.rb

@@ -1,108 +1,107 @@
-module CodeRay
-	module Scanners
+# = WordList
+# 
+# Copyright (c) 2006 by murphy (Kornelius Kalnbach) <murphy cYcnus de>
+#
+# License:: LGPL / ask the author
+# Version:: 1.0 (2006-Feb-3)
+# 
+# A WordList is a Hash with some additional features.
+# It is intended to be used for keyword recognition.
+#
+# WordList is highly optimized to be used in Scanners,
+# typically to decide whether a given ident is a keyword.
+#
+# For case insensitive words use CaseIgnoringWordList.
+#
+# Example:
+# 
+#  # define word arrays
+#  RESERVED_WORDS = %w[
+#    asm break case continue default do else
+#    ...		
+#  ]
+#  
+#  PREDEFINED_TYPES = %w[
+#    int long short char void
+#    ...
+#  ]
+#  
+#  PREDEFINED_CONSTANTS = %w[
+#    EOF NULL ...
+#  ]
+#  
+#  # make a WordList
+#  IDENT_KIND = WordList.new(:ident).
+#    add(RESERVED_WORDS, :reserved).
+#    add(PREDEFINED_TYPES, :pre_type).
+#    add(PREDEFINED_CONSTANTS, :pre_constant)
+#
+#  ...
+#
+#  def scan_tokens tokens, options
+#    ...
+#    
+#    elsif scan(/[A-Za-z_][A-Za-z_0-9]*/)
+#      # use it
+#      kind = IDENT_KIND[match]
+#      ...
+#  
+class WordList < Hash
 
-		class Scanner
-
-			# A WordList is a Hash with some additional features.
-			# It is intended to be used for keyword recognition.
-			#
-			# WordList is highly optimized to be used in Scanners,
-			# typically to decide whether a given ident is a keyword.
-			#
-			# For case insensitive words use CaseIgnoringWordList.
-			#
-			# Example:
-			# 
-			#  # define word arrays
-			#  RESERVED_WORDS = %w[
-			#    asm break case continue default do else
-			#    ...		
-			#  ]
-			#  
-			#  PREDEFINED_TYPES = %w[
-			#    int long short char void
-			#    ...
-			#  ]
-			#  
-			#  PREDEFINED_CONSTANTS = %w[
-			#    EOF NULL ...
-			#  ]
-			#  
-			#  # make a WordList
-			#  IDENT_KIND = WordList.new(:ident).
-			#    add(RESERVED_WORDS, :reserved).
-			#    add(PREDEFINED_TYPES, :pre_type).
-			#    add(PREDEFINED_CONSTANTS, :pre_constant)
-			#
-			#  ...
-			#
-			#  def scan_tokens tokens, options
-			#    ...
-			#    
-			#    elsif scan(/[A-Za-z_][A-Za-z_0-9]*/)
-			#      # use it
-			#      kind = IDENT_KIND[match]
-			#      ...
-			#  
-			class WordList < Hash
-
-				# Creates a new WordList with +default+ as default value.
-				def initialize default = false, &block
-					super default, &block
-				end
+	# Create a WordList for the given +words+.
+	#
+	# This WordList responds to [] with +true+, if the word is
+	# in +words+, and with +false+ otherwise.
+	def self.for words
+		new.add words
+	end
 
-				# Checks if a word is included.
-				def include? word
-					has_key? word
-				end
+	# Creates a new WordList with +default+ as default value.
+	def initialize default = false, &block
+		super default, &block
+	end
 
-				# Add words to the list and associate them with +kind+.
-				def add words, kind = true
-					words.each do |word|
-						self[word] = kind
-					end
-					self
-				end
+	# Checks if a word is included.
+	def include? word
+		has_key? word
+	end
 
-			end
-			
+	# Add words to the list and associate them with +kind+.
+	def add words, kind = true
+		words.each do |word|
+			self[word] = kind
+		end
+		self
+	end
 
-			# A WordList is a Hash with some additional features.
-			# It is intended to be used for keyword recognition.
-			#
-			# Keys are compared case-insensitively.
-			#
-			# See WordList.
-			class CaseIgnoringWordList < WordList
+end
 
-				# Creates a new WordList with +default+ as default value.
-				#
-				# Text case is ignored.
-				def initialize default = false, &block
-					block ||= proc do |h, k|
-						h[k] = h.fetch k.downcase, default
-					end
-					super default 
-				end
 
-				# Checks if a word is included.
-				def include? word
-					has_key? word.downcase
-				end
+# A CaseIgnoringWordList is like a WordList, only that
+# keys are compared case-insensitively.
+class CaseIgnoringWordList < WordList
 
-				# Add words to the list and associate them with +kind+.
-				def add words, kind = true
-					words.each do |word|
-						self[word.downcase] = kind
-					end
-					self
-				end
+	# Creates a new WordList with +default+ as default value.
+	#
+	# Text case is ignored.
+	def initialize default = false, &block
+		block ||= proc do |h, k|
+			h[k] = h.fetch k.downcase, default
+		end
+		super default 
+	end
 
-			end		
+	# Checks if a word is included.
+	def include? word
+		has_key? word.downcase
+	end
 
+	# Add words to the list and associate them with +kind+.
+	def add words, kind = true
+		words.each do |word|
+			self[word.downcase] = kind
 		end
-
+		self
 	end
-end
 
-# vim:sw=2:ts=2:noet:tw=78
+end

data/lib/coderay/scanners/ruby.rb

@@ -134,7 +134,7 @@ module CodeRay module Scanners
 							last_state = state  # scan one token as normal code, then return here
 							state = :initial
 						else
-							raise 'else-case # reached; #%p not handled' % peek(1), tokens
+							raise_inspect 'else-case # reached; #%p not handled' % peek(1), tokens
 						end
 						
 					when state.paren
@@ -145,7 +145,7 @@ module CodeRay module Scanners
 						tokens << [match, :function]
 						
 					else
-						raise 'else-case " reached; %p not handled, state = %p' % [match, state], tokens
+						raise_inspect 'else-case " reached; %p not handled, state = %p' % [match, state], tokens
 						
 					end
 					next
@@ -178,7 +178,7 @@ module CodeRay module Scanners
 							type = :comment
 							regexp_allowed = true
 						else
-							raise 'else-case _ reached, because case %p was not handled' % [matched[0].chr], tokens
+							raise_inspect 'else-case _ reached, because case %p was not handled' % [matched[0].chr], tokens
 						end
 						tokens << [match, type]
 						next
@@ -274,7 +274,7 @@ module CodeRay module Scanners
 							
 						elsif fancy_allowed and match = scan(/#{FANCY_START}/o)
 							type, interpreted = *FancyStringType.fetch(self[1]) do
-								raise 'Unknown fancy string: %%%p' % k, tokens
+								raise_inspect 'Unknown fancy string: %%%p' % k, tokens
 							end
 							tokens << [:open, type]
 							state = StringState.new type, interpreted, self[2]

data/lib/coderay/scanners/ruby/patterns.rb

@@ -71,7 +71,7 @@ module CodeRay module Scanners
 		EXPONENT = / [eE] [+-]? #{DECIMAL} /ox
 		FLOAT_SUFFIX = / #{EXPONENT} | \. #{DECIMAL} #{EXPONENT}? /ox
 		FLOAT_OR_INT = / #{DECIMAL} (?: #{FLOAT_SUFFIX} () )? /ox
-		NUMERIC = / (?=0) (?: #{OCTAL} | #{HEXADECIMAL} | #{BINARY} ) | #{FLOAT_OR_INT} /ox
+		NUMERIC = / [-+]? (?: (?=0) (?: #{OCTAL} | #{HEXADECIMAL} | #{BINARY} ) | #{FLOAT_OR_INT} ) /ox
 
 		SYMBOL = /
 			:
@@ -160,8 +160,8 @@ module CodeRay module Scanners
 			STRING_PATTERN = Hash.new { |h, k|
 				delim, interpreted = *k
 				delim_pattern = Regexp.escape(delim.dup)
-				if starter = OPENING_PAREN[delim]
-					delim_pattern << Regexp.escape(starter)
+				if closing_paren = CLOSING_PAREN[delim]
+					delim_pattern << Regexp.escape(closing_paren)
 				end
 
 				
@@ -194,15 +194,15 @@ module CodeRay module Scanners
 			}
 
 			def initialize kind, interpreted, delim, heredoc = false
-				if paren = CLOSING_PAREN[delim]
-					delim, paren = paren, delim
-					paren_depth = 1
-				end
 				if heredoc
 					pattern = HEREDOC_PATTERN[ [delim, interpreted, heredoc == :indented] ]
 					delim	= nil
 				else
 					pattern = STRING_PATTERN[ [delim, interpreted] ]
+					if paren = CLOSING_PAREN[delim]
+						delim, paren = paren, delim
+						paren_depth = 1
+					end
 				end
 				super kind, interpreted, delim, heredoc, paren, paren_depth, pattern, :initial
 			end

metadata

@@ -1,100 +1,102 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.100
-date: 2005-12-10
+  version: 0.5.0.115
+date: 2006-03-16 00:00:00 +01:00
 summary: CodeRay is a fast syntax highlighter engine for many languages.
 require_paths: 
-  - lib
+- lib
 email: murphy@cYcnus.de
 homepage: http://rd.cycnus.de/coderay
 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"
+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: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - murphy
+- murphy
 files: 
-  - "./lib/coderay.rb"
-  - "./lib/coderay/tokens.rb"
-  - "./lib/coderay/encoder.rb"
-  - "./lib/coderay/scanner.rb"
-  - "./lib/coderay/style.rb"
-  - "./lib/coderay/encoders/statistic.rb"
-  - "./lib/coderay/encoders/xml.rb"
-  - "./lib/coderay/encoders/yaml.rb"
-  - "./lib/coderay/encoders/tokens.rb"
-  - "./lib/coderay/encoders/text.rb"
-  - "./lib/coderay/encoders/count.rb"
-  - "./lib/coderay/encoders/null.rb"
-  - "./lib/coderay/encoders/debug.rb"
-  - "./lib/coderay/encoders/_map.rb"
-  - "./lib/coderay/encoders/span.rb"
-  - "./lib/coderay/encoders/div.rb"
-  - "./lib/coderay/encoders/html.rb"
-  - "./lib/coderay/encoders/html/numerization.rb"
-  - "./lib/coderay/encoders/html/classes.rb"
-  - "./lib/coderay/encoders/html/output.rb"
-  - "./lib/coderay/encoders/html/css.rb"
-  - "./lib/coderay/helpers/filetype.rb"
-  - "./lib/coderay/helpers/plugin.rb"
-  - "./lib/coderay/helpers/word_list.rb"
-  - "./lib/coderay/helpers/gzip_simple.rb"
-  - "./lib/coderay/scanners/plaintext.rb"
-  - "./lib/coderay/scanners/c.rb"
-  - "./lib/coderay/scanners/delphi.rb"
-  - "./lib/coderay/scanners/_map.rb"
-  - "./lib/coderay/scanners/ruby.rb"
-  - "./lib/coderay/scanners/ruby/patterns.rb"
-  - "./lib/coderay/styles/murphy.rb"
-  - "./lib/coderay/styles/cycnus.rb"
-  - "./demo/demo_load_encoder.rb"
-  - "./demo/demo_load_scanner.rb"
-  - "./demo/demo_more.rb"
-  - "./demo/demo_css.rb"
-  - "./demo/demo_global_vars2.rb"
-  - "./demo/demo_stream2.rb"
-  - "./demo/demo_encoder.rb"
-  - "./demo/demo_div.rb"
-  - "./demo/demo_html2.rb"
-  - "./demo/demo_count.rb"
-  - "./demo/demo_simple.rb"
-  - "./demo/demo_scanner.rb"
-  - "./demo/demo_stream.rb"
-  - "./demo/demo_global_vars.rb"
-  - "./demo/demo_tokens.rb"
-  - "./demo/demo_html.rb"
-  - "./demo/demo_dump.rb"
-  - "./demo/demo_server.rb"
-  - "./demo/demo_highlight.rb"
-  - "./demo/suite.rb"
-  - "./README"
-  - "./LICENSE"
+- ./lib/coderay.rb
+- ./lib/coderay/encoder.rb
+- ./lib/coderay/scanner.rb
+- ./lib/coderay/style.rb
+- ./lib/coderay/tokens.rb
+- ./lib/coderay/encoders/count.rb
+- ./lib/coderay/encoders/debug.rb
+- ./lib/coderay/encoders/div.rb
+- ./lib/coderay/encoders/html.rb
+- ./lib/coderay/encoders/null.rb
+- ./lib/coderay/encoders/span.rb
+- ./lib/coderay/encoders/statistic.rb
+- ./lib/coderay/encoders/text.rb
+- ./lib/coderay/encoders/tokens.rb
+- ./lib/coderay/encoders/xml.rb
+- ./lib/coderay/encoders/yaml.rb
+- ./lib/coderay/encoders/_map.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/helpers/filetype.rb
+- ./lib/coderay/helpers/gzip_simple.rb
+- ./lib/coderay/helpers/plugin.rb
+- ./lib/coderay/helpers/word_list.rb
+- ./lib/coderay/scanners/c.rb
+- ./lib/coderay/scanners/delphi.rb
+- ./lib/coderay/scanners/plaintext.rb
+- ./lib/coderay/scanners/ruby.rb
+- ./lib/coderay/scanners/_map.rb
+- ./lib/coderay/scanners/ruby/patterns.rb
+- ./lib/coderay/styles/cycnus.rb
+- ./lib/coderay/styles/murphy.rb
+- ./demo/demo_count.rb
+- ./demo/demo_css.rb
+- ./demo/demo_div.rb
+- ./demo/demo_dump.rb
+- ./demo/demo_encoder.rb
+- ./demo/demo_global_vars.rb
+- ./demo/demo_global_vars2.rb
+- ./demo/demo_highlight.rb
+- ./demo/demo_html.rb
+- ./demo/demo_html2.rb
+- ./demo/demo_load_encoder.rb
+- ./demo/demo_load_scanner.rb
+- ./demo/demo_more.rb
+- ./demo/demo_scanner.rb
+- ./demo/demo_server.rb
+- ./demo/demo_simple.rb
+- ./demo/demo_stream.rb
+- ./demo/demo_stream2.rb
+- ./demo/demo_tokens.rb
+- ./demo/suite.rb
+- ./README
+- ./LICENSE
 test_files: []
+
 rdoc_options: 
-  - "-SNw2"
-  - "-mREADME"
-  - "-a"
-  - "-t CodeRay Documentation"
+- -SNw2
+- -mREADME
+- -a
+- -t CodeRay Documentation
 extra_rdoc_files: 
-  - "./README"
+- ./README
 executables: []
+
 extensions: []
+
 requirements: 
-  - strscan
-dependencies: []
+- strscan
+dependencies: []
+