coderay 0.5.0.121 → 0.7.1.147

data/lib/coderay/encoders/html.rb

@@ -36,7 +36,7 @@ module Encoders
 	# 
 	# You can also use Encoders::Div and Encoders::Span.
 	# 
-	# Default: :page
+	# Default: nil
 	# 
 	# === :line_numbers
 	# Include line numbers in :table, :inline, :list or nil (no line numbers)
@@ -73,7 +73,7 @@ module Encoders
 
 			:style => :cycnus,
 			
-			:wrap => :page,
+			:wrap => nil,
 
 			:line_numbers => nil,
 			:line_number_start => 1,
@@ -86,11 +86,6 @@ module Encoders
 
 		attr_reader :css
 
-		def initialize(*)
-			super
-			@last_options = nil
-		end
-
 	protected
 		
 		HTML_ESCAPE = {  #:nodoc:
@@ -139,8 +134,6 @@ module Encoders
 
 		def setup options
 			super
-			return if options == @last_options
-			@last_options = options
 
 			@HTML_ESCAPE = HTML_ESCAPE.dup
 			@HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
@@ -205,26 +198,23 @@ module Encoders
 		def finish options
 			not_needed = @opened.shift
 			@out << '</span>' * @opened.size
+			warn '%d tokens still open' % @opened.size unless @opened.empty?
 
 			@out.extend Output
 			@out.css = @css
-			@out.numerize! options[:line_numbers], options # if options[:line_numbers]
-			@out.wrap! options[:wrap] # if options[:wrap]
-
-			#require 'pp'
-			#pp @css_style, @css_style.size
+			@out.numerize! options[:line_numbers], options
+			@out.wrap! options[:wrap]
 
 			super
 		end
 
 		def token text, type
-			if text.is_a? String
+			if text.is_a? ::String
 				if text =~ /#{HTML_ESCAPE_PATTERN}/o
 					text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }
 				end
 				@opened[0] = type
-				style = @css_style[@opened]
-				if style
+				if style = @css_style[@opened]
 					@out << style << text << '</span>'
 				else
 					@out << text
@@ -233,11 +223,11 @@ module Encoders
 				case text
 				when :open
 					@opened[0] = type
-					@out << @css_style[@opened]
+					@out << (@css_style[@opened] || '<span>')
 					@opened << type
 				when :close
 					unless @opened.empty?
-						raise 'Not Token to be closed.' unless @opened.size > 1
+						raise 'Malformed token stream: Trying to close a token that was never opened.' unless @opened.size > 1
 						@out << '</span>'
 						@opened.pop
 					end

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

@@ -1,4 +1,5 @@
-module CodeRay module Encoders
+module CodeRay
+module Encoders
 
 	class HTML
 
@@ -20,6 +21,7 @@ module CodeRay module Encoders
 			:directive => 'di',
 			:doc => 'do',
 			:doc_string => 'ds',
+			:entity => 'en',
 			:error => 'er',
 			:escape => 'e',
 			:exception => 'ex',
@@ -67,4 +69,5 @@ module CodeRay module Encoders
 
 	end
 
-end end
+end
+end

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

@@ -1,14 +1,12 @@
-module CodeRay module Encoders
+module CodeRay
+module Encoders
 
 	class HTML
 		class CSS
 
-			DEFAULT_STYLESHEET_ID = :cycnus
-
 			attr :stylesheet
 
-			def CSS.load_stylesheet style = :default
-				style = DEFAULT_STYLESHEET_ID if style == :default
+			def CSS.load_stylesheet style = nil
 				CodeRay::Styles[style]
 			end
 			
@@ -58,7 +56,8 @@ module CodeRay module Encoders
 		end
 	end
 	
-end end
+end
+end
 
 if $0 == __FILE__
 	require 'pp'

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

@@ -1,5 +1,5 @@
 module CodeRay
-	module Encoders
+module Encoders
 
 	class HTML
 		
@@ -9,13 +9,13 @@ module CodeRay
 				clone.numerize!(*args)
 			end
 
-			NUMERIZABLE_WRAPPINGS = {
-				:table => [:div, :page],
+=begin			NUMERIZABLE_WRAPPINGS = {
+				:table => [:div, :page, nil],
 				:inline => :all,
-				:list => [:div, :page]
+				:list => [:div, :page, nil]
 			}
 			NUMERIZABLE_WRAPPINGS.default = :all
-			
+=end			
 			def numerize! mode = :table, options = {}
 				return self unless mode
 
@@ -26,16 +26,17 @@ module CodeRay
 					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
+				#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
+					if bold_every == false
 						proc { |line| line.to_s }
 					elsif bold_every.is_a? Integer
+						raise ArgumentError, ":bolding can't be 0." if bold_every == 0
 						proc do |line|
 							if line % bold_every == 0
 								"<strong>#{line}</strong>"  # every bold_every-th number in bold
@@ -44,22 +45,20 @@ module CodeRay
 							end
 						end
 					else
-						raise ArgumentError, "Invalid value %p for :bolding; :no_bolding or Integer expected." % bolding
+						raise ArgumentError, 'Invalid value %p for :bolding; false or Integer expected.' % bold_every
 					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
+						indent = ' ' * (max_width - line.to_s.size)
+						res = "<span class=\"no\">#{indent}#{line_number}</span> "
 						line += 1
-						"<span class=\"no\">#{ line_number.rjust(max_width) }</span>  "
+						res
 					end
-					#wrap! :div
 					
 				when :table
 					# This is really ugly.
@@ -97,13 +96,24 @@ module CodeRay
 					@wrapped_in = :div
 					
 				else
-					raise ArgumentError, "Unknown value %p for mode: expected one of %p" %
-						[mode, NUMERIZABLE_WRAPPINGS.keys - [:all]]
+					raise ArgumentError, 'Unknown value %p for mode: expected one of %p' %
+						[mode, [:table, :list, :inline]]
 				end
 
 				self
 			end
 
+			def line_count
+				line_count = count("\n")
+				position_of_last_newline = rindex(?\n)
+				if position_of_last_newline
+					after_last_newline = self[position_of_last_newline + 1 .. -1]
+					ends_with_newline = after_last_newline[/\A(?:<\/span>)*\z/]
+					line_count += 1 if not ends_with_newline
+				end
+				line_count
+			end
+
 		end
 
 	end

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

@@ -1,5 +1,5 @@
 module CodeRay
-	module Encoders
+module Encoders
 
 	class HTML
 		
@@ -158,10 +158,10 @@ module CodeRay
 			DIV
 
 			TABLE = <<-`TABLE`
-<table class="CodeRay"> <tr>
+<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>
+</tr></table>
 			TABLE
 			# title="double click to expand" 
 
@@ -174,7 +174,7 @@ module CodeRay
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="de">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<title>CodeRay HTML Encoder Example</title>
 	<style type="text/css">
 <%CSS%>

data/lib/coderay/encoders/null.rb

@@ -1,26 +1,26 @@
 module CodeRay
-	module Encoders
+module Encoders
 
-		# = Null Encoder
-		#
-		# Does nothing and returns an empty string.
-		class Null < Encoder
+	# = Null Encoder
+	#
+	# Does nothing and returns an empty string.
+	class Null < Encoder
 
-			include Streamable
-			register_for :null
+		include Streamable
+		register_for :null
 
-			# Defined for faster processing
-			def to_proc
-				proc {}
-			end
-
-		protected
+		# Defined for faster processing
+		def to_proc
+			proc {}
+		end
 
-			def token(*)
-				# do nothing
-			end
+	protected
 
+		def token(*)
+			# do nothing
 		end
 
 	end
+
+end
 end

data/lib/coderay/encoders/page.rb

@@ -0,0 +1,21 @@
+module CodeRay
+module Encoders
+	
+	load :html
+
+	class Page < HTML
+
+		FILE_EXTENSION = 'html'
+
+		register_for :page
+
+		DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge({
+			:css => :class,
+			:wrap => :page,
+			:line_numbers => :table
+		})
+
+	end
+
+end
+end

data/lib/coderay/encoders/span.rb

@@ -1,5 +1,6 @@
-module CodeRay module Encoders
-	
+module CodeRay
+module Encoders
+
 	load :html
 
 	class Span < HTML
@@ -12,6 +13,8 @@ module CodeRay module Encoders
 			:css => :style,
 			:wrap => :span,
 		})
+
 	end
 
-end end
+end
+end

data/lib/coderay/encoders/statistic.rb

@@ -1,4 +1,5 @@
-module CodeRay module Encoders
+module CodeRay
+module Encoders
 
 	# Makes a statistic for the given tokens.
 	class Statistic < Encoder
@@ -76,4 +77,5 @@ Token Types (%d):
 		
 	end
 
-end end
+end
+end

data/lib/coderay/encoders/tokens.rb

@@ -1,44 +1,44 @@
 module CodeRay
-	module Encoders
+module Encoders
 
-		# The Tokens encoder converts the tokens to a simple
-		# readable format. It doesn't use colors and is mainly
-		# intended for console output.
-		# 
-		# The tokens are converted with Tokens.write_token.
-		#
-		# The format is:
-		#
-		#   <token-kind> \t <escaped token-text> \n
-		#
-		# Example:
-		#
-		#   require 'coderay'
-		#   puts CodeRay.scan("puts 3 + 4", :ruby).tokens
-		# 
-		# prints:
-		#   
-		#   ident   puts
-		#   space
-		#   integer 3
-		#   space
-		#   operator        +
-		#   space
-		#   integer 4
-		# 
-		class Tokens < Encoder
+	# The Tokens encoder converts the tokens to a simple
+	# readable format. It doesn't use colors and is mainly
+	# intended for console output.
+	# 
+	# The tokens are converted with Tokens.write_token.
+	#
+	# The format is:
+	#
+	#   <token-kind> \t <escaped token-text> \n
+	#
+	# Example:
+	#
+	#   require 'coderay'
+	#   puts CodeRay.scan("puts 3 + 4", :ruby).tokens
+	# 
+	# prints:
+	#   
+	#   ident   puts
+	#   space
+	#   integer 3
+	#   space
+	#   operator        +
+	#   space
+	#   integer 4
+	# 
+	class Tokens < Encoder
 
-			include Streamable
-			register_for :tokens
+		include Streamable
+		register_for :tokens
 
-			FILE_EXTENSION = 'tok'
-
-			protected
-			def token *args
-				@out << CodeRay::Tokens.write_token(*args)
-			end
+		FILE_EXTENSION = 'tok'
 
+		protected
+		def token *args
+			@out << CodeRay::Tokens.write_token(*args)
 		end
 
 	end
+
+end
 end

data/lib/coderay/encoders/xml.rb

@@ -1,70 +1,71 @@
 module CodeRay
-	module Encoders
+module Encoders
 
-		# = Debug Encoder
-		class XML < Encoder
+	# = XML Encoder
+	#
+	# Uses REXML. Very slow.
+	class XML < Encoder
 
-			include Streamable
-			register_for :xml
+		include Streamable
+		register_for :xml
 
-			FILE_EXTENSION = 'xml'
+		FILE_EXTENSION = 'xml'
 
-			require 'rexml/document'
+		require 'rexml/document'
 
-			DEFAULT_OPTIONS = {
-				:tab_width => 8,
-				:pretty => -1,
-				:transitive => false,
-			}
+		DEFAULT_OPTIONS = {
+			:tab_width => 8,
+			:pretty => -1,
+			:transitive => false,
+		}
 
-		protected
-			
-			def setup options
-				@out = ''
-				@doc = REXML::Document.new
-				@doc << REXML::XMLDecl.new
-				@tab_width = options[:tab_width]
-				@root = @node = @doc.add_element('coderay-tokens')
-			end
-			
-			def finish options
-				@doc.write @out, options[:pretty], options[:transitive], true
-				@out
+	protected
+		
+		def setup options
+			@out = ''
+			@doc = REXML::Document.new
+			@doc << REXML::XMLDecl.new
+			@tab_width = options[:tab_width]
+			@root = @node = @doc.add_element('coderay-tokens')
+		end
+		
+		def finish options
+			@doc.write @out, options[:pretty], options[:transitive], true
+			@out
+		end
+		
+		def text_token text, kind
+			if kind == :space
+				token = @node
+			else
+				token = @node.add_element kind.to_s
 			end
-			
-			def text_token text, kind
-				if kind == :space
-					token = @node
+			text.scan(/(\x20+)|(\t+)|(\n)|[^\x20\t\n]+/) do |space, tab, nl|
+				case
+				when space
+					token << REXML::Text.new(space, true)
+				when tab
+					token << REXML::Text.new(tab, true)
+				when nl
+					token << REXML::Text.new(nl, true)
 				else
-					token = @node.add_element kind.to_s
-				end
-				text.scan(/(\x20+)|(\t+)|(\n)|[^\x20\t\n]+/) do |space, tab, nl|
-					case
-					when space
-						token << REXML::Text.new(space, true)
-					when tab
-						token << REXML::Text.new(tab, true)
-					when nl
-						token << REXML::Text.new(nl, true)
-					else
-						token << REXML::Text.new($&)
-					end
+					token << REXML::Text.new($&)
 				end
 			end
+		end
 
-			def open_token kind
-				@node = @node.add_element kind.to_s
-			end
+		def open_token kind
+			@node = @node.add_element kind.to_s
+		end
 
-			def close_token kind
-				if @node == @root
-					raise 'no token to close!'
-				end
-				@node = @node.parent
+		def close_token kind
+			if @node == @root
+				raise 'no token to close!'
 			end
-
+			@node = @node.parent
 		end
 
 	end
+
+end
 end
-