coderay 0.4.5.73 → 0.5.0.100

data/lib/coderay/encoders/{helpers/html_output.rb → html/output.rb}

@@ -13,7 +13,9 @@ module CodeRay
 		# TODO: more doc.
 		module Output
 
-			attr_accessor :wrapped_in
+			require 'coderay/encoders/html/numerization.rb'
+
+			attr_accessor :css
 			
 			class << self
 				
@@ -23,9 +25,10 @@ module CodeRay
 				# 
 				#  a = Output.new '<span class="co">Code</span>'
 				#  a.wrap! :page
-				def new string, element = nil
+				def new string, css, element = nil
 					output = string.clone.extend self
 					output.wrapped_in = element
+					output.css = css
 					output
 				end
 				
@@ -35,19 +38,19 @@ module CodeRay
 					warn "The Output module is intended to extend instances of String, not #{o.class}." unless o.respond_to? :to_str
 				end
 
-				def stylesheet in_tag = false
-					ss = CSS::DEFAULT_STYLESHEET
-					ss = <<-CSS if in_tag
+				def make_stylesheet css, in_tag = false
+					sheet = css.stylesheet
+					sheet = <<-CSS if in_tag
 <style type="text/css">
-#{ss}
+#{sheet}
 </style>
 					CSS
-					ss
+					sheet
 				end
 
-				def page_template_for_css css = :default
-					css = stylesheet if css == :default
-					PAGE.apply 'CSS', css
+				def page_template_for_css css
+					sheet = make_stylesheet css
+					PAGE.apply 'CSS', sheet
 				end
 
 				# Define a new wrapper. This is meta programming.
@@ -61,6 +64,7 @@ module CodeRay
 						end
 					end
 				end
+				
 			end
 
 			wrapper :div, :span, :page
@@ -69,6 +73,11 @@ module CodeRay
 				wrapped_in == element
 			end
 			
+			def wrapped_in
+				@wrapped_in ||= nil
+			end
+			attr_writer :wrapped_in
+			
 			def wrap_in template
 				clone.wrap_in! template
 			end
@@ -90,7 +99,7 @@ module CodeRay
 				when :page
 					wrap! :div if wrapped_in? nil
 					raise "Can't wrap %p in %p" % [wrapped_in, element] unless wrapped_in? :div
-					wrap_in! Output.page_template_for_css
+					wrap_in! Output.page_template_for_css(@css)
 				when nil
 					return self
 				else
@@ -104,84 +113,8 @@ module CodeRay
 				clone.wrap!(*args)
 			end
 
-			NUMERIZABLE_WRAPPINGS = {
-				:table => [:div, :page],
-				:inline => :all,
-				nil => :all
-			}
-			
-			def numerize! mode = :table, options = {}
-				return self unless mode
-
-				options = DEFAULT_OPTIONS.merge options
-
-				start = options[:line_number_start]
-				unless start.is_a? Integer
-					raise ArgumentError, "Invalid value %p for :line_number_start; Integer expected." % start
-				end
-				
-				allowed_wrappings = NUMERIZABLE_WRAPPINGS[mode]
-				unless allowed_wrappings == :all or allowed_wrappings.include? options[:wrap]
-					raise ArgumentError, "Can't numerize, :wrap must be in %p, but is %p" % [NUMERIZABLE_WRAPPINGS, options[:wrap]]
-				end
-				
-				bold_every = options[:bold_every]
-				bolding = 
-					if bold_every == :no_bolding or bold_every == 0
-						proc { |line| line.to_s }
-					elsif bold_every.is_a? Integer
-						proc do |line|
-							if line % bold_every == 0
-								"<strong>#{line}</strong>"  # every bold_every-th number in bold
-							else
-								line.to_s
-							end
-						end
-					else
-						raise ArgumentError, "Invalid value %p for :bolding; :no_bolding or Integer expected." % bolding
-					end
-				
-				line_count = count("\n")
-				line_count += 1 if self[-1] != ?\n
-
-				case mode				
-				when :inline
-					max_width = (start + line_count).to_s.size
-					line = start
-					gsub!(/^/) do
-						line_number = bolding.call line
-						line += 1
-						"<span class=\"no\">#{ line_number.rjust(max_width) }</span>  "
-					end
-					#wrap! :div
-					
-				when :table
-					# This is really ugly.
-					# Because even monospace fonts seem to have different heights when bold, 
-					# I make the newline bold, both in the code and the line numbers.
-					# FIXME Still not working perfect for Mr. Internet Exploder
-					line_numbers = (start ... start + line_count).to_a.map(&bolding).join("\n")
-					line_numbers << "\n"  # also for Mr. MS Internet Exploder :-/
-					line_numbers.gsub!(/\n/) { "<tt>\n</tt>" }
-					
-					line_numbers_tpl = DIV_TABLE.apply('LINE_NUMBERS', line_numbers)
-					gsub!(/\n/) { "<tt>\n</tt>" }
-					wrap_in! line_numbers_tpl
-					@wrapped_in = :div
-					
-				else
-					raise ArgumentError, "Unknown value %p for mode: :inline or :table expected" % mode
-				end
-
-				self
-			end
-
-			def numerize *args
-				clone.numerize!(*args)
-			end
-
 			def stylesheet in_tag = false
-				Output.stylesheet in_tag
+				Output.make_stylesheet @css, in_tag
 			end
 
 			class Template < String
@@ -224,14 +157,18 @@ module CodeRay
 </div>
 			DIV
 
-			DIV_TABLE = <<-`DIV_TABLE`
+			TABLE = <<-`TABLE`
 <table class="CodeRay"> <tr>
 	<td class="line_numbers" title="click to toggle" onclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><%LINE_NUMBERS%></pre></td>
 	<td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }"><%CONTENT%></pre></td>
 </tr> </table>
-			DIV_TABLE
+			TABLE
 			# title="double click to expand" 
 
+			LIST = <<-`LIST`
+<ol class="CodeRay"><%CONTENT%></ol>
+			LIST
+
 			PAGE = <<-`PAGE`
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

data/lib/coderay/encoders/span.rb

@@ -1,6 +1,7 @@
 module CodeRay module Encoders
 	
-	require 'coderay/encoders/html'
+	load :html
+
 	class Span < HTML
 
 		FILE_EXTENSION = 'span.html'

data/lib/coderay/encoders/statistic.rb

@@ -64,7 +64,7 @@ Token Types (%d):
 			@type_stats.each do |type, stat|
 				stat.size /= stat.count.to_f
 			end
-			types_stats = @type_stats.sort_by { |k, v| -v.count }.map do |k, v|
+			types_stats = @type_stats.sort_by { |k, v| [-v.count, k.to_s] }.map do |k, v|
 				TOKEN_TYPES_ROW % [k, v.count, 100.0 * v.count / all_count, v.size]
 			end.join
 			STATS % [

data/lib/coderay/helpers/plugin.rb

@@ -1,6 +1,6 @@
 # = PluginHost
 #
-# $Id: plugin.rb 59 2005-10-29 04:55:15Z murphy $
+# $Id: plugin.rb 100 2005-12-10 04:20:30Z murphy $
 #
 # A simple subclass plugin system.
 # 
@@ -32,12 +32,42 @@ module PluginHost
 	PLUGIN_HOSTS = []
 	PLUGIN_HOSTS_BY_ID = {}  # dummy hash
 
+	# Loads all plugins using all_plugin_names and load.
+	def load_all
+		for plugin in all_plugin_names
+			load plugin
+		end
+	end
+
+	# Returns the Plugin for +id+.
+	# 
+	# Example:
+	#  yaml_plugin = MyPluginHost[:yaml]
+	def [] id, *args, &blk
+		plugin = validate_id(id)
+		begin
+			plugin = plugin_hash.[] plugin, *args, &blk
+		end while plugin.is_a? Symbol
+		plugin
+	end
+
+	# Alias for +[]+.
+	alias load []
+
+	def require_helper plugin_id, helper_name
+		path = path_to File.join(plugin_id, helper_name)
+		#$stderr.puts 'Loading helper: ' + path
+		require path
+	end		
+
 	class << self
 
+		# Adds the module/class to the PLUGIN_HOSTS list.
 		def extended mod
 			PLUGIN_HOSTS << mod
 		end
 
+		# Warns you that you should not #include this module.
 		def included mod
 			warn "#{name} should not be included. Use extend."
 		end
@@ -58,17 +88,11 @@ module PluginHost
 
 	end
 	
-	def plugin_host_id host_id
-		if host_id.is_a? String
-			raise ArgumentError,
-				"String or Symbol expected, but #{lang.class} given."
-		end
-	end
-
 	# The path where the plugins can be found.
 	def plugin_path *args
 		unless args.empty?
-			@plugin_path = File.join(*args)
+			@plugin_path = File.expand_path File.join(*args)
+			load_map
 		end
 		@plugin_path
 	end
@@ -84,6 +108,44 @@ module PluginHost
 		end
 	end
 
+	# Map a plugin_id to another.
+	#
+	# Usage: Put this in a file plugin_path/_map.rb.
+	#
+	#  class MyColorHost < PluginHost
+	#    map :navy => :dark_blue,
+	#      :maroon => :brown,
+	#      :luna => :moon
+	#  end
+	def map hash
+		for from, to in hash
+			from = validate_id from
+			to = validate_id to
+			plugin_hash[from] = to unless plugin_hash.has_key? from
+		end
+	end
+	
+	# Every plugin must register itself for one or more
+	# +ids+ by calling register_for, which calls this method.
+	#
+	# See Plugin#register_for.
+	def register plugin, *ids
+		for id in ids
+			unless id.is_a? Symbol
+				raise ArgumentError,
+					"id must be a Symbol, but it was a #{id.class}" 
+			end
+			plugin_hash[validate_id(id)] = plugin
+		end
+	end
+
+	# A Hash of plugion_id => Plugin pairs.
+	def plugin_hash
+		@plugin_hash ||= create_plugin_hash
+	end
+
+protected
+	# Created a new plugin list and stores it to @plugin_hash.
 	def create_plugin_hash
 		@plugin_hash =
 			Hash.new do |h, plugin_id|
@@ -105,54 +167,37 @@ module PluginHost
 			end
 	end
 
-	def plugin_hash
-		@plugin_hash ||= create_plugin_hash
+	# Makes a map of all loaded scanners.
+	def inspect
+		map = plugin_hash.dup
+		map.each do |id, plugin|
+			map[id] = plugin.name[/(?>[\w_]+)$/]
+		end
+		map.inspect
 	end
 
-
-	# Every plugin must register itself for one or more
-	# +ids+ by calling register_for, which calls this method.
+	# Loads the map file (see map).
 	#
-	# See Plugin#register_for.
-	def register plugin, *ids
-		for id in ids
-			unless id.is_a? Symbol
-				raise ArgumentError,
-					"id must be a Symbol, but it was a #{id.class}" 
-			end
-			plugin_hash[validate_id(id)] = plugin
+	# This is done automatically when plaugin_path is called.
+	def load_map
+		begin
+			require path_to('_map')
+		rescue LoadError
+			warn 'no _map.rb found for %s' % name if $DEBUG
 		end
 	end
 
-
 	# Returns an array of all .rb files in the plugin path.
 	# 
 	# The extension .rb is not included.
 	def all_plugin_names
-		Dir[path_to('*')].map do |file|
+		Dir[path_to('*')].select do |file|
+			File.basename(file)[/^(?!_)\w+\.rb$/]
+		end.map do |file|
 			File.basename file, '.rb'
 		end
 	end
 
-	# Loads all plugins using all_plugin_names and load.
-	def load_all
-		for plugin in all_plugin_names
-			load_plugin plugin
-		end
-	end
-
-
-	# Returns the Plugin for +id+.
-	# 
-	# Example:
-	#  yaml_plugin = MyPluginHost[:yaml]
-	def [] id, *args, &blk
-		plugin_hash.[] validate_id(id), *args, &blk
-	end
-
-	# Alias for +[]+.
-	alias load []
-
 	# Returns the Plugin for +id+.
 	# Use it like Hash#fetch.
 	# 
@@ -167,7 +212,7 @@ module PluginHost
 		File.join plugin_path, "#{plugin_id}.rb"
 	end
 
-	# Converts +id+ to a downcase Symbol if it is a String,
+	# Converts +id+ to a Symbol if it is a String,
 	# or returns +id+ if it already is a Symbol.
 	#
 	# Raises +ArgumentError+ for all other objects, or if the
@@ -177,7 +222,7 @@ module PluginHost
 			id
 		elsif id.is_a? String
 			if id[/\w+/] == id
-				id.downcase.to_sym
+				id.to_sym
 			else
 				raise ArgumentError, "Invalid id: '#{id}' given."
 			end
@@ -225,6 +270,16 @@ module Plugin
 		self::PLUGIN_HOST
 	end
 
+	def helper *helpers
+		for helper in helpers
+			self::PLUGIN_HOST.require_helper plugin_id, helper.to_s			
+		end
+	end
+
+	def plugin_id
+		name[/[\w_]+$/].downcase
+	end
+
 end
 
 
@@ -241,46 +296,3 @@ def require_plugin path
 		"No host for #{host_id.inspect} found." unless host
 	host.load plugin_id
 end
-
-
-if $0 == __FILE__
-	$VERBOSE = $DEBUG = true
-	eval DATA.read, nil, $0, __LINE__+4
-end
-
-__END__
-
-require 'test/unit'
-
-class TC_PLUGINS < Test::Unit::TestCase
-
-	class Generators
-		extend PluginHost
-		plugin_path '.'
-	end
-
-	class Generator
-		extend Plugin
-		plugin_host Generators
-	end
-
-	class FancyGenerator < Generator
-		register_for :plugin_host
-	end
-
-	def test_plugin
-		assert_nothing_raised do
-			Generators[:plugin_host]
-		end	
-		assert_equal FancyGenerator, Generators[:plugin_host]
-	end
-	
-	def test_require
-		assert_nothing_raised do
-			require_plugin('TC_PLUGINS::Generators/plugin_host')
-		end
-		assert_equal FancyGenerator,
-			require_plugin('TC_PLUGINS::Generators/plugin_host')
-	end
-
-end