coderay 0.4.5.73 → 0.5.0.100

data/README

@@ -18,13 +18,13 @@ And with line numbers.
 * is what everybody should have on their website
 * solves all your problems and makes the girls run after you
 
-Version: 0.4.4 (2005.october.1)
+Version: 0.5.0 (2005.november.5)
 Author:: murphy
 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 48 2005-10-01 06:12:12Z murphy $
+Subversion:: $Id: README 94 2005-11-10 21:52:03Z murphy $
 
 -----
 
@@ -101,3 +101,4 @@ Where would we be without all those people?
 * As you can see, CodeRay was created under heavy use of *free* software.
 * So CodeRay is also *free*.
 * If you use CodeRay to create software, think about making this software *free*, too.
+* Thanks :)

data/demo/demo_css.rb

@@ -1,4 +1,4 @@
 require 'coderay'
 
 # print the default stylesheet for HTML codes
-puts CodeRay::Encoders[:html]::CSS::DEFAULT_STYLESHEET
+puts CodeRay::Encoders[:html]::CSS.new.stylesheet

data/demo/demo_load_encoder.rb

@@ -15,3 +15,11 @@ tokens_encoder = require_plugin 'CodeRay::Encoders/tokens'
 print 'Require is also possible: '
 p tokens_encoder
 puts 'See?'
+
+puts 'Now load some mapped encoders: stats and plain.'
+require_plugin 'CodeRay::Encoders/stats'
+require_plugin 'CodeRay::Encoders/plain'
+
+puts 'Require all Encoders:'
+CodeRay::Encoders.load_all
+p CodeRay::Encoders.plugin_hash.sort_by { |k,v| k.to_s }

data/demo/demo_load_scanner.rb

@@ -0,0 +1,25 @@
+require 'coderay'
+
+begin
+	CodeRay::Scanners::Ruby
+rescue
+	puts 'CodeRay::Encoders::Ruby is not defined; you must load it first.'
+end
+
+ruby_scanner = CodeRay::Scanners[:ruby]
+print 'Now it is loaded: '
+p ruby_scanner
+puts 'See?'
+
+c_scanner = require_plugin 'CodeRay::Scanners/c'
+print 'Require is also possible: '
+p c_scanner
+puts 'See?'
+
+puts 'Now load some mapped scanners: cpp and plain.'
+require_plugin 'CodeRay::Scanners/cpp'
+require_plugin 'CodeRay::Scanners/plain'
+
+puts 'Require all Scanners:'
+CodeRay::Scanners.load_all
+p CodeRay::Scanners.plugin_hash.sort_by { |k,v| k.to_s }

data/demo/demo_more.rb

@@ -17,7 +17,7 @@ time = Benchmark.realtime do
 	body = %w[C Ruby Genereated\ by].zip([c, ruby, me]).map do |title, code|
 		"<h1>#{title}</h1>\n#{code}"
 	end.join
-	body = hl.class::Output.new(body, :div).page!
+	body = hl.class::Output.new(body, hl.css, :div).page!
 
 	# CodeRay also provides a simple page generator
 	$output = body #hl.class.wrap_in_page body
@@ -27,7 +27,8 @@ File.open('test.html', 'w') do |f|
 	f.write $output
 end
 puts 'Input: %dB, Output: %dB' % [$input.size, $output.size]
-puts 'Created "test.html" in %0.3f seconds (%d KB/s). Take a look with your browser.' % [time, $input.size / 1024.0 / time]
+#puts 'Created "test.html" in %0.3f seconds (%d KB/s).' % [time, $input.size / 1024.0 / time]
+puts 'Take a look with your browser.'
 
 __END__
 /**********************************************************************

data/demo/suite.rb

@@ -0,0 +1,82 @@
+mydir = File.dirname(__FILE__)
+$:.unshift mydir + '/../lib/'
+
+$VERBOSE = true
+
+require 'test/unit'
+include Test::Unit
+
+class CodeRaySuite < TestCase
+	
+	def self.dir &block
+		@dir ||= File.dirname(__FILE__)
+		if block
+			Dir.chdir @dir, &block
+		end
+		@dir
+	end
+
+	def dir &block
+		self.class.dir(&block)
+	end
+	
+	def test_ALL
+		dir do
+			for input in Dir["demo_*.rb"] - ['demo_server.rb', 'demo_stream.rb']
+				puts "[ testing #{input}... ]"
+				name = File.basename(input, ".rb")
+				output = name + '.out'
+				code = File.open(input, 'rb') { |f| break f.read }
+
+				result = `ruby -wI../lib #{input}`
+
+				if File.exist? output
+					expected = File.read output
+					ok = expected == result
+					computed = output.sub('.out', '.computed')
+					unless ok
+						File.open(computed, 'w') { |f| f.write result }
+						print `gvimdiff #{output} #{computed}` if $DEBUG
+					end
+					assert(ok, "Output error: #{computed} != #{output}") unless $DEBUG
+				else
+					File.open(output, 'w') do |f| f.write result end
+					puts "New test: #{output}"
+				end
+
+			end
+		end
+	end
+
+end
+
+require 'test/unit/testsuite'
+$suite = TestSuite.new 'CodeRay Demos Test'
+$suite << CodeRaySuite.suite
+
+def load_suite name
+	begin
+		require name + '/suite.rb'
+	rescue LoadError
+		$stderr.puts <<-ERR
+
+!! Folder #{File.split(__FILE__).first + '/' + name} not found
+		
+		ERR
+		false
+	end
+end
+
+if subsuite = ARGV.find { |a| break $1 if a[/^([^-].*)/] }
+	load_suite(subsuite) or exit
+else
+	Dir[mydir + '/*/'].each { |suite| load_suite suite }
+end
+
+if ARGV.include? '-f'
+	require 'test/unit/ui/fox/testrunner'
+	UI::Fox::TestRunner.run $suite
+else
+	require 'test/unit/ui/console/testrunner'
+	UI::Console::TestRunner.run $suite
+end

data/lib/coderay.rb

@@ -1,6 +1,6 @@
 # = CodeRay Library
 #
-# $Id: coderay.rb 73 2005-10-29 16:09:17Z murphy $
+# $Id: coderay.rb 96 2005-11-13 06:24:54Z murphy $
 #
 # CodeRay is a Ruby library for syntax highlighting.
 #
@@ -128,11 +128,17 @@
 #	The scanning methods provide more flexibility; we recommend to use these.
 module CodeRay
 	
-	Version = '0.4.6'
+	# Version: Major.Minor.Teeny[.Revision]
+	# Major: 0 for pre-release
+	# Minor: odd for beta, even for stable
+	# Teeny: development state
+	# Revision: Subversion Revision number (generated on rake)
+	Version = '0.6.0'
 	
 	require 'coderay/tokens'
 	require 'coderay/scanner'
 	require 'coderay/encoder'
+	require 'coderay/style'
 
 
 	class << self

data/lib/coderay/encoder.rb

@@ -9,7 +9,7 @@ module CodeRay
 	# belonging to the given format.
 	module Encoders
 		extend PluginHost
-		plugin_path 'coderay/encoders'
+		plugin_path File.dirname(__FILE__), 'encoders'
 
 		# = Encoder
 		#

data/lib/coderay/encoders/_map.rb

@@ -0,0 +1,8 @@
+module CodeRay
+	module Encoders
+		
+		map :stats => :statistic,
+			:plain => :text
+		
+	end
+end

data/lib/coderay/encoders/div.rb

@@ -1,6 +1,7 @@
 module CodeRay module Encoders
 	
-	require 'coderay/encoders/html'
+	load :html
+
 	class Div < HTML
 
 		FILE_EXTENSION = 'div.html'
@@ -11,6 +12,7 @@ module CodeRay module Encoders
 			:css => :style,
 			:wrap => :div,
 		})
+
 	end
 
 end end

data/lib/coderay/encoders/html.rb

@@ -39,7 +39,7 @@ module Encoders
 	# Default: :page
 	# 
 	# === :line_numbers
-	# Include line numbers in :table, :inline or nil (no line numbers)
+	# Include line numbers in :table, :inline, :list or nil (no line numbers)
 	# 
 	# Default: nil
 	# 
@@ -71,6 +71,8 @@ module Encoders
 			:level => :xhtml,
 			:css => :class,
 
+			:style => :cycnus,
+			
 			:wrap => :page,
 
 			:line_numbers => nil,
@@ -80,9 +82,9 @@ module Encoders
 			:hint => false,
 		}
 		
-		require 'coderay/encoders/helpers/html_helper'
-		require 'coderay/encoders/helpers/html_output'
-		require 'coderay/encoders/helpers/html_css'
+		helper :classes, :output, :css
+
+		attr_reader :css
 
 		def initialize(*)
 			super
@@ -116,7 +118,7 @@ module Encoders
 			@HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
 			
 			@opened = [nil]
-			@css = CSS.new
+			@css = CSS.new options[:style]
 
 			hint = options[:hint]
 			if hint and not [:debug, :info].include? hint
@@ -192,6 +194,7 @@ module Encoders
 			@out << '</span>' * @opened.size
 
 			@out.extend Output
+			@out.css = @css
 			@out.numerize! options[:line_numbers], options # if options[:line_numbers]
 			@out.wrap! options[:wrap] # if options[:wrap]
 

data/lib/coderay/encoders/{helpers/html_helper.rb → html/classes.rb}

@@ -54,6 +54,7 @@ module CodeRay module Encoders
 			:xml_text => 'xt',
 
 			:ident => :NO_HIGHLIGHT, # 'id'
+			#:operator => 'op',			
 			:operator => :NO_HIGHLIGHT,  # 'op'
 			:space => :NO_HIGHLIGHT,  # 'sp'
 			:plain => :NO_HIGHLIGHT,

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

@@ -0,0 +1,66 @@
+module CodeRay module Encoders
+
+	class HTML
+		class CSS
+
+			DEFAULT_STYLESHEET_ID = :cycnus
+
+			attr :stylesheet
+
+			def CSS.load_stylesheet style
+				style = DEFAULT_STYLESHEET_ID if style == :default
+				CodeRay::Styles[style]
+			end
+			
+			def initialize style = :default
+				@classes = Hash.new
+				style = CSS.load_stylesheet style
+				@stylesheet = [
+					style::CSS_MAIN_STYLES,
+					style::TOKEN_COLORS.gsub(/^(?!$)/, '.CodeRay ')
+				].join("\n")
+				parse style::TOKEN_COLORS
+			end
+
+			def [] *styles
+				cl = @classes[styles.first]
+				return '' unless cl
+				style = ''
+				1.upto(styles.size) do |offset|
+					break if style = cl[styles[offset .. -1]]
+				end
+				raise 'Style not found: %p' % [styles] if $DEBUG and style.empty?
+				return style
+			end
+			
+		private
+			
+			CSS_CLASS_PATTERN = /
+				( (?:                # $1 = classes
+					\s* \. [-\w]+
+				)+ )
+				\s* \{ \s*
+				( [^\}]+ )?          # $2 = style
+				\s* \} \s*
+			|
+				( . )                # $3 = error
+			/mx
+			def parse stylesheet
+				stylesheet.scan CSS_CLASS_PATTERN do |classes, style, error|
+					raise "CSS parse error: '#{error.inspect}' not recognized" if error
+					styles = classes.scan(/[-\w]+/)
+					cl = styles.pop
+					@classes[cl] ||= Hash.new
+					@classes[cl][styles] = style.to_s.strip
+				end
+			end
+			
+		end
+	end
+	
+end end
+
+if $0 == __FILE__
+	require 'pp'
+	pp CodeRay::Encoders::HTML::CSS.new
+end

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

@@ -0,0 +1,112 @@
+module CodeRay
+	module Encoders
+
+	class HTML
+		
+		module Output
+
+			def numerize *args
+				clone.numerize!(*args)
+			end
+
+			NUMERIZABLE_WRAPPINGS = {
+				:table => [:div, :page],
+				:inline => :all,
+				:list => [:div, :page],
+				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
+					# FIXME Firefox struggles with very long codes (> 200 lines)
+					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_table_tpl = TABLE.apply('LINE_NUMBERS', line_numbers)
+					gsub!(/\n/) { "<tt>\n</tt>" }
+					wrap_in! line_numbers_table_tpl
+					@wrapped_in = :div
+					
+				when :list
+					opened_tags = []
+					gsub!(/^.*$\n?/) do |line|
+						line.chomp!
+						
+						open = opened_tags.join
+						line.scan(%r!<(/)?span[^>]*>?!) do |close,|
+							if close
+								opened_tags.pop
+							else
+								opened_tags << $&
+							end
+						end
+						close = '</span>' * opened_tags.size
+						
+						"<li>#{open}#{line}#{close}</li>"
+					end
+					wrap_in! LIST
+					@wrapped_in = :div
+					
+				else
+					raise ArgumentError, "Unknown value %p for mode: expected one of %p" %
+						[mode, NUMERIZABLE_WRAPPINGS.keys - [:all]]
+				end
+
+				self
+			end
+
+		end
+
+	end
+
+end
+end