<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[GlotPress][740] trunk: Adding current_count, untranslated_count and waiting_count to API.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/740">740</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-03-12 23:41:08 +0000 (Tue, 12 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding current_count, untranslated_count and waiting_count to API. Props nacin and sushkov. Fixes <a href="http://glotpress.trac.wordpress.org/ticket/163">#163</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
<li><a href="#trunktlibtestcaseroutephp">trunk/t/lib/testcase-route.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkttests_routestest_route_apiphp">trunk/t/tests_routes/test_route_api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation-set.php (739 => 740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2013-03-12 23:36:59 UTC (rev 739)
+++ trunk/gp-includes/things/translation-set.php 2013-03-12 23:41:08 UTC (rev 740)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx">
</span><span class="cx"> var $table_basename = 'translation_sets';
</span><span class="cx"> var $field_names = array( 'id', 'name', 'slug', 'project_id', 'locale' );
</span><del>- var $non_db_field_names = array( 'wp_locale' );
</del><ins>+ var $non_db_field_names = array( 'wp_locale', 'current_count', 'untranslated_count', 'waiting_count' );
</ins><span class="cx"> var $non_updatable_attributes = array( 'id' );
</span><span class="cx">
</span><span class="cx"> function __construct( $fields = array() ) {
</span></span></pre></div>
<a id="trunktlibtestcaseroutephp"></a>
<div class="modfile"><h4>Modified: trunk/t/lib/testcase-route.php (739 => 740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/testcase-route.php 2013-03-12 23:36:59 UTC (rev 739)
+++ trunk/t/lib/testcase-route.php 2013-03-12 23:41:08 UTC (rev 740)
</span><span class="lines">@@ -80,4 +80,12 @@
</span><span class="cx"> function assert404() {
</span><span class="cx"> $this->assertTemplateLoadedIs( '404' );
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+
+ /**
+ * Parses and returns the API response.
+ */
+ function api_response() {
+ return json_decode( $this->route->template_output );
+ }
+
+}
</ins></span></pre></div>
<a id="trunkttests_routestest_route_apiphp"></a>
<div class="addfile"><h4>Added: trunk/t/tests_routes/test_route_api.php (0 => 740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_routes/test_route_api.php (rev 0)
+++ trunk/t/tests_routes/test_route_api.php 2013-03-12 23:41:08 UTC (rev 740)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<?php
+require_once( dirname( __FILE__ ) . '/../init.php');
+
+class GP_Test_Projects_API extends GP_UnitTestCase_Route {
+ var $route_class = 'GP_Route_Project';
+
+ function setUp() {
+ parent::setUp();
+ $this->set = $this->factory->translation_set->create_with_project_and_locale();
+ $this->route->api = true;
+ }
+
+ function test_api_projects_list_count() {
+ $this->route->index();
+ $response = $this->api_response();
+
+ $this->assertEquals( count( GP::$project->all() ), count( $response ) );
+ }
+
+ function test_api_projects_list_contains_expected_project() {
+ $this->route->index();
+ $response = $this->api_response();
+ $first_project = reset( $response );
+
+ $this->assertEquals( $this->set->project->id, $first_project->id );
+ $this->assertEquals( $this->set->project->name, $first_project->name );
+ }
+
+ function test_api_project_has_translation_sets() {
+ $this->route->single($this->set->project->path);
+ $response = $this->api_response();
+
+ $this->assertObjectHasAttribute( 'translation_sets', $response );
+ $this->assertFalse( empty( $response->translation_sets ) );
+ }
+
+ function test_api_project_translation_set_exposes_keys_with_counts() {
+ $this->route->single($this->set->project->path);
+ $response = $this->api_response();
+
+ $first_set = reset( $response->translation_sets );
+
+ $this->assertObjectHasAttribute( 'current_count', $first_set );
+ $this->assertObjectHasAttribute( 'untranslated_count', $first_set );
+ $this->assertObjectHasAttribute( 'waiting_count', $first_set );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>