ansi-sys 0.3.0 → 0.4.0

data/ChangeLog

@@ -1,3 +1,17 @@
+* 2007-10-27 zunda <zunda at freeshell.org>
+- (0.4.0)
+- lib/ansisys.rb: implemented SU, SD, SCP, and RCP onto Terminal
+  - not to be implemented: DSR
+
+* 2007-10-26 zunda <zunda at freeshell.org>
+- lib/ansisys.rb: implemented ED and EL onto Terminal
+  - more to be done: SU SD DSR SCP RCP
+
+* 2007-10-26 zunda <zunda at freeshell.org>
+- lib/ansisys.rb: modified arguments of apply_code! to avoid
+  decoding of arguments into a letter and parameters
+- spec/attach/test_utf8.txt: added
+
 * 2007-10-23 zunda <zunda at freeshell.org>
 - (0.3.0)
 - lib/ansisys.rb: convert string to EUC as a Hiki plugin

data/Manifest.txt

@@ -17,6 +17,7 @@ script/txt2html
 setup.rb
 spec/attach/test_data.html
 spec/attach/test_data.txt
+spec/attach/test_utf8.txt
 spec/character_screen_spec.rb
 spec/character_spec.rb
 spec/cursor_spec.rb

data/lib/ansisys.rb

@@ -11,7 +11,7 @@ require 'webrick'
 module AnsiSys
 	module VERSION	#:nodoc:
 		MAJOR = 0
-		MINOR = 3
+		MINOR = 4
 		TINY = 0
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
@@ -136,18 +136,7 @@ module AnsiSys
 			@max_row = max_row
 		end
 
-		def apply_code!(args)
-			letter = args.pop
-			pars = args.map do |arg|
-				case arg
-				when nil
-					nil
-				when ''
-					nil
-				else
-					Integer(arg)
-				end
-			end
+		def apply_code!(letter, *pars)
 			case letter
 			when 'A'
 				@cur_row -= pars[0] ? pars[0] : 1
@@ -229,14 +218,12 @@ module AnsiSys
 		end
 
 		def reset!
-			apply_code!(%w(0 m))
+			apply_code!('m', 0)
 		end
 
-		def apply_code!(args = %w(0 m))
-			letter = args.pop
-			raise AnsiSysError, "Invalid code for SGR" unless 'm' == letter
-			pars = args.map{|arg| arg.to_i}
-			pars = [0] if pars.empty?
+		def apply_code!(letter = 'm', *pars)
+			raise AnsiSysError, "Invalid code for SGR: #{letter.inspect}" unless 'm' == letter
+			pars = [0] unless pars
 			pars.each do |code|
 				case code
 				when 0
@@ -435,6 +422,8 @@ module AnsiSys
 			return "pre.screen {\n\t" + CSSFormatter.hash_to_styles(self.css_styles(*args), ";\n\t") + ";\n}\n"
 		end
 
+		attr_reader :lines
+
 		def initialize(colors = Screen.default_css_colors, max_col = nil, max_row = nil)
 			@colors = colors
 			@max_col = max_col
@@ -501,13 +490,13 @@ module AnsiSys
 			return result
 		end
 
-		def apply_code!(args)	# TODO - some codes
+		def apply_code!(letter, *pars)	# TODO - some codes
 			return self
 		end
 	end
 
 	class Terminal
-		CODE_LETTERS = []	# TODO - make a new screen
+		CODE_LETTERS = %w(J K S T n s u)
 
 		def initialize(csis = ["\x1b["])
 			@lexer = Lexer.new(csis)
@@ -539,38 +528,101 @@ module AnsiSys
 			return screens.map{|screen| screen.render(format, css_class, css_style)}.join(separator)
 		end
 
+		def apply_code!(letter, *pars)
+			case letter
+			when 'J'
+				cur_col = @cursor.cur_col
+				cur_row = @cursor.cur_row
+				lines = @screens[-1].lines
+				if pars.empty? or 0 == pars[0]
+					rs = lines.keys.select{|r| r > cur_row}
+					cs = lines[cur_row].keys.select{|c| c >= cur_col}
+				elsif 1 == pars[0]
+					rs = lines.keys.select{|r| r < cur_row}
+					cs = lines[cur_row].keys.select{|c| c <= cur_col}
+				elsif 2 == pars[0]
+					rs = lines.keys
+					cs = []
+					@cursor.apply_code!('H', 1, 1)
+				end
+				rs.each do |r|
+					lines.delete(r)
+				end
+				cs.each do |c|
+					lines[cur_row].delete(c)
+				end
+			when 'K'
+				cur_col = @cursor.cur_col
+				cur_row = @cursor.cur_row
+				line = @screens[-1].lines[cur_row]
+				if pars.empty? or 0 == pars[0]
+					cs = line.keys.select{|c| c >= cur_col}
+				elsif 1 == pars[0]
+					cs = line.keys.select{|c| c <= cur_col}
+				elsif 2 == pars[0]
+					cs = line.keys
+				end
+				cs.each do |c|
+					line.delete(c)
+				end
+			when 'S'
+				lines = @screens[-1].lines
+				n = pars.empty? ? 1 : pars[0]
+				n.times do |l|
+					lines.delete(l)
+				end
+				rs = lines.keys.sort
+				rs.each do |r|
+					lines[r-n] = lines[r]
+					lines.delete(r)
+				end
+				@cursor.apply_code!('H', rs[-1] - n + 1, 1)
+			when 'T'
+				lines = @screens[-1].lines
+				n = pars.empty? ? 1 : pars[0]
+				rs = lines.keys.sort_by{|a| -a}	# sort.reverse
+				rs.each do |r|
+					lines[r+n] = lines[r]
+					lines.delete(r)
+				end
+				@cursor.apply_code!('H', rs[-1] - n + 1, 1)
+			when 's'
+				@stored_cursor = @cursor.dup
+			when 'u'
+				@cursor = @stored_cursor.dup if @stored_cursor
+			end
+
+			return self
+		end
+
 		private
 		def populate(format = :html, max_col = 80, max_row = nil, colors = Screen.default_css_colors)
-			cursor = Cursor.new(1, 1, max_col, max_row)
-			screens = [Screen.new(colors, max_col, max_row)]
-			sgr = SGR.new
+			@cursor = Cursor.new(1, 1, max_col, max_row)
+			@stored_cursor = nil
+			@screens = [Screen.new(colors, max_col, max_row)]
+			@sgr = SGR.new
 			@stream += @lexer.lex!
 			@stream.each do |type, payload|
 				case type
 				when :string
-					Characters.new(payload, sgr).echo_on(screens[-1], cursor)
+					Characters.new(payload, @sgr).echo_on(@screens[-1], @cursor)
 				when :code
 					unless Lexer::PARAMETER_AND_LETTER =~ payload
 						raise AnsiSysError, "Invalid code: #{payload.inspect}"
 					end
-					parameters = $1
 					letter = $2
-					args = parameters.split(/;/) + [letter]
+					pars = $1.split(/;/).map{|i| i.to_i}
 					applied = false
-					[sgr, cursor, screens[-1], self].each do |recv|
+					[@sgr, @cursor, @screens[-1], self].each do |recv|
 						if recv.class.const_get(:CODE_LETTERS).include?(letter)
-							recv.apply_code!(args)
+							recv.apply_code!(letter, *pars)
 							applied = true
 						end
 					end
 					raise AnsiSysError, "Invalid code or not implemented: #{payload.inspect}" unless applied
 				end
 			end
-			return screens
-		end
-
-		def apply_code!(args) # TODO - make a new screen
-			return self
+			return @screens
 		end
 	end
 end

data/spec/attach/test_utf8.txt

@@ -0,0 +1 @@
+日本語でUTF-8のテキストファイル。

data/spec/cursor_spec.rb

@@ -26,46 +26,46 @@ describe Cursor, 'when moved normally' do
 	end
 
 	it "should move up with code CUU" do
-		lambda{@cursor.apply_code!(%w(A))}.should change(@cursor, :cur_row).by(-1)
-		lambda{@cursor.apply_code!(%w(1 A))}.should change(@cursor, :cur_row).by(-1)
-		lambda{@cursor.apply_code!(%w(2 A))}.should change(@cursor, :cur_row).by(-2)
+		lambda{@cursor.apply_code!('A')}.should change(@cursor, :cur_row).by(-1)
+		lambda{@cursor.apply_code!('A', 1)}.should change(@cursor, :cur_row).by(-1)
+		lambda{@cursor.apply_code!('A', 2)}.should change(@cursor, :cur_row).by(-2)
 	end
 
 	it "should move down with code CUD" do
-		lambda{@cursor.apply_code!(%w(B))}.should change(@cursor, :cur_row).by(1)
-		lambda{@cursor.apply_code!(%w(1 B))}.should change(@cursor, :cur_row).by(1)
-		lambda{@cursor.apply_code!(%w(2 B))}.should change(@cursor, :cur_row).by(2)
+		lambda{@cursor.apply_code!('B')}.should change(@cursor, :cur_row).by(1)
+		lambda{@cursor.apply_code!('B', 1)}.should change(@cursor, :cur_row).by(1)
+		lambda{@cursor.apply_code!('B', 2)}.should change(@cursor, :cur_row).by(2)
 	end
 
 	it "should move to right with code CUF" do
-		lambda{@cursor.apply_code!(%w(C))}.should change(@cursor, :cur_col).by(1)
-		lambda{@cursor.apply_code!(%w(1 C))}.should change(@cursor, :cur_col).by(1)
-		lambda{@cursor.apply_code!(%w(2 C))}.should change(@cursor, :cur_col).by(2)
+		lambda{@cursor.apply_code!('C')}.should change(@cursor, :cur_col).by(1)
+		lambda{@cursor.apply_code!('C', 1)}.should change(@cursor, :cur_col).by(1)
+		lambda{@cursor.apply_code!('C', 2)}.should change(@cursor, :cur_col).by(2)
 	end
 
 	it "should move to left with code CUB" do
-		lambda{@cursor.apply_code!(%w(D))}.should change(@cursor, :cur_col).by(-1)
-		lambda{@cursor.apply_code!(%w(1 D))}.should change(@cursor, :cur_col).by(-1)
-		lambda{@cursor.apply_code!(%w(2 D))}.should change(@cursor, :cur_col).by(-2)
+		lambda{@cursor.apply_code!('D')}.should change(@cursor, :cur_col).by(-1)
+		lambda{@cursor.apply_code!('D', 1)}.should change(@cursor, :cur_col).by(-1)
+		lambda{@cursor.apply_code!('D', 2)}.should change(@cursor, :cur_col).by(-2)
 	end
 
 	it "should move to beggining of lower line with CNL" do
-		[[1, %w(E)], [1, %w(1 E)], [2, %w(2 E)]].each do |d, code|
-			lambda{@cursor.apply_code!(code)}.should change(@cursor, :cur_row).by(d)
+		[[1, 'E'], [1, ['E', 1]], [2, ['E', 2]]].each do |d, code|
+			lambda{@cursor.apply_code!(*code)}.should change(@cursor, :cur_row).by(d)
 			@cursor.cur_col.should == 1
 		end
 	end
 
 	it "should move to beggining of upper line with CPL" do
-		[[-1, %w(F)], [-1, %w(1 F)], [-2, %w(2 F)]].each do |d, code|
-			lambda{@cursor.apply_code!(code)}.should change(@cursor, :cur_row).by(d)
+		[[-1, ['F']], [-1, ['F', 1]], [-2, ['F', 2]]].each do |d, code|
+			lambda{@cursor.apply_code!(*code)}.should change(@cursor, :cur_row).by(d)
 			@cursor.cur_col.should == 1
 		end
 	end
 
 	it "should move to specified column with CHA" do
-		[[1, %w(G)], [1, %w(1 G)], [2, %w(2 G)]].each do |c, code|
-			lambda{@cursor.apply_code!(code)}.should_not change(@cursor, :cur_row)
+		[[1, ['G']], [1, ['G', 1]], [2, ['G', 2]]].each do |c, code|
+			lambda{@cursor.apply_code!(*code)}.should_not change(@cursor, :cur_row)
 			@cursor.cur_col.should == c
 		end
 	end
@@ -73,16 +73,14 @@ describe Cursor, 'when moved normally' do
 	it "should move to specified position with CUP and HVP" do
 		%w(H f).each do |letter|
 			[
-				# row, column, code
-				[1, 5, [nil, '5']],
-				[1, 5, ['', '5']],
-				[1, 5, ['1', '5']],
-				[17, 1, ['17', nil]],
-				[17, 1, ['17', '']],
-				[17, 1, ['17', '1']],
-				[9, 8, ['9', '8']],
-			].each do |r, c, code|
-				@cursor.apply_code!(code + [letter])
+				# row, column, pars
+				[1, 5, [nil, 5]],
+				[1, 5, [1, 5]],
+				[17, 1, [17, nil]],
+				[17, 1, [17, 1]],
+				[9, 8, [9, 8]],
+			].each do |r, c, pars|
+				@cursor.apply_code!(letter, *pars)
 				@cursor.cur_col.should == c
 				@cursor.cur_row.should == r
 			end
@@ -98,36 +96,36 @@ describe Cursor, 'when tried to be moved beyond edge' do
 
 	it "should not move with code CUU" do
 		@cursor.instance_variable_set('@cur_row', 1)
-		lambda{@cursor.apply_code!(%w(1 A))}.should_not change(@cursor, :cur_row)
+		lambda{@cursor.apply_code!('A', 1)}.should_not change(@cursor, :cur_row)
 	end
 
 	it "should not move with code CUD" do
 		@cursor.instance_variable_set('@cur_row', @cursor.max_row)
-		lambda{@cursor.apply_code!(%w(1 B))}.should_not change(@cursor, :cur_row)
+		lambda{@cursor.apply_code!('B', 1)}.should_not change(@cursor, :cur_row)
 	end
 
 	it "should not move with code CUF" do
 		@cursor.instance_variable_set('@cur_col', @cursor.max_col)
-		lambda{@cursor.apply_code!(%w(1 C))}.should_not change(@cursor, :cur_col)
+		lambda{@cursor.apply_code!('C', 1)}.should_not change(@cursor, :cur_col)
 	end
 
 	it "should not move with code CUB" do
 		@cursor.instance_variable_set('@cur_col', 1)
-		lambda{@cursor.apply_code!(%w(1 D))}.should_not change(@cursor, :cur_col)
+		lambda{@cursor.apply_code!('D', 1)}.should_not change(@cursor, :cur_col)
 	end
 
 	it "should make screen longer with code CNL" do
 		@cursor.instance_variable_set('@cur_row', @cursor.max_row)
-		lambda{@cursor.apply_code!(%w(1 E))}.should change(@cursor, :max_row).by(1)
+		lambda{@cursor.apply_code!('E', 1)}.should change(@cursor, :max_row).by(1)
 	end
 
 	it "should not change row with code CNL" do
 		@cursor.instance_variable_set('@cur_row', 1)
-		lambda{@cursor.apply_code!(%w(1 F))}.should_not change(@cursor, :cur_row)
+		lambda{@cursor.apply_code!('F', 1)}.should_not change(@cursor, :cur_row)
 	end
 
 	it "should move to edge column with code CHA" do
-		lambda{@cursor.apply_code!(%w(99 G))}.should change(@cursor, :cur_col).to(@cursor.max_col)
+		lambda{@cursor.apply_code!('G', 99)}.should change(@cursor, :cur_col).to(@cursor.max_col)
 	end
 
 end

data/spec/screen_spec.rb

@@ -73,7 +73,7 @@ _SCREEN
 	end
 
 	it "should change colors" do
-		@sgr.apply_code!(%w(32 m))
+		@sgr.apply_code!('m', 32)
 		@screen.write(':', 1, 1, 1, @sgr)
 		@screen.write(')', 1, 2, 1, @sgr)
 		@screen.render(:html).should == <<_SCREEN.chomp
@@ -99,7 +99,7 @@ describe Screen, "with default colors" do
 		@screen.write('l', 1, 5, 1, @sgr)
 		@screen.write('l', 1, 6, 1, @sgr)
 		@screen.write('o', 1, 7, 1, @sgr)
-		@sgr.apply_code!(%w(32 m))
+		@sgr.apply_code!('m', 32)
 		@screen.write(':', 1, 1, 1, @sgr)
 		@screen.write(')', 1, 2, 1, @sgr)
 	end
@@ -122,7 +122,7 @@ describe Screen, "with inverted colors" do
 		@screen.write('l', 1, 5, 1, @sgr)
 		@screen.write('l', 1, 6, 1, @sgr)
 		@screen.write('o', 1, 7, 1, @sgr)
-		@sgr.apply_code!(%w(32 m))
+		@sgr.apply_code!('m', 32)
 		@screen.write(':', 1, 1, 1, @sgr)
 		@screen.write(')', 1, 2, 1, @sgr)
 	end
@@ -145,7 +145,7 @@ describe Screen, "with bright colors" do
 		@screen.write('l', 1, 5, 1, @sgr)
 		@screen.write('l', 1, 6, 1, @sgr)
 		@screen.write('o', 1, 7, 1, @sgr)
-		@sgr.apply_code!(%w(32 m))
+		@sgr.apply_code!('m', 32)
 		@screen.write(':', 1, 1, 1, @sgr)
 		@screen.write(')', 1, 2, 1, @sgr)
 	end

data/spec/sgr_spec.rb

@@ -25,7 +25,7 @@ describe SGR, 'when two are initialized' do
 
   it 'should be equal when initialized' do @sgr1.should == @sgr2; end
   it 'should be different after a code is executed' do
-    @sgr2.apply_code!(%w(1 m))
+    @sgr2.apply_code!('m', 1)
     @sgr1.should_not == @sgr2
   end
 end
@@ -46,64 +46,64 @@ describe SGR, 'when a code is executed' do
   end
 
 	it 'should treat empty parameter as a code 0' do
-		@sgr.apply_code!(['m'])
+		@sgr.apply_code!('m')
 		@sgr.should == SGR.new
 	end
   it 'should have bold intensity with a code 1' do
-    @sgr.change_only(:intensity, :bold){|x| x.apply_code!(%w(1 m))}
+    @sgr.change_only(:intensity, :bold){|x| x.apply_code!('m', 1)}
   end
   it 'should have faint intensity with a code 2' do
-    @sgr.change_only(:intensity, :faint){|x| x.apply_code!(%w(2 m))}
+    @sgr.change_only(:intensity, :faint){|x| x.apply_code!('m', 2)}
   end
   it 'should be italic with a code 3' do
-    @sgr.change_only(:italic, :on){|x| x.apply_code!(%w(3 m))}
+    @sgr.change_only(:italic, :on){|x| x.apply_code!('m', 3)}
   end
   it 'should have single underline with a code 4' do
-    @sgr.change_only(:underline, :single){|x| x.apply_code!(%w(4 m))}
+    @sgr.change_only(:underline, :single){|x| x.apply_code!('m', 4)}
   end
   it 'should be concealed with a code 8' do
-    @sgr.change_only(:conceal, :on){|x| x.apply_code!(%w(8 m))}
+    @sgr.change_only(:conceal, :on){|x| x.apply_code!('m', 8)}
   end
   it 'should be revealed with a code 28' do
     @sgr.change_only(:conceal, :off) do |x|
-			x.apply_code!(%w(8 m))
-			x.apply_code!(%w(28 m))
+			x.apply_code!('m', 8)
+			x.apply_code!('m', 28)
 		end
   end
   it 'should have green foreground with normal intensity with a code 32' do
-    @sgr.apply_code!(%w(1 m))
-    @sgr.apply_code!(%w(32 m))
+    @sgr.apply_code!('m', 1)
+    @sgr.apply_code!('m', 32)
     @sgr.foreground.should == :green
     @sgr.intensity.should == :normal
   end
   it 'should have white foreground with normal intensity with a code 39' do
-    @sgr.apply_code!(%w(32 m))
-    @sgr.apply_code!(%w(1 m))
-    @sgr.apply_code!(%w(39 m))
+    @sgr.apply_code!('m', 32)
+    @sgr.apply_code!('m', 1)
+    @sgr.apply_code!('m', 39)
     @sgr.foreground.should == :white
     @sgr.intensity.should == :normal
   end
   it 'should have yellow background with normal intensity with a code 43' do
-    @sgr.apply_code!(%w(1 m))
-    @sgr.apply_code!(%w(43 m))
+    @sgr.apply_code!('m', 1)
+    @sgr.apply_code!('m', 43)
     @sgr.background.should == :yellow
     @sgr.intensity.should == :normal
   end
   it 'should have blue foreground with bold intensity with a code 94' do
-    @sgr.apply_code!(%w(1 m))
-    @sgr.apply_code!(%w(94 m))
+    @sgr.apply_code!('m', 1)
+    @sgr.apply_code!('m', 94)
     @sgr.foreground.should == :blue
     @sgr.intensity.should == :bold
   end
   it 'should have magenta background with bold intensity with a code 105' do
-    @sgr.apply_code!(%w(1 m))
-    @sgr.apply_code!(%w(105 m))
+    @sgr.apply_code!('m', 1)
+    @sgr.apply_code!('m', 105)
     @sgr.background.should == :magenta
     @sgr.intensity.should == :bold
   end
   it 'should have white background with bold intensity with a code 107' do
-    @sgr.apply_code!(%w(1 m))
-    @sgr.apply_code!(%w(107 m))
+    @sgr.apply_code!('m', 1)
+    @sgr.apply_code!('m', 107)
     @sgr.background.should == :white
     @sgr.intensity.should == :bold
   end
@@ -131,42 +131,42 @@ describe SGR, 'to be rendered in HTML' do
 	end
 
 	it "should change foreground color" do
-    @sgr.apply_code!(%w(32 m))
+    @sgr.apply_code!('m', 32)
     @sgr.css_styles.should == {'color' => ['green']}
 	end
 
 	it "shuold show underline for ANSI single underline" do
-    @sgr.apply_code!(%w(4 m))
+    @sgr.apply_code!('m', 4)
     @sgr.css_styles.should == {'text-decoration' => ['underline']}
 	end
 
 	it "shuold show underline for ANSI double underline" do
-    @sgr.apply_code!(%w(4 m))
+    @sgr.apply_code!('m', 4)
     @sgr.css_styles.should == {'text-decoration' => ['underline']}
 	end
 
 	it "should switch foreground and background colors with reverse video" do
-		@sgr.apply_code!(%w(7 m))
+		@sgr.apply_code!('m', 7)
     @sgr.css_styles.should == {'color' => ['black'], 'background-color' => ['silver']}
 	end
 
 	it "should blink for ANSI slow blink" do
-		@sgr.apply_code!(%w(5 m))
+		@sgr.apply_code!('m', 5)
     @sgr.css_styles.should == {'text-decoration' => ['blink']}
 	end
 
 	it "should blink for ANSI fast blink" do
-		@sgr.apply_code!(%w(6 m))
+		@sgr.apply_code!('m', 6)
     @sgr.css_styles.should == {'text-decoration' => ['blink']}
 	end
 
 	it "should be able to be italic" do
-		@sgr.apply_code!(%w(3 m))
+		@sgr.apply_code!('m', 3)
     @sgr.css_styles.should == {'font-style' => ['italic']}
 	end
 	
 	it "should be able to be invisible" do
-		@sgr.apply_code!(%w(8 m))
+		@sgr.apply_code!('m', 8)
     @sgr.css_styles.should == {'color' => ['black']}
 	end
 end

data/spec/terminal_spec.rb

@@ -80,3 +80,147 @@ _CSS
 		end
 	end
 end
+
+describe Terminal, 'when code ED is sent' do
+  before do
+		@terminal = Terminal.new
+		@terminal.echo("Hello\nand\ngood bye\nworld\e[2;2H")
+  end
+
+	it 'should clear from cursor to end of screen with J' do
+		@terminal.echo("\e[J")
+		@terminal.render(:text).should == "Hello\na"
+	end
+
+	it 'should clear from cursor to end of screen with 0J' do
+		@terminal.echo("\e[0J")
+		@terminal.render(:text).should == "Hello\na"
+	end
+
+	it 'should clear from cursor to beggining of screen with 1J' do
+		@terminal.echo("\e[1J")
+		@terminal.render(:text).should == "\n  d\ngood bye\nworld"
+	end
+
+	it 'should clear entier screen with 2J' do
+		@terminal.echo("\e[2J")
+		@terminal.render(:text).should == ""
+	end
+
+	it 'should move cursor to top left with 2J' do
+		@terminal.echo("\e[2JX")
+		@terminal.render(:text).should == "X"
+	end
+end
+
+describe Terminal, 'when code EL is sent' do
+  before do
+		@terminal = Terminal.new
+		@terminal.echo("red\ngreen\nrefactor\e[2;2H")
+  end
+
+	it 'should clear from cursor to end of line with K' do
+		@terminal.echo("\e[K")
+		@terminal.render(:text).should == "red\ng\nrefactor"
+	end
+
+	it 'should clear from cursor to end of line with K' do
+		@terminal.echo("\e[0K")
+		@terminal.render(:text).should == "red\ng\nrefactor"
+	end
+
+	it 'should clear from cursor to beginning of line with K' do
+		@terminal.echo("\e[1K")
+		@terminal.render(:text).should == "red\n  een\nrefactor"
+	end
+
+	it 'should clear entier line with 2K' do
+		@terminal.echo("\e[2K")
+		@terminal.render(:text).should == "red\n\nrefactor"
+	end
+
+	it 'should not move cursor with 2K' do
+		@terminal.echo("\e[2KX")
+		@terminal.render(:text).should == "red\n X\nrefactor"
+	end
+end
+
+describe Terminal, 'when code SU is sent' do
+	before do
+		@terminal = Terminal.new
+		@terminal.echo("red\ngreen\n\nrefactor\e[2;2H")
+  end
+
+	it 'shuold scroll down by one line with S' do
+		@terminal.echo("\e[S")
+		@terminal.render(:text).should == "green\n\nrefactor"
+	end
+
+	it 'shuold scroll down by one line with 1S' do
+		@terminal.echo("\e[1S")
+		@terminal.render(:text).should == "green\n\nrefactor"
+	end
+
+	it 'shuold scroll down by two lines with 2S' do
+		@terminal.echo("\e[2S")
+		@terminal.render(:text).should == "\nrefactor"
+	end
+
+	it 'shuold append a line at the bottom after S' do
+		@terminal.echo("\e[2SX")
+		@terminal.render(:text).should == "\nrefactor\nX"
+	end
+end
+
+describe Terminal, 'when code SD is sent' do
+	before do
+		@terminal = Terminal.new
+		@terminal.echo("red\ngreen\n\nrefactor\e[2;2H")
+  end
+
+	it 'shuold scroll up by one line with T' do
+		@terminal.echo("\e[T")
+		@terminal.render(:text).should == "\nred\ngreen\n\nrefactor"
+	end
+
+	it 'shuold scroll up by one line with 1T' do
+		@terminal.echo("\e[1T")
+		@terminal.render(:text).should == "\nred\ngreen\n\nrefactor"
+	end
+
+	it 'shuold scroll up by two lines with 2T' do
+		@terminal.echo("\e[2T")
+		@terminal.render(:text).should == "\n\nred\ngreen\n\nrefactor"
+	end
+
+	it 'shuold append a line at the top after T' do
+		@terminal.echo("\e[2TX")
+		@terminal.render(:text).should == "X\n\nred\ngreen\n\nrefactor"
+	end
+end
+
+describe Terminal, 'when code SCP and RCP is sent' do
+	before do
+		@terminal = Terminal.new
+		@terminal.echo("red\ngreen\nrefactor\e[2;2H")
+  end
+
+	it 'should save and restore the cursor position' do
+		@terminal.echo("\e[sXX\nY\e[uZ")
+		@terminal.render(:text).should == "red\ngZXen\nYefactor"
+		@terminal.echo("\e[uz")
+		@terminal.render(:text).should == "red\ngzXen\nYefactor"
+	end
+end
+
+describe Terminal, 'when only code RCP is sent' do
+	before do
+		@terminal = Terminal.new
+		@terminal.echo("red\ngreen\nrefactor\n\e[2;2H")
+  end
+
+	it 'should ignore the code' do
+		@terminal.echo("\e[udone")
+		@terminal.render(:text).should == "red\ngdone\nrefactor"
+	end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Ruby-ANSI.SYS</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ansi-sys"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ansi-sys" class="numbers">0.3.0</a>
+      <a href="http://rubyforge.org/projects/ansi-sys" class="numbers">0.4.0</a>
     </div>
     <h1>&#x2192; &#8216;ansi-sys&#8217;</h1>
 
@@ -110,7 +110,7 @@ terminal.render #=&gt; HTML fragment</pre>
 	<p>Please refer
 <a href="rdoc/files/License_txt.html">License.txt</a></p>
     <p class="coda">
-      zunda, 23rd October 2007<br>
+      zunda, 21st October 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: ansi-sys
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-10-23 00:00:00 -10:00
+  version: 0.4.0
+date: 2007-10-27 00:00:00 -10:00
 summary: Ruby-ANSI.SYS is a library to render texts with ANSI escape sequences.
 require_paths: 
 - lib
@@ -48,6 +48,7 @@ files:
 - setup.rb
 - spec/attach/test_data.html
 - spec/attach/test_data.txt
+- spec/attach/test_utf8.txt
 - spec/character_screen_spec.rb
 - spec/character_spec.rb
 - spec/cursor_spec.rb
@@ -80,6 +81,7 @@ extra_rdoc_files:
 - gpl.rd.txt
 - lgpl.rd.txt
 - spec/attach/test_data.txt
+- spec/attach/test_utf8.txt
 - website/index.txt
 executables: []