Fixed setRoute (flatiron/director#314)

README.md

@@ -939,7 +939,16 @@ Remove a segment from the current route.
 * `value` {String} - The new value to assign the the position indicated by the
   first parameter.
 
-Set a segment of the current route.
+Replace a segment of the current route.
+
+### setRoute(start, length, value)
+
+* `start` {Number} - The position at which to start removing items.
+* `length` {Number} - The number of items to remove from the route.
+* `value` {String} - The new value to assign the the position indicated by the
+  first parameter.
+
+Remove and set a segment of the current route.
 
 # Frequently Asked Questions
 

build/tarantino.js

@@ -938,6 +938,7 @@ var listener = {
     }
 
     if (this.history === true) {
+      s = ((s.indexOf('/') === 0) ? s : '/' + s);
       window.history.pushState({}, document.title, s);
       // Fire an onpopstate event manually since pushing does not obviously
       // trigger the pop event.
@@ -1040,12 +1041,23 @@ Router$$1.prototype.explode = function () {
 Router$$1.prototype.setRoute = function (i, v, val) {
   var url = this.explode();
 
-  if (typeof i === 'number' && typeof v === 'string') {
-    url[i] = v;
+  // Remove and insert:
+  if (typeof i === 'number' && typeof v === 'number' && typeof val === 'string') {
+    if (i < url.length) {
+      url.splice(i, v, val);
+    }
   }
-  else if (typeof val === 'string') {
-    url.splice(i, v, s);
+  // Remove:
+  else if (typeof i === 'number' && typeof v === 'number') {
+    if (i < url.length) {
+      url.splice(i, v);
+    }
+  }
+  // Replace:
+  else if (typeof i === 'number' && typeof v === 'string') {
+    url[i] = v;
   }
+  // Do nothing:
   else {
     url = [i];
   }

lib/browser.js

@@ -114,6 +114,7 @@ var listener = {
     }
 
     if (this.history === true) {
+      s = ((s.indexOf('/') === 0) ? s : '/' + s);
       window.history.pushState({}, document.title, s);
       // Fire an onpopstate event manually since pushing does not obviously
       // trigger the pop event.
@@ -216,12 +217,23 @@ Router.prototype.explode = function () {
 Router.prototype.setRoute = function (i, v, val) {
   var url = this.explode();
 
-  if (typeof i === 'number' && typeof v === 'string') {
-    url[i] = v;
+  // Remove and insert:
+  if (typeof i === 'number' && typeof v === 'number' && typeof val === 'string') {
+    if (i < url.length) {
+      url.splice(i, v, val);
+    }
   }
-  else if (typeof val === 'string') {
-    url.splice(i, v, s);
+  // Remove:
+  else if (typeof i === 'number' && typeof v === 'number') {
+    if (i < url.length) {
+      url.splice(i, v);
+    }
+  }
+  // Replace:
+  else if (typeof i === 'number' && typeof v === 'string') {
+    url[i] = v;
   }
+  // Do nothing:
   else {
     url = [i];
   }

test/browser/html5-routes-test.js

@@ -642,6 +642,96 @@ createTest('setRoute with a single parameter should change location correctly',
   }, 14)
 });
 
+createTest('setRoute: replace a specific segment of the current route and change location correctly', {
+  '/authors/12/book/23': {
+    on: function() {
+      if (!browser_history_support) {
+        shared.fired.push(location.hash.replace(/^#/, ''));
+      } else {
+        shared.fired.push(location.pathname);
+      }
+    }
+  },
+  '/authors/12/video/23': {
+    on: function() {
+      if (!browser_history_support) {
+        shared.fired.push(location.hash.replace(/^#/, ''));
+      } else {
+        shared.fired.push(location.pathname);
+      }
+    }
+  }
+}, function(assert) {
+  var self = this;
+  this.navigate('/authors/12/book/23', function() {
+    this.router.setRoute(2, 'video');
+    setTimeout(function() {
+      assert.deepEqual(shared.fired, ['/authors/12/book/23', '/authors/12/video/23']);
+      self.finish();
+    }, 14);
+  });
+});
+
+createTest('setRoute: remove segments of the current route and change location correctly', {
+  '/authors/12/book/23': {
+    on: function() {
+      if (!browser_history_support) {
+        shared.fired.push(location.hash.replace(/^#/, ''));
+      } else {
+        shared.fired.push(location.pathname);
+      }
+    }
+  },
+  '/authors/12': {
+    on: function() {
+      if (!browser_history_support) {
+        shared.fired.push(location.hash.replace(/^#/, ''));
+      } else {
+        shared.fired.push(location.pathname);
+      }
+    }
+  }
+}, function(assert) {
+  var self = this;
+  this.navigate('/authors/12/book/23', function() {
+    this.router.setRoute(2, 2);
+    setTimeout(function() {
+      assert.deepEqual(shared.fired, ['/authors/12/book/23', '/authors/12']);
+      self.finish();
+    }, 14);
+  });
+});
+
+createTest('setRoute: insert and replace a segment into the current route and change location correctly', {
+  '/authors/12/book/23': {
+    on: function() {
+      if (!browser_history_support) {
+        shared.fired.push(location.hash.replace(/^#/, ''));
+      } else {
+        shared.fired.push(location.pathname);
+      }
+    }
+  },
+  '/authors/12/awesome': {
+    on: function() {
+      if (!browser_history_support) {
+        shared.fired.push(location.hash.replace(/^#/, ''));
+      } else {
+        shared.fired.push(location.pathname);
+      }
+    }
+  }
+}, function(assert) {
+  var self = this;
+  this.navigate('/authors/12/book/23', function() {
+    this.router.setRoute(2, 2, 'awesome');
+    setTimeout(function() {
+      assert.deepEqual(shared.fired, ['/authors/12/book/23', '/authors/12/awesome']);
+      self.finish();
+    }, 14);
+  });
+});
+
 createTest('route should accept _ and . within parameters', {
   '/:a': {
     on: function root() {

test/browser/routes-test.js

@@ -630,6 +630,75 @@ createTest('setRoute with a single parameter should change location correctly',
   }, 14)
 });
 
+createTest('setRoute: replace a specific segment of the current route and change location correctly', {
+  '/authors/12/book/23': {
+    on: function() {
+      shared.fired.push(window.location.hash);
+    }
+  },
+  '/authors/12/video/23': {
+    on: function() {
+      shared.fired.push(window.location.hash);
+    }
+  }
+}, function(assert) {
+  var self = this;
+  shared.fired = [];
+  this.navigate('/authors/12/book/23', function() {
+    this.router.setRoute(2, 'video');
+    setTimeout(function() {
+      assert.deepEqual(shared.fired, ['#/authors/12/book/23', '#/authors/12/video/23']);
+      self.finish();
+    }, 14);
+  });
+});
+
+createTest('setRoute: remove segments of the current route and change location correctly', {
+  '/authors/12/book/23': {
+    on: function() {
+      shared.fired.push(window.location.hash);
+    }
+  },
+  '/authors/12': {
+    on: function() {
+      shared.fired.push(window.location.hash);
+    }
+  }
+}, function(assert) {
+  var self = this;
+  shared.fired = [];
+  this.navigate('/authors/12/book/23', function() {
+    this.router.setRoute(2, 2);
+    setTimeout(function() {
+      assert.deepEqual(shared.fired, ['#/authors/12/book/23', '#/authors/12']);
+      self.finish();
+    }, 14);
+  });
+});
+
+createTest('setRoute: insert and replace a segment into the current route and change location correctly', {
+  '/authors/12/book/23': {
+    on: function() {
+      shared.fired.push(window.location.hash);
+    }
+  },
+  '/authors/12/awesome': {
+    on: function() {
+      shared.fired.push(window.location.hash);
+    }
+  }
+}, function(assert) {
+  var self = this;
+  shared.fired = [];
+  this.navigate('/authors/12/book/23', function() {
+    this.router.setRoute(2, 2, 'awesome');
+    setTimeout(function() {
+      assert.deepEqual(shared.fired, ['#/authors/12/book/23', '#/authors/12/awesome']);
+      self.finish();
+    }, 14);
+  });
+});
+
 createTest('route should accept _ and . within parameters', {
   '/:a': {
     on: function root() {