+
+
+
+
+ This page has moved to a ' - + entity.yml.title - + '.
' - + '' - + '' + desi.content.root.forEach(normalizeContentEntity); + desi.content.collections.forEach(normalizeContentEntity); + + desi.content.collections.sort(byDate); + desi.collated = collate(desi.content.collections); + console.info('desi.collated'); + console.info(desi.collated); + + return desi; + }).then(function (desi) { + var compiled = [] ; - compiled.push({ contents: content, path: path.join(desi.config.compiled_path, redirect) }); + /* + function compileScriptEntity(entity, i, arr) { + } + */ + desi.assets = []; + function compileThemeEntity(entity, i, arr) { + console.log("compiling " + (i + 1) + "/" + arr.length + " " + (entity.path || entity.name)); + // TODO less / sass / etc + compiled.push({ contents: entity.body || entity.contents, path: path.join(desi.config.compiled_path, 'themes', entity.path) }); + if (/stylesheets.*\.css/.test(entity.path) && (!/google/.test(entity.path) || /obsid/.test(entity.path))) { + // TODO XXX move to a partial + desi.assets.push( + '' + ); + } + } + desi.navigation.filter(function (n) { + return n; }); - } + //console.log(desi.navigation); + function compileContentEntity(entity, i, arr) { + console.log("compiling " + (i + 1) + "/" + arr.length + " " + (entity.path || entity.name)); - console.info('[first] compiling theme assets'); - desi.content.themes.filter(function (f) { return !/\blayouts\b/.test(f.path); }).forEach(compileThemeEntity); + var previous = '' + , layers + , view + ; - console.info('compiling root pages'); - desi.content.root.forEach(compileContentEntity); - console.info('compiling article pages'); - desi.content.collections.forEach(compileContentEntity); + layers = getLayout(desi, entity.yml.theme, entity.yml.layout, [entity]); - desi.compiled = compiled; - return desi; - }).then(function (desi) { - var compiled = desi.compiled.slice(0) - , batches = [] - , now - , size = 0 - ; + view = { + page: entity.yml // data for just *this* page + //, data: desi.data // data.yml + // https://github.com/janl/mustache.js/issues/415 + , data: num2str(desi.data) + , collection: {} // data for just *this* collection + , categories: [] // *all* categories in all collections + , tags: [] // *all* tags in all collections + , site: num2str(desi.site || {}) + , url: entity.canonical_url + , canonical_url: entity.canonical_url + , relative_url: entity.relative_url + , urls: desi.urls + , previous: arr[i - 1] + , next: arr[i + 1] + , posts: { collated: desi.collated } + // TODO concat theme, widget, and site assets + , assets: desi.assets.join('\n') + }; - if (!compiled.length) { - console.info("No files were deemed worthy to compile. Done"); - return; - } - - // because some servers / proxies are terrible at handling large uploads (>= 100k) - // (vagrant? or express? one of the two is CRAZY slow) - console.info('saving compiled files', desi.compiled); - while (compiled.length) { - batches.push(compiled.splice(0, 500)); - } - - now = Date.now(); - console.info('compiled files'); - return forEachAsync(batches, function (files) { - return fsapi.putFiles(files).then(function (saved) { - size += saved.size; - - if (saved.error) { - console.error(saved.error); - } - - if (!saved.errors || !saved.errors.length) { - return; - } - - saved.errors.forEach(function (e) { - console.error(e); + //console.log('rel:', view.relative_url); + view.site.author = desi.data.author; + view.site.navigation = JSON.parse(JSON.stringify(desi.navigation)); + view.site.navigation.forEach(function (nav) { + + if (nav.href === view.relative_url) { + nav.active = true; + } }); - //console.info('saved ' + files.length + ' files'); - //console.log(saved); + // backwards compat + view.site['navigation?to_pages'] = view.site.navigation; + view.site['navigation?to__root'] = view.site.navigation; + view.data.navigation = view.site.navigation; + view.data['navigation?to_pages'] = view.site.navigation; + view.data['navigation?to__root'] = view.site.navigation; + + layers.forEach(function (current) { + // TODO meta.layout + var body = (current.body || current.contents || '').trim() + , html + , curview = {} + ; + + // TODO move to normalization + current.path = current.path || (entity.relativePath + '/' + entity.name); + + if (/\.(html|htm)$/.test(current.path)) { + html = body; + } else if (/\.(md|markdown|mdown|mkdn|mkd|mdwn|mdtxt|mdtext)$/.test(current.ext)) { + html = marked.render(body) + //.replace('"', '"') + //.replace(''', "'") + //.replace('/', '/') + ; + } else { + console.error('unknown parser for ' + (entity.path)); + } + + view.content = previous; + view.page.content = previous; + + // to prevent perfect object equality (and potential template caching) + Object.keys(view).forEach(function (key) { + curview[key] = view[key]; + }); + previous = Mustache.render(html, curview, desi.partials); + }); + + // NOTE: by now, all permalinks should be in the format /path/to/page.html or /path/to/page/index.html + if (/^(index)?(\/?index.html)?$/.test(entity.yml.permalink)) { + console.info('found compiled index'); + compiled.push({ contents: previous, path: path.join(desi.config.compiled_path, 'index.html') }); + } else { + compiled.push({ contents: previous, path: path.join(desi.config.compiled_path, entity.yml.permalink) }); + } + + entity.yml.redirects = entity.yml.redirects || []; + if (/\/index.html$/.test(entity.yml.permalink)) { + entity.yml.redirects.push(entity.yml.permalink.replace(/\/index.html$/, '.html')); + } else if (/\.html$/.test(entity.yml.permalink)) { + entity.yml.redirects.push(entity.yml.permalink.replace(/\.html?$/, '/index.html')); + } else { + console.info('found index, ignoring redirect'); + } + entity.yml.redirects.forEach(function (redirect) { + var content + ; + + // TODO move to partial + content = + '' + + '' + + 'This page has moved to a ' + + entity.yml.title + + '.
' + + '' + + '' + ; + + compiled.push({ contents: content, path: path.join(desi.config.compiled_path, redirect) }); + }); + } + + console.info('[first] compiling theme assets'); + desi.content.themes.filter(function (f) { return !/\blayouts\b/.test(f.path); }).forEach(compileThemeEntity); + + console.info('compiling root pages'); + desi.content.root.forEach(compileContentEntity); + console.info('compiling article pages'); + desi.content.collections.forEach(compileContentEntity); + + desi.compiled = compiled; + return desi; + }).then(function (desi) { + var compiled = desi.compiled.slice(0) + , batches = [] + , now + , size = 0 + ; + + if (!compiled.length) { + console.info("No files were deemed worthy to compile. Done"); + return; + } + + // because some servers / proxies are terrible at handling large uploads (>= 100k) + // (vagrant? or express? one of the two is CRAZY slow) + console.info('saving compiled files', desi.compiled); + while (compiled.length) { + batches.push(compiled.splice(0, 500)); + } + + now = Date.now(); + console.info('compiled files'); + return forEachAsync(batches, function (files) { + return fsapi.putFiles(files).then(function (saved) { + size += saved.size; + + if (saved.error) { + console.error(saved.error); + } + + if (!saved.errors || !saved.errors.length) { + return; + } + + saved.errors.forEach(function (e) { + console.error(e); + }); + //console.info('saved ' + files.length + ' files'); + //console.log(saved); + }); + }).then(function () { + // TODO update cache + console.info('wrote ' + desi.compiled.length + + ' files (' + (size / (1024 * 1024)).toFixed(2) + + ' MiB) in ' + + ((Date.now() - now) / 1000).toFixed(3) + 's' + ); }); - }).then(function () { - // TODO update cache - console.info('wrote ' + desi.compiled.length - + ' files (' + (size / (1024 * 1024)).toFixed(2) - + ' MiB) in ' - + ((Date.now() - now) / 1000).toFixed(3) + 's' - ); }); - }).catch(function (e) { - console.error('A great and uncatchable error has befallen the land. Read ye here for das detalles..'); - console.error(e.message); - console.error(e); - throw e; - }); + }; + + exports.Desi = Desi.Desi = Desi; }('undefined' !== typeof exports && exports || window)); diff --git a/index.html b/index.html index 4e11fca..7b8c4d5 100644 --- a/index.html +++ b/index.html @@ -1,26 +1,113 @@ + + + + + + + + - - -Open up the console, fool!
- + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/about/about.html b/views/about/about.html
new file mode 100644
index 0000000..cab8ef4
--- /dev/null
+++ b/views/about/about.html
@@ -0,0 +1,45 @@
+Dear Desi, ...