Fixing hypermedia() by ensuring no link Objects when a collection…

… is empty, added a test
avoidwork · Aug 3, 2014 · ed126f1 · ed126f1
1 parent ce788db
commit ed126f1
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 0.0.10
+- Fixing `hypermedia()` by ensuring no `link` Objects when a collection is empty, added a test
+
 ## 0.0.9
 - Fixing `hypermedia()` URI reconstruction by encoding the query string values, added a test
 

diff --git a/doc/global.html b/doc/global.html
@@ -1137,7 +1137,7 @@ <h5>Returns:</h5>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on Sun Aug 03 2014 09:18:14 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
+		on Sun Aug 03 2014 09:31:03 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
 			</div>

diff --git a/doc/index.html b/doc/index.html
@@ -203,7 +203,7 @@ <h2>License</h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on Sun Aug 03 2014 09:18:14 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
+		on Sun Aug 03 2014 09:31:03 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
 			</div>

diff --git a/doc/module-tenso.html b/doc/module-tenso.html
@@ -108,7 +108,7 @@ <h2>
 
 
     <dt class="tag-version">Version:</dt>
-    <dd class="tag-version"><ul class="dummy"><li>0.0.9</li></ul></dd>
+    <dd class="tag-version"><ul class="dummy"><li>0.0.10</li></ul></dd>
 
 
 
@@ -194,7 +194,7 @@ <h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on Sun Aug 03 2014 09:18:14 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
+		on Sun Aug 03 2014 09:31:03 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
 			</div>

diff --git a/doc/modules.list.html b/doc/modules.list.html
@@ -171,7 +171,7 @@ <h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on Sun Aug 03 2014 09:18:14 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
+		on Sun Aug 03 2014 09:31:03 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
 			</div>

diff --git a/doc/tenso.js.html b/doc/tenso.js.html
@@ -95,13 +95,13 @@ <h1 class="page-title">Source: tenso.js</h1>
  * @license BSD-3 &lt;https://raw.github.com/avoidwork/tenso/master/LICENSE>
  * @link http://avoidwork.github.io/tenso
  * @module tenso
- * @version 0.0.9
+ * @version 0.0.10
  */
 ( function () {
 "use strict";
 
 var TurtleIO = require( "turtle.io" ),
-    SERVER   = "tenso/0.0.9",
+    SERVER   = "tenso/0.0.10",
     CONFIG   = require( __dirname + "/../config.json" ),
     keigai   = require( "keigai" ),
     util     = keigai.util,
@@ -118,7 +118,7 @@ <h1 class="page-title">Source: tenso.js</h1>
 function Tenso () {
 	this.messages = {};
 	this.server   = new TurtleIO();
-	this.version  = "0.0.9";
+	this.version  = "0.0.10";
 }
 
 /**
@@ -290,7 +290,7 @@ <h1 class="page-title">Source: tenso.js</h1>
 				rep.data.link.push( {uri: root.replace( "page=0", "page=" + ( page + 1 ) ), rel: "next"} );
 			}
 
-			if ( page !== nth ) {
+			if ( nth > 0 && page !== nth ) {
 				rep.data.link.push( {uri: root.replace("page=0", "page=" + nth ), rel: "last"} );
 			}
 		}
@@ -388,7 +388,7 @@ <h1 class="page-title">Source: tenso.js</h1>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on Sun Aug 03 2014 09:18:14 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
+		on Sun Aug 03 2014 09:31:03 GMT-0400 (EDT) using the <a href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>
 			</div>

diff --git a/lib/tenso.js b/lib/tenso.js
@@ -6,13 +6,13 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/tenso/master/LICENSE>
  * @link http://avoidwork.github.io/tenso
  * @module tenso
- * @version 0.0.9
+ * @version 0.0.10
  */
 ( function () {
 "use strict";
 
 var TurtleIO = require( "turtle.io" ),
-    SERVER   = "tenso/0.0.9",
+    SERVER   = "tenso/0.0.10",
     CONFIG   = require( __dirname + "/../config.json" ),
     keigai   = require( "keigai" ),
     util     = keigai.util,
@@ -29,7 +29,7 @@ var TurtleIO = require( "turtle.io" ),
 function Tenso () {
 	this.messages = {};
 	this.server   = new TurtleIO();
-	this.version  = "0.0.9";
+	this.version  = "0.0.10";
 }
 
 /**
@@ -201,7 +201,7 @@ function hypermedia ( server, req, rep, headers ) {
 				rep.data.link.push( {uri: root.replace( "page=0", "page=" + ( page + 1 ) ), rel: "next"} );
 			}
 
-			if ( page !== nth ) {
+			if ( nth > 0 && page !== nth ) {
 				rep.data.link.push( {uri: root.replace("page=0", "page=" + nth ), rel: "last"} );
 			}
 		}

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tenso",
   "description": "Tensō is a REST API facade for node.js, designed to simplify the implementation of APIs.",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "homepage": "http://avoidwork.github.io/tenso",
   "author": {
     "name": "Jason Mulligan",

diff --git a/src/hypermedia.js b/src/hypermedia.js
@@ -49,7 +49,7 @@ function hypermedia ( server, req, rep, headers ) {
 				rep.data.link.push( {uri: root.replace( "page=0", "page=" + ( page + 1 ) ), rel: "next"} );
 			}
 
-			if ( page !== nth ) {
+			if ( nth > 0 && page !== nth ) {
 				rep.data.link.push( {uri: root.replace("page=0", "page=" + nth ), rel: "last"} );
 			}
 		}

diff --git a/test/routes.js b/test/routes.js
@@ -1,5 +1,6 @@
 module.exports.get = {
 	"/": ["/items"],
+	"/empty": [],
 	"/items": [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15],
 	"/something": {"user_id": 123, "title": "This is a title", "body": "Where is my body?", "source_url": "http://source.tld"}
 }
diff --git a/test/tenso_test.js b/test/tenso_test.js
@@ -105,6 +105,22 @@ describe("Permissions", function () {
 });
 
 describe("Pagination", function () {
+	describe("GET /empty", function () {
+		it("returns an empty array", function (done) {
+			api()
+				.get("/empty")
+				.expectStatus(200)
+				.expectValue("data.link", [])
+				.expectValue("data.result", [])
+				.expectValue("error", null)
+				.expectValue("status", 200)
+				.end(function(err) {
+					if (err) throw err;
+					done();
+				});
+		});
+	});
+
 	describe("GET /items", function () {
 		it("returns page 1/3 of an array of numbers", function (done) {
 			api()