Update tests, badges

Author: ScottPJones

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/JuliaString/HTML_Entities.jl.svg?branch=master)](https://travis-ci.org/JuliaString/HTML_Entities.jl)
 
-[![Coverage Status](https://coveralls.io/repos/JuliaString/HTML_Entities.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaString/HTML_Entities.jl?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/JuliaString/HTML_Entities.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaString/HTML_Entities.jl?branch=master)
 
 [![codecov.io](http://codecov.io/github/JuliaString/HTML_Entities.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaString/HTML_Entities.jl?branch=master)
 

src/HTML_Entities.jl

@@ -10,7 +10,23 @@ __precompile__()
 module HTML_Entities
 using StrTables
 
-include("html_table.jl")
+VER = UInt32(1)
+
+immutable HTML_Table{T} <: AbstractEntityTable
+    ver::UInt32
+    tim::String
+    inf::String
+    base32::UInt32
+    base2c::UInt32
+    nam::StrTable{T}
+    ind::Vector{UInt16}
+    val16::Vector{UInt16}
+    ind16::Vector{UInt16}
+    val32::Vector{UInt16}
+    ind32::Vector{UInt16}
+    val2c::Vector{UInt32}
+    ind2c::Vector{UInt16}
+end
 
 function __init__()
     const global _tab =
@@ -34,20 +50,16 @@ function _get_strings{T}(val::T, tab::Vector{T}, ind::Vector{UInt16})
     _tab.nam[ind[rng]]
 end
 
-"""Given a HTML name, return the string it represents, or an empty string if not found"""
 function lookupname(str::AbstractString)
     rng = searchsorted(_tab.nam, str)
     isempty(rng) ? _empty_str : _get_str(_tab.ind[rng.start])
 end
 
-"""Given a character, return all exact matches to the character as a vector"""
 matchchar(ch::Char) =
     (ch <= '\uffff'
      ? _get_strings(ch%UInt16, _tab.val16, _tab.ind16)
      : (ch <= '\U1ffff' ? _get_strings(ch%UInt16, _tab.val32, _tab.ind32) : _empty_str_vec))
 
-"""Given a string, return all exact matches to the string as a vector"""
-function matches end
 matches(str::AbstractString) = matches(convert(Vector{Char}, str))
 function matches(vec::Vector{Char})
     if length(vec) == 1
@@ -59,8 +71,6 @@ function matches(vec::Vector{Char})
     end
 end
 
-"""Given a string, return all of the longest matches to the beginning of the string as a vector"""
-function longestmatches end
 longestmatches(str::AbstractString) = longestmatches(convert(Vector{Char}, str))
 function longestmatches(vec::Vector{Char})
     isempty(vec) && return _empty_str_vec
@@ -72,9 +82,6 @@ function longestmatches(vec::Vector{Char})
     matchchar(vec[1])
 end
 
-
-"""Given a string, return all of the HTML entity names that start with that string, if any"""
-function completions end
 completions(str::AbstractString) = completions(convert(String, str))
 completions(str::String) = StrTables.matchfirst(_tab.nam, str)
 

src/html_table.jl

@@ -8,14 +8,17 @@ HE = HTML_Entities
 
 @testset "HTML_Entities" begin
 @testset "lookupname" begin
+    @test HE.lookupname(SubString("My name is Spock", 12)) == ""
     @test HE.lookupname("foobar") == ""
     @test HE.lookupname("nle")    == "\u2270"
     @test HE.lookupname("Pscr")   == "\U1d4ab"
     @test HE.lookupname("lvnE")   == "\u2268\ufe00"
 end
 
 @testset "matches" begin
+    @test isempty(HE.matches(""))
     @test isempty(HE.matches("\u201f"))
+    @test isempty(EE.matches(SubString("This is \u201f", 9)))
     for (chrs, exp) in (("\u2270", ["nle", "nleq"]),
                         ("\U1d4ab", ["Pscr"]),
                         ("\U1d51e", ["afr"]),
@@ -28,6 +31,7 @@ end
 
 @testset "longestmatches" begin
     @test isempty(HE.longestmatches("\u201f abcd"))
+    @test isempty(EE.longestmatches(SubString("This is \U201f abcd", 9)))
     for (chrs, exp) in (("\u2270 abcd", ["nle", "nleq"]),
                         ("\U1d4ab abcd", ["Pscr"]),
                         ("\u2268\ufe00 silly", ["lvertneqq", "lvnE"]))
@@ -39,6 +43,7 @@ end
 
 @testset "completions" begin
     @test isempty(HE.completions("ScottPaulJones"))
+    @test isempty(EE.completions(SubString("My name is Scott", 12)))
     for (chrs, exp) in (("and", ["and", "andand", "andd", "andslope", "andv"]),
                         ("um", ["umacr", "uml"]))
         res = HE.completions(chrs)