Owned bin urls

lib/db/mysql.js

@@ -392,5 +392,18 @@ module.exports = utils.inherit(Object, {
       }
       fn(null);
     });
+  },
+  isOwnerOf: function (params, fn) {
+    var values = [
+      params.name,
+      params.url
+    ], sql = templates.isOwnerOf;
+
+    this.connection.query(sql, values, function (err, result) {
+      if (err) {
+        return fn(err);
+      }
+      fn(null, { found: !!result.length, isowner: result.length ? result[0].owner === 1 : false });
+    });
   }
 });

lib/db/sql_templates.json

@@ -26,5 +26,6 @@
   "getUserForForgotToken": "SELECT `ownership`.*, expires FROM `ownership` INNER JOIN `forgot_tokens` ON `name` = `owner_name` WHERE `token` = ? AND `forgot_tokens`.`expires` >= ?",
   "setForgotToken": "INSERT INTO `forgot_tokens` (`owner_name`, `token`, `expires`, `created`) VALUES (?, ?, ?, ?)",
   "deleteExpiredForgotToken": "DELETE FROM `forgot_tokens` WHERE `expires` <= ? OR `token`=? OR `owner_name`=?",
-  "reportBin": "UPDATE `sandbox` SET `reported`=? WHERE `url`=? AND `revision`=? AND `active`='y'"
+  "reportBin": "UPDATE `sandbox` SET `reported`=? WHERE `url`=? AND `revision`=? AND `active`='y'",
+  "isOwnerOf": "SELECT name=? as `owner` FROM `owners` WHERE `url`=? AND `revision`=1"
 }

lib/db/sqlite.js

@@ -209,7 +209,7 @@ module.exports = utils.inherit(Object, {
         if (result) {
           result = _this.convertUserDates(result);
         }
-        fn(null, result);        
+        fn(null, result);
       }
     });
   },
@@ -450,5 +450,23 @@ module.exports = utils.inherit(Object, {
       }
       fn(null, results);
     });
+  },
+  isOwnerOf: function (params, fn) {
+    var values = [
+      params.name,
+      params.url
+    ], sql = templates.isOwnerOf;
+
+    this.connection.run(sql, values, function (err, result) {
+      if (err) {
+        return fn(err);
+      }
+      if (typeof result === 'undefined') {
+        return fn(null, { found: false });
+      } else {
+        return fn(null, { found: true, isowner: result[0].owner === 1 });
+      }
+    });
   }
+
 });

lib/handlers/bin.js

@@ -243,20 +243,34 @@ module.exports = Observable.extend({
     if (req.param('method') === 'save') {
       params = utils.extract(req.body, 'html', 'css', 'javascript', 'settings');
       params.url = req.bin.url;
-      params.revision = req.bin.revision + 1;
+      params.revision = parseInt(req.params.rev, 10) || 1, //req.bin.revision;
       params.summary = utils.titleForBin(params);
 
       this.validateBin(params, function (err) {
         if (err) {
           return next(err);
         }
 
-        _this.models.bin.createRevision(params, function (err, result) {
-          if (err) {
-            return next(err);
+        var username = req.session.user ? req.session.user.name : undefined;
+
+        _this.models.user.isOwnerOf(username, params, function (err, result) {
+          console.log('isOwnerOf', username, params, result);
+          var method = 'create';
+
+          if (result.isowner || result.found === false) {
+            method = 'createRevision';
+            params.revision = req.bin.revision + 1; // bump the revision from the *latest*
+          } else {
+            delete params.revision;
           }
 
-          _this.completeCreateBin(result, req, res, next);
+          _this.models.bin[method](params, function (err, result) {
+            if (err) {
+              return next(err);
+            }
+
+            _this.completeCreateBin(result, req, res, next);
+          });
         });
       });
     } else if (req.param('method') === 'update') {

lib/models/user.js

@@ -67,6 +67,14 @@ module.exports = Observable.extend({
     };
     this.store.getBinsByUser(id, fn);
   },
+  isOwnerOf: function (username, bin, fn) {
+    var params = {
+      name: username,
+      url: bin.url,
+      revision: bin.revision
+    };
+    this.store.isOwnerOf(params, fn);
+  },
   setBinOwner: function (id, bin, fn) {
     var params = {
       name: id,

lib/store.js

@@ -41,7 +41,7 @@ var methods = [
   'reportBin',
   'getAllOwners',
   'getOwnersBlock',
-
+  'isOwnerOf',
 
   'populateOwners'
 ];

package.json

@@ -9,7 +9,7 @@
   "name": "jsbin",
   "description": "Collaborative JavaScript Debugging App",
   "main": "./lib/app",
-  "version": "3.2.24",
+  "version": "3.2.25",
   "preferGlobal": "true",
   "homepage": "http://jsbin.com",
   "bin": "./bin/jsbin",

public/js/chrome/app.js

@@ -1,5 +1,5 @@
 // if a gist has been requested, lazy load the gist library and plug it in
-if (/gist\/\d+/.test(window.location.pathname) && (!sessionStorage.getItem('javascript') && !sessionStorage.getItem('html'))) {
+if (/gist(\/.*)?\/\d+/.test(window.location.pathname) && (!sessionStorage.getItem('javascript') && !sessionStorage.getItem('html'))) {
   window.editors = editors; // needs to be global when the callback triggers to set the content
   loadGist = function () {
     $.getScript('/js/chrome/gist.js', function () {

public/js/editors/panel.js

@@ -12,7 +12,7 @@ var editorModes = {
   processing: 'text/x-csrc'
 };
 
-var badChars = new RegExp('\u200B', 'g');
+var badChars = new RegExp('[\u200B\u0080-\u00a0]', 'g');
 
 if (jsbin.settings.editor.tabMode === 'default') {
   CodeMirror.keyMap.basic.Tab = undefined;
@@ -369,7 +369,7 @@ Panel.prototype = {
       if (content === undefined) content = '';
       this.controlButton.toggleClass('hasContent', !!content.trim().length);
       this.codeSet = true;
-      this.editor.setCode(content);
+      this.editor.setCode(content.replace(badChars, ''));
     }
   },
   codeSet: false,