s around + // "paragraphs" that are wrapped in non-block-level tags, such as anchors, + // phrase emphasis, and spans. The list of tags we're looking for is + // hard-coded: + var block_tags_a = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del" + var block_tags_b = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math" + + // First, look for nested blocks, e.g.: + //
+ //
+ //
+ // The outermost tags must start at the left margin for this to match, and
+ // the inner nested divs must be indented.
+ // We need to do this before the next, more liberal match, because the next
+ // match will start at the first `
+ // tags for inner block must be indented.
+ //
+ // ` and stop at the first `
`.
+
+ // attacklab: This regex can be expensive when it fails.
+ /*
+ var text = text.replace(/
+ ( // save in $1
+ ^ // start of line (with /m)
+ <($block_tags_a) // start tag = $2
+ \b // word break
+ // attacklab: hack around khtml/pcre bug...
+ [^\r]*?\n // any number of lines, minimally matching
+ // the matching end tag
+ [ \t]* // trailing spaces/tabs
+ (?=\n+) // followed by a newline
+ ) // attacklab: there are sentinel newlines at end of document
+ /gm,function(){...}};
+ */
+ text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?\n<\/\2>[ \t]*(?=\n+))/gm,hashElement);
+
+ //
+ // Now match more liberally, simply from `\n. It was easier to make a special case than + // to make the other regex more complicated. + + /* + text = text.replace(/ + ( // save in $1 + \n\n // Starting after a blank line + [ ]{0,3} + (<(hr) // start tag = $2 + \b // word break + ([^<>])*? // + \/?>) // the matching end tag + [ \t]* + (?=\n{2,}) // followed by a blank line + ) + /g,hashElement); + */ + text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,hashElement); + + // Special case for standalone HTML comments: + + /* + text = text.replace(/ + ( // save in $1 + \n\n // Starting after a blank line + [ ]{0,3} // attacklab: g_tab_width - 1 + + [ \t]* + (?=\n{2,}) // followed by a blank line + ) + /g,hashElement); + */ + text = text.replace(/(\n\n[ ]{0,3}[ \t]*(?=\n{2,}))/g,hashElement); + + // PHP and ASP-style processor instructions ( and <%...%>) + + /* + text = text.replace(/ + (?: + \n\n // Starting after a blank line + ) + ( // save in $1 + [ ]{0,3} // attacklab: g_tab_width - 1 + (?: + <([?%]) // $2 + [^\r]*? + \2> + ) + [ \t]* + (?=\n{2,}) // followed by a blank line + ) + /g,hashElement); + */ + text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,hashElement); + + // attacklab: Undo double lines (see comment at top of this function) + text = text.replace(/\n\n/g,"\n"); + return text; +} + +var hashElement = function(wholeMatch,m1) { + var blockText = m1; + + // Undo double lines + blockText = blockText.replace(/\n\n/g,"\n"); + blockText = blockText.replace(/^\n/,""); + + // strip trailing blank lines + blockText = blockText.replace(/\n+$/g,""); + + // Replace the element text with a marker ("~KxK" where x is its key) + blockText = "\n\n~K" + (g_html_blocks.push(blockText)-1) + "K\n\n"; + + return blockText; +}; + +var _RunBlockGamut = function(text) { +// +// These are all the transformations that form block-level +// tags like paragraphs, headers, and list items. +// + text = _DoHeaders(text); + + // Do Horizontal Rules: + var key = hashBlock("
"); + text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm,key); + text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm,key); + text = text.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm,key); + + text = _DoLists(text); + text = _DoCodeBlocks(text); + text = _DoBlockQuotes(text); + + // We already ran _HashHTMLBlocks() before, in Markdown(), but that + // was to escape raw HTML in the original Markdown source. This time, + // we're escaping the markup we've just created, so that we don't wrap + //
tags around block-level tags.
+ text = _HashHTMLBlocks(text);
+ text = _FormParagraphs(text);
+
+ return text;
+}
+
+
+var _RunSpanGamut = function(text) {
+//
+// These are all the transformations that occur *within* block-level
+// tags like paragraphs, headers, and list items.
+//
+
+ text = _DoCodeSpans(text);
+ text = _EscapeSpecialCharsWithinTagAttributes(text);
+ text = _EncodeBackslashEscapes(text);
+
+ // Process anchor and image tags. Images must come first,
+ // because ![foo][f] looks like an anchor.
+ text = _DoImages(text);
+ text = _DoAnchors(text);
+
+ // Make links out of things like ` Just type tags
+//
+
+ // Strip leading and trailing lines:
+ text = text.replace(/^\n+/g,"");
+ text = text.replace(/\n+$/g,"");
+
+ var grafs = text.split(/\n{2,}/g);
+ var grafsOut = new Array();
+
+ //
+ // Wrap tags.
+ //
+ var end = grafs.length;
+ for (var i=0; i ");
+ str += " ༄ (discussion requires JavaScript) ༄ (discussion requires JavaScript) ༄ (discussion requires JavaScript) ༄ (discussion requires JavaScript)
+ ༄ (discussion requires JavaScript) ༄ (discussion requires JavaScript) ༄
\n");
+
+ return text;
+}
+
+var _EscapeSpecialCharsWithinTagAttributes = function(text) {
+//
+// Within tags -- meaning between < and > -- encode [\ ` * _] so they
+// don't conflict with their use in Markdown for code, italics and strong.
+//
+
+ // Build a regex to find HTML tags and comments. See Friedl's
+ // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
+ var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|)/gi;
+
+ text = text.replace(regex, function(wholeMatch) {
+ var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g,"$1`");
+ tag = escapeCharacters(tag,"\\`*_");
+ return tag;
+ });
+
+ return text;
+}
+
+var _DoAnchors = function(text) {
+//
+// Turn Markdown link shortcuts into XHTML tags.
+//
+ //
+ // First, handle reference-style links: [link text] [id]
+ //
+
+ /*
+ text = text.replace(/
+ ( // wrap whole match in $1
+ \[
+ (
+ (?:
+ \[[^\]]*\] // allow brackets nested one level
+ |
+ [^\[] // or anything else
+ )*
+ )
+ \]
+
+ [ ]? // one optional space
+ (?:\n[ ]*)? // one optional newline followed by spaces
+
+ \[
+ (.*?) // id = $3
+ \]
+ )()()()() // pad remaining backreferences
+ /g,_DoAnchors_callback);
+ */
+ text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g,writeAnchorTag);
+
+ //
+ // Next, inline-style links: [link text](url "optional title")
+ //
+
+ /*
+ text = text.replace(/
+ ( // wrap whole match in $1
+ \[
+ (
+ (?:
+ \[[^\]]*\] // allow brackets nested one level
+ |
+ [^\[\]] // or anything else
+ )
+ )
+ \]
+ \( // literal paren
+ [ \t]*
+ () // no id, so leave $3 empty
+ ? // href = $4
+ [ \t]*
+ ( // $5
+ (['"]) // quote char = $6
+ (.*?) // Title = $7
+ \6 // matching quote
+ [ \t]* // ignore any spaces/tabs between closing quote and )
+ )? // title is optional
+ \)
+ )
+ /g,writeAnchorTag);
+ */
+ text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,writeAnchorTag);
+
+ //
+ // Last, handle reference-style shortcuts: [link text]
+ // These must come last in case you've also got [link test][1]
+ // or [link test](/foo)
+ //
+
+ /*
+ text = text.replace(/
+ ( // wrap whole match in $1
+ \[
+ ([^\[\]]+) // link text = $2; can't contain '[' or ']'
+ \]
+ )()()()()() // pad rest of backreferences
+ /g, writeAnchorTag);
+ */
+ text = text.replace(/(\[([^\[\]]+)\])()()()()()/g, writeAnchorTag);
+
+ return text;
+}
+
+var writeAnchorTag = function(wholeMatch,m1,m2,m3,m4,m5,m6,m7) {
+ if (m7 == undefined) m7 = "";
+ var whole_match = m1;
+ var link_text = m2;
+ var link_id = m3.toLowerCase();
+ var url = m4;
+ var title = m7;
+
+ if (url == "") {
+ if (link_id == "") {
+ // lower-case and turn embedded newlines into spaces
+ link_id = link_text.toLowerCase().replace(/ ?\n/g," ");
+ }
+ url = "#"+link_id;
+
+ if (g_urls[link_id] != undefined) {
+ url = g_urls[link_id];
+ if (g_titles[link_id] != undefined) {
+ title = g_titles[link_id];
+ }
+ }
+ else {
+ if (whole_match.search(/\(\s*\)$/m)>-1) {
+ // Special case for explicit empty url
+ url = "";
+ } else {
+ return whole_match;
+ }
+ }
+ }
+
+ url = escapeCharacters(url,"*_");
+ var result = "";
+
+ return result;
+}
+
+
+var _DoImages = function(text) {
+//
+// Turn Markdown image shortcuts into tags.
+//
+
+ //
+ // First, handle reference-style labeled images: ![alt text][id]
+ //
+
+ /*
+ text = text.replace(/
+ ( // wrap whole match in $1
+ !\[
+ (.*?) // alt text = $2
+ \]
+
+ [ ]? // one optional space
+ (?:\n[ ]*)? // one optional newline followed by spaces
+
+ \[
+ (.*?) // id = $3
+ \]
+ )()()()() // pad rest of backreferences
+ /g,writeImageTag);
+ */
+ text = text.replace(/(!\[(.*?)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g,writeImageTag);
+
+ //
+ // Next, handle inline images: 
+ // Don't forget: encode * and _
+
+ /*
+ text = text.replace(/
+ ( // wrap whole match in $1
+ !\[
+ (.*?) // alt text = $2
+ \]
+ \s? // One optional whitespace character
+ \( // literal paren
+ [ \t]*
+ () // no id, so leave $3 empty
+ ? // src url = $4
+ [ \t]*
+ ( // $5
+ (['"]) // quote char = $6
+ (.*?) // title = $7
+ \6 // matching quote
+ [ \t]*
+ )? // title is optional
+ \)
+ )
+ /g,writeImageTag);
+ */
+ text = text.replace(/(!\[(.*?)\]\s?\([ \t]*()?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,writeImageTag);
+
+ return text;
+}
+
+var writeImageTag = function(wholeMatch,m1,m2,m3,m4,m5,m6,m7) {
+ var whole_match = m1;
+ var alt_text = m2;
+ var link_id = m3.toLowerCase();
+ var url = m4;
+ var title = m7;
+
+ if (!title) title = "";
+
+ if (url == "") {
+ if (link_id == "") {
+ // lower-case and turn embedded newlines into spaces
+ link_id = alt_text.toLowerCase().replace(/ ?\n/g," ");
+ }
+ url = "#"+link_id;
+
+ if (g_urls[link_id] != undefined) {
+ url = g_urls[link_id];
+ if (g_titles[link_id] != undefined) {
+ title = g_titles[link_id];
+ }
+ }
+ else {
+ return whole_match;
+ }
+ }
+
+ alt_text = alt_text.replace(/"/g,""");
+ url = escapeCharacters(url,"*_");
+ var result = "
" + _RunSpanGamut(m1) + "");});
+
+ text = text.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm,
+ function(matchFound,m1){return hashBlock("
" + _RunSpanGamut(m1) + "
");});
+
+ // atx-style headers:
+ // # Header 1
+ // ## Header 2
+ // ## Header 2 with closing hashes ##
+ // ...
+ // ###### Header 6
+ //
+
+ /*
+ text = text.replace(/
+ ^(\#{1,6}) // $1 = string of #'s
+ [ \t]*
+ (.+?) // $2 = Header text
+ [ \t]*
+ \#* // optional closing #'s (not counted)
+ \n+
+ /gm, function() {...});
+ */
+
+ text = text.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm,
+ function(wholeMatch,m1,m2) {
+ var h_level = m1.length;
+ return hashBlock("` blocks.
+//
+
+ /*
+ text = text.replace(text,
+ /(?:\n\n|^)
+ ( // $1 = the code block -- one or more lines, starting with a space/tab
+ (?:
+ (?:[ ]{4}|\t) // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
+ .*\n+
+ )+
+ )
+ (\n*[ ]{0,3}[^ \t\n]|(?=~0)) // attacklab: g_tab_width
+ /g,function(){...});
+ */
+
+ // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+ text += "~0";
+
+ text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
+ function(wholeMatch,m1,m2) {
+ var codeblock = m1;
+ var nextChar = m2;
+
+ codeblock = _EncodeCode( _Outdent(codeblock));
+ codeblock = _Detab(codeblock);
+ codeblock = codeblock.replace(/^\n+/g,""); // trim leading newlines
+ codeblock = codeblock.replace(/\n+$/g,""); // trim trailing whitespace
+
+ codeblock = "
";
+
+ return hashBlock(codeblock) + nextChar;
+ }
+ );
+
+ // attacklab: strip sentinel
+ text = text.replace(/~0/,"");
+
+ return text;
+}
+
+var hashBlock = function(text) {
+ text = text.replace(/(^\n+|\n+$)/g,"");
+ return "\n\n~K" + (g_html_blocks.push(text)-1) + "K\n\n";
+}
+
+
+var _DoCodeSpans = function(text) {
+//
+// * Backtick quotes are used for " + codeblock + "\n spans.
+//
+// * You can use multiple backticks as the delimiters if you want to
+// include literal backticks in the code span. So, this input:
+//
+// Just type ``foo `bar` baz`` at the prompt.
+//
+// Will translate to:
+//
+// foo `bar` baz at the prompt.`bar` ...
+//
+
+ /*
+ text = text.replace(/
+ (^|[^\\]) // Character before opening ` can't be a backslash
+ (`+) // $2 = Opening run of `
+ ( // $3 = The code block
+ [^\r]*?
+ [^`] // attacklab: work around lack of lookbehind
+ )
+ \2 // Matching closer
+ (?!`)
+ /gm, function(){...});
+ */
+
+ text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
+ function(wholeMatch,m1,m2,m3,m4) {
+ var c = m3;
+ c = c.replace(/^([ \t]*)/g,""); // leading whitespace
+ c = c.replace(/[ \t]*$/g,""); // trailing whitespace
+ c = _EncodeCode(c);
+ return m1+""+c+"";
+ });
+
+ return text;
+}
+
+
+var _EncodeCode = function(text) {
+//
+// Encode/escape certain characters inside Markdown code runs.
+// The point is that in code, these characters are literals,
+// and lose their special Markdown meanings.
+//
+ // Encode all ampersands; HTML entities are not
+ // entities within a Markdown code span.
+ text = text.replace(/&/g,"&");
+
+ // Do the angle bracket song and dance:
+ text = text.replace(//g,">");
+
+ // Now, escape characters that are magic in Markdown:
+ text = escapeCharacters(text,"\*_{}[]\\",false);
+
+// jj the line above breaks this:
+//---
+
+//* Item
+
+// 1. Subitem
+
+// special char: *
+//---
+
+ return text;
+}
+
+
+var _DoItalicsAndBold = function(text) {
+
+ // must go first:
+ text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,
+ "$2");
+
+ text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,
+ "$2");
+
+ return text;
+}
+
+
+var _DoBlockQuotes = function(text) {
+
+ /*
+ text = text.replace(/
+ ( // Wrap whole match in $1
+ (
+ ^[ \t]*>[ \t]? // '>' at the start of a line
+ .+\n // rest of the first line
+ (.+\n)* // subsequent consecutive lines
+ \n* // blanks
+ )+
+ )
+ /gm, function(){...});
+ */
+
+ text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,
+ function(wholeMatch,m1) {
+ var bq = m1;
+
+ // attacklab: hack around Konqueror 3.5.4 bug:
+ // "----------bug".replace(/^-/g,"") == "bug"
+
+ bq = bq.replace(/^[ \t]*>[ \t]?/gm,"~0"); // trim one level of quoting
+
+ // attacklab: clean up hack
+ bq = bq.replace(/~0/g,"");
+
+ bq = bq.replace(/^[ \t]+$/gm,""); // trim whitespace-only lines
+ bq = _RunBlockGamut(bq); // recurse
+
+ bq = bq.replace(/(^|\n)/g,"$1 ");
+ // These leading spaces screw with content, so we need to fix that:
+ bq = bq.replace(
+ /(\s*
[^\r]+?<\/pre>)/gm,
+ function(wholeMatch,m1) {
+ var pre = m1;
+ // attacklab: hack around Konqueror 3.5.4 bug:
+ pre = pre.replace(/^ /mg,"~0");
+ pre = pre.replace(/~0/g,"");
+ return pre;
+ });
+
+ return hashBlock("\n" + bq + "\n
");
+ });
+ return text;
+}
+
+
+var _FormParagraphs = function(text) {
+//
+// Params:
+// $text - string to process with html sjs' blog
-
+
-
-
+
+
diff --git a/blog/a-preview-of-mach-o-file-generation.html b/blog/a-preview-of-mach-o-file-generation.html
index e2f0654..9403f26 100644
--- a/blog/a-preview-of-mach-o-file-generation.html
+++ b/blog/a-preview-of-mach-o-file-generation.html
@@ -7,36 +7,20 @@
var _gaq = _gaq || [];
_gaq.push( ['_setAccount', 'UA-214054-5']
, ['_trackPageview']
- );
+ )
-(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-if (document.addEventListener) {
- document.addEventListener('DOMContentLoaded', ready, false)
-} else if (window.attachEvent) {
- window.attachEvent('onload', ready)
-}
-function ready() {
- function html(id, h) {
- document.getElementById(id).innerHTML = h
- }
-
- var discussion = document.getElementById('discussion')
- , discussionToggle = document.getElementById('discussion-toggle')
- , hidden = true
- discussionToggle.onclick = function() {
- hidden = !hidden
- discussion.style.display = hidden ? 'none' : 'block'
- discussionToggle.innerHTML = hidden ? '↓ show discussion ↓' : '↑ hide discussion ↑'
- SJS.request({uri: 'http://bohodev.net:8000/comments/'}, function(err, body) {
- html('comments', body)
- })
- }
-}
+;(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s)
+})()
+
+
+
+
sjs' blog
-
+
-
-
+
+
diff --git a/blog/basics-of-the-mach-o-file-format.html b/blog/basics-of-the-mach-o-file-format.html
index 5afc886..de48c98 100644
--- a/blog/basics-of-the-mach-o-file-format.html
+++ b/blog/basics-of-the-mach-o-file-format.html
@@ -7,36 +7,20 @@
var _gaq = _gaq || [];
_gaq.push( ['_setAccount', 'UA-214054-5']
, ['_trackPageview']
- );
+ )
-(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-if (document.addEventListener) {
- document.addEventListener('DOMContentLoaded', ready, false)
-} else if (window.attachEvent) {
- window.attachEvent('onload', ready)
-}
-function ready() {
- function html(id, h) {
- document.getElementById(id).innerHTML = h
- }
-
- var discussion = document.getElementById('discussion')
- , discussionToggle = document.getElementById('discussion-toggle')
- , hidden = true
- discussionToggle.onclick = function() {
- hidden = !hidden
- discussion.style.display = hidden ? 'none' : 'block'
- discussionToggle.innerHTML = hidden ? '↓ show discussion ↓' : '↑ hide discussion ↑'
- SJS.request({uri: 'http://bohodev.net:8000/comments/'}, function(err, body) {
- html('comments', body)
- })
- }
-}
+;(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s)
+})()
+
+
+
+
sjs' blog
-
+
+
+
-
-
+
+
diff --git a/blog/index.html b/blog/index.html
index ae3c5ba..8eb7d32 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -3,34 +3,34 @@
+
sjs' blog
+
+
diff --git a/blog/working-with-c-style-structs-in-ruby.html b/blog/working-with-c-style-structs-in-ruby.html
index 86502a0..f12e1cc 100644
--- a/blog/working-with-c-style-structs-in-ruby.html
+++ b/blog/working-with-c-style-structs-in-ruby.html
@@ -7,36 +7,20 @@
var _gaq = _gaq || [];
_gaq.push( ['_setAccount', 'UA-214054-5']
, ['_trackPageview']
- );
+ )
-(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-if (document.addEventListener) {
- document.addEventListener('DOMContentLoaded', ready, false)
-} else if (window.attachEvent) {
- window.attachEvent('onload', ready)
-}
-function ready() {
- function html(id, h) {
- document.getElementById(id).innerHTML = h
- }
-
- var discussion = document.getElementById('discussion')
- , discussionToggle = document.getElementById('discussion-toggle')
- , hidden = true
- discussionToggle.onclick = function() {
- hidden = !hidden
- discussion.style.display = hidden ? 'none' : 'block'
- discussionToggle.innerHTML = hidden ? '↓ show discussion ↓' : '↑ hide discussion ↑'
- SJS.request({uri: 'http://bohodev.net:8000/comments/'}, function(err, body) {
- html('comments', body)
- })
- }
-}
+;(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s)
+})()
+
+
+
+
+
+
+ sjs' blog
-
+
-
-
+
+
diff --git a/combine.sh b/combine.sh
new file mode 100755
index 0000000..2fd97f0
--- /dev/null
+++ b/combine.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+
+echo "request,showdown,strftime,tmpl,jquery-serializeObject,blog -> assets/blog-all.min.js"
+cat assets/{request,showdown,strftime,tmpl,jquery-serializeObject,blog}.min.js >|assets/blog-all.min.js
+
+echo "gitter.storage-polyfill,store,proj -> assets/proj-all.min.js"
+cat assets/{gitter,storage-polyfill,store,proj}.min.js >|assets/proj-all.min.js
diff --git a/discussd/discussd.js b/discussd/discussd.js
index f3857f3..06ee271 100755
--- a/discussd/discussd.js
+++ b/discussd/discussd.js
@@ -2,10 +2,14 @@
var fs = require('fs')
, http = require('http')
+ , path = require('path')
+ , parseURL = require('url').parse
, keys = require('keys')
+ , markdown = require('markdown')
+ , strftime = require('strftime').strftime
, DefaultOptions = { host: 'localhost'
, port: 2020
- , postsFile: 'posts.json'
+ , postsFile: path.join(__dirname, 'posts.json')
}
function main() {
@@ -19,12 +23,15 @@ function main() {
readJSON(options.postsFile, function(err, posts) {
if (err) {
console.error('failed to parse posts file, is it valid JSON?')
- console.dir(e)
+ console.dir(err)
process.exit(1)
}
+ if (context.posts === null) {
+ var n = posts.published.length
+ , t = strftime('%Y-%m-%d %I:%M:%S %p')
+ console.log('(' + t + ') ' + 'loaded discussions for ' + n + ' posts...')
+ }
context.posts = posts.published
- var n = context.posts.length
- console.log((context.posts === null ? '' : 're') + 'loaded ' + n + ' posts...')
if (typeof cb == 'function') cb()
})
}
@@ -56,63 +63,232 @@ function readJSON(f, cb) {
})
}
-function requestHandler(context) {
- function addComment(data) {
- if (missingParams(data) || context.posts.indexOf(data.post) === -1) {
- console.log('missing params or invalid post title in ' + JSON.stringify(data, null, 2))
- return false
+// returns a request handler that returns a string
+function createTextHandler(options) {
+ if (typeof options === 'string') {
+ options = { body: options }
+ } else {
+ options = options || {}
+ }
+ var body = options.body || ''
+ , code = options.cody || 200
+ , type = options.type || 'text/plain'
+ , n = body.length
+ return function(req, res) {
+ var headers = res.headers || {}
+ headers['content-type'] = type
+ headers['content-length'] = n
+
+// console.log('code: ', code)
+// console.log('headers: ', JSON.stringify(headers, null, 2))
+// console.log('body: ', body)
+
+ res.writeHead(code, headers)
+ res.end(body)
+ }
+}
+
+// Cross-Origin Resource Sharing
+var createCorsHandler = (function() {
+ var AllowedOrigins = [ 'http://samhuri.net'
+ , 'http://localhost:8888'
+ ]
+
+ return function(handler) {
+ handler = handler || createTextHandler('ok')
+ return function(req, res) {
+ var origin = req.headers.origin
+ console.log('origin: ', origin)
+ console.log('index: ', AllowedOrigins.indexOf(origin))
+ if (AllowedOrigins.indexOf(origin) !== -1) {
+ res.headers = { 'Access-Control-Allow-Origin': origin
+ , 'Access-Control-Request-Method': 'POST, GET'
+ , 'Access-Control-Allow-Headers': 'content-type'
+ }
+ handler(req, res)
+ } else {
+ BadRequest(req, res)
+ }
}
- var comments = context.db.get(data.post) || []
- comments.push({ name: data.name
- , email: data.email
- , body: data.body
+ }
+}())
+
+var DefaultHandler = createTextHandler({ code: 404, body: 'not found' })
+ , BadRequest = createTextHandler({ code: 400, body: 'bad request' })
+ , ServerError = createTextHandler({ code: 500, body: 'server error' })
+ , _routes = {}
+
+function route(method, pattern, handler) {
+ if (typeof pattern === 'function' && !handler) {
+ handler = pattern
+ pattern = ''
+ }
+ if (!pattern || typeof pattern.exec !== 'function') {
+ pattern = new RegExp('^/' + pattern)
+ }
+ var route = { pattern: pattern, handler: handler }
+ console.log('routing ' + method, pattern)
+ if (!(method in _routes)) _routes[method] = []
+ _routes[method].push(route)
+}
+
+function resolve(method, path) {
+ var rs = _routes[method]
+ , i = rs.length
+ , m
+ , r
+ while (i--) {
+ r = rs[i]
+ m = r.pattern.exec ? r.pattern.exec(path) : path.match(r.pattern)
+ if (m) return r.handler
+ }
+ console.warn('*** using default handler, this is probably not what you want')
+ return DefaultHandler
+}
+
+function get(pattern, handler) {
+ route('GET', pattern, handler)
+}
+
+function post(pattern, handler) {
+ route('POST', pattern, handler)
+}
+
+function options(pattern, handler) {
+ route('OPTIONS', pattern, handler)
+}
+
+function handleRequest(req, res) {
+ var handler = resolve(req.method, req.url)
+ try {
+ handler(req, res)
+ } catch (e) {
+ console.error('!!! error handling ' + req.method, req.url)
+ console.dir(e)
+ }
+}
+
+function commentServer(context) {
+ function addComment(post, name, email, url, body) {
+ var comments = context.db.get(post) || []
+ comments.push({ name: name
+ , email: email
+ , url: url
+ , body: body
, timestamp: Date.now()
})
- context.db.set(data.post, comments)
- console.log('[' + new Date() + '] add comment ' + JSON.stringify(data, null, 2))
- return true
+ context.db.set(post, comments)
+ console.log('[' + new Date() + '] comment on ' + post)
+ console.log('name:', name)
+ console.log('email:', email)
+ console.log('url:', url)
+ console.log('body:', body)
}
- return function(req, res) {
+ function getComments(req, res) {
+ var post = parseURL(req.url).pathname.replace(/^\/comments\//, '')
+ , comments
+ if (context.posts.indexOf(post) === -1) {
+ console.warn('post not found: ' + post)
+ BadRequest(req, res)
+ return
+ }
+ comments = context.db.get(post) || []
+ res.respond({comments: comments.map(function(c) {
+ delete c.email
+ c.html = markdown.parse(c.body)
+ // FIXME discount has a race condition, sometimes gives a string
+ // with trailing garbage.
+ while (c.html.charAt(c.html.length - 1) !== '>') {
+ console.log("!!! removing trailing garbage from discount's html")
+ c.html = c.html.slice(0, c.html.length - 1)
+ }
+ return c
+ })})
+ }
+
+ function postComment(req, res) {
var body = ''
- , m
- if (req.method === 'POST' && req.url.match(/^\/comment\/?$/)) {
- req.on('data', function(chunk) { body += chunk })
- req.on('end', function() {
- var data
- try {
- data = JSON.parse(body)
- } catch (x) {
- badRequest(res)
- return
- }
- if (!addComment(data)) {
- badRequest(res)
- return
- }
- res.writeHead(204)
- res.end()
- // TODO mail watchers about the comment
- })
- } else if (req.method === 'GET' && (m = req.url.match(/^\/comments\/(.*)$/))) {
- var post = m[1]
- , comments
- , s
- if (context.posts.indexOf(post) === -1) {
- badRequest(res)
+ req.on('data', function(chunk) { body += chunk })
+ req.on('end', function() {
+ var data, post, name, email, url
+ try {
+ data = JSON.parse(body)
+ } catch (e) {
+ console.log('not json -> ' + body)
+ BadRequest(req, res)
return
}
- comments = context.db.get(post) || []
- s = JSON.stringify({comments: comments})
- res.writeHead(200, { 'content-type': 'appliaction/json'
- , 'content-length': s.length
- })
- res.end(s)
- } else {
- console.log('unhandled request')
- console.dir(req)
- badRequest(res)
+ post = (data.post || '').trim()
+ name = (data.name || 'anonymous').trim()
+ email = (data.email || '').trim()
+ url = (data.url || '').trim()
+ if (!url.match(/^https?:\/\//)) url = 'http://' + url
+ body = data.body || ''
+ if (!post || !body || context.posts.indexOf(post) === -1) {
+ console.warn('mising post, body, or post not found: ' + post)
+ console.warn('body: ', body)
+ BadRequest(req, res)
+ return
+ }
+ addComment(post, name, email, url, body)
+ res.respond()
+ // TODO mail watchers about the comment
+ })
+ }
+
+ function countComments(req, res) {
+ var post = parseURL(req.url).pathname.replace(/^\/count\//, '')
+ , comments
+ if (context.posts.indexOf(post) === -1) {
+ console.warn('post not found: ' + post)
+ BadRequest(req, res)
+ return
}
+ comments = context.db.get(post) || []
+ res.respond({count: comments.length})
+ }
+
+ return { get: getComments
+ , count: countComments
+ , post: postComment
+ }
+}
+
+function requestHandler(context) {
+ var comments = commentServer(context)
+ get(/comments\//, createCorsHandler(comments.get))
+ get(/count\//, createCorsHandler(comments.count))
+ post(/comment\/?/, createCorsHandler(comments.post))
+ options(createCorsHandler())
+
+ return function(req, res) {
+ console.log(req.method + ' ' + req.url)
+ res.respond = function(obj) {
+ var s = ''
+ var headers = res.headers || {}
+ if (obj) {
+ try {
+ s = JSON.stringify(obj)
+ } catch (e) {
+ ServerError(req, res)
+ return
+ }
+ headers['content-type'] = 'application/json'
+ }
+ headers['content-length'] = s.length
+
+ /*
+ console.log('code: ', s ? 200 : 204)
+ process.stdout.write('headers: ')
+ console.dir(headers)
+ console.log('body: ', s)
+ */
+
+ res.writeHead(s ? 200 : 204, headers)
+ res.end(s)
+ }
+ handleRequest(req, res)
}
}
@@ -151,14 +327,6 @@ function parseArgs(defaults) {
return options
}
-function badRequest(res) {
- var s = 'bad request'
- res.writeHead(400, { 'content-type': 'text/plain'
- , 'content-length': s.length
- })
- res.end(s)
-}
-
var missingParams = (function() {
var requiredParams = 'name email body'.split(' ')
return function(d) {
diff --git a/minify.sh b/minify.sh
new file mode 100755
index 0000000..acbe575
--- /dev/null
+++ b/minify.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env zsh
+
+setopt extendedglob
+
+for js (assets/*.js~*.min.js) {
+ target=${js%.js}.min.js
+ if [ ! -f $target ] || [ $js -nt $target ]; then
+ echo "$js -> $target"
+ closure-compiler < $js >| $target
+ fi
+}
diff --git a/templates/blog/index.html b/templates/blog/index.html
index 2b3315a..2e0d3d1 100644
--- a/templates/blog/index.html
+++ b/templates/blog/index.html
@@ -3,34 +3,36 @@
+
sjs' blog
{{! TODO extract a post partial used here and in post.html }}
- {{#post}}
+
{{#previous}}
← {{title}}
@@ -64,6 +67,36 @@ function ready() {
{{/next}}
+{{#comments}}
+
+
+
+{{/comments}}
diff --git a/templates/blog/post.html b/templates/blog/post.html
index 0ded7b8..006b0d1 100644
--- a/templates/blog/post.html
+++ b/templates/blog/post.html
@@ -7,38 +7,22 @@
var _gaq = _gaq || [];
_gaq.push( ['_setAccount', 'UA-214054-5']
, ['_trackPageview']
- );
+ )
-(function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-{{#comments}}
-if (document.addEventListener) {
- document.addEventListener('DOMContentLoaded', ready, false)
-} else if (window.attachEvent) {
- window.attachEvent('onload', ready)
-}
-function ready() {
- function html(id, h) {
- document.getElementById(id).innerHTML = h
- }
-
- var discussion = document.getElementById('discussion')
- , discussionToggle = document.getElementById('discussion-toggle')
- , hidden = true
- discussionToggle.onclick = function() {
- hidden = !hidden
- discussion.style.display = hidden ? 'none' : 'block'
- discussionToggle.innerHTML = hidden ? '↓ show discussion ↓' : '↑ hide discussion ↑'
- SJS.request({uri: 'http://bohodev.net:8000/comments/{{filename}}'}, function(err, body) {
- html('comments', body)
- })
- }
-}
-{{/comments}}
+;(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s)
+})()
+{{#comments}}
+
+
+
+{{/comments}}
+
+
+
+ sjs' blog
{{#previous}}
← {{title}}
@@ -64,22 +49,35 @@ function ready() {
{{/next}}
-
{{#comments}}
-