[ProblemSet] Refactor to prepare for other problem sets.

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/config.js

@@ -6,7 +6,7 @@ var DEFAULT_CONFIG = {
   // usually you don't wanna change those
   URL_BASE:            'https://leetcode.com',
   URL_LOGIN:           'https://leetcode.com/accounts/login/',
-  URL_PROBLEMS:        'https://leetcode.com/api/problems/algorithms/',
+  URL_PROBLEMS:        'https://leetcode.com/api/problems/$category/',
   URL_PROBLEM:         'https://leetcode.com/problems/$slug',
   URL_TEST:            'https://leetcode.com/problems/$slug/interpret_solution/',
   URL_SUBMIT:          'https://leetcode.com/problems/$slug/submit/',

lib/core.js

@@ -36,7 +36,7 @@ core.getProblems = function(cb) {
 
   log.debug('running getProblems');
   var user = this.getUser();
-  client.getProblems(user, function(e, problems) {
+  client.getProblems('algorithms', user, function(e, problems) {
     if (e) return cb(e);
 
     saveUser(user);

lib/leetcode_client.js

@@ -101,8 +101,8 @@ function requestWithReLogin(opts, cb) {
 
 var leetcodeClient = {};
 
-leetcodeClient.getProblems = function(user, cb) {
-  var opts = makeOpts(config.URL_PROBLEMS);
+leetcodeClient.getProblems = function(category, user, cb) {
+  var opts = makeOpts(config.URL_PROBLEMS.replace('$category', category));
 
   requestWithReLogin(opts, function(e, resp, body) {
     if (e) return cb(e);

test/test_core.js

@@ -133,7 +133,7 @@ describe('core', function() {
       it('should getProblems w/o cache ok', function(done) {
         cache.del('all');
 
-        client.getProblems = function(user, cb) {
+        client.getProblems = function(category, user, cb) {
           return cb(null, PROBLEMS);
         };
 
@@ -147,7 +147,7 @@ describe('core', function() {
       it('should getProblems w/o cache fail if client error', function(done) {
         cache.del('all');
 
-        client.getProblems = function(user, cb) {
+        client.getProblems = function(category, user, cb) {
           return cb('client getProblems error');
         };
 
@@ -232,7 +232,7 @@ describe('core', function() {
 
       it('should getProblem fail if getProblems error', function(done) {
         cache.del('all');
-        client.getProblems = function(user, cb) {
+        client.getProblems = function(category, user, cb) {
           return cb('getProblems error');
         };
 

test/test_leetcode_client.js

@@ -20,6 +20,7 @@ describe('leetcode_client', function() {
     msg:        'session expired, please login again',
     statusCode: -1
   };
+  var URL_ALGORITHMS = 'https://leetcode.com/api/problems/algorithms/';
 
   before(function() {
     config.init();
@@ -46,10 +47,10 @@ describe('leetcode_client', function() {
 
     it('should ok', function(done) {
       config.AUTO_LOGIN = true;
-      nock(config.URL_PROBLEMS).get('/').reply(403);
-      nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
+      nock(URL_ALGORITHMS).get('/').reply(403);
+      nock(URL_ALGORITHMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
 
-      client.getProblems(USER, function(e, problems) {
+      client.getProblems('algorithms', USER, function(e, problems) {
         assert.equal(e, null);
         assert.equal(problems.length, 377);
         done();
@@ -58,19 +59,19 @@ describe('leetcode_client', function() {
 
     it('should fail if no auto login', function(done) {
       config.AUTO_LOGIN = false;
-      nock(config.URL_PROBLEMS).get('/').reply(403);
+      nock(URL_ALGORITHMS).get('/').reply(403);
 
-      client.getProblems(USER, function(e, problems) {
+      client.getProblems('algorithms', USER, function(e, problems) {
         assert.deepEqual(e, EXPIRED_ERROR);
         done();
       });
     });
 
     it('should fail if other error', function(done) {
       config.AUTO_LOGIN = true;
-      nock(config.URL_PROBLEMS).get('/').reply(503);
+      nock(URL_ALGORITHMS).get('/').reply(503);
 
-      client.getProblems(USER, function(e, problems) {
+      client.getProblems('algorithms', USER, function(e, problems) {
         var expected = {
           msg:        'http error',
           statusCode: 503
@@ -82,13 +83,13 @@ describe('leetcode_client', function() {
 
     it('should fail if http error in relogin', function(done) {
       config.AUTO_LOGIN = true;
-      nock(config.URL_PROBLEMS).get('/').reply(403);
-      nock(config.URL_PROBLEMS).get('/').reply(403);
+      nock(URL_ALGORITHMS).get('/').reply(403);
+      nock(URL_ALGORITHMS).get('/').reply(403);
       core.login = function(user, cb) {
         return cb('unknown error!');
       };
 
-      client.getProblems(USER, function(e, problems) {
+      client.getProblems('algorithms', USER, function(e, problems) {
         assert.deepEqual(e, EXPIRED_ERROR);
         done();
       });
@@ -97,9 +98,9 @@ describe('leetcode_client', function() {
 
   describe('#getProblems', function() {
     it('should ok', function(done) {
-      nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
+      nock(URL_ALGORITHMS).get('/').replyWithFile(200, './test/mock/problems.json.20160911');
 
-      client.getProblems(USER, function(e, problems) {
+      client.getProblems('algorithms', USER, function(e, problems) {
         assert.equal(e, null);
         assert.equal(problems.length, 377);
         done();
@@ -108,9 +109,9 @@ describe('leetcode_client', function() {
 
     it('should fail if not login', function(done) {
       config.AUTO_LOGIN = false;
-      nock(config.URL_PROBLEMS).get('/').replyWithFile(200, './test/mock/problems.nologin.json.20161015');
+      nock(URL_ALGORITHMS).get('/').replyWithFile(200, './test/mock/problems.nologin.json.20161015');
 
-      client.getProblems(USER, function(e, problems) {
+      client.getProblems('algorithms', USER, function(e, problems) {
         assert.deepEqual(e, EXPIRED_ERROR);
         done();
       });