Skip to content

Commit

Permalink
Misc refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@tj
tj committed Jun 24, 2010
1 parent 1fa6a6c commit 8a8d6f3
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 34 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Expand Up @@ -10,8 +10,8 @@ uninstall:
rm -fr ~/.node_libraries/dox rm -fr ~/.node_libraries/dox


docs: uninstall install docs: uninstall install
dox --title "Dox Example" \ dox --title "Dox" \
--desc "This is an example using _dox_, how **cool!**" \ --desc "JavaScript documentation parser for [node](http://ndoejs.org)." \
lib/*.js > docs.html lib/*.js > docs.html


.PHONY: install uninstall docs .PHONY: install uninstall docs
83 changes: 55 additions & 28 deletions docs.html
View file
@@ -1,14 +1,13 @@
<html> <html>
<head> <head>
<title>Dox Example</title> <title>Dox</title>
<style>body { <style>body {
margin: 0; margin: 0;
padding: 0; padding: 0;
font: 14px/1.5 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif; font: 14px/1.5 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
color: #252519; color: #252519;
} }
a { a {
text-decoration: none;
color: #252519; color: #252519;
} }
a:hover { a:hover {
Expand Down Expand Up @@ -48,6 +47,7 @@
border-bottom: none; border-bottom: none;
} }
ul#menu li a { ul#menu li a {
text-decoration: none;
font-size: 12px; font-size: 12px;
color: rgba(0,0,0,0.5); color: rgba(0,0,0,0.5);
} }
Expand All @@ -60,7 +60,7 @@
border-collapse: collapse; border-collapse: collapse;
} }
table#source td:first-child { table#source td:first-child {
padding: 30px 0 30px 40px; padding: 30px 40px 30px 40px;
vertical-align: top; vertical-align: top;
} }
table#source td:first-child, table#source td:first-child,
Expand Down Expand Up @@ -121,7 +121,7 @@
code .this { color: #19469D; }</style> code .this { color: #19469D; }</style>
</head> </head>
<body> <body>
<ul id="menu"><li><a href="#lib/index.js">lib/<strong>index</strong></a></li></ul><table id="source"><tbody><tr><td><h1>Dox Example</h1><p>This is an example using <em>dox</em>, how <strong>cool!</strong></p>@��</td><td></td></tr><tr class="filename"><td><h2 id="lib/index.js">index</h2></td><td>lib/index.js</td></tr><tr class="code"> <ul id="menu"><li><a href="#lib/index.js">lib/<strong>index</strong></a></li></ul><table id="source"><tbody><tr><td><h1>Dox</h1><p>JavaScript documentation parser for <a href="http://ndoejs.org">node</a>.</p> </td><td></td></tr><tr class="filename"><td><h2 id="lib/index.js">index</h2></td><td>lib/index.js</td></tr><tr class="code">
<td class="docs"> <td class="docs">
<p>Module dependencies.</p> <p>Module dependencies.</p>
</td> </td>
Expand Down Expand Up @@ -172,12 +172,12 @@
</td> </td>
<td class="code"> <td class="code">
<pre><code><span class="keyword">var</span> <span class="variable">usage</span> = <span class="string">''</span> <pre><code><span class="keyword">var</span> <span class="variable">usage</span> = <span class="string">''</span>
+ <span class="string">'Usage: dox [options] <file ...>\n'</span> + <span class="string">'Usage: dox [options] &lt;file ...&gt;\n'</span>
+ <span class="string">'\n'</span> + <span class="string">'\n'</span>
+ <span class="string">'Options:\n'</span> + <span class="string">'Options:\n'</span>
+ <span class="string">' -t, --title Project title\n'</span> + <span class="string">' -t, --title Project title\n'</span>
+ <span class="string">' -d, --desc Project description (markdown)\n'</span> + <span class="string">' -d, --desc Project description (markdown)\n'</span>
+ <span class="string">' -s, --style Document style, available: ["default"]\n'</span> + <span class="string">' -s, --style Document style, available: [&quot;default&quot;]\n'</span>
+ <span class="string">' -J, --no-jsdoc Disable jsdoc parsing (coverts to markdown)\n'</span> + <span class="string">' -J, --no-jsdoc Disable jsdoc parsing (coverts to markdown)\n'</span>
+ <span class="string">' -h, --help Display help information'</span> + <span class="string">' -h, --help Display help information'</span>
+ <span class="string">'\n'</span>;</code></pre> + <span class="string">'\n'</span>;</code></pre>
Expand All @@ -191,7 +191,7 @@
<li><strong>param</strong>: <em>String</em> msg</li> <li><strong>param</strong>: <em>String</em> msg</li>
<li><strong>api</strong>: <em>private</em></li> <li><strong>api</strong>: <em>private</em></li>
</ul> </ul>

</td> </td>
<td class="code"> <td class="code">
<pre><code><span class="keyword">function</span> <span class="variable">log</span>(<span class="variable">msg</span>){ <pre><code><span class="keyword">function</span> <span class="variable">log</span>(<span class="variable">msg</span>){
Expand Down Expand Up @@ -267,14 +267,14 @@


<span class="comment">// Navigation</span> <span class="comment">// Navigation</span>
<span class="variable">log</span>(<span class="string">'generating navigation'</span>); <span class="variable">log</span>(<span class="string">'generating navigation'</span>);
<span class="keyword">var</span> <span class="variable">menu</span> = <span class="string">'<ul id="menu">'</span> + <span class="variable">files</span>.<span class="variable">map</span>(<span class="keyword">function</span>(<span class="variable">file</span>){ <span class="keyword">var</span> <span class="variable">menu</span> = <span class="string">'&lt;ul id=&quot;menu&quot;&gt;'</span> + <span class="variable">files</span>.<span class="variable">map</span>(<span class="keyword">function</span>(<span class="variable">file</span>){
<span class="keyword">var</span> <span class="variable">basename</span> = <span class="variable">path</span>.<span class="variable">basename</span>(<span class="variable">file</span>, <span class="string">'.js'</span>), <span class="keyword">var</span> <span class="variable">basename</span> = <span class="variable">path</span>.<span class="variable">basename</span>(<span class="variable">file</span>, <span class="string">'.js'</span>),
<span class="variable">title</span> = <span class="variable">file</span>.<span class="variable">replace</span>(<span class="variable">basename</span>, <span class="string">'<strong>'</span> + <span class="variable">basename</span> + <span class="string">'</strong>'</span>).<span class="variable">replace</span>(<span class="string">'.js'</span>, <span class="string">''</span>); <span class="variable">title</span> = <span class="variable">file</span>.<span class="variable">replace</span>(<span class="variable">basename</span>, <span class="string">'&lt;strong&gt;'</span> + <span class="variable">basename</span> + <span class="string">'&lt;/strong&gt;'</span>).<span class="variable">replace</span>(<span class="string">'.js'</span>, <span class="string">''</span>);
<span class="keyword">return</span> <span class="string">'<li><a href="#'</span> + <span class="variable">file</span> + <span class="string">'">'</span> + <span class="variable">title</span> + <span class="string">'</a></li>'</span> <span class="keyword">return</span> <span class="string">'&lt;li&gt;&lt;a href=&quot;#'</span> + <span class="variable">file</span> + <span class="string">'&quot;&gt;'</span> + <span class="variable">title</span> + <span class="string">'&lt;/a&gt;&lt;/li&gt;'</span>
}).<span class="variable">join</span>(<span class="string">'\n'</span>) + <span class="string">'</ul>'</span>; }).<span class="variable">join</span>(<span class="string">'\n'</span>) + <span class="string">'&lt;/ul&gt;'</span>;


<span class="variable">sys</span>.<span class="variable">print</span>(<span class="variable">head</span>, <span class="variable">menu</span>); <span class="variable">sys</span>.<span class="variable">print</span>(<span class="variable">head</span>, <span class="variable">menu</span>);
<span class="variable">sys</span>.<span class="variable">print</span>(<span class="string">'<table id="source"><tbody>'</span>); <span class="variable">sys</span>.<span class="variable">print</span>(<span class="string">'&lt;table id=&quot;source&quot;&gt;&lt;tbody&gt;'</span>);


<span class="comment">// Render files</span> <span class="comment">// Render files</span>
<span class="keyword">var</span> <span class="variable">first</span> = <span class="variable">true</span>; <span class="keyword">var</span> <span class="variable">first</span> = <span class="variable">true</span>;
Expand All @@ -284,14 +284,14 @@
<span class="keyword">if</span> (<span class="variable">err</span>) <span class="keyword">throw</span> <span class="variable">err</span>; <span class="keyword">if</span> (<span class="variable">err</span>) <span class="keyword">throw</span> <span class="variable">err</span>;
<span class="keyword">if</span> (<span class="variable">first</span>) { <span class="keyword">if</span> (<span class="variable">first</span>) {
<span class="keyword">if</span> (<span class="variable">desc</span>) <span class="variable">desc</span> = <span class="variable">markdown</span>.<span class="variable">parse</span>(<span class="variable">desc</span>); <span class="keyword">if</span> (<span class="variable">desc</span>) <span class="variable">desc</span> = <span class="variable">markdown</span>.<span class="variable">parse</span>(<span class="variable">desc</span>);
<span class="variable">sys</span>.<span class="variable">print</span>(<span class="string">'<tr><td><h1>'</span> + <span class="variable">title</span> + <span class="string">'</h1>'</span> + <span class="variable">desc</span> + <span class="string">'</td><td></td></tr>'</span>); <span class="variable">sys</span>.<span class="variable">print</span>(<span class="string">'&lt;tr&gt;&lt;td&gt;&lt;h1&gt;'</span> + <span class="variable">title</span> + <span class="string">'&lt;/h1&gt;'</span> + <span class="variable">desc</span> + <span class="string">'&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;'</span>);
<span class="variable">first</span> = <span class="variable">false</span>; <span class="variable">first</span> = <span class="variable">false</span>;
} }
<span class="variable">sys</span>.<span class="variable">print</span>(<span class="string">'<tr class="filename"><td><h2 id="'</span> + <span class="variable">file</span> + <span class="string">'">'</span> <span class="variable">sys</span>.<span class="variable">print</span>(<span class="string">'&lt;tr class=&quot;filename&quot;&gt;&lt;td&gt;&lt;h2 id=&quot;'</span> + <span class="variable">file</span> + <span class="string">'&quot;&gt;'</span>
+ <span class="variable">path</span>.<span class="variable">basename</span>(<span class="variable">file</span>, <span class="string">'.js'</span>) + <span class="string">'</h2></td><td>'</span> + <span class="variable">path</span>.<span class="variable">basename</span>(<span class="variable">file</span>, <span class="string">'.js'</span>) + <span class="string">'&lt;/h2&gt;&lt;/td&gt;&lt;td&gt;'</span>
+ <span class="variable">file</span> + <span class="string">'</td></tr>'</span>); + <span class="variable">file</span> + <span class="string">'&lt;/td&gt;&lt;/tr&gt;'</span>);
<span class="variable">sys</span>.<span class="variable">print</span>(<span class="variable">render</span>(<span class="variable">str</span>)); <span class="variable">sys</span>.<span class="variable">print</span>(<span class="variable">render</span>(<span class="variable">str</span>));
--<span class="variable">pending</span> || <span class="variable">sys</span>.<span class="variable">print</span>(<span class="variable">foot</span>, <span class="string">'</tbody></table>'</span>); --<span class="variable">pending</span> || <span class="variable">sys</span>.<span class="variable">print</span>(<span class="variable">foot</span>, <span class="string">'&lt;/tbody&gt;&lt;/table&gt;'</span>);
}); });
}); });


Expand All @@ -310,15 +310,15 @@
<li><strong>return</strong>: <em>String</em> undefined</li> <li><strong>return</strong>: <em>String</em> undefined</li>
<li><strong>api</strong>: <em>public</em></li> <li><strong>api</strong>: <em>public</em></li>
</ul> </ul>

</td> </td>
<td class="code"> <td class="code">
<pre><code><span class="keyword">var</span> <span class="variable">render</span> = <span class="variable">exports</span>.<span class="variable">render</span> = <span class="keyword">function</span>(<span class="variable">str</span>){ <pre><code><span class="keyword">var</span> <span class="variable">render</span> = <span class="variable">exports</span>.<span class="variable">render</span> = <span class="keyword">function</span>(<span class="variable">str</span>){
<span class="keyword">var</span> <span class="variable">parts</span> = <span class="variable">str</span>.<span class="variable">split</span>(<span class="regexp">/\s*\/</span>\*([^]+?)\*\<span class="regexp">/\s*/g</span>), <span class="keyword">var</span> <span class="variable">parts</span> = <span class="variable">str</span>.<span class="variable">split</span>(<span class="regexp">/\s*\/</span>\*([^]+?)\*\<span class="regexp">/\s*/g</span>),
<span class="variable">blocks</span> = []; <span class="variable">blocks</span> = [];


<span class="comment">// Populate blocks</span> <span class="comment">// Populate blocks</span>
<span class="keyword">for</span> (<span class="keyword">var</span> <span class="variable">i</span> = <span class="number integer">0</span>, <span class="variable">len</span> = <span class="variable">parts</span>.<span class="variable">length</span>; <span class="variable">i</span> < <span class="variable">len</span>; ++<span class="variable">i</span>) { <span class="keyword">for</span> (<span class="keyword">var</span> <span class="variable">i</span> = <span class="number integer">0</span>, <span class="variable">len</span> = <span class="variable">parts</span>.<span class="variable">length</span>; <span class="variable">i</span> &<span class="variable">lt</span>; <span class="variable">len</span>; ++<span class="variable">i</span>) {
<span class="keyword">var</span> <span class="variable">part</span> = <span class="variable">parts</span>[<span class="variable">i</span>], <span class="keyword">var</span> <span class="variable">part</span> = <span class="variable">parts</span>[<span class="variable">i</span>],
<span class="variable">next</span> = <span class="variable">parts</span>[<span class="variable">i</span> + <span class="number integer">1</span>] || <span class="string">''</span>; <span class="variable">next</span> = <span class="variable">parts</span>[<span class="variable">i</span> + <span class="number integer">1</span>] || <span class="string">''</span>;
<span class="comment">// Empty</span> <span class="comment">// Empty</span>
Expand All @@ -331,22 +331,22 @@
++<span class="variable">i</span>; ++<span class="variable">i</span>;
<span class="keyword">var</span> <span class="variable">part</span> = <span class="variable">part</span>.<span class="variable">replace</span>(<span class="regexp">/^ *\* ?/gm</span>, <span class="string">''</span>); <span class="keyword">var</span> <span class="variable">part</span> = <span class="variable">part</span>.<span class="variable">replace</span>(<span class="regexp">/^ *\* ?/gm</span>, <span class="string">''</span>);
<span class="variable">blocks</span>.<span class="variable">push</span>({ <span class="variable">blocks</span>.<span class="variable">push</span>({
<span class="variable">comment</span>: <span class="variable">markdown</span>.<span class="variable">parse</span>(<span class="variable">jsdocToMarkdown</span>(<span class="variable">part</span>)), <span class="variable">comment</span>: <span class="variable">markdown</span>.<span class="variable">parse</span>(<span class="variable">jsdocToMarkdown</span>(<span class="variable">escape</span>(<span class="variable">part</span>))),
<span class="variable">code</span>: <span class="variable">koala</span>.<span class="variable">render</span>(<span class="string">'.js'</span>, <span class="variable">next</span>) <span class="variable">code</span>: <span class="variable">koala</span>.<span class="variable">render</span>(<span class="string">'.js'</span>, <span class="variable">escape</span>(<span class="variable">next</span>))
}); });
} }
} }


<span class="comment">// Generate html</span> <span class="comment">// Generate html</span>
<span class="keyword">var</span> <span class="variable">html</span> = []; <span class="keyword">var</span> <span class="variable">html</span> = [];
<span class="keyword">for</span> (<span class="keyword">var</span> <span class="variable">i</span> = <span class="number integer">0</span>, <span class="variable">len</span> = <span class="variable">blocks</span>.<span class="variable">length</span>; <span class="variable">i</span> < <span class="variable">len</span>; ++<span class="variable">i</span>) { <span class="keyword">for</span> (<span class="keyword">var</span> <span class="variable">i</span> = <span class="number integer">0</span>, <span class="variable">len</span> = <span class="variable">blocks</span>.<span class="variable">length</span>; <span class="variable">i</span> &<span class="variable">lt</span>; <span class="variable">len</span>; ++<span class="variable">i</span>) {
<span class="keyword">var</span> <span class="variable">block</span> = <span class="variable">blocks</span>[<span class="variable">i</span>]; <span class="keyword">var</span> <span class="variable">block</span> = <span class="variable">blocks</span>[<span class="variable">i</span>];
<span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'<tr class="code">'</span>); <span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'&lt;tr class=&quot;code&quot;&gt;'</span>);
<span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'<td class="docs">'</span>, <span class="variable">block</span>.<span class="variable">comment</span> || <span class="string">''</span>, <span class="string">'</td>'</span>); <span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'&lt;td class=&quot;docs&quot;&gt;'</span>, <span class="variable">block</span>.<span class="variable">comment</span> || <span class="string">''</span>, <span class="string">'&lt;/td&gt;'</span>);
<span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'<td class="code">'</span>, <span class="variable">block</span>.<span class="variable">code</span> <span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'&lt;td class=&quot;code&quot;&gt;'</span>, <span class="variable">block</span>.<span class="variable">code</span>
? <span class="string">'<pre><code>'</span> + <span class="variable">block</span>.<span class="variable">code</span> + <span class="string">'</code></pre>'</span> ? <span class="string">'&lt;pre&gt;&lt;code&gt;'</span> + <span class="variable">block</span>.<span class="variable">code</span> + <span class="string">'&lt;/code&gt;&lt;/pre&gt;'</span>
: <span class="string">''</span>, <span class="string">'</td>'</span>); : <span class="string">''</span>, <span class="string">'&lt;/td&gt;'</span>);
<span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'</tr>'</span>); <span class="variable">html</span>.<span class="variable">push</span>(<span class="string">'&lt;/tr&gt;'</span>);
} }


<span class="keyword">return</span> <span class="variable">html</span>.<span class="variable">join</span>(<span class="string">'\n'</span>); <span class="keyword">return</span> <span class="variable">html</span>.<span class="variable">join</span>(<span class="string">'\n'</span>);
Expand Down Expand Up @@ -374,5 +374,32 @@
.<span class="variable">replace</span>(<span class="regexp">/^ *@(\w+) *(\w+)/gm</span>, <span class="string">'- **$1**: _$2_'</span>); .<span class="variable">replace</span>(<span class="regexp">/^ *@(\w+) *(\w+)/gm</span>, <span class="string">'- **$1**: _$2_'</span>);
}</code></pre> }</code></pre>
</td> </td>
</tr>
<tr class="code">
<td class="docs">
<p>Escape the given string of html.</p>

<h2>Example</h2>

<pre><code>escape('&amp;lt;foo&amp;gt;');
// =&amp;gt; &amp;quot;&amp;amp;lt;foo&amp;amp;gt;&amp;quot;
</code></pre>

<ul>
<li><strong>param</strong>: <em>String</em> html</li>
<li><strong>return</strong>: <em>String</em> undefined</li>
<li><strong>api</strong>: <em>private</em></li>
</ul>

</td>
<td class="code">
<pre><code><span class="keyword">function</span> <span class="variable">escape</span>(<span class="variable">html</span>){
<span class="keyword">return</span> <span class="class">String</span>(<span class="variable">html</span>)
.<span class="variable">replace</span>(<span class="regexp">/&amp;/g</span>, <span class="string">'&amp;amp;'</span>)
.<span class="variable">replace</span>(<span class="regexp">/&lt;/g</span>, <span class="string">'&amp;lt;'</span>)
.<span class="variable">replace</span>(<span class="regexp">/&gt;/g</span>, <span class="string">'&amp;gt;'</span>)
.<span class="variable">replace</span>(<span class="regexp">/&quot;/g</span>, <span class="string">'&amp;quot;'</span>);
}</code></pre>
</td>
</tr> </body> </tr> </body>
</html></tbody></table> </html></tbody></table>
25 changes: 23 additions & 2 deletions lib/index.js
View file
Expand Up @@ -189,8 +189,8 @@ var render = exports.render = function(str){
++i; ++i;
var part = part.replace(/^ *\* ?/gm, ''); var part = part.replace(/^ *\* ?/gm, '');
blocks.push({ blocks.push({
comment: markdown.parse(jsdocToMarkdown(part)), comment: markdown.parse(jsdocToMarkdown(escape(part))),
code: koala.render('.js', next) code: koala.render('.js', escape(next))
}); });
} }
} }
Expand Down Expand Up @@ -225,4 +225,25 @@ function jsdocToMarkdown(str) {
return '- **' + key + '**: _' + type.split(/ *[|\/] */).join(' | ') + '_ ' + desc; return '- **' + key + '**: _' + type.split(/ *[|\/] */).join(' | ') + '_ ' + desc;
}) })
.replace(/^ *@(\w+) *(\w+)/gm, '- **$1**: _$2_'); .replace(/^ *@(\w+) *(\w+)/gm, '- **$1**: _$2_');
}

/**
* Escape the given string of html.
*
* Example:
*
* escape('<foo>');
* // => "&lt;foo&gt;"
*
* @param {String} html
* @return {String}
* @api private
*/

function escape(html){
return String(html)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
} }
4 changes: 2 additions & 2 deletions lib/styles/default/style.css
View file
Expand Up @@ -5,7 +5,6 @@ body {
color: #252519; color: #252519;
} }
a { a {
text-decoration: none;
color: #252519; color: #252519;
} }
a:hover { a:hover {
Expand Down Expand Up @@ -45,6 +44,7 @@ ul#menu li:last-child {
border-bottom: none; border-bottom: none;
} }
ul#menu li a { ul#menu li a {
text-decoration: none;
font-size: 12px; font-size: 12px;
color: rgba(0,0,0,0.5); color: rgba(0,0,0,0.5);
} }
Expand All @@ -57,7 +57,7 @@ table#source {
border-collapse: collapse; border-collapse: collapse;
} }
table#source td:first-child { table#source td:first-child {
padding: 30px 0 30px 40px; padding: 30px 40px 30px 40px;
vertical-align: top; vertical-align: top;
} }
table#source td:first-child, table#source td:first-child,
Expand Down

0 comments on commit 8a8d6f3

Please sign in to comment.