WIP

Author: gkalpak

src/ngResource/resource.js

@@ -529,13 +529,113 @@ angular.module('ngResource', ['ng']).
           encodeUriQuery = angular.$$encodeUriQuery,
           encodeUriSegment = angular.$$encodeUriSegment;
 
+      var urlTransforms = [];
+
       function Route(template, defaults) {
         this.template = template;
         this.defaults = extend({}, provider.defaults, defaults);
         this.urlParams = {};
       }
 
       Route.prototype = {
+        extractParams: function(str) {
+          if (!str || !str.length) {
+            return str;
+          }
+
+          var extracted = {
+            parts: [],
+            params: [],
+            paramsPositions: []
+          };
+          var escaped = false;
+          var inParam = false;
+          var buffer = [];
+
+          str.split('').forEach(function(char) {
+            if (inParam && /\W/.test(char)) {
+              paramsPositions.push(parts.length);
+              params.push(buffer.join(''));
+              parts.push(null);
+
+              buffer.length = 0;
+              inParam = false;
+            }
+
+            if (char === '\\') {
+              if (escaped) {
+                buffer.push(char);
+              } else {
+                escaped = true;
+              }
+            } else if (char === ':') {
+              if (escaped) {
+                buffer.push(char);
+              } else {
+                parts.push(buffer.join(''));
+
+                buffer.length = 0;
+                inParam = true;
+              }
+
+              escaped = false;
+            } else {
+              buffer.push(char);
+              escaped = false;
+            }
+          });
+
+          if (inParam) {
+            paramsPositions.push(parts.length);
+            params.push(buffer.join(''));
+            parts.push(null);
+          } else {
+            parts.push(buffer.join(''));
+          }
+
+          return extracted;
+        },
+
+        parseUrl: function(url) {
+          var PROTOCOL_SERVER_REST_REGEX = /^(https?):\/\/([^/]*)(.*)$/;
+          var USERINFO_HOST_PORT_REGEX = /^(?:([^@]*)@)?(.*?)(?::(\d+))?$/;
+          var PATH_QUERY_REGEX = /^([^?]*)(?:\?(.*))?$/;
+
+          var self = this;
+          var parsedUrl = {};
+          var match;
+
+          match = PROTOCOL_SERVER_REST_REGEX.exec(url);
+
+          parsedUrl.protocol = match[1];   // No params in protocol
+          var userInfoHostPort = match[2];
+          var pathQuery = match[3];
+
+          match = USERINFO_HOST_PORT_REGEX.exec(userInfoHostPort);
+
+          parsedUrl.userInfo = match[1];   // No params in userInfo
+          parsedUrl.host = self.extractParams(match[2]);
+          parsedUrl.port = match[3];   // No params in port
+
+          match = PATH_QUERY_REGEX.exec(pathQuery);
+
+          parsedUrl.path = self.extractParams(match[1]);
+          parsedUrl.query = self.extractParams(match[2]);
+
+          return parsedUrl;
+        },
+
+        setUrlParams2: function(config, params, actionUrl) {
+          var self = this;
+          var url = actionUrl || self.template;
+          var parsedUrl = self.parseUrl(url);
+          params = params || {};
+
+          urlTransforms.forEach(function(transform) {
+            transform(self, parsedUrl, params);
+          });
+        },
+
         setUrlParams: function(config, params, actionUrl) {
           var self = this,
             url = actionUrl || self.template,

test/ngResource/resourceSpec.js

@@ -240,6 +240,13 @@ describe('basic usage', function() {
     R.get({a: 'foo', b: 'bar'});
   });
 
+  fit('should support escaped and unescaped params with the same name', function() {
+    var R = $resource('http://localhost\\:8080/Path/:a/\\:b/:c/:b');
+
+    $httpBackend.expect('GET', 'http://localhost:8080/Path/foo/:b/baz/bar').respond();
+    R.get({a: 'foo', b: 'bar', c: 'baz'});
+  });
+
   it('should support an unescaped url', function() {
     var R = $resource('http://localhost:8080/Path/:a');
 
@@ -368,6 +375,29 @@ describe('basic usage', function() {
     R6.get({octet: 42});
   });
 
+  fit('should support setting `hostname` to IPv6 URL via param', inject(function($q) {
+    var keepSlashes = {stripTrailingSlashes: false};
+
+    var R1 = $resource('http://:host', null, null, keepSlashes);
+    var R2 = $resource('http://:host/', null, null, keepSlashes);
+    var R3 = $resource('http://:hostname::port', null, null, keepSlashes);
+    var R4 = $resource('http://:hostname::port/', null, null, keepSlashes);
+
+    $httpBackend.expect('GET', 'http://[2620:0:861:ed1a::1]').respond(null);         // R1
+    $httpBackend.expect('GET', 'http://[2620:0:861:ed1a::1]:1337').respond(null);    // R1
+    $httpBackend.expect('GET', 'http://[2620:0:861:ed1a::1]/').respond(null);        // R2
+    $httpBackend.expect('GET', 'http://[2620:0:861:ed1a::1]:1337/').respond(null);   // R2
+    $httpBackend.expect('GET', 'http://[2620:0:861:ed1a::1]:1337').respond(null);    // R3
+    $httpBackend.expect('GET', 'http://[2620:0:861:ed1a::1]:1337/').respond(null);   // R4
+
+    R1.get({host: '[2620:0:861:ed1a::1]'});
+    R1.get({host: '[2620:0:861:ed1a::1]:1337'});
+    R2.get({host: '[2620:0:861:ed1a::1]'});
+    R2.get({host: '[2620:0:861:ed1a::1]:1337'});
+    R3.get({hostname: '[2620:0:861:ed1a::1]', port: '1337'});
+    R4.get({hostname: '[2620:0:861:ed1a::1]', port: '1337'});
+  }));
+
   it('should support overriding provider default trailing-slash stripping configuration', function() {
     // Set the new behavior for all new resources created by overriding the
     // provider configuration