Modified API Versioning System, Version 0.13.6

aneesh-neelam · Feb 4, 2015 · b31e950 · b31e950
1 parent aa51c2a
commit b31e950
Show file tree

Hide file tree

Showing 65 changed files with 740 additions and 24 deletions.
diff --git a/api-0.12/friends/generate.js → api-legacy/friends/generate.js b/api-0.12/friends/generate.js → api-legacy/friends/generate.js
diff --git a/api-0.12/friends/share.js → api-legacy/friends/share.js b/api-0.12/friends/share.js → api-legacy/friends/share.js
diff --git a/api-0.12/login/auto.js → api-legacy/login/auto.js b/api-0.12/login/auto.js → api-legacy/login/auto.js
diff --git a/api-0.12/login/captcha-parser.js → api-legacy/login/captcha-parser.js b/api-0.12/login/captcha-parser.js → api-legacy/login/captcha-parser.js
diff --git a/api-0.12/login/captcha-resource.js → api-legacy/login/captcha-resource.js b/api-0.12/login/captcha-resource.js → api-legacy/login/captcha-resource.js
diff --git a/api-0.12/login/get.js → api-legacy/login/get.js b/api-0.12/login/get.js → api-legacy/login/get.js
diff --git a/api-0.12/login/submit.js → api-legacy/login/submit.js b/api-0.12/login/submit.js → api-legacy/login/submit.js
diff --git a/...2/sample-data/api-data-first_success.json → ...y/sample-data/api-data-first_success.json b/...2/sample-data/api-data-first_success.json → ...y/sample-data/api-data-first_success.json
diff --git a/...sample-data/api-data-refresh_success.json → ...sample-data/api-data-refresh_success.json b/...sample-data/api-data-refresh_success.json → ...sample-data/api-data-refresh_success.json
diff --git a/...-data/api-friends-regenerate_success.json → ...-data/api-friends-regenerate_success.json b/...-data/api-friends-regenerate_success.json → ...-data/api-friends-regenerate_success.json
diff --git a/...ample-data/api-friends-share_expired.json → ...ample-data/api-friends-share_expired.json b/...ample-data/api-friends-share_expired.json → ...ample-data/api-friends-share_expired.json
diff --git a/...ample-data/api-friends-share_success.json → ...ample-data/api-friends-share_success.json b/...ample-data/api-friends-share_success.json → ...ample-data/api-friends-share_success.json
diff --git a/...e-data/api-friends-share_unavailable.json → ...e-data/api-friends-share_unavailable.json b/...e-data/api-friends-share_unavailable.json → ...e-data/api-friends-share_unavailable.json
diff --git a/...mple-data/api-login-auto_captchafail.json → ...mple-data/api-login-auto_captchafail.json b/...mple-data/api-login-auto_captchafail.json → ...mple-data/api-login-auto_captchafail.json
diff --git a/...2/sample-data/api-login-auto_success.json → ...y/sample-data/api-login-auto_success.json b/...2/sample-data/api-login-auto_success.json → ...y/sample-data/api-login-auto_success.json
diff --git a/api-0.12/sample-data/api-mongodown.json → api-legacy/sample-data/api-mongodown.json b/api-0.12/sample-data/api-mongodown.json → api-legacy/sample-data/api-mongodown.json
diff --git a/api-0.12/sample-data/api_invalid.json → api-legacy/sample-data/api_invalid.json b/api-0.12/sample-data/api_invalid.json → api-legacy/sample-data/api_invalid.json
diff --git a/api-0.12/sample-data/api_timedout.json → api-legacy/sample-data/api_timedout.json b/api-0.12/sample-data/api_timedout.json → api-legacy/sample-data/api_timedout.json
diff --git a/api-0.12/scraper/aggregate.js → api-legacy/scraper/aggregate.js b/api-0.12/scraper/aggregate.js → api-legacy/scraper/aggregate.js
diff --git a/api-0.12/scraper/attendance.js → api-legacy/scraper/attendance.js b/api-0.12/scraper/attendance.js → api-legacy/scraper/attendance.js
diff --git a/api-0.12/scraper/grades.js → api-legacy/scraper/grades.js b/api-0.12/scraper/grades.js → api-legacy/scraper/grades.js
diff --git a/api-0.12/scraper/marks.js → api-legacy/scraper/marks.js b/api-0.12/scraper/marks.js → api-legacy/scraper/marks.js
diff --git a/api-0.12/scraper/timetable.js → api-legacy/scraper/timetable.js b/api-0.12/scraper/timetable.js → api-legacy/scraper/timetable.js
diff --git a/api-0.12/status.js → api-legacy/status.js b/api-0.12/status.js → api-legacy/status.js
diff --git a/api-0.12/system.js → api-legacy/system.js b/api-0.12/system.js → api-legacy/system.js
diff --git a/api-0.12/timetable-resource.js → api-legacy/timetable-resource.js b/api-0.12/timetable-resource.js → api-legacy/timetable-resource.js
diff --git a/api-0.12/token-resource.js → api-legacy/token-resource.js b/api-0.12/token-resource.js → api-legacy/token-resource.js
diff --git a/api-0.12/txtweb.js → api-legacy/txtweb.js b/api-0.12/txtweb.js → api-legacy/txtweb.js
diff --git a/api-0.14/friends/generate.js → api/friends/generate.js b/api-0.14/friends/generate.js → api/friends/generate.js
diff --git a/api-0.14/friends/share.js → api/friends/share.js b/api-0.14/friends/share.js → api/friends/share.js
diff --git a/api-0.14/login/auto.js → api/login/auto.js b/api-0.14/login/auto.js → api/login/auto.js
diff --git a/api-0.14/login/captcha-parser.js → api/login/captcha-parser.js b/api-0.14/login/captcha-parser.js → api/login/captcha-parser.js
diff --git a/api-0.14/login/captcha-resource.js → api/login/captcha-resource.js b/api-0.14/login/captcha-resource.js → api/login/captcha-resource.js
diff --git a/api-0.14/login/get.js → api/login/get.js b/api-0.14/login/get.js → api/login/get.js
diff --git a/api-0.14/login/submit.js → api/login/submit.js b/api-0.14/login/submit.js → api/login/submit.js
diff --git a/...4/sample-data/api-data-first_success.json → api/sample-data/api-data-first_success.json b/...4/sample-data/api-data-first_success.json → api/sample-data/api-data-first_success.json
diff --git a/...sample-data/api-data-refresh_success.json → ...sample-data/api-data-refresh_success.json b/...sample-data/api-data-refresh_success.json → ...sample-data/api-data-refresh_success.json
diff --git a/...-data/api-friends-regenerate_success.json → ...-data/api-friends-regenerate_success.json b/...-data/api-friends-regenerate_success.json → ...-data/api-friends-regenerate_success.json
diff --git a/...ample-data/api-friends-share_expired.json → ...ample-data/api-friends-share_expired.json b/...ample-data/api-friends-share_expired.json → ...ample-data/api-friends-share_expired.json
diff --git a/...ample-data/api-friends-share_success.json → ...ample-data/api-friends-share_success.json b/...ample-data/api-friends-share_success.json → ...ample-data/api-friends-share_success.json
diff --git a/...e-data/api-friends-share_unavailable.json → ...e-data/api-friends-share_unavailable.json b/...e-data/api-friends-share_unavailable.json → ...e-data/api-friends-share_unavailable.json
diff --git a/...mple-data/api-login-auto_captchafail.json → ...mple-data/api-login-auto_captchafail.json b/...mple-data/api-login-auto_captchafail.json → ...mple-data/api-login-auto_captchafail.json
diff --git a/...4/sample-data/api-login-auto_success.json → api/sample-data/api-login-auto_success.json b/...4/sample-data/api-login-auto_success.json → api/sample-data/api-login-auto_success.json
diff --git a/api-0.14/sample-data/api-mongodown.json → api/sample-data/api-mongodown.json b/api-0.14/sample-data/api-mongodown.json → api/sample-data/api-mongodown.json
diff --git a/api-0.14/sample-data/api_invalid.json → api/sample-data/api_invalid.json b/api-0.14/sample-data/api_invalid.json → api/sample-data/api_invalid.json
diff --git a/api-0.14/sample-data/api_timedout.json → api/sample-data/api_timedout.json b/api-0.14/sample-data/api_timedout.json → api/sample-data/api_timedout.json
diff --git a/api/sample-data/courses.json b/api/sample-data/courses.json
diff --git a/api-0.14/scraper/aggregate.js → api/scraper/aggregate.js b/api-0.14/scraper/aggregate.js → api/scraper/aggregate.js
diff --git a/api-0.14/scraper/attendance.js → api/scraper/attendance.js b/api-0.14/scraper/attendance.js → api/scraper/attendance.js
diff --git a/api-0.14/scraper/grades.js → api/scraper/grades.js b/api-0.14/scraper/grades.js → api/scraper/grades.js
diff --git a/api-0.14/scraper/marks.js → api/scraper/marks.js b/api-0.14/scraper/marks.js → api/scraper/marks.js
diff --git a/api-0.14/scraper/timetable.js → api/scraper/timetable.js b/api-0.14/scraper/timetable.js → api/scraper/timetable.js
diff --git a/api-0.14/status.js → api/status.js b/api-0.14/status.js → api/status.js
diff --git a/api-0.14/system.js → api/system.js b/api-0.14/system.js → api/system.js
diff --git a/api-0.14/timetable-resource.js → api/timetable-resource.js b/api-0.14/timetable-resource.js → api/timetable-resource.js
diff --git a/api-0.14/token-resource.js → api/token-resource.js b/api-0.14/token-resource.js → api/token-resource.js
diff --git a/api-0.14/txtweb.js → api/txtweb.js b/api-0.14/txtweb.js → api/txtweb.js
diff --git a/app.js b/app.js
@@ -43,8 +43,8 @@ if (process.env.LOGENTRIES_TOKEN) {
     });
 }
 
-var apiRoutes_012 = require(path.join(__dirname, 'routes', 'api-0.12'));
-var apiRoutes_014 = require(path.join(__dirname, 'routes', 'api-0.14'));
+var apiRoutes = require(path.join(__dirname, 'routes', 'api'));
+var apiRoutesLegacy = require(path.join(__dirname, 'routes', 'api-legacy'));
 var testRoutes = require(path.join(__dirname, 'routes', 'test'));
 var txtwebRoutes = require(path.join(__dirname, 'routes', 'txtweb'));
 var webRoutes = require(path.join(__dirname, 'routes', 'web'));
@@ -136,11 +136,11 @@ app.use(function (req, res, next) {
 
 app.use('/', webRoutes);
 app.use('/tests', testRoutes);
-app.use('/api/0.14/vellore', apiRoutes_014);
-app.use('/api/0.14/chennai', apiRoutes_014);
+app.use('/api/v2/vellore', apiRoutes);
+app.use('/api/v2/chennai', apiRoutes);
 app.use('/api/txtweb', txtwebRoutes);
-app.use('/api/vellore', apiRoutes_012);
-app.use('/api/chennai', apiRoutes_012);
+app.use('/api/vellore', apiRoutesLegacy);
+app.use('/api/chennai', apiRoutesLegacy);
 
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "VITacademics",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "description": "VITacademics Backend and Web App",
   "bugs": {
     "url": "https://github.com/aneesh-neelam/VITacademics/issues",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "VITacademics",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "description": "VITacademics Backend and Web App",
   "homepage": "http://vitacademics-dev.herokuapp.com/",
   "bugs": {

diff --git a/routes/api-0.12.js → routes/api-legacy.js b/routes/api-0.12.js → routes/api-legacy.js
@@ -20,14 +20,14 @@ var express = require('express');
 var path = require('path');
 var router = express.Router();
 
-var loginManual = require(path.join(__dirname, '..', 'api-0.12', 'login', 'get'));
-var loginAuto = require(path.join(__dirname, '..', 'api-0.12', 'login', 'auto'));
-var loginSubmit = require(path.join(__dirname, '..', 'api-0.12', 'login', 'submit'));
-var dataAggregate = require(path.join(__dirname, '..', 'api-0.12', 'scraper', 'aggregate'));
-var dataGrades = require(path.join(__dirname, '..', 'api-0.12', 'scraper', 'grades'));
-var friendsGenerate = require(path.join(__dirname, '..', 'api-0.12', 'friends', 'generate'));
-var friendsShare = require(path.join(__dirname, '..', 'api-0.12', 'friends', 'share'));
-var system = require(path.join(__dirname, '..', 'api-0.12', 'system'));
+var loginManual = require(path.join(__dirname, '..', 'api-legacy', 'login', 'get'));
+var loginAuto = require(path.join(__dirname, '..', 'api-legacy', 'login', 'auto'));
+var loginSubmit = require(path.join(__dirname, '..', 'api-legacy', 'login', 'submit'));
+var dataAggregate = require(path.join(__dirname, '..', 'api-legacy', 'scraper', 'aggregate'));
+var dataGrades = require(path.join(__dirname, '..', 'api-legacy', 'scraper', 'grades'));
+var friendsGenerate = require(path.join(__dirname, '..', 'api-legacy', 'friends', 'generate'));
+var friendsShare = require(path.join(__dirname, '..', 'api-legacy', 'friends', 'share'));
+var system = require(path.join(__dirname, '..', 'api-legacy', 'system'));
 
 
 router.get('/system', function (req, res) {

diff --git a/routes/api-0.14.js → routes/api.js b/routes/api-0.14.js → routes/api.js
@@ -20,11 +20,11 @@ var express = require('express');
 var path = require('path');
 var router = express.Router();
 
-var loginAuto = require(path.join(__dirname, '..', 'api-0.14', 'login', 'auto'));
-var dataAggregate = require(path.join(__dirname, '..', 'api-0.14', 'scraper', 'aggregate'));
-var dataGrades = require(path.join(__dirname, '..', 'api-0.14', 'scraper', 'grades'));
-var friendsGenerate = require(path.join(__dirname, '..', 'api-0.14', 'friends', 'generate'));
-var friendsShare = require(path.join(__dirname, '..', 'api-0.14', 'friends', 'share'));
+var loginAuto = require(path.join(__dirname, '..', 'api', 'login', 'auto'));
+var dataAggregate = require(path.join(__dirname, '..', 'api', 'scraper', 'aggregate'));
+var dataGrades = require(path.join(__dirname, '..', 'api', 'scraper', 'grades'));
+var friendsGenerate = require(path.join(__dirname, '..', 'api', 'friends', 'generate'));
+var friendsShare = require(path.join(__dirname, '..', 'api', 'friends', 'share'));
 
 
 router.get('/login', function (req, res) {

diff --git a/routes/system.js b/routes/system.js
@@ -20,7 +20,7 @@ var express = require('express');
 var path = require('path');
 var router = express.Router();
 
-var system = require(path.join(__dirname, '..', 'api-0.14', 'system'));
+var system = require(path.join(__dirname, '..', 'api', 'system'));
 
 
 router.get('/system', function (req, res) {

diff --git a/routes/txtweb.js b/routes/txtweb.js
@@ -20,7 +20,7 @@ var express = require('express');
 var path = require('path');
 var router = express.Router();
 
-var api_txtweb = require(path.join(__dirname, '..', 'api-0.14', 'txtweb'));
+var api_txtweb = require(path.join(__dirname, '..', 'api', 'txtweb'));
 
 router.get('/', function (req, res) {
     var googleAnalyticsToken = process.env.GOOGLE_ANALYTICS_TOKEN || 'UA-35429946-2';

diff --git a/views/status.ejs b/views/status.ejs
@@ -82,7 +82,7 @@
         <h4>Host Architecture: <%= arch %></h4>
     </div>
     <div class="large-12 columns">
-        <h4>Node Engine: <%= engine %></h4>
+        <h4>Node.js/io.js Engine: <%= engine %></h4>
     </div>
 </div>
 <div class="row" style="text-align: center">