Properly escape all args, some rework

Makes sure to encode all uri components

Author: euank

index.js

@@ -3,10 +3,30 @@
 var querystring = require('querystring');
 var request = require('request');
 
+function encodeURIComponentArray(arr) {
+  return arr.map(function(component) {
+    return encodeURIComponent(component);
+  });
+}
+
 var hn = {
-  // make a request to the specified endpoint
-  call: function (endpoint, cb) {
-    var query = 'https://hn.algolia.com/api/v1/' + endpoint;
+  // Make a request with the spicified uri component array
+  // and query argument object. If the queryObj is omitted,
+  // it will be assumed to be empty and the callback may be 
+  // there instead
+  call: function (components, queryObj, cb) {
+    if(!Array.isArray(components)) components = [components];
+    if(typeof queryObj === 'function') {
+      cb = queryObj;
+      queryObj = {};
+    }
+
+    var endpoint_parts = encodeURIComponentArray(components);
+    var query = 'https://hn.algolia.com/api/v1/' + endpoint_parts.join('/');
+
+    var query_args = querystring.stringify(queryObj);
+    if(query_args.length > 0) query += '?' + query_args;
+
     request(query, function (error, response, body) {
       if (!error && response.statusCode != 200)
         error = response.statusCode;
@@ -23,93 +43,93 @@ var hn = {
 
   // get popular/recent comments
   getComments: function (cb) {
-    hn.call('search?tags=comment', cb);
+    hn.call('search', {tags: 'comment'}, cb);
   },
   getLastComments: function (cb) {
-    hn.call('search_by_date?tags=comment', cb);
+    hn.call('search_by_date', {tags: 'comment'}, cb);
   },
 
   // get popular/recent polls
   getPolls: function (cb) {
-    hn.call('search?tags=poll', cb);
+    hn.call('search', {tags: 'poll'}, cb);
   },
   getLastPolls: function (cb) {
-    hn.call('search_by_date?tags=poll', cb);
+    hn.call('search_by_date', {tags: 'poll'}, cb);
   },
 
   // get popular/recent posts
   getPosts: function (cb) {
-    hn.call('search?tags=(story,poll)', cb);
+    hn.call('search', {tags: '(story,poll)'}, cb);
   },
   getLastPosts: function (cb) {
-    hn.call('search_by_date?tags=(story,poll)', cb);
+    hn.call('search_by_date', {tags: '(story,poll)'}, cb);
   },
 
   // get popular/recent stories
   getStories: function (cb) {
-    hn.call('search?tags=story', cb);
+    hn.call('search', {tags: 'story'}, cb);
   },
   getLastStories: function (cb) {
-    hn.call('search_by_date?tags=story', cb);
+    hn.call('search_by_date', {tags: 'story'}, cb);
   },
 
   // get unique post/comment
   getItem: function (id, cb) {
-    hn.call('items/' + id, cb);
+    hn.call(['items', id], cb);
   },
 
   // get unique user
   getUser: function (username, cb) {
-    hn.call('users/' + username, cb);
+    hn.call(['users', username], cb);
   },
 
   // get popular/recent user comments
   getUserComments: function (username, cb) {
-    hn.call('search?tags=comment,author_' + username, cb);
+    hn.call('search', {tags: 'comment,author_' + username}, cb);
   },
   getLastUserComments: function (username, cb) {
-    hn.call('search_by_date?tags=comment,author_' + username, cb);
+    hn.call('search_by_date', {tags: 'comment,author_' + username}, cb);
   },
 
   // get popular/recent user polls
   getUserPolls: function (username, cb) {
-    hn.call('search?tags=poll,author_' + username, cb);
+    hn.call('search', {tags: 'poll,author_' + username}, cb);
   },
   getLastUserPolls: function (username, cb) {
-    hn.call('search_by_date?tags=poll,author_' + username, cb);
+    hn.call('search_by_date', {tags: 'poll,author_' + username}, cb);
   },
 
   // get popular/recent user posts
   getUserPosts: function (username, cb) {
-    hn.call('search?tags=(story,poll),author_' + username, cb);
+    hn.call('search', {tags: '(story,poll),author_' + username}, cb);
   },
   getLastUserPosts: function (username, cb) {
-    hn.call('search_by_date?tags=(story,poll),author_' + username, cb);
+    hn.call('search_by_date', {tags: '(story,poll),author_' + username}, cb);
   },
 
   // get popular/recent user stories
   getUserStories: function (username, cb) {
-    hn.call('search?tags=story,author_' + username, cb);
+    hn.call('search', {tags: 'story,author_' + username}, cb);
   },
   getLastUserStories: function (username, cb) {
-    hn.call('search_by_date?tags=story,author_' + username, cb);
+    hn.call('search_by_date', {tags: 'story,author_' + username}, cb);
   },
 
 
   // search popular/recent comments
   searchComments: function (query, cb) {
-    hn.call('search?query=' + query + '&tags=comment', cb);
+    hn.call('search', {query: query, tags: 'comment'}, cb);
   },
   searchLastComments: function (query, cb) {
-    hn.call('search_by_date?query=' + query + '&tags=comment', cb);
+    hn.call('search_by_date', {query: query, tags: 'comment'}, cb);
   },
 
   // search popular/recent polls
   searchPolls: function (query, cb) {
-    hn.call('search?query=' + query + '&tags=poll', cb);
+    hn.call('search', {query: query, tags: 'poll'}, cb);
   },
   searchLastPolls: function (query, cb) {
-    hn.call('search_by_date?query=' + query + '&tags=poll', cb);
+    hn.call('search_by_date', {query: query, tags: 'poll'}, cb);
   },
 
   // search popular/recent posts
@@ -122,21 +142,19 @@ var hn = {
 
   // search popular/recent stories
   searchStories: function (query, cb) {
-    hn.call('search?query=' + query + '&tags=story', cb);
+    hn.call('search', {query: query, tags: 'story'}, cb);
   },
   searchLastStories: function (query, cb) {
-    hn.call('search_by_date?query=' + query + '&tags=story', cb);
+    hn.call('search_by_date', {query: query, tags: 'story'}, cb);
   },
 
 
   // search popular/recent
   search: function (obj, cb) {
-    var params = querystring.stringify(obj);
-    hn.call('search?' + params, cb);
+    hn.call('search', obj, cb);
   },
   searchLast: function (obj, cb) {
-    var params = querystring.stringify(obj);
-    hn.call('search_by_date?' + params, cb);
+    hn.call('search_by_date', obj, cb);
   }
 };