Skip to content

Commit

Permalink
Merge pull request #39 from tallerify/develop
Browse files Browse the repository at this point in the history
Checkpoint 3
  • Loading branch information
mastanca authored May 31, 2017
2 parents dae05e1 + 72a563c commit d84f6bb
Show file tree
Hide file tree
Showing 120 changed files with 3,439 additions and 852 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ find_package(PythonInterp REQUIRED)
if (CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-Wall -ansi -Wno-deprecated -pthread)
endif ()
add_definitions(-DMG_ENABLE_HTTP_STREAMING_MULTIPART)

#-------------------
# set common include folder for module
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV COVERALLS_SERVICE_NAME=$travis_service

WORKDIR fiuba-taller2-tallerify-app-server
WORKDIR build
RUN $HOME/usr/bin/cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
RUN $HOME/usr/bin/cmake -DCOVERALLS=OFF -DCMAKE_BUILD_TYPE=Debug ..
RUN make

CMD ["./fiuba_taller2_tallerify_app_server", "0.0.0.0"]
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
# built documents.
#
# The short X.Y version.
version = u'0.2.0'
version = u'0.2.1'
# The full version, including alpha/beta/rc tags.
release = u'0.2.0'
release = u'0.2.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: b4f4b76259434676a5e1fbaf29f24dde
config: 5d2bb56954f7653c3522193763a0cb8f
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified doc/.doctrees/doc/rst/controller.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/json_response.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/request.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/tracks_controller.doctree
Binary file not shown.
Binary file modified doc/.doctrees/environment.pickle
Binary file not shown.
Binary file modified doc/.doctrees/index.doctree
Binary file not shown.
10 changes: 5 additions & 5 deletions doc/doc/rst/controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Controller &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>Controller &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="JSONResponse" href="json_response.html"/>
<link rel="prev" title="This is the long awaited Tallerify App Server’s documentation!" href="../../index.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -169,7 +169,7 @@ <h1>Controller<a class="headerlink" href="#controller" title="Permalink to this
<dl class="class">
<dt id="_CPPv210Controller">
<span id="Controller"></span><span class="target" id="tallerify_app_serverclass_controller"></span><em class="property">class </em><code class="descclassname"></code><code class="descname">Controller</code><a class="headerlink" href="#_CPPv210Controller" title="Permalink to this definition"></a><br /></dt>
<dd><p>Subclassed by <a class="reference internal" href="ping_controller.html#tallerify_app_serverclass_ping_controller"><span class="std std-ref">PingController</span></a>, <a class="reference internal" href="tracks_controller.html#tallerify_app_serverclass_tracks_controller"><span class="std std-ref">TracksController</span></a></p>
<dd><p>Subclassed by <a class="reference internal" href="ping_controller.html#tallerify_app_serverclass_ping_controller"><span class="std std-ref">PingController</span></a>, PlayController, <a class="reference internal" href="tracks_controller.html#tallerify_app_serverclass_tracks_controller"><span class="std std-ref">TracksController</span></a></p>
<div class="breathe-sectiondef docutils container">
<p class="breathe-sectiondef-title rubric">Public Functions</p>
<dl class="function">
Expand Down Expand Up @@ -294,7 +294,7 @@ <h1>Controller<a class="headerlink" href="#controller" title="Permalink to this
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
8 changes: 4 additions & 4 deletions doc/doc/rst/json_response.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>JSONResponse &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>JSONResponse &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="MongoDao" href="mongo_dao.html"/>
<link rel="prev" title="Controller" href="controller.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -243,7 +243,7 @@ <h1>JSONResponse<a class="headerlink" href="#jsonresponse" title="Permalink to t
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
8 changes: 4 additions & 4 deletions doc/doc/rst/mongo_dao.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>MongoDao &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>MongoDao &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="PingController" href="ping_controller.html"/>
<link rel="prev" title="JSONResponse" href="json_response.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -260,7 +260,7 @@ <h1>MongoDao<a class="headerlink" href="#mongodao" title="Permalink to this head
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
8 changes: 4 additions & 4 deletions doc/doc/rst/ping_controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>PingController &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>PingController &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="TracksController" href="tracks_controller.html"/>
<link rel="prev" title="MongoDao" href="mongo_dao.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -247,7 +247,7 @@ <h1>PingController<a class="headerlink" href="#pingcontroller" title="Permalink
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
86 changes: 82 additions & 4 deletions doc/doc/rst/request.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Request &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>Request &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="Response" href="response.html"/>
<link rel="prev" title="TracksController" href="tracks_controller.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -185,6 +185,21 @@ <h1>Request<a class="headerlink" href="#request" title="Permalink to this headli
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2N7Request7RequestEP13mg_connectioniPv">
<span id="Request::Request__mg_connectionP.i.voidP"></span><span class="target" id="tallerify_app_serverclass_request_1a18eac53d1c3271949bc437a9fc59eb8d"></span><code class="descname">Request</code><span class="sig-paren">(</span>mg_connection *<em>connection</em>, int <em>event</em>, void *<em>eventData</em><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N7Request7RequestEP13mg_connectioniPv" title="Permalink to this definition"></a><br /></dt>
<dd><p><a class="reference internal" href="#tallerify_app_serverclass_request"><span class="std std-ref">Request</span></a> constructor for multipart requests <dl class="docutils">
<dt><strong>Parameters</strong></dt>
<dd><ul class="breatheparameterlist first last simple">
<li><code class="docutils literal"><span class="pre">connection</span></code>: </li>
<li><code class="docutils literal"><span class="pre">event</span></code>: </li>
<li><code class="docutils literal"><span class="pre">eventData</span></code>: </li>
</ul>
</dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2N7RequestD0Ev">
<span id="Request::~Request"></span><span class="target" id="tallerify_app_serverclass_request_1a4d57c725686701f773eb3630630a7ea2"></span><code class="descname">~Request</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N7RequestD0Ev" title="Permalink to this definition"></a><br /></dt>
Expand Down Expand Up @@ -270,6 +285,69 @@ <h1>Request<a class="headerlink" href="#request" title="Permalink to this headli
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK7Request13getConnectionEv">
<span id="Request::getConnectionC"></span><span class="target" id="tallerify_app_serverclass_request_1ae9f922fbd88f6af79cc17a9bff246607"></span>mg_connection *<code class="descname">getConnection</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK7Request13getConnectionEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>Get the associated connection <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>the connection </dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK7Request14getHttpMessageEv">
<span id="Request::getHttpMessageC"></span><span class="target" id="tallerify_app_serverclass_request_1a60a3e5d7449321bcc5ad0d0e5457f5bd"></span>http_message *<code class="descname">getHttpMessage</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK7Request14getHttpMessageEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>Get the original http message <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>the http message </dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK7Request18getElementIdStringEv">
<span id="Request::getElementIdStringC"></span><span class="target" id="tallerify_app_serverclass_request_1a4be2ede697baa3c864ee25949a772d2f"></span><em class="property">const</em> std::string &amp;<code class="descname">getElementIdString</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK7Request18getElementIdStringEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>Get the element id as string <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>element id as string </dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2N7Request18setElementIdStringERKNSt6stringE">
<span id="Request::setElementIdString__ssCR"></span><span class="target" id="tallerify_app_serverclass_request_1a5d44421204028633e4eae9bb19328057"></span>void <code class="descname">setElementIdString</code><span class="sig-paren">(</span><em class="property">const</em> std::string &amp;<em>elementIdString</em><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N7Request18setElementIdStringERKNSt6stringE" title="Permalink to this definition"></a><br /></dt>
<dd><p>Set the elementId as a string <dl class="docutils">
<dt><strong>Parameters</strong></dt>
<dd><ul class="breatheparameterlist first last simple">
<li><code class="docutils literal"><span class="pre">elementIdString</span></code>: to set </li>
</ul>
</dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK7Request8getEventEv">
<span id="Request::getEventC"></span><span class="target" id="tallerify_app_serverclass_request_1a7433cace2f6288d8e65c7e2529c741f8"></span>int <code class="descname">getEvent</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK7Request8getEventEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>Event getter <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>the event code </dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK7Request12getEventDataEv">
<span id="Request::getEventDataC"></span><span class="target" id="tallerify_app_serverclass_request_1a56e3fcb4f829a5d23f4e1e7510ff2f05"></span>void *<code class="descname">getEventData</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK7Request12getEventDataEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>Event data getter <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>the event data as void* </dd>
</dl>
</p>
</dd></dl>

</div>
</dd></dl>

Expand Down Expand Up @@ -319,7 +397,7 @@ <h1>Request<a class="headerlink" href="#request" title="Permalink to this headli
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
8 changes: 4 additions & 4 deletions doc/doc/rst/response.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Response &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>Response &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="Server" href="server.html"/>
<link rel="prev" title="Request" href="request.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -247,7 +247,7 @@ <h1>Response<a class="headerlink" href="#response" title="Permalink to this head
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
8 changes: 4 additions & 4 deletions doc/doc/rst/server.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Server &mdash; Tallerify App Server 0.2.0 documentation</title>
<title>Server &mdash; Tallerify App Server 0.2.1 documentation</title>



Expand All @@ -35,7 +35,7 @@
<link rel="index" title="Index"
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="top" title="Tallerify App Server 0.2.1 documentation" href="../../index.html"/>
<link rel="next" title="Track" href="track.html"/>
<link rel="prev" title="Response" href="response.html"/>

Expand Down Expand Up @@ -66,7 +66,7 @@


<div class="version">
0.2.0
0.2.1
</div>


Expand Down Expand Up @@ -252,7 +252,7 @@ <h1>Server<a class="headerlink" href="#server" title="Permalink to this headline
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../',
VERSION:'0.2.0',
VERSION:'0.2.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
Loading

0 comments on commit d84f6bb

Please sign in to comment.