diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-06-28 02:45:04 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-06-28 02:45:42 +1000 |
| commit | 2636da0d98dcf737a4a27d72d99ab4558d00b063 (patch) | |
| tree | 286607ad52ee52d9b9d00861bf992edad24b2713 /src | |
| parent | Store only messages with body or subject (EJABS-2034) (diff) | |
Fix IDNA conversion
Diffstat (limited to 'src')
| -rw-r--r-- | src/idna.erl | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/idna.erl b/src/idna.erl index ee4c8cb4a..7e3d0aefb 100644 --- a/src/idna.erl +++ b/src/idna.erl @@ -28,18 +28,21 @@ -author('alexey@process-one.net'). -%%-compile(export_all). -export([domain_utf8_to_ascii/1, domain_ucs2_to_ascii/1, utf8_to_ucs2/1]). +-ifdef(TEST). +-include_lib("eunit/include/eunit.hrl"). +-endif. + -spec domain_utf8_to_ascii(binary()) -> false | binary(). domain_utf8_to_ascii(Domain) -> domain_ucs2_to_ascii(utf8_to_ucs2(Domain)). utf8_to_ucs2(S) -> - list_to_binary(utf8_to_ucs2(binary_to_list(S), "")). + utf8_to_ucs2(binary_to_list(S), ""). utf8_to_ucs2([], R) -> lists:reverse(R); utf8_to_ucs2([C | S], R) when C < 128 -> @@ -51,10 +54,10 @@ utf8_to_ucs2([C1, C2, C3 | S], R) when C1 < 240 -> [C1 band 15 bsl 12 bor (C2 band 63 bsl 6) bor C3 band 63 | R]). --spec domain_ucs2_to_ascii(binary()) -> false | binary(). +-spec domain_ucs2_to_ascii(list()) -> false | binary(). domain_ucs2_to_ascii(Domain) -> - case catch domain_ucs2_to_ascii1(binary_to_list(Domain)) of + case catch domain_ucs2_to_ascii1(Domain) of {'EXIT', _Reason} -> false; Res -> iolist_to_binary(Res) end. @@ -204,3 +207,19 @@ codepoint(C) -> if (0 =< C) and (C =< 25) -> C + 97; (26 =< C) and (C =< 35) -> C + 22 end. + +%%%=================================================================== +%%% Unit tests +%%%=================================================================== +-ifdef(TEST). + +acsii_test() -> + ?assertEqual(<<"test.org">>, domain_utf8_to_ascii(<<"test.org">>)). + +utf8_test() -> + ?assertEqual( + <<"xn--d1acufc.xn--p1ai">>, + domain_utf8_to_ascii( + <<208,180,208,190,208,188,208,181,208,189,46,209,128,209,132>>)). + +-endif. |