Demos updated, rewritten, enhanced, tested.

Some code cleanups.

Bugs fixed, scanner and encoder improved:
count.rb: marked Streamable
html_css.rb: style for inline numbers
html.rb: changed options; :line_numbers_offset is now :line_number_start
html_output.rb: offset for inline numbers fixed
html.rb: token text no longer changed by gsub! while highlighting (this is even faster!)
text.rb, plugin.rb: reindented
ruby.rb: eleminated multiple assignments for speed

tokens.rb: reindented, Tokens#to_s added, #<< returns self

Plugin system: bugs fixed, error messages improved.

1 files changed, 109 insertions, 110 deletions

diff --git a/lib/coderay/helpers/plugin.rb b/lib/coderay/helpers/plugin.rb
index b0bb49e..aacde99 100644
--- a/lib/coderay/helpers/plugin.rb
+++ b/lib/coderay/helpers/plugin.rb
@@ -1,4 +1,3 @@
-

 # = PluginHost

 #

 # $Id$

@@ -28,6 +27,7 @@ module PluginHost
 	# * a file could not be found

 	# * the requested Encoder is not registered

 	PluginNotFound = Class.new Exception

+	HostNotFound = Class.new Exception

 

 	PLUGIN_HOSTS = []

 	PLUGIN_HOSTS_BY_ID = {}  # dummy hash

@@ -45,11 +45,11 @@ module PluginHost
 		# Find the PluginHost for host_id.

 		def host_by_id host_id

 			unless PLUGIN_HOSTS_BY_ID.default_proc

-				ph = Hash.new do |h, _host_id|

+				ph = Hash.new do |h, a_host_id|

 					for host in PLUGIN_HOSTS

 						h[host.host_id] = host

 					end

-					h.fetch _host_id, nil

+					h.fetch a_host_id, nil

 				end				

 				PLUGIN_HOSTS_BY_ID.replace ph

 			end

@@ -58,138 +58,134 @@ 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

-			

+	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)

-			end

-			@plugin_path

+	# The path where the plugins can be found.

+	def plugin_path *args

+		unless args.empty?

+			@plugin_path = File.join(*args)

 		end

+		@plugin_path

+	end

 

-		# The host's ID.

-		#

-		# If PLUGIN_HOST_ID is not set, it is simply the class name.

-		def host_id

-			if self.const_defined? :PLUGIN_HOST_ID

-				self::PLUGIN_HOST_ID

-			else

-				name

-			end

+	# The host's ID.

+	#

+	# If PLUGIN_HOST_ID is not set, it is simply the class name.

+	def host_id

+		if self.const_defined? :PLUGIN_HOST_ID

+			self::PLUGIN_HOST_ID

+		else

+			name

 		end

+	end

 

-		def create_plugin_hash

-			@plugin_hash =

-				Hash.new do |h, plugin_id|

-					id = validate_id(plugin_id)

-					path = path_to id

-					begin

-						puts 'Loading plugin: ' + path if $DEBUG

-						require path

-					rescue LoadError

-						raise PluginNotFound, "#{path} not found."

-					else

-						# Plugin should have registered by now

-						unless h.has_key? id

-							raise PluginNotFound,

-								"No #{self.name} plugin for #{id} found in #{path}."

-						end

+	def create_plugin_hash

+		@plugin_hash =

+			Hash.new do |h, plugin_id|

+				id = validate_id(plugin_id)

+				path = path_to id

+				begin

+					$stderr.puts 'Loading plugin: ' + path if $DEBUG

+					require path

+				rescue LoadError

+					raise PluginNotFound, "Plugin #{id.inspect} not found."

+				else

+					# Plugin should have registered by now

+					unless h.has_key? id

+						raise PluginNotFound,

+							"No #{self.name} plugin for #{id.inspect} found in #{path}."

 					end

-					h[id]

 				end

-		end

+				h[id]

+			end

+	end

 

-		def plugin_hash

-			@plugin_hash ||= create_plugin_hash

-		end

+	def plugin_hash

+		@plugin_hash ||= create_plugin_hash

+	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

+	# 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

 

 

-		# 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|

-				File.basename file, '.rb'

-			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|

+			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

+	# 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

+	# 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_plugin []

+	# Alias for +[]+.

+	alias load_plugin []

 

-		# Returns the Plugin for +id+.

-		# Use it like Hash#fetch.

-		# 

-		# Example:

-		#  yaml_plugin = MyPluginHost[:yaml, :default]

-		def fetch id, *args, &blk

-			plugin_hash.fetch validate_id(id), *args, &blk

-		end

+	# Returns the Plugin for +id+.

+	# Use it like Hash#fetch.

+	# 

+	# Example:

+	#  yaml_plugin = MyPluginHost[:yaml, :default]

+	def fetch id, *args, &blk

+		plugin_hash.fetch validate_id(id), *args, &blk

+	end

 

-		# Returns the path to the encoder for format.

-		def path_to plugin_id

-			File.join plugin_path, "#{plugin_id}.rb"

-		end

+	# Returns the path to the encoder for format.

+	def path_to plugin_id

+		File.join plugin_path, "#{plugin_id}.rb"

+	end

 

-		# Converts +id+ to a downcase Symbol if it is a String,

-		# or returns +id+ if it already is a Symbol.

-		#

-		# Raises +ArgumentError+ for all other objects, or if the

-		# given String includes non-alphanumeric characters (\W).

-		def validate_id id

-			if id.is_a? Symbol

-				id

-			elsif id.is_a? String

-				if id[/\w+/] == id

-					id.downcase.to_sym

-				else

-					raise ArgumentError, "Invalid id: '#{id}' given."

-				end

+	# Converts +id+ to a downcase Symbol if it is a String,

+	# or returns +id+ if it already is a Symbol.

+	#

+	# Raises +ArgumentError+ for all other objects, or if the

+	# given String includes non-alphanumeric characters (\W).

+	def validate_id id

+		if id.is_a? Symbol

+			id

+		elsif id.is_a? String

+			if id[/\w+/] == id

+				id.downcase.to_sym

 			else

-				raise ArgumentError,

-					"String or Symbol expected, but #{id.class} given."

+				raise ArgumentError, "Invalid id: '#{id}' given."

 			end

+		else

+			raise ArgumentError,

+				"String or Symbol expected, but #{id.class} given."

 		end

-

-	#end

-

+	end

 

 end

 

@@ -239,8 +235,11 @@ end
 # 

 # Returns the loaded plugin.

 def require_plugin path

-	host, plugin_id = path.split '/', 2

-	PluginHost.host_by_id(host).load_plugin plugin_id

+	host_id, plugin_id = path.split '/', 2

+	host = PluginHost.host_by_id(host_id)

+	raise PluginHost::HostNotFound,

+		"No host for #{host_id.inspect} found." unless host

+	host.load_plugin plugin_id

 end