Merge pull request esl#79 from esl/fix-escaping-bug

Fix escaping bug

Author: michalwski

.travis.yml

@@ -21,6 +21,7 @@ before_script:
 script:
         - make test
         - make ct
+        - make dialyzer
 
 after_script:
         - make mongooseim-stop

rebar.config

@@ -9,7 +9,7 @@
 {require_otp_vsn, "^(R1[56]|17|18)"}.
 
 {deps, [
-        {exml, ".*", {git, "git://github.com/esl/exml.git", {tag, "2.1.5"}}},
+        {exml, "2.2.*", {git, "git://github.com/esl/exml.git", {tag, "2.2.0"}}},
         {base16, ".*", {git, "git://github.com/goj/base16.git", "ec420aa"}},
         {fusco, ".*", {git, "git://github.com/esl/fusco.git", "0a428471"}},
         {wsecli, ".*", {git, "git://github.com/esl/wsecli.git", "f1c3facf82e4cd310decb036ed557b7679c0c7e0"}},

rebar.config.script

@@ -1,6 +1,6 @@
 ExtraDeps = [
              {mongooseim, ".*",
-              {git, "git://github.com/esl/mongooseim", "1.5.0"}}
+              {git, "git://github.com/esl/mongooseim", {branch, "exml-v2"}}}
             ].
 
 AddExtraDeps = fun (Deps) ->

src/escalus_assert.erl

@@ -46,7 +46,7 @@
 %%===================================================================
 
 % note argument order change (backwards compatibility hack)
--spec is_error(xmlterm(), binary(), binary()) -> ok | no_return().
+-spec is_error(exml:element(), binary(), binary()) -> ok | no_return().
 is_error(Stanza, Type, Condition) ->
     escalus:assert(is_error, [Type, Condition], Stanza).
 

src/escalus_bosh.erl

@@ -76,7 +76,7 @@
 %%% API
 %%%===================================================================
 
--spec connect([{atom(), any()}]) -> {ok, #client{}}.
+-spec connect([{atom(), any()}]) -> {ok, escalus:client()}.
 connect(Args) ->
     {ok, Pid} = gen_server:start_link(?MODULE, [Args, self()], []),
     Transport = gen_server:call(Pid, get_transport),
@@ -233,7 +233,7 @@ get_active(#client{rcv_pid = Pid}) ->
 set_active(#client{rcv_pid = Pid}, Active) ->
     gen_server:call(Pid, {set_active, Active}).
 
--spec recv(#client{}) -> xmlstreamelement() | empty.
+-spec recv(escalus:client()) -> exml_stream:element() | empty.
 recv(#client{rcv_pid = Pid}) ->
     gen_server:call(Pid, recv).
 
@@ -341,7 +341,7 @@ handle_info({http_reply, Ref, Body, Transport}, S) ->
           of
               {streamend, _, _} -> close_requests(NS#state{terminated=true});
               {_, false, _}     -> NS;
-              {_, true, true}   -> send(Transport, 
+              {_, true, true}   -> send(Transport,
                                         empty_body(NS#state.rid, NS#state.sid),
                                         NS);
               {_, true, false}  -> NS

src/escalus_connection.erl

@@ -149,11 +149,11 @@ send(#client{module = Mod, event_client = EventClient} = Client, Elem) ->
     escalus_event:outgoing_stanza(EventClient, Elem),
     Mod:send(Client, Elem).
 
--spec get_stanza(client(), any()) -> xmlstreamelement().
+-spec get_stanza(client(), any()) -> exml_stream:element().
 get_stanza(Conn, Name) ->
     get_stanza(Conn, Name, ?TIMEOUT).
 
--spec get_stanza(client(), any(), timeout()) -> #xmlel{}.
+-spec get_stanza(client(), any(), timeout()) -> exml_stream:element().
 get_stanza(Conn, Name, Timeout) ->
     receive
         {stanza, Conn, Stanza} ->