jsduck 3.8.2 → 3.8.3

data/Rakefile

@@ -17,12 +17,12 @@ def load_sdk_vars
   else
     puts "Error: sdk-vars.rb not found."
     puts
-    puts "Please create file sdk-vars.rb and define constants SDK_DIR and OUT_DIR in it."
-    puts
-    puts "For example:"
+    puts "Please create file sdk-vars.rb and define in it:"
     puts
     puts "    # path to Ext JS 4 build"
-    puts "    EXT_DIR='/path/to/ext-4.0.7'"
+    puts "    EXT_BUILD='/path/to/ext-4.0.7'"
+    puts "    # path to Touch 2 build"
+    puts "    TOUCH_BUILD='/path/to/touch-2.0.0'"
     puts "    # where to output the docs"
     puts "    OUT_DIR='/path/to/ouput/dir'"
     puts "    # path to SDK (for developers at Sencha)"
@@ -132,7 +132,7 @@ def compress
   system "mkdir #{dir}/extjs"
   system "cp template/extjs/ext-all.js #{dir}/extjs"
   system "mkdir -p #{dir}/extjs/resources/themes/images"
-  system "cp -r #{EXT_DIR}/resources/themes/images/default #{dir}/extjs/resources/themes/images"
+  system "cp -r #{EXT_BUILD}/resources/themes/images/default #{dir}/extjs/resources/themes/images"
 end
 
 
@@ -140,10 +140,6 @@ class JsDuckRunner
   def initialize
     @options = []
     load_sdk_vars
-    @sdk_dir = SDK_DIR
-    @out_dir = OUT_DIR
-    @ext_dir = EXT_DIR
-    @animator_dir = ANIMATOR_DIR
   end
 
   def add_options(options)
@@ -168,14 +164,14 @@ class JsDuckRunner
 
   # For export of ExtJS, reference extjs from the parent dir
   def make_extjs_path_relative
-    ["#{@out_dir}/index.html"].each do |file|
+    ["#{OUT_DIR}/index.html"].each do |file|
       out = []
       IO.read(file).each_line do |line|
         out << line.sub(/(src|href)="extjs\//, '\1="../')
       end
       File.open(file, 'w') {|f| f.write(out) }
     end
-    system "rm -rf #{@out_dir}/extjs"
+    system "rm -rf #{OUT_DIR}/extjs"
   end
 
   def add_ext4
@@ -184,10 +180,10 @@ class JsDuckRunner
       "--footer", "Ext JS 4.0 Docs - Generated with <a href='https://github.com/senchalabs/jsduck'>JSDuck</a> VERSION. <a href='http://www.sencha.com/legal/terms-of-use/'>Terms of Use</a>",
       "--ignore-global",
       "--no-warnings",
-      "--images", "#{@ext_dir}/docs/doc-resources",
+      "--images", "#{EXT_BUILD}/docs/doc-resources",
       "--local-storage-db", "ext-4",
-      "--output", "#{@out_dir}",
-      "#{@ext_dir}/src",
+      "--output", "#{OUT_DIR}",
+      "#{EXT_BUILD}/src",
     ]
   end
 
@@ -274,6 +270,10 @@ class JsDuckRunner
               text: 'Ext JS 3',
               href: 'http://docs.sencha.com/ext-js/3-4'
           },
+          {
+              text: 'Ext JS 2',
+              href: 'http://docs.sencha.com/ext-js/2-3'
+          },
           {
               text: 'Sencha Touch 2',
               href: 'http://docs.sencha.com/touch/2-0'
@@ -302,12 +302,12 @@ class JsDuckRunner
   end
 
   def copy_extjs_build
-    system "cp -r #{@ext_dir} #{@out_dir}/extjs-build"
+    system "cp -r #{EXT_BUILD} #{OUT_DIR}/extjs-build"
   end
 
   # Copy over Sencha Touch
   def copy_touch2_build
-    system "cp -r #{@sdk_dir}/touch/build #{@out_dir}/touch"
+    system "cp -r #{TOUCH_BUILD} #{OUT_DIR}/touch"
   end
 
   def run
@@ -397,6 +397,23 @@ task :ext3, [:mode] => :sass do |t, args|
   runner.run
 end
 
+desc "Run JSDuck on official Ext JS 2.3 build\n" +
+     "ext2             - creates debug/development version\n" +
+     "ext2[export]     - creates export/deployable version\n"
+     "ext2[live]       - creates live version for deployment\n"
+task :ext2, [:mode] => :sass do |t, args|
+  mode = args[:mode] || "debug"
+  throw "Unknown mode #{mode}" unless ["debug", "export", "live"].include?(mode)
+  compress if mode == "export"
+
+  runner = JsDuckRunner.new
+  runner.add_options ["--output", OUT_DIR, "--config", "#{SDK_DIR}/../ext-2-source/doc-config.json"]
+  runner.add_debug if mode == "debug"
+  runner.add_seo if mode == "live"
+  runner.add_google_analytics if mode == "live"
+  runner.run
+end
+
 desc "Run JSDuck on Sencha Touch (for internal use at Sencha)\n" +
      "touch       - creates debug/development version\n" +
      "touch[live] - create live version for deployment\n"
@@ -475,7 +492,7 @@ task :senchaio, [:mode] => :sass do |t, args|
   compress if mode == "live"
 
   runner = JsDuckRunner.new
-  runner.add_options ["--output", OUT_DIR, "--config", "#{SDK_DIR}/../sync/docs/config.json"]
+  runner.add_options ["--output", OUT_DIR, "--config", "#{SDK_DIR}/../client-framework/docs/config.json"]
   runner.add_debug if mode == "debug"
   runner.add_seo if mode == "debug" || mode == "live"
   runner.add_google_analytics if mode == "live"

data/jsduck.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.5"
 
   s.name = 'jsduck'
-  s.version = '3.8.2'
-  s.date = '2012-03-29'
+  s.version = '3.8.3'
+  s.date = '2012-04-05'
   s.summary = "Simple JavaScript Duckumentation generator"
   s.description = "Documentation generator for Sencha JS frameworks"
   s.homepage = "https://github.com/senchalabs/jsduck"

data/lib/jsduck/file_categories.rb

@@ -13,7 +13,7 @@ module JsDuck
 
       # Don't crash if old syntax is used.
       if @categories.is_a?(Hash) && @categories["categories"]
-        Logger.instance.warn(:old_cat_format, 'Update categories file to contain just the array inside {"categories": [...]}')
+        Logger.instance.warn(nil, 'Update categories file to contain just the array inside {"categories": [...]}')
         @categories = @categories["categories"]
       end
 

data/lib/jsduck/json_duck.rb

@@ -34,7 +34,12 @@ module JsDuck
 
     # Reads and parses JSON from file
     def self.read(filename)
-      self.parse(JsDuck::IO.read(filename))
+      begin
+        self.parse(JsDuck::IO.read(filename))
+      rescue
+        puts "Oh noes!  #{filename} is not a valid JSON file."
+        exit(1)
+      end
     end
 
     # Parses JSON string

data/lib/jsduck/options.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 require 'jsduck/meta_tag_registry'
 require 'jsduck/logger'
-require 'jsduck/io'
+require 'jsduck/json_duck'
 
 module JsDuck
 
@@ -73,7 +73,7 @@ module JsDuck
       ]
       @meta_tag_paths = []
 
-      @version = "3.8.2"
+      @version = "3.8.3"
 
       # Customizing output
       @title = "Sencha Docs - Ext JS"
@@ -349,7 +349,12 @@ module JsDuck
         opts.on('--config=PATH',
           "Loads config options from JSON file.", " ") do |path|
           path = canonical(path)
-          config = read_json_config(path)
+          if File.exists?(path)
+            config = read_json_config(path)
+          else
+            puts "Oh noes!  The config file #{path} doesn't exist."
+            exit(1)
+          end
           # treat paths inside JSON config relative to the location of
           # config file.  When done, switch back to current working dir.
           @working_dir = File.dirname(path)
@@ -447,7 +452,7 @@ module JsDuck
 
     # Extracts files of first build in jsb file
     def extract_jsb_files(jsb_file)
-      json = JSON.parse(JsDuck::IO.read(jsb_file))
+      json = JsonDuck::read(jsb_file)
       basedir = File.dirname(jsb_file)
 
       return json["builds"][0]["packages"].map do |package_id|

data/opt/comments-server-side/app.js

@@ -19,10 +19,8 @@
  *
  */
 
-config = require('./config');
-mongoose = require('mongoose');
+var config = require('./config');
 require('./database');
-require('express-namespace');
 
 var mysql = require('mysql'),
     client = mysql.createClient({
@@ -32,328 +30,334 @@ var mysql = require('mysql'),
         database: config.db.dbName
     }),
     express = require('express'),
-    connect = require('connect'),
-    MongoStore = require('connect-session-mongo'),
+    MongoStore = require('connect-mongo'),
     _ = require('underscore'),
     ForumUser = require('./ForumUser').ForumUser,
     forumUser = new ForumUser(client),
     util = require('./util'),
-    crypto = require('crypto');
+    crypto = require('crypto'),
+    mongoose = require('mongoose');
 
+var app = express();
 
-var app = express.createServer(
+app.configure(function() {
 
     // Headers for Cross Origin Resource Sharing (CORS)
-    function (req, res, next) {
+    app.use(function (req, res, next) {
         res.setHeader('Access-Control-Allow-Origin', '*');
         res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
         res.setHeader('Access-Control-Allow-Headers', 'X-Requested-With, X-HTTP-Method-Override, Content-Type, Accept');
         next();
-    },
+    });
 
-    express.cookieParser(),
+    app.use(express.cookieParser(config.sessionSecret));
 
     // Hack to set session cookie if session ID is set as a URL param.
     // This is because not all browsers support sending cookies via CORS
-    function(req, res, next) {
-        if (req.query.sid) {
+    app.use(function(req, res, next) {
+        if (req.query.sid && req.query.sid != 'null') {
             var sid = req.query.sid.replace(/ /g, '+');
-            req.cookies = req.cookies || {};
-            req.cookies['sencha_docs'] = sid;
+            req.sessionID = sid;
+            req.signedCookies = req.signedCookies || {};
+            req.signedCookies['sencha_docs'] = sid;
         }
         next();
-    },
+    });
 
     // Use MongoDB for session storage
-    connect.session({ store: new MongoStore, secret: config.sessionSecret, key: 'sencha_docs' }),
-
-    function(req, res, next) {
+    app.use(express.session({
+        secret: config.sessionSecret,
+        key: 'sencha_docs',
+        store: new MongoStore({
+            url: exports.mongoDb + "/sessions"
+        })
+    }));
+
+    app.use(function(req, res, next) {
         // IE doesn't get content-type, so default to form encoded.
         if (!req.headers['content-type']) {
             req.headers['content-type'] = 'application/x-www-form-urlencoded';
         }
         next();
-    },
-    express.bodyParser(),
-    express.methodOverride()
-);
+    });
 
-app.enable('jsonp callback');
+    app.use(express.bodyParser());
+    app.use(express.methodOverride());
 
-// All URLs start with /auth
-app.namespace('/auth', function(){
+    app.enable('jsonp callback');
+});
 
-    /**
-     * Authentication
-     */
+app.configure('development', function(){
+    app.use(express.logger('dev'));
+    app.use(express.errorHandler());
+});
 
-    app.get('/session', function(req, res) {
-        var result = req.session && req.session.user && forumUser.clientUser(req.session.user);
-        res.json(result || false);
-    });
+/**
+ * Authentication
+ */
 
-    app.post('/login', function(req, res){
+app.get('/auth/session', function(req, res) {
+    var result = req.session && req.session.user && forumUser.clientUser(req.session.user);
+    res.json(result || false);
+});
 
-        forumUser.login(req.body.username, req.body.password, function(err, result) {
+app.post('/auth/login', function(req, res){
 
-            if (err) {
-                res.json({ success: false, reason: err });
-                return;
-            }
+    forumUser.login(req.body.username, req.body.password, function(err, result) {
 
-            req.session = req.session || {};
-            req.session.user = result;
+        if (err) {
+            res.json({ success: false, reason: err });
+            return;
+        }
 
-            var response = _.extend(forumUser.clientUser(result), {
-                sessionID: req.sessionID,
-                success: true
-            });
+        req.session = req.session || {};
+        req.session.user = result;
 
-            res.json(response);
+        var response = _.extend(forumUser.clientUser(result), {
+            sessionID: req.sessionID,
+            success: true
         });
-    });
-
-    // Remove session
-    app.post('/logout', function(req, res){
-        req.session.user = null;
-        res.json({ success: true });
-    });
 
-    /**
-     * Handles comment unsubscription requests.
-     */
-    app.get('/unsubscribe/:subscriptionId', function(req, res) {
-
-        Subscription.findOne({ _id: req.params.subscriptionId }, function(err, subscription) {
-            if (err) throw(err);
-
-            if (subscription) {
-                if (req.query.all == 'true') {
-                    Subscription.remove({ userId: subscription.userId }, function(err) {
-                        res.send("You have been unsubscribed from all threads.");
-                    });
-                } else {
-                    Subscription.remove({ _id: req.params.subscriptionId }, function(err) {
-                        res.send("You have been unsubscribed from that thread.");
-                    });
-                }
-            } else {
-                res.send("You are already unsubscribed.");
-            }
-        });
+        res.json(response);
     });
-
 });
 
+// Remove session
+app.post('/auth/logout', function(req, res){
+    req.session.user = null;
+    res.json({ success: true });
+});
 
 /**
- * Commenting
+ * Handles comment unsubscription requests.
  */
-app.namespace('/auth/:sdk/:version', function(){
+app.get('/auth/unsubscribe/:subscriptionId', function(req, res) {
 
-    /**
-     * Returns a list of comments for a particular target (eg class, guide, video)
-     */
-    app.get('/comments', util.getCommentReads, function(req, res) {
+    Subscription.findOne({ _id: req.params.subscriptionId }, function(err, subscription) {
+        if (err) throw(err);
 
-        if (!req.query.startkey) {
-            res.json({error: 'Invalid request'});
-            return;
+        if (subscription) {
+            if (req.query.all == 'true') {
+                Subscription.remove({ userId: subscription.userId }, function(err) {
+                    res.send("You have been unsubscribed from all threads.");
+                });
+            } else {
+                Subscription.remove({ _id: req.params.subscriptionId }, function(err) {
+                    res.send("You have been unsubscribed from that thread.");
+                });
+            }
+        } else {
+            res.send("You are already unsubscribed.");
         }
-
-        Comment.find({
-            target: JSON.parse(req.query.startkey),
-            deleted: { '$ne': true },
-            sdk: req.params.sdk,
-            version: req.params.version
-        }).sort('createdAt', 1).run(function(err, comments){
-            res.json(util.scoreComments(comments, req));
-        });
     });
+});
 
-    /**
-     * Returns n most recent comments.
-     * Takes two parameters: offset and limit.
-     *
-     * The last comment object returned will contain `total_rows`,
-     * `offset` and `limit` fields. I'd say it's a hack, but at least
-     * it works for now.
-     */
-    app.get('/comments_recent', util.getCommentReads, function(req, res) {
-        var offset = parseInt(req.query.offset, 10) || 0;
-        var limit = parseInt(req.query.limit, 10) || 100;
-        var filter = {
-            deleted: { '$ne': true },
-            sdk: req.params.sdk,
-            version: req.params.version
-        };
-
-        if (req.query.hideRead && req.commentMeta.reads.length > 0) {
-            filter._id = { $nin: req.commentMeta.reads };
-        }
 
-        Comment.find(filter).sort('createdAt', -1).skip(offset).limit(limit).run(function(err, comments) {
-            comments = util.scoreComments(comments, req);
-            // Count all comments, store count to last comment
-            Comment.count(filter).run(function(err, count) {
-                var last = comments[comments.length-1];
-                last.total_rows = count;
-                last.offset = offset;
-                last.limit = limit;
-                res.json(comments);
-            });
-        });
-    });
+/**
+ * Commenting
+ */
 
-    /**
-     * Returns number of comments for each class/member,
-     * and a list of classes/members into which the user has subscribed.
-     */
-    app.get('/comments_meta', util.getCommentCounts, util.getCommentSubscriptions, function(req, res) {
-        res.send({ comments: req.commentCounts, subscriptions: req.commentSubscriptions || [] });
+/**
+ * Returns a list of comments for a particular target (eg class, guide, video)
+ */
+app.get('/auth/:sdk/:version/comments', util.getCommentReads, function(req, res) {
+
+    if (!req.query.startkey) {
+        res.json({error: 'Invalid request'});
+        return;
+    }
+
+    Comment.find({
+        target: JSON.parse(req.query.startkey),
+        deleted: { '$ne': true },
+        sdk: req.params.sdk,
+        version: req.params.version
+    }).sort('createdAt', 1).run(function(err, comments){
+        res.json(util.scoreComments(comments, req));
     });
+});
 
-    /**
-     * Returns an individual comment (used when editing a comment)
-     */
-    app.get('/comments/:commentId', util.findComment, function(req, res) {
-        res.json({ success: true, content: req.comment.content });
+/**
+ * Returns n most recent comments.
+ * Takes two parameters: offset and limit.
+ *
+ * The last comment object returned will contain `total_rows`,
+ * `offset` and `limit` fields. I'd say it's a hack, but at least
+ * it works for now.
+ */
+app.get('/auth/:sdk/:version/comments_recent', util.getCommentReads, function(req, res) {
+    var offset = parseInt(req.query.offset, 10) || 0;
+    var limit = parseInt(req.query.limit, 10) || 100;
+    var filter = {
+        deleted: { '$ne': true },
+        sdk: req.params.sdk,
+        version: req.params.version
+    };
+
+    if (req.query.hideRead && req.commentMeta.reads.length > 0) {
+        filter._id = { $nin: req.commentMeta.reads };
+    }
+
+    Comment.find(filter).sort('createdAt', -1).skip(offset).limit(limit).run(function(err, comments) {
+        comments = util.scoreComments(comments, req);
+        // Count all comments, store count to last comment
+        Comment.count(filter).run(function(err, count) {
+            var last = comments[comments.length-1];
+            last.total_rows = count;
+            last.offset = offset;
+            last.limit = limit;
+            res.json(comments);
+        });
     });
+});
 
-    /**
-     * Creates a new comment
-     */
-    app.post('/comments', util.requireLoggedInUser, function(req, res) {
-
-        var target = JSON.parse(req.body.target);
-
-        if (target.length === 2) {
-            target.push('');
-        }
-
-        var comment = new Comment({
-            author: req.session.user.username,
-            userId: req.session.user.userid,
-            content: req.body.comment,
-            action: req.body.action,
-            rating: Number(req.body.rating),
-            contentHtml: util.markdown(req.body.comment),
-            downVotes: [],
-            upVotes: [],
-            createdAt: new Date,
-            target: target,
-            emaiHash: crypto.createHash('md5').update(req.session.user.email).digest("hex"),
-            sdk: req.params.sdk,
-            version: req.params.version,
-            moderator: req.session.user.moderator,
-            title: req.body.title,
-            url: req.body.url
-        });
+/**
+ * Returns number of comments for each class/member,
+ * and a list of classes/members into which the user has subscribed.
+ */
+app.get('/auth/:sdk/:version/comments_meta', util.getCommentCounts, util.getCommentSubscriptions, function(req, res) {
+    res.send({ comments: req.commentCounts, subscriptions: req.commentSubscriptions || [] });
+});
 
-        comment.save(function(err, response) {
-            res.json({ success: true, id: response._id, action: req.body.action });
+/**
+ * Returns an individual comment (used when editing a comment)
+ */
+app.get('/auth/:sdk/:version/comments/:commentId', util.findComment, function(req, res) {
+    res.json({ success: true, content: req.comment.content });
+});
 
-            util.sendEmailUpdates(comment);
-        });
+/**
+ * Creates a new comment
+ */
+app.post('/auth/:sdk/:version/comments', util.requireLoggedInUser, function(req, res) {
+
+    var target = JSON.parse(req.body.target);
+
+    if (target.length === 2) {
+        target.push('');
+    }
+
+    var comment = new Comment({
+        author: req.session.user.username,
+        userId: req.session.user.userid,
+        content: req.body.comment,
+        action: req.body.action,
+        rating: Number(req.body.rating),
+        contentHtml: util.markdown(req.body.comment),
+        downVotes: [],
+        upVotes: [],
+        createdAt: new Date,
+        target: target,
+        emaiHash: crypto.createHash('md5').update(req.session.user.email).digest("hex"),
+        sdk: req.params.sdk,
+        version: req.params.version,
+        moderator: req.session.user.moderator,
+        title: req.body.title,
+        url: req.body.url
     });
 
-    /**
-     * Updates an existing comment (for voting or updating contents)
-     */
-    app.post('/comments/:commentId', util.requireLoggedInUser, util.findComment, function(req, res) {
-
-        var voteDirection,
-            comment = req.comment;
+    comment.save(function(err, response) {
+        res.json({ success: true, id: response._id, action: req.body.action });
 
-        if (req.body.vote) {
-            util.vote(req, res, comment);
-        } else {
-            util.requireOwner(req, res, function() {
-                comment.content = req.body.content;
-                comment.contentHtml = util.markdown(req.body.content);
-
-                comment.updates = comment.updates || [];
-                comment.updates.push({
-                    updatedAt: String(new Date()),
-                    author: req.session.user.username
-                });
+        util.sendEmailUpdates(comment);
+    });
+});
 
-                comment.save(function(err, response) {
-                    res.json({ success: true, content: comment.contentHtml });
-                });
+/**
+ * Updates an existing comment (for voting or updating contents)
+ */
+app.post('/auth/:sdk/:version/comments/:commentId', util.requireLoggedInUser, util.findComment, function(req, res) {
+
+    var voteDirection,
+        comment = req.comment;
+
+    if (req.body.vote) {
+        util.vote(req, res, comment);
+    } else {
+        util.requireOwner(req, res, function() {
+            comment.content = req.body.content;
+            comment.contentHtml = util.markdown(req.body.content);
+
+            comment.updates = comment.updates || [];
+            comment.updates.push({
+                updatedAt: String(new Date()),
+                author: req.session.user.username
             });
-        }
-    });
 
-    /**
-     * Deletes a comment
-     */
-    app.post('/comments/:commentId/delete', util.requireLoggedInUser, util.findComment, util.requireOwner, function(req, res) {
-        req.comment.deleted = true;
-        req.comment.save(function(err, response) {
-            res.send({ success: true });
+            comment.save(function(err, response) {
+                res.json({ success: true, content: comment.contentHtml });
+            });
         });
-    });
+    }
+});
 
-    /**
-     * Restores deleted comment
-     */
-    app.post('/comments/:commentId/undo_delete', util.requireLoggedInUser, util.findComment, util.requireOwner, util.getCommentReads, function(req, res) {
-        req.comment.deleted = false;
-        req.comment.save(function(err, response) {
-            res.send({ success: true, comment: util.scoreComments([req.comment], req)[0] });
-        });
+/**
+ * Deletes a comment
+ */
+app.post('/auth/:sdk/:version/comments/:commentId/delete', util.requireLoggedInUser, util.findComment, util.requireOwner, function(req, res) {
+    req.comment.deleted = true;
+    req.comment.save(function(err, response) {
+        res.send({ success: true });
     });
+});
 
-    /**
-     * Marks a comment 'read'
-     */
-    app.post('/comments/:commentId/read', util.requireLoggedInUser, util.findCommentMeta, function(req, res) {
-        req.commentMeta.metaType = 'read';
-        req.commentMeta.save(function(err, response) {
-            res.send({ success: true });
-        });
+/**
+ * Restores deleted comment
+ */
+app.post('/auth/:sdk/:version/comments/:commentId/undo_delete', util.requireLoggedInUser, util.findComment, util.requireOwner, util.getCommentReads, function(req, res) {
+    req.comment.deleted = false;
+    req.comment.save(function(err, response) {
+        res.send({ success: true, comment: util.scoreComments([req.comment], req)[0] });
     });
+});
 
-    /**
-     * Get email subscriptions
-     */
-    app.get('/subscriptions', util.getCommentSubscriptions, function(req, res) {
-        res.json({ subscriptions: req.commentMeta.subscriptions });
+/**
+ * Marks a comment 'read'
+ */
+app.post('/auth/:sdk/:version/comments/:commentId/read', util.requireLoggedInUser, util.findCommentMeta, function(req, res) {
+    req.commentMeta.metaType = 'read';
+    req.commentMeta.save(function(err, response) {
+        res.send({ success: true });
     });
+});
+
+/**
+ * Get email subscriptions
+ */
+app.get('/auth/:sdk/:version/subscriptions', util.getCommentSubscriptions, function(req, res) {
+    res.json({ subscriptions: req.commentMeta.subscriptions });
+});
 
-    /**
-     * Subscibe / unsubscribe to a comment thread
-     */
-    app.post('/subscribe', util.requireLoggedInUser, function(req, res) {
+/**
+ * Subscibe / unsubscribe to a comment thread
+ */
+app.post('/auth/:sdk/:version/subscribe', util.requireLoggedInUser, function(req, res) {
 
-        var subscriptionBody = {
-            sdk: req.params.sdk,
-            version: req.params.version,
-            target: JSON.parse(req.body.target),
-            userId: req.session.user.userid
-        };
+    var subscriptionBody = {
+        sdk: req.params.sdk,
+        version: req.params.version,
+        target: JSON.parse(req.body.target),
+        userId: req.session.user.userid
+    };
 
-        Subscription.findOne(subscriptionBody, function(err, subscription) {
+    Subscription.findOne(subscriptionBody, function(err, subscription) {
 
-            if (subscription && req.body.subscribed == 'false') {
+        if (subscription && req.body.subscribed == 'false') {
 
-                subscription.remove(function(err, ok) {
-                    res.send({ success: true });
-                });
+            subscription.remove(function(err, ok) {
+                res.send({ success: true });
+            });
 
-            } else if (!subscription && req.body.subscribed == 'true') {
+        } else if (!subscription && req.body.subscribed == 'true') {
 
-                subscription = new Subscription(subscriptionBody);
-                subscription.email = req.session.user.email;
+            subscription = new Subscription(subscriptionBody);
+            subscription.email = req.session.user.email;
 
-                subscription.save(function(err, ok) {
-                    res.send({ success: true });
-                });
-            }
-        });
+            subscription.save(function(err, ok) {
+                res.send({ success: true });
+            });
+        }
     });
-
 });
 
 var port = 3000;

data/opt/comments-server-side/database.js

@@ -1,6 +1,11 @@
+
 /**
  * Defines comment schema and connects to database
  */
+
+var mongoose = require('mongoose'),
+    config = require('./config');
+
 Comment = mongoose.model('Comment', new mongoose.Schema({
     sdk:         String,
     version:     String,
@@ -43,4 +48,6 @@ Meta = mongoose.model('Meta', new mongoose.Schema({
     metaType:    String
 }));
 
-mongoose.connect(config.mongoDb);
+mongoose.connect(config.mongoDb, function(err, ok) {
+    console.log("Connected to DB")
+});

data/opt/comments-server-side/package.json

@@ -4,10 +4,10 @@
   "description": "Commenting backend for JSDuck Documentation",
   "author": "Nick Poudlen <nick@sencha.com>",
   "dependencies": {
+    "express": "git://github.com/visionmedia/express.git",
+    "express-namespace": "",
     "connect": "",
     "connect-mongo": "",
-    "express": "",
-    "express-namespace": "",
     "marked": "",
     "mongoose": "",
     "mysql": "",
@@ -17,4 +17,3 @@
     "nodemailer": ""
   }
 }
-

data/opt/comments-server-side/util.js

@@ -2,7 +2,8 @@
 var marked = require('marked'),
     _ = require('underscore'),
     sanitizer = require('sanitizer'),
-    nodemailer = require("nodemailer");
+    nodemailer = require("nodemailer"),
+    mongoose = require('mongoose');
 
 /**
  * Converts Markdown-formatted comment text into HTML.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsduck
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 3.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &9961600 !ruby/object:Gem::Requirement
+  requirement: &9318620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9961600
+  version_requirements: *9318620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9961020 !ruby/object:Gem::Requirement
+  requirement: &9318020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9961020
+  version_requirements: *9318020
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &9960340 !ruby/object:Gem::Requirement
+  requirement: &9317460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9960340
+  version_requirements: *9317460
 description: Documentation generator for Sencha JS frameworks
 email: rene.saarsoo@sencha.com
 executables:
@@ -464,20 +464,12 @@ files:
 - template-min/extjs/resources/themes/images/default/form/text-bg.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-bottom-corners.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-right-sides.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-bottom-corners.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-right-sides.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-top-sides.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-left-sides.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-top-corners.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-left-corners.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-right-corners.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-top-corners.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-left-sides.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-bottom-sides.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-left-corners.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-right-corners.gif
 - template-min/extjs/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif
-- template-min/extjs/resources/themes/images/default/window-header/window-header-default-collapsed-top-sides.gif
 - template-min/extjs/resources/themes/images/default/tab-bar/scroll-left.gif
 - template-min/extjs/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif
 - template-min/extjs/resources/themes/images/default/tab-bar/scroll-right.gif