From b70cc51303d19828c92d6e62579f8070b9b154b5 Mon Sep 17 00:00:00 2001 From: sa3ruby Date: Sun, 20 Jan 2008 16:08:03 +0000 Subject: [PATCH] Ruby 1.9 += sniffer --- ruby/lib/html5/sniffer.rb | 12 ++++++------ ruby/test19.rb | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ruby/lib/html5/sniffer.rb b/ruby/lib/html5/sniffer.rb index 5e52c2c..6d564fd 100644 --- a/ruby/lib/html5/sniffer.rb +++ b/ruby/lib/html5/sniffer.rb @@ -7,9 +7,9 @@ def html_or_feed str while pos < s.length case s[pos] - when 0x09, 0x20, 0x0A, 0x0D # tab, space, LF, CR + when ?\t, ?\ , ?\n, ?\r # 0x09, 0x20, 0x0A, 0x0D == tab, space, LF, CR pos += 1 - when 0x3C # "<" + when ?< # 0x3C pos += 1 if s[pos..pos+2] == "!--" # [0x21, 0x2D, 0x2D] pos += 3 @@ -17,13 +17,13 @@ def html_or_feed str pos += 1 end pos += 3 - elsif s[pos] == 0x21 # "!" + elsif s[pos] == ?! # 0x21 pos += 1 - until s[pos] == 0x3E or pos >= s.length # ">" + until s[pos] == ?> or pos >= s.length # 0x3E pos += 1 end pos += 1 - elsif s[pos] == 0x3F # "?" + elsif s[pos] == ?? # 0x3F until s[pos..pos+1] == "?>" or pos >= s.length # [0x3F, 0x3E] pos += 1 end @@ -42,4 +42,4 @@ def html_or_feed str "text/html" end end -end \ No newline at end of file +end diff --git a/ruby/test19.rb b/ruby/test19.rb index 3e8903f..d00b803 100644 --- a/ruby/test19.rb +++ b/ruby/test19.rb @@ -24,8 +24,7 @@ require 'test/test_serializer' -# undebugged -# require 'test/test_sniffer' +require 'test/test_sniffer' require 'test/test_stream'