Merge pull request #34 from tallerify/develop

Update travis build

doc/html/_server_8h_source.html

@@ -67,14 +67,14 @@
 </div><!--header-->
 <div class="contents">
 <a href="_server_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;</div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;</div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="preprocessor">#ifndef FIUBA_TALLER2_TALLERIFY_APP_SERVER_SERVER_H</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="preprocessor">#define FIUBA_TALLER2_TALLERIFY_APP_SERVER_SERVER_H</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;</div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor">#include &lt;vector&gt;</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;mongoose/mongoose.h&quot;</span></div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;../controllers/Controller.h&quot;</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;</div><div class="line"><a name="l00015"></a><span class="lineno"><a class="line" href="class_server.html">   15</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_server.html">Server</a> {</div><div class="line"><a name="l00017"></a><span class="lineno"><a class="line" href="class_server.html#ad28f45770d3f08c840688fb4993911ad">   17</a></span>&#160;    <span class="keyword">friend</span> <span class="keyword">class </span><a class="code" href="class_server.html#ad28f45770d3f08c840688fb4993911ad">ServerTest</a>;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    <a class="code" href="class_server.html#a1ec901fc55efaa9be38ab73335a9e677">Server</a>(<span class="keywordtype">int</span> port = 8080, std::string ip = <span class="stringliteral">&quot;127.0.0.1&quot;</span>);</div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;    <span class="keyword">virtual</span> <a class="code" href="class_server.html#a4b3aa2579cb1c8cd1d069582c14d0fa6">~Server</a>();</div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    <span class="keywordtype">void</span> <a class="code" href="class_server.html#a7eac07d2582fa01c2671362efa955b31">start</a>();</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    <span class="keywordtype">void</span> <a class="code" href="class_server.html#a07c45a7e101a3926d8f9685c3c5d14e4">stop</a>();</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="keyword">private</span>:</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    mg_mgr *server;</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    mg_connection *connection;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    <span class="keywordtype">int</span> port;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    std::string localIp;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keywordtype">bool</span> running;</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    std::vector&lt;Controller *&gt; controllers;</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordtype">void</span> handleRequest(mg_connection *connection, http_message *message);</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keyword">friend</span> <span class="keywordtype">void</span> event_handler(mg_connection *c, <span class="keywordtype">int</span> ev, <span class="keywordtype">void</span> *p);</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    <a class="code" href="class_response.html">Response</a> *handleRequest(<a class="code" href="class_request.html">Request</a> &amp;request);</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    <span class="keywordtype">void</span> registerController(<a class="code" href="class_controller.html">Controller</a> *controller);</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;};</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="preprocessor">#endif //FIUBA_TALLER2_TALLERIFY_APP_SERVER_SERVER_H</span></div><div class="ttc" id="class_server_html"><div class="ttname"><a href="class_server.html">Server</a></div><div class="ttdef"><b>Definition:</b> Server.h:15</div></div>
-<div class="ttc" id="class_server_html_a7eac07d2582fa01c2671362efa955b31"><div class="ttname"><a href="class_server.html#a7eac07d2582fa01c2671362efa955b31">Server::start</a></div><div class="ttdeci">void start()</div><div class="ttdef"><b>Definition:</b> Server.cpp:37</div></div>
-<div class="ttc" id="class_server_html_a1ec901fc55efaa9be38ab73335a9e677"><div class="ttname"><a href="class_server.html#a1ec901fc55efaa9be38ab73335a9e677">Server::Server</a></div><div class="ttdeci">Server(int port=8080, std::string ip=&quot;127.0.0.1&quot;)</div><div class="ttdef"><b>Definition:</b> Server.cpp:20</div></div>
+<div class="ttc" id="class_server_html_a7eac07d2582fa01c2671362efa955b31"><div class="ttname"><a href="class_server.html#a7eac07d2582fa01c2671362efa955b31">Server::start</a></div><div class="ttdeci">void start()</div><div class="ttdef"><b>Definition:</b> Server.cpp:35</div></div>
+<div class="ttc" id="class_server_html_a1ec901fc55efaa9be38ab73335a9e677"><div class="ttname"><a href="class_server.html#a1ec901fc55efaa9be38ab73335a9e677">Server::Server</a></div><div class="ttdeci">Server(int port=8080, std::string ip=&quot;127.0.0.1&quot;)</div><div class="ttdef"><b>Definition:</b> Server.cpp:18</div></div>
 <div class="ttc" id="class_request_html"><div class="ttname"><a href="class_request.html">Request</a></div><div class="ttdef"><b>Definition:</b> Request.h:13</div></div>
 <div class="ttc" id="class_controller_html"><div class="ttname"><a href="class_controller.html">Controller</a></div><div class="ttdef"><b>Definition:</b> Controller.h:14</div></div>
 <div class="ttc" id="class_server_html_ad28f45770d3f08c840688fb4993911ad"><div class="ttname"><a href="class_server.html#ad28f45770d3f08c840688fb4993911ad">Server::ServerTest</a></div><div class="ttdeci">friend class ServerTest</div><div class="ttdoc">Friend class for testing private methods. </div><div class="ttdef"><b>Definition:</b> Server.h:17</div></div>
-<div class="ttc" id="class_server_html_a07c45a7e101a3926d8f9685c3c5d14e4"><div class="ttname"><a href="class_server.html#a07c45a7e101a3926d8f9685c3c5d14e4">Server::stop</a></div><div class="ttdeci">void stop()</div><div class="ttdef"><b>Definition:</b> Server.cpp:56</div></div>
+<div class="ttc" id="class_server_html_a07c45a7e101a3926d8f9685c3c5d14e4"><div class="ttname"><a href="class_server.html#a07c45a7e101a3926d8f9685c3c5d14e4">Server::stop</a></div><div class="ttdeci">void stop()</div><div class="ttdef"><b>Definition:</b> Server.cpp:54</div></div>
 <div class="ttc" id="class_response_html"><div class="ttname"><a href="class_response.html">Response</a></div><div class="ttdef"><b>Definition:</b> Response.h:12</div></div>
-<div class="ttc" id="class_server_html_a4b3aa2579cb1c8cd1d069582c14d0fa6"><div class="ttname"><a href="class_server.html#a4b3aa2579cb1c8cd1d069582c14d0fa6">Server::~Server</a></div><div class="ttdeci">virtual ~Server()</div><div class="ttdef"><b>Definition:</b> Server.cpp:28</div></div>
+<div class="ttc" id="class_server_html_a4b3aa2579cb1c8cd1d069582c14d0fa6"><div class="ttname"><a href="class_server.html#a4b3aa2579cb1c8cd1d069582c14d0fa6">Server::~Server</a></div><div class="ttdeci">virtual ~Server()</div><div class="ttdef"><b>Definition:</b> Server.cpp:26</div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>

doc/html/md__r_e_a_d_m_e.html

@@ -75,7 +75,7 @@ <h3>Docs</h3>
 <p>You can find the docs by opening <code>doc/index.html</code> with your favorite browser \ \ To get the HEAD version of them you need doxygen and sphinx. Then run</p>
 <div class="fragment"><div class="line">doxygen</div><div class="line">sphinx-build . doc/ </div></div><!-- fragment --><h3>Running</h3>
 <p>To run you only need docker</p>
-<div class="fragment"><div class="line">docker-compose build</div><div class="line">docker-compose up</div></div><!-- fragment --><h3>API</h3>
+<div class="fragment"><div class="line">docker-compose up --build</div></div><!-- fragment --><h3>API</h3>
 <p>See the wiki for api references </p>
 </div></div><!-- contents -->
 <!-- start footer part -->

doc/xml/_r_e_a_d_m_e_8md.xml

@@ -30,8 +30,7 @@
 <codeline><highlight class="normal">To<sp/>run<sp/>you<sp/>only<sp/>need<sp/>docker</highlight></codeline>
 <codeline></codeline>
 <codeline><highlight class="normal">```bash</highlight></codeline>
-<codeline><highlight class="normal">docker-compose<sp/>build</highlight></codeline>
-<codeline><highlight class="normal">docker-compose<sp/>up</highlight></codeline>
+<codeline><highlight class="normal">docker-compose<sp/>up<sp/>--build</highlight></codeline>
 <codeline><highlight class="normal">```</highlight></codeline>
 <codeline></codeline>
 <codeline></codeline>