Merge pull request #114 from sourcejs/0.5.0-rc

0.5.0 release

Author: robhrt7

Gruntfile.js

@@ -285,6 +285,7 @@ module.exports = function(grunt) {
         var spec = grunt.option('spec');
 
         if (spec) {
+            // if custom mask set - `grunt test --spec=test/specs/middleware/**/*.js`
             grunt.config.set('mochaTest.test.src', [spec]);
             grunt.task.run('mochaTest');
         } else {

app.js

@@ -7,7 +7,6 @@
 var express = require('express');
 var colors = require('colors');
 var fs = require('fs');
-var deepExtend = require('deep-extend');
 var loadOptions = require('./core/loadOptions');
 var commander = require('commander');
 var bodyParser = require('body-parser');
@@ -51,6 +50,19 @@ global.app.use(require('compression')());
 
 // Cookies
 global.app.use(require('cookie-parser')());
+global.app.use(require('express-session')({
+    secret: (function() {
+        var d = new Date().getTime();
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+            var r = (d + Math.random() * 16) % 16 | 0;
+            d = Math.floor(d / 16);
+            return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+        });
+    })(),
+  resave: false,
+  saveUninitialized: true
+}));
+
 app.use(function (req, res, next) {
     res.cookie('source-mode', global.MODE, { maxAge: 3600000, httpOnly: false });
 
@@ -71,48 +83,42 @@ app.use(bodyParser.json());
 
 /* Middlewares */
 
-// LESS processing
-if (global.MODE === 'development') {
-    var less = require('less-middleware');
-
-    var lessOpts = {
-        src: global.app.get('user')
-    };
-
-    deepExtend(lessOpts, global.opts.core.less);
-
-    global.app.use(less(lessOpts));
-}
-
+// Auth initializing
+var auth = require('./core/auth')(app);
+app.use(auth.everyauth.middleware());
 
 // Clarify
 global.app.use(require('./core/middleware/clarify'));
 
-
 // File tree module
-fileTree = require('./core/file-tree');
-global.app.use(function(req, res, next){
+var fileTree = require('./core/file-tree');
 
-    // Updating navigation on each main page visit
-    if(global.MODE !== 'presentation' && req.url === "/") {
-        // Making this async
-    	fileTree.scan();
-    }
+// Run file tree scan on start
+fileTree.scan();
+
+// Run file tree scan on main page visit
+if (global.opts.core.fileTree.mainPageTrigger && global.MODE !== 'presentation') {
+    global.app.use(function(req, res, next){
+
+        // Updating navigation on each main page visit
+        if (req.url === "/") fileTree.scan();
+
+        next();
+    });
+}
 
-    next();
-});
 
 // Middleware that loads spec content
 var read = require("./core/middleware/read");
-global.app.use(read.handleIndex);
 global.app.use(read.process);
 
+// Markdown
+global.app.use(require("./core/middleware/md").process);
+global.app.use(require("./core/middleware/mdTag").process);
+
 // Load user defined middleware, that processes spec content
 require("./core/middleware/userMiddleware");
 
-// Basic markdown support
-global.app.use(require("./core/middleware/markdown").process);
-
 // Middleware that wraps spec with Source template
 global.app.use(require("./core/middleware/wrap").process);
 
@@ -142,6 +148,13 @@ try {
     // User additional functionality
     require(global.app.get('user') + "/core/app.js");
 } catch(e){}
+
+
+// Watchers
+if (global.opts.core.watch.enabled && global.MODE !== 'presentation') {
+    require('./core/watchNewSpecs');
+}
+
 /* /Includes */
 
 
@@ -153,10 +166,9 @@ var headerFooter = require('./core/headerFooter');
 global.app.use(express.static(global.app.get('user')));
 
 // Page 404
-global.app.use(function(req, res, next){
+global.app.use(function(req, res){
 
 	if (req.accepts('html')) {
-
         var headerFooterHTML = headerFooter.getHeaderAndFooter();
 		res.status(404).render(__dirname + '/core/views/404.ejs', {
             header: headerFooterHTML.header,
@@ -171,26 +183,23 @@ global.app.use(function(req, res, next){
 
 /* Error handling */
 var logErrors = function(err, req, res, next) {
-    log.error(("Error: " + err.stack).red);
-    next(err);
-};
+    if (err) {
+        var url = req.url || '';
 
-var clientErrorHandler = function(err, req, res, next) {
-    if (req.xhr) {
-        res.send(500, { error: 'Something blew up!' });
+        log.debug(req.method, req.headers);
+        log.error(url.red, ('Error: ' + err.stack).red);
+
+        if (req.xhr) {
+            res.status(500).json({msg: 'Server error'});
+        } else {
+            res.status(500).send('Server error');
+        }
     } else {
-        next(err);
+        next();
     }
 };
 
-var errorHandler = function(err, req, res, next) {
-    res.status(500);
-    res.render('error', { error: err });
-};
-
 global.app.use(logErrors);
-global.app.use(clientErrorHandler);
-global.app.use(errorHandler);
 /* /Error handling */
 
 
@@ -202,5 +211,5 @@ if (!module.parent) {
     global.app.listen(port);
     var portString = port.toString();
 
-    log.info('[SOURCEJS] launched on http://localhost:'.blue + portString.red + ' in '.blue + MODE.blue + ' mode...'.blue);
+    log.info('[SOURCEJS] launched on http://127.0.0.1:'.blue + portString.red + ' in '.blue + MODE.blue + ' mode...'.blue);
 }

assets/css/defaults.less

@@ -31,6 +31,7 @@
 @import url('project/modal.less');
 @import url('project/autocomplete.less');
 @import url('project/clarify-in-spec.less');
+@import url('project/auth.less');
 
 //Cosmetic
 @import url('cosmetic/highlights.less');

assets/css/project/auth.less

@@ -0,0 +1,35 @@
+.source_login {
+	display: inline-block;
+	height: 40px;
+	float: right;
+
+	margin-top: 2px;
+	vertical-align: top;
+	}
+
+.source_login-avatar {
+	width: 25px;
+	height: 25px;
+
+	border-radius: 50%;
+	border: 1px solid #FFF;
+	cursor: pointer;
+	}
+
+	.source_login-avatar.anonymous {
+		border: 1px solid #333;
+		}
+
+.source_login-button {
+	display: inline-block;
+
+	color: #999;
+	text-decoration: none;
+	line-height: 1;
+	cursor: pointer;
+	vertical-align: top;
+	margin: 5px 0px 0px 10px;
+	}
+	.source_login-button:hover {
+		color: #FFF
+		}

assets/css/project/info.less

@@ -1,16 +1,22 @@
 /* Info blocks
 ---------------------------------------------------------------------------------- */
 
+// !important next to rules are intended solution till we will use shadow DOM or iframes for source_examples
+
 .source_data,
 .source_doc,
 .source_note,
 .source_warn,
 .source_info {
 	display: block;
 	position: relative;
-    box-sizing: content-box;
+    box-sizing: content-box !important;
 
-	border-radius: 10px;
+	border-radius: @border-radius !important;
+
+    .source_section & {
+        font-size: @fz-size-s !important;
+        }
 
     &:empty {
 		display: none;
@@ -25,7 +31,6 @@
 		}
     }
 
-body p.source_info, /* cascade for weight */
 .source_info {
 	background: #FFF6DD !important;
 
@@ -39,7 +44,6 @@ body p.source_info, /* cascade for weight */
         }
 	}
 
-body p.source_warn, /* cascade for weight */
 .source_warn {
 	margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
 	padding: 10px 10px 10px 35px !important;
@@ -51,20 +55,17 @@ body p.source_warn, /* cascade for weight */
         }
 	}
 
-body p.source_note, /* cascade for weight */
 .source_note {
     margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
     padding: 10px 10px 10px 35px !important;
 
     background: #DCF1FA url(/source/assets/i/note.png) no-repeat 13px 13px !important;
 
-
     .source_section & {
         margin-right: 0 !important;
         }
     }
 
-body p.source_doc, /* cascade for weight */
 .source_doc {
     margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
     padding: 10px 25px !important;
@@ -77,7 +78,6 @@ body p.source_doc, /* cascade for weight */
         }
     }
 
-body p.source_data, /* cascade for weight */
 .source_data {
     margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
     padding: 10px 25px !important;

assets/css/reset.less

@@ -180,11 +180,14 @@ body {
     });
 
 .source-section-reset(ol, {
-    margin: 15px 0 15px 5px;
+    margin: 25px 0 25px 22px;
     });
 
 .source-section-reset(~'ol > li', {
-    list-style-type: decimal !important;
+    font-family: @font-family-main;
+    font-size: @fz-size-m;
+    line-height: 1.5;
+    list-style: outside decimal;
     });
 
 //a {

assets/css/variables.less

@@ -13,6 +13,8 @@
 
 /* Layout
 -------------------------------------------------- */
+@border-radius: 10px;
+
 @layout_col-main--padding: 25px;
 @layout_col-main--max-width: @max-width - @layout_col-main--padding * 2;
 
@@ -93,26 +95,29 @@
  *          @reset - Boolean enable of disable reset (enabled by default) [true | false]
  */
 .source-only(@selector, @rules, @reset: true) {
-    .source_section > *@{notCleaningClasses} > @{selector},
     .source_section > *@{notCleaningClasses} > @{selector},
     .source_section > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_section > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_section > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
+
     .source_info > @{selector},
     .source_info > *@{notCleaningClasses} > @{selector},
     .source_info > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_info > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_info > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
+
     .source_doc > @{selector},
     .source_doc > *@{notCleaningClasses} > @{selector},
     .source_doc > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_doc > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_doc > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
+
     .source_warn > @{selector},
     .source_warn > *@{notCleaningClasses} > @{selector},
     .source_warn > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_warn > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
     .source_warn > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},
+
     .source_deps > @{selector},
     .source_deps > *@{notCleaningClasses} > @{selector},
     .source_deps > *@{notCleaningClasses} > *@{notCleaningClasses} > @{selector},

assets/i/github-loagind.gif

@@ -8,7 +8,12 @@ require([
     "jquery",
     "source/load-options", // TODO: remove when all modules inherit Module()
     "sourceModules/browser",
-    "sourceModules/moduleLoader"
-    ], function ($, options) {
-
+    "sourceModules/moduleLoader",
+    'sourceModules/auth',
+    ], function ($, options, browser, Loader, Auth) {
+        if (options && options.modulesEnabled && options.modulesEnabled.auth === true) {
+            new Auth({
+                target: $('.js-hook.source_login')
+            });
+        }
 });