minor

Author: iliakan

.gitignore

@@ -26,6 +26,9 @@ download/
 # database dump for tutorial export
 dump/
 
+# extra handlers are not in the repo
+extra/
+
 # NPM packages folder.
 node_modules/
 

extra/.gitkeep

@@ -11,7 +11,7 @@ const runSequence = require('run-sequence');
 const linkModules = require('./modules/linkModules');
 
 linkModules({
-  src: ['client', 'styles', 'modules/*', 'handlers/*']
+  src: ['client', 'styles', 'modules/*', 'handlers/*', 'extra/*']
 });
 
 const config = require('config');

gulpfile.js

@@ -20,5 +20,7 @@ function addNodeIgnores(app) {
 
 
 exports.Article = require('./models/article');
+exports.ArticleRenderer = require('./renderer/articleRenderer');
 exports.Reference = require('./models/reference');
 exports.Task = require('./models/task');
+exports.TaskRenderer = require('./renderer/taskRenderer');

handlers/tutorial/controller/bookify.js

@@ -2,7 +2,6 @@ var Router = require('koa-router');
 
 var task = require('./controller/task');
 var article = require('./controller/article');
-var bookify = require('./controller/bookify');
 var frontpage = require('./controller/frontpage');
 var node = require('./controller/node');
 var zipview = require('./controller/zipview');
@@ -18,9 +17,3 @@ router.get('/tutorial/map', map.get);
 router.get('/tutorial/zipview/:name', zipview.get);
 router.get('/tutorial', frontpage.get);
 router.get('/:slug', article.get);
-
-if (process.env.NODE_ENV == 'ebook') {
-  router.get('/pdf/:slug', bookify.get);
-  router.get('/epub/:slug', bookify.get);
-}
-

handlers/tutorial/index.js

@@ -99,14 +99,14 @@ app.requireHandler('paymentsMethods');
 
 // ======== Endpoint services that actually generate something ==========
 
-var endpoints = ['frontpage'];
+var endpoints = [];
 
 if (process.env.NODE_ENV == 'development') {
   endpoints.push('markup', 'dev');
 }
 
 endpoints.push(
-  'users', 'auth', 'ebook', 'cache', 'search', 'profile', 'jb', 'play', 'nodejsScreencast',
+  'users', 'auth', 'frontpage', 'ebook', 'cache', 'search', 'profile', 'jb', 'play', 'nodejsScreencast',
   'profileGuest', 'quiz', 'currencyRate', 'payments', 'download', 'staticPage', 'newsletter', 'mailer'
 );
 
@@ -119,6 +119,11 @@ endpoints.forEach(function(name) {
   app.requireHandler(name);
 });
 
+require('fs').readdirSync(config.extraHandlersRoot).forEach(function(extraHandler) {
+  if (extraHandler[0] == '.') return;
+  app.requireHandler(extraHandler);
+});
+
 
 // uncomment for time-require to work
 //process.emit('exit');

handlers/tutorial/router.js

@@ -106,6 +106,8 @@ module.exports = {
   // private files, for expiring links, not directly accessible
   downloadRoot:         path.join(process.cwd(), 'download'),
   tmpRoot:              path.join(process.cwd(), 'tmp'),
+  // extra handlers from outside of the main repo
+  extraHandlersRoot:          path.join(process.cwd(), 'extra'),
   // js/css build versions
   manifestRoot:         path.join(process.cwd(), 'manifest')
 };

handlers/tutorial/templates/bookify.jade

@@ -86,7 +86,6 @@
     "nodemailer": "*",
     "nodemailer-ses-transport": "*",
     "nodemon": "*",
-    "passport": "*",
     "passport-facebook": "*",
     "passport-github": "*",
     "passport-google-oauth": "git://github.com/iliakan/passport-google-oauth",
@@ -169,17 +168,14 @@
     "supertest": "*",
     "time-require": "*"
   },
-  "engines": {
-    "node": ">=0.12"
-  },
   "engineStrict": true,
   "repository": {
     "type": "git",
-    "url": "https://github.com/iliakan/javascript-nodejs.git"
+    "url": "https://github.com/iliakan/javascript.git"
   },
-  "author": "Ilya Kantor and other contributors in git repo",
+  "author": "Ilya Kantor",
   "license": "CC BY-NC-SA 3.0",
   "bugs": {
-    "url": "https://github.com/iliakan/javascript-nodejs/issues"
+    "url": "https://github.com/iliakan/javascript/issues"
   }
 }