Merge pull request #124 from tightenco/encode-uri-component

Add encodeURIComponent to path and query params.

src/js/route.js

@@ -60,7 +60,7 @@ class Router extends String {
                 paramsArrayKey++;
                 if (typeof tags[key] !== 'undefined') {
                     delete this.queryParams[key];
-                    return tags[key].id || tags[key];
+                    return tags[key].id || encodeURIComponent(tags[key]);
                 }
                 if (tag.indexOf('?') === -1) {
                     throw new Error(`Ziggy Error: '${keyName}' key is required for route '${this.name}'`);
@@ -91,7 +91,7 @@ class Router extends String {
 
         Object.keys(this.queryParams).forEach(function(key, i) {
             queryString = i === 0 ? queryString : queryString + '&';
-            queryString += key + '=' + this.queryParams[key];
+            queryString += key + '=' + encodeURIComponent(this.queryParams[key]);
         }.bind(this));
 
         return queryString;

tests/js/test.route.js

@@ -450,4 +450,18 @@ describe('route()', function() {
             route('events.venues.index', 1)
         );
     });
+
+    it('Should URL encode path params.', function() {
+        assert.equal(
+            'http://test.thing/ab/cd/events/Fun%26Games/venues',
+            route('events.venues.index', {event: "Fun&Games"}).url()
+        );
+    });
+
+    it('Should URL encode query params.', function() {
+        assert.equal(
+            'http://test.thing/ab/cd/events/Fun%26Games/venues?location=Brews%26Clues',
+            route('events.venues.index', {event: "Fun&Games", location: "Brews&Clues"}).url()
+        );
+    });
 });