Skip to content

Commit 984b596

Browse files
committed
rubyfying
--HG-- extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40944
1 parent baea4a5 commit 984b596

6 files changed

+16
-16
lines changed

tests/test_parser.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Html5ParserTestCase < Test::Unit::TestCase
2626
test_name = File.basename(test_file).sub('.dat', '')
2727

2828
TestData.new(test_file, %w(data errors document-fragment document)).
29-
each_with_index do |(input, errors, innerHTML, expected), index|
29+
each_with_index do |(input, errors, inner_html, expected), index|
3030

3131
errors = errors.split("\n")
3232
expected = expected.gsub("\n| ","\n")[2..-1]
@@ -36,8 +36,8 @@ class Html5ParserTestCase < Test::Unit::TestCase
3636

3737
parser = HTMLParser.new(:tree => TreeBuilders[tree_name])
3838

39-
if innerHTML
40-
parser.parseFragment(input, innerHTML)
39+
if inner_html
40+
parser.parse_fragment(input, inner_html)
4141
else
4242
parser.parse(input)
4343
end

tests/test_sanitizer.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ class SanitizeTest < Test::Unit::TestCase
1212
include HTML5
1313

1414
def sanitize_xhtml stream
15-
XHTMLParser.parseFragment(stream, {:tokenizer => HTMLSanitizer, :encoding => 'utf-8', :lowercase_element_name => false, :lowercase_attr_name => false}).to_s
15+
XHTMLParser.parse_fragment(stream, {:tokenizer => HTMLSanitizer, :encoding => 'utf-8', :lowercase_element_name => false, :lowercase_attr_name => false}).to_s
1616
end
1717

1818
def sanitize_html stream
19-
HTMLParser.parseFragment(stream, {:tokenizer => HTMLSanitizer, :encoding => 'utf-8', :lowercase_element_name => false, :lowercase_attr_name => false}).to_s
19+
HTMLParser.parse_fragment(stream, {:tokenizer => HTMLSanitizer, :encoding => 'utf-8', :lowercase_element_name => false, :lowercase_attr_name => false}).to_s
2020
end
2121

2222
def sanitize_rexml stream
2323
require 'rexml/document'
2424
doc = REXML::Document.new("<div xmlns='http://www.w3.org/1999/xhtml'>#{stream}</div>")
25-
tokens = TreeWalkers.getTreeWalker('rexml').new(doc)
25+
tokens = TreeWalkers.get_tree_walker('rexml').new(doc)
2626
XHTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
2727
:quote_char => "'",
2828
:inject_meta_charset => false,

tests/test_serializer.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ def each
1212
@tree.each do |token|
1313
case token[0]
1414
when 'StartTag'
15-
yield startTag(token[1], token[2])
15+
yield start_tag(token[1], token[2])
1616
when 'EndTag'
17-
yield endTag(token[1])
17+
yield end_tag(token[1])
1818
when 'EmptyTag'
19-
yield emptyTag(token[1], token[2])
19+
yield empty_tag(token[1], token[2])
2020
when 'Comment'
2121
yield comment(token[1])
2222
when 'Characters', 'SpaceCharacters'

tests/test_tokenizer.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ def tokenizer_test(data)
6565
assert_nothing_raised message do
6666
tokenizer = HTML5::HTMLTokenizer.new(data['input'])
6767

68-
tokenizer.contentModelFlag = content_model_flag.to_sym
68+
tokenizer.content_model_flag = content_model_flag.to_sym
6969

70-
tokenizer.currentToken = {:type => :startTag, :name => data['lastStartTag']} if data.has_key?('lastStartTag')
70+
tokenizer.current_token = {:type => :startTag, :name => data['lastStartTag']} if data.has_key?('lastStartTag')
7171

7272
tokens = TokenizerTestParser.new(tokenizer).parse
7373

tests/test_treewalkers.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def convertTokens(tokens)
8080
next if test_name == 'tests5' # TODO
8181

8282
TestData.new(test_file, %w(data errors document-fragment document)).
83-
each_with_index do |(input, errors, innerHTML, expected), index|
83+
each_with_index do |(input, errors, inner_html, expected), index|
8484

8585
expected = expected.gsub("\n| ","\n")[2..-1]
8686

@@ -90,13 +90,13 @@ def convertTokens(tokens)
9090

9191
parser = HTML5::HTMLParser.new(:tree => tree_class[:builder])
9292

93-
if innerHTML
94-
parser.parseFragment(input, innerHTML)
93+
if inner_html
94+
parser.parse_fragment(input, inner_html)
9595
else
9696
parser.parse(input)
9797
end
9898

99-
document = parser.tree.getDocument
99+
document = parser.tree.get_document
100100

101101
begin
102102
output = sortattrs(convertTokens(tree_class[:walker].new(document)))

tests/tokenizer_test_parser.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def processCharacters(token)
5454
@outputTokens.push(["Character", token[:data]])
5555
end
5656

57-
def processEOF(token)
57+
def process_eof(token)
5858
end
5959

6060
def processParseError(token)

0 commit comments

Comments
 (0)