Merge branch 'feature/dash-update'

neogeek · neogeek · commit 962452ee8f87 · 2014-12-12T00:17:24.000-05:00
diff --git a/lib/utils.js b/lib/utils.js
@@ -17,10 +17,23 @@ module.exports.buildDashDocSet = function (input) {
 
         input.uid = module.exports.formatStringForUID(input.title);
 
-        zip.addFile(
-            input.title + '.docset/Contents/Resources/Documents/index.html',
-            require('../templates/dash/index.hbs')(input)
-        );
+        input.files.forEach(function (file) {
+
+            file.methods.forEach(function (method) {
+
+                if (!method.ignore && method.ctx) {
+
+                    zip.addFile(
+                        input.title + '.docset/Contents/Resources/Documents/' + method.ctx.uid + '.html',
+                        require('../templates/dash/method.hbs')(method)
+                    );
+
+                }
+
+            });
+
+        });
+
 
         zip.addFile(
             input.title + '.docset/Contents/Info.plist',
@@ -53,7 +66,7 @@ module.exports.buildDashDocSet = function (input) {
                         db.run('INSERT OR IGNORE INTO searchIndex(name, type, path) VALUES ($name, $type, $path);', {
                             $name: hbs.helpers.formatName(method.ctx.string),
                             $type: method.ctx.type.replace(/^[a-z]/, function (match) { return match.toUpperCase(); }),
-                            $path: 'index.html#' + method.ctx.uid
+                            $path: method.ctx.uid + '.html'
                         });
 
                     }
@@ -117,29 +130,21 @@ module.exports.formatStringForUID = function (content) {
 
 module.exports.parseData = function (data, file) {
 
-    data.forEach(function (methods) {
+    data.forEach(function (method) {
 
-        if (methods.ctx) {
+        if (method.ctx) {
 
-            methods.ctx.uid = file + '-' + module.exports.formatStringForUID(methods.ctx.string);
+            method.ctx.uid = file + '-' + module.exports.formatStringForUID(method.ctx.string);
 
         }
 
-        if (methods.tags) {
-
-            methods.tags.forEach(function (tag) {
-
-                if (tag.types) {
-
-                    tag.types.forEach(function (type, index) {
-
-                        if (type.match(/\?/g)) {
+        if (method.tags) {
 
-                            tag.types[index] = type.replace(/\?/g, '');
+            method.tags.forEach(function (tag) {
 
-                        }
+                if (tag.name && tag.optional) {
 
-                    });
+                    tag.name = tag.name.replace(/^\[|\]$/g, '');
 
                 }
 
diff --git a/templates/dash/method.hbs b/templates/dash/method.hbs
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="initial-scale=1">
-<title>{{title}}</title>
+<title>{{formatName ctx.string}}</title>
 <link rel="stylesheet" href="resources/bootstrap/bootstrap.min.css">
 <link rel="stylesheet" href="resources/highlight.js/github.min.css">
 <style>
@@ -36,12 +36,6 @@ pre .hljs {
 
     <div class="wrap">
 
-        <h1>{{title}}{{#if description}} <small>{{description}}</small>{{/if}}</h1>
-
-        {{#each files}}
-
-        {{#each methods}}
-
         {{#unless ignore}}
 
         {{#if ctx}}
@@ -73,6 +67,7 @@ pre .hljs {
 
                 {{#ifCond type "param"}}
 
+                <a name="//apple_ref/cpp/Parameter/{{name}}" class="dashAnchor"></a>
                 <p>
                     <b>{{name}}</b>
                     {{#each types}}
@@ -106,6 +101,7 @@ pre .hljs {
 
                 {{#ifCond type "property"}}
 
+                <a name="//apple_ref/cpp/Property/{{name}}" class="dashAnchor"></a>
                 <p>
                     <b>{{name}}</b>
                     {{#each types}}
@@ -143,14 +139,6 @@ pre .hljs {
 
             </section>
 
-            <section class="code">
-
-                <h3>Code</h3>
-
-                <pre><code class="hljs">{{{highlightBlock code}}}</code></pre>
-
-            </section>
-
             <h3>Returns</h3>
 
             {{#each tags}}
@@ -169,10 +157,6 @@ pre .hljs {
 
         {{/unless}}
 
-        {{/each}}
-
-        {{/each}}
-
     </div>
 
 <footer class="bs-footer">
diff --git a/templates/dash/plist.hbs b/templates/dash/plist.hbs
@@ -6,9 +6,11 @@
     <string>{{uid}}</string>
     <key>CFBundleName</key>
     <string>{{title}}</string>
+    <key>DocSetPlatformFamily</key>
+    <string>{{uid}}</string>
     <key>isDashDocset</key>
     <true/>
-    <key>dashIndexFilePath</key>
-    <string>index.html</string>
+    <key>DashDocSetFamily</key>
+    <string>dashtoc</string>
 </dict>
 </plist>
