uri-js-rails 1.10.2 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a7679fe260f287fbf4cd1b2e7343099c24d65db
-  data.tar.gz: 840a0a784bea3cf14f18bf2e713413d68f855b01
+  metadata.gz: 832749544eac4e151c71f2eca3a7c721f0fc09ab
+  data.tar.gz: d6066ba989fb1c729d59cbe6c04fa4daa9437ef0
 SHA512:
-  metadata.gz: 6096b252b722dd13466b81cbea3f59a386ddac30d7c7d478ee1d1a1df0bb5ad16b55829673bb765ac2f16dae1636f15202fa066d03b2db678f9a942d0f780ecc
-  data.tar.gz: bfecfe90b7073d03073724c1f9eae3dbb5f8f9b5b68bc555c2eafdd8a49f29536e54f8843483724b829001d35e38038a0a3c7e519321a9b4563d7f2d8ee1edd3
+  metadata.gz: 06ab4a80a1df8c24dccbc9804d8bed2565b8ca1aac198ad7af6801e3b7b5fadc64263102bc11813cb34924eddec0f44d67ac0326daf896a101042bc0e83a6dad
+  data.tar.gz: 8d9d8637df1038a7c92a69d5690215b1d3bb2dd2b52d85ab10368808e1db0441121572b70569e07f365d7d72893cca3f19a9931360d8789ae1ec679492647aad

data/lib/uri-js-rails/version.rb

@@ -1,7 +1,7 @@
 module Uri
   module Js
     module Rails
-      VERSION = "1.10.2"
+      VERSION = "1.11.2"
     end
   end
 end

data/vendor/assets/javascripts/URI.js

@@ -1,7 +1,7 @@
 /*!
  * URI.js - Mutating URLs
  *
- * Version: 1.10.2
+ * Version: 1.11.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.com/URI.js/
@@ -21,11 +21,14 @@
         define(['./punycode', './IPv6', './SecondLevelDomains'], factory);
     } else {
         // Browser globals (root is window)
-        root.URI = factory(root.punycode, root.IPv6, root.SecondLevelDomains);
+        root.URI = factory(root.punycode, root.IPv6, root.SecondLevelDomains, root);
     }
-}(this, function (punycode, IPv6, SLD) {
+}(this, function (punycode, IPv6, SLD, root) {
 "use strict";
 
+// save current URI variable, if any
+var _URI = root && root.URI;
+
 function URI(url, base) {
     // Allow instantiation without the 'new' keyword
     if (!(this instanceof URI)) {
@@ -59,6 +62,11 @@ function escapeRegEx(string) {
 }
 
 function getType(value) {
+    // IE8 doesn't return [Object Undefined] but [Object Object] for undefined value
+    if (value === undefined) {
+        return 'Undefined';
+    }
+
     return String(Object.prototype.toString.call(value)).slice(8, -1);
 }
 
@@ -152,11 +160,14 @@ URI._parts = function() {
         query: null,
         fragment: null,
         // state
-        duplicateQueryParameters: URI.duplicateQueryParameters
+        duplicateQueryParameters: URI.duplicateQueryParameters,
+        escapeQuerySpace: URI.escapeQuerySpace
     };
 };
 // state: allow duplicate query parameters (a=1&a=1)
 URI.duplicateQueryParameters = false;
+// state: replaces + with %20 (space in query strings)
+URI.escapeQuerySpace = true;
 // static properties
 URI.protocol_expression = /^[a-z][a-z0-9-+-]*$/i;
 URI.idn_expression = /[^a-z0-9\.-]/i;
@@ -183,11 +194,46 @@ URI.defaultPorts = {
 // ALPHA DIGIT "-" "." "_" "~" "!" "$" "&" "'" "(" ")" "*" "+" "," ";" "=" %encoded
 // I've never seen a (non-IDN) hostname other than: ALPHA DIGIT . -
 URI.invalid_hostname_characters = /[^a-zA-Z0-9\.-]/;
+// map DOM Elements to their URI attribute
+URI.domAttributes = {
+    'a': 'href',
+    'blockquote': 'cite',
+    'link': 'href',
+    'base': 'href',
+    'script': 'src',
+    'form': 'action',
+    'img': 'src',
+    'area': 'href',
+    'iframe': 'src',
+    'embed': 'src',
+    'source': 'src',
+    'track': 'src',
+    'input': 'src' // but only if type="image"
+};
+URI.getDomAttribute = function(node) {
+    if (!node || !node.nodeName) {
+        return undefined;
+    }
+    
+    var nodeName = node.nodeName.toLowerCase();
+    // <input> should only expose src for type="image"
+    if (nodeName === 'input' && node.type !== 'image') {
+        return undefined;
+    }
+    
+    return URI.domAttributes[nodeName];
+};
+
+function escapeForDumbFirefox36(value) {
+    // https://github.com/medialize/URI.js/issues/91
+    return escape(value);
+}
+
 // encoding / decoding according to RFC3986
 function strictEncodeURIComponent(string) {
     // see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/encodeURIComponent
     return encodeURIComponent(string)
-        .replace(/[!'()*]/g, escape)
+        .replace(/[!'()*]/g, escapeForDumbFirefox36)
         .replace(/\*/g, "%2A");
 }
 URI.encode = strictEncodeURIComponent;
@@ -257,11 +303,21 @@ URI.characters = {
         }
     }
 };
-URI.encodeQuery = function(string) {
-    return URI.encode(string + "").replace(/%20/g, '+');
+URI.encodeQuery = function(string, escapeQuerySpace) {
+    var escaped = URI.encode(string + "");
+    return escapeQuerySpace ? escaped.replace(/%20/g, '+') : escaped;
 };
-URI.decodeQuery = function(string) {
-    return URI.decode((string + "").replace(/\+/g, '%20'));
+URI.decodeQuery = function(string, escapeQuerySpace) {
+    string += "";
+    try {
+        return URI.decode(escapeQuerySpace ? string.replace(/\+/g, '%20') : string);
+    } catch(e) {
+        // we're not going to mess with weird encodings,
+        // give up and return the undecoded original string
+        // see https://github.com/medialize/URI.js/issues/87
+        // see https://github.com/medialize/URI.js/issues/92
+        return string;
+    }
 };
 URI.recodePath = function(string) {
     var segments = (string + "").split('/');
@@ -297,7 +353,7 @@ for (_part in _parts) {
 URI.encodeReserved = generateAccessor("reserved", "encode");
 
 URI.parse = function(string, parts) {
-    var pos, t;
+    var pos;
     if (!parts) {
         parts = {};
     }
@@ -322,14 +378,14 @@ URI.parse = function(string, parts) {
     // extract protocol
     if (string.substring(0, 2) === '//') {
         // relative-scheme
-        parts.protocol = '';
+        parts.protocol = null;
         string = string.substring(2);
         // extract "user:pass@host:port"
         string = URI.parseAuthority(string, parts);
     } else {
         pos = string.indexOf(':');
         if (pos > -1) {
-            parts.protocol = string.substring(0, pos);
+            parts.protocol = string.substring(0, pos) || null;
             if (parts.protocol && !parts.protocol.match(URI.protocol_expression)) {
                 // : may be within the path
                 parts.protocol = undefined;
@@ -395,8 +451,10 @@ URI.parseAuthority = function(string, parts) {
 };
 URI.parseUserinfo = function(string, parts) {
     // extract username:password
-    var pos = string.indexOf('@');
     var firstSlash = string.indexOf('/');
+    var pos = firstSlash > -1 
+        ? string.lastIndexOf('@', firstSlash) 
+        : string.indexOf('@');
     var t;
 
     // authority@ must come before /path
@@ -413,7 +471,7 @@ URI.parseUserinfo = function(string, parts) {
 
     return string;
 };
-URI.parseQuery = function(string) {
+URI.parseQuery = function(string, escapeQuerySpace) {
     if (!string) {
         return {};
     }
@@ -432,9 +490,9 @@ URI.parseQuery = function(string) {
 
     for (var i = 0; i < length; i++) {
         v = splits[i].split('=');
-        name = URI.decodeQuery(v.shift());
+        name = URI.decodeQuery(v.shift(), escapeQuerySpace);
         // no "=" is null according to http://dvcs.w3.org/hg/url/raw-file/tip/Overview.html#collect-url-parameters
-        value = v.length ? URI.decodeQuery(v.join('=')) : null;
+        value = v.length ? URI.decodeQuery(v.join('='), escapeQuerySpace) : null;
 
         if (items[name]) {
             if (typeof items[name] === "string") {
@@ -520,7 +578,7 @@ URI.buildUserinfo = function(parts) {
 
     return t;
 };
-URI.buildQuery = function(data, duplicates) {
+URI.buildQuery = function(data, duplicateQueryParameters, escapeQuerySpace) {
     // according to http://tools.ietf.org/html/rfc3986 or http://labs.apache.org/webarch/uri/rfc/rfc3986.html
     // being »-._~!$&'()*+,;=:@/?« %HEX and alnum are allowed
     // the RFC explicitly states ?/foo being a valid use case, no mention of parameter syntax!
@@ -535,24 +593,24 @@ URI.buildQuery = function(data, duplicates) {
                 unique = {};
                 for (i = 0, length = data[key].length; i < length; i++) {
                     if (data[key][i] !== undefined && unique[data[key][i] + ""] === undefined) {
-                        t += "&" + URI.buildQueryParameter(key, data[key][i]);
-                        if (duplicates !== true) {
+                        t += "&" + URI.buildQueryParameter(key, data[key][i], escapeQuerySpace);
+                        if (duplicateQueryParameters !== true) {
                             unique[data[key][i] + ""] = true;
                         }
                     }
                 }
             } else if (data[key] !== undefined) {
-                t += '&' + URI.buildQueryParameter(key, data[key]);
+                t += '&' + URI.buildQueryParameter(key, data[key], escapeQuerySpace);
             }
         }
     }
 
     return t.substring(1);
 };
-URI.buildQueryParameter = function(name, value) {
+URI.buildQueryParameter = function(name, value, escapeQuerySpace) {
     // http://www.w3.org/TR/REC-html40/interact/forms.html#form-content-type -- application/x-www-form-urlencoded
     // don't append "=" for null values, according to http://dvcs.w3.org/hg/url/raw-file/tip/Overview.html#url-parameter-serialization
-    return URI.encodeQuery(name) + (value !== null ? "=" + URI.encodeQuery(value) : "");
+    return URI.encodeQuery(name, escapeQuerySpace) + (value !== null ? "=" + URI.encodeQuery(value, escapeQuerySpace) : "");
 };
 
 URI.addQuery = function(data, name, value) {
@@ -723,6 +781,33 @@ URI.ensureValidHostname = function(v) {
     }
 };
 
+// noConflict
+URI.noConflict = function(removeAll) {
+    if (removeAll) {
+        var unconflicted = {
+            URI: this.noConflict()
+        };
+
+        if (URITemplate && typeof URITemplate.noConflict == "function") {
+            unconflicted.URITemplate = URITemplate.noConflict();
+        }
+
+        if (IPv6 && typeof IPv6.noConflict == "function") {
+            unconflicted.IPv6 = IPv6.noConflict();
+        }
+
+        if (SecondLevelDomains && typeof SecondLevelDomains.noConflict == "function") {
+            unconflicted.SecondLevelDomains = SecondLevelDomains.noConflict();
+        }
+
+        return unconflicted;
+    } else if (root.URI === this) {
+        root.URI = _URI;
+    }
+
+    return this;
+};
+
 p.build = function(deferBuild) {
     if (deferBuild === true) {
         this._deferred_build = true;
@@ -749,7 +834,7 @@ generateAccessor = function(_part){
         if (v === undefined) {
             return this._parts[_part] || "";
         } else {
-            this._parts[_part] = v;
+            this._parts[_part] = v || null;
             this.build(!build);
             return this;
         }
@@ -800,7 +885,7 @@ for (_part in _parts) {
 
 p.pathname = function(v, build) {
     if (v === undefined || v === true) {
-        var res = this._parts.path || (this._parts.urn ? '' : '/');
+        var res = this._parts.path || (this._parts.hostname ? '/' : '');
         return v ? URI.decodePath(res) : res;
     } else {
         this._parts.path = v ? URI.recodePath(v) : "/";
@@ -820,8 +905,12 @@ p.href = function(href, build) {
     this._parts = URI._parts();
 
     var _URI = href instanceof URI;
-    var _object = typeof href === "object" && (href.hostname || href.path);
-
+    var _object = typeof href === "object" && (href.hostname || href.path || href.pathname);
+    if (href.nodeName) {
+        var attribute = URI.getDomAttribute(href);
+        href = href[attribute] || "";
+        _object = false;
+    }
     
     // window.location is reported to be an object, but it's not the sort
     // of object we're looking for: 
@@ -1301,7 +1390,7 @@ p.segment = function(segment, v, build) {
     var absolute = path.substring(0, 1) === '/';
     var segments = path.split(separator);
 
-    if (typeof segment !== 'number') {
+    if (segment !== undefined && typeof segment !== 'number') {
         build = v;
         v = segment;
         segment = undefined;
@@ -1326,11 +1415,23 @@ p.segment = function(segment, v, build) {
             : segments[segment];
     } else if (segment === null || segments[segment] === undefined) {
         if (isArray(v)) {
-            segments = v;
-        } else if (v || (typeof v === "string" && v.length)) {
+            segments = [];
+            // collapse empty elements within array
+            for (var i=0, l=v.length; i < l; i++) {
+                if (!v[i].length && (!segments.length || !segments[segments.length -1].length)) {
+                    continue;
+                }
+                
+                if (segments.length && !segments[segments.length -1].length) {
+                    segments.pop();
+                }
+                
+                segments.push(v[i]);
+            }
+        } else if (v || (typeof v === "string")) {
             if (segments[segments.length -1] === "") {
                 // empty trailing elements have to be overwritten
-                // to prefent results such as /foo//bar
+                // to prevent results such as /foo//bar
                 segments[segments.length -1] = v;
             } else {
                 segments.push(v);
@@ -1350,20 +1451,52 @@ p.segment = function(segment, v, build) {
 
     return this.path(segments.join(separator), build);
 };
+p.segmentCoded = function(segment, v, build) {
+    var segments, i, l;
+
+    if (typeof segment !== 'number') {
+        build = v;
+        v = segment;
+        segment = undefined;
+    }
+
+    if (v === undefined) {
+        segments = this.segment(segment, v, build);
+        if (!isArray(segments)) {
+            segments = segments !== undefined ? URI.decode(segments) : undefined;
+        } else {
+            for (i = 0, l = segments.length; i < l; i++) {
+                segments[i] = URI.decode(segments[i]);
+            }
+        }
+
+        return segments;
+    }
+
+    if (!isArray(v)) {
+        v = typeof v === 'string' ? URI.encode(v) : v;
+    } else {
+        for (i = 0, l = v.length; i < l; i++) {
+            v[i] = URI.decode(v[i]);
+        }
+    }
+
+    return this.segment(segment, v, build);
+};
 
 // mutating query string
 var q = p.query;
 p.query = function(v, build) {
     if (v === true) {
-        return URI.parseQuery(this._parts.query);
+        return URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace);
     } else if (typeof v === "function") {
-        var data = URI.parseQuery(this._parts.query);
+        var data = URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace);
         var result = v.call(this, data);
-        this._parts.query = URI.buildQuery(result || data, this._parts.duplicateQueryParameters);
+        this._parts.query = URI.buildQuery(result || data, this._parts.duplicateQueryParameters, this._parts.escapeQuerySpace);
         this.build(!build);
         return this;
     } else if (v !== undefined && typeof v !== "string") {
-        this._parts.query = URI.buildQuery(v, this._parts.duplicateQueryParameters);
+        this._parts.query = URI.buildQuery(v, this._parts.duplicateQueryParameters, this._parts.escapeQuerySpace);
         this.build(!build);
         return this;
     } else {
@@ -1371,7 +1504,7 @@ p.query = function(v, build) {
     }
 };
 p.setQuery = function(name, value, build) {
-    var data = URI.parseQuery(this._parts.query);
+    var data = URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace);
     
     if (typeof name === "object") {
         for (var key in name) {
@@ -1385,7 +1518,7 @@ p.setQuery = function(name, value, build) {
         throw new TypeError("URI.addQuery() accepts an object, string as the name parameter");
     }
     
-    this._parts.query = URI.buildQuery(data, this._parts.duplicateQueryParameters);
+    this._parts.query = URI.buildQuery(data, this._parts.duplicateQueryParameters, this._parts.escapeQuerySpace);
     if (typeof name !== "string") {
         build = value;
     }
@@ -1394,9 +1527,9 @@ p.setQuery = function(name, value, build) {
     return this;
 };
 p.addQuery = function(name, value, build) {
-    var data = URI.parseQuery(this._parts.query);
+    var data = URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace);
     URI.addQuery(data, name, value === undefined ? null : value);
-    this._parts.query = URI.buildQuery(data, this._parts.duplicateQueryParameters);
+    this._parts.query = URI.buildQuery(data, this._parts.duplicateQueryParameters, this._parts.escapeQuerySpace);
     if (typeof name !== "string") {
         build = value;
     }
@@ -1405,9 +1538,9 @@ p.addQuery = function(name, value, build) {
     return this;
 };
 p.removeQuery = function(name, value, build) {
-    var data = URI.parseQuery(this._parts.query);
+    var data = URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace);
     URI.removeQuery(data, name, value);
-    this._parts.query = URI.buildQuery(data, this._parts.duplicateQueryParameters);
+    this._parts.query = URI.buildQuery(data, this._parts.duplicateQueryParameters, this._parts.escapeQuerySpace);
     if (typeof name !== "string") {
         build = value;
     }
@@ -1416,7 +1549,7 @@ p.removeQuery = function(name, value, build) {
     return this;
 };
 p.hasQuery = function(name, value, withinArray) {
-    var data = URI.parseQuery(this._parts.query);
+    var data = URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace);
     return URI.hasQuery(data, name, value, withinArray);
 };
 p.setSearch = p.setQuery;
@@ -1484,20 +1617,20 @@ p.normalizePath = function(build) {
     }
 
     var _was_relative;
-    var _was_relative_prefix;
     var _path = this._parts.path;
     var _parent, _pos;
 
     // handle relative paths
     if (_path.charAt(0) !== '/') {
-        if (_path.charAt(0) === '.') {
-            _was_relative_prefix = _path.substring(0, _path.indexOf('/'));
-        }
         _was_relative = true;
         _path = '/' + _path;
     }
+
     // resolve simples
-    _path = _path.replace(/(\/(\.\/)+)|\/{2,}/g, '/');
+    _path = _path
+        .replace(/(\/(\.\/)+)|(\/\.$)/g, '/')
+        .replace(/\/{2,}/g, '/');
+
     // resolve parents
     while (true) {
         _parent = _path.indexOf('/../');
@@ -1516,6 +1649,7 @@ p.normalizePath = function(build) {
         }
         _path = _path.substring(0, _pos) + _path.substring(_parent + 3);
     }
+
     // revert to relative
     if (_was_relative && this.is('relative')) {
         _path = _path.substring(1);
@@ -1532,7 +1666,7 @@ p.normalizeQuery = function(build) {
         if (!this._parts.query.length) {
             this._parts.query = null;
         } else {
-            this.query(URI.parseQuery(this._parts.query));
+            this.query(URI.parseQuery(this._parts.query, this._parts.escapeQuerySpace));
         }
 
         this.build(!build);
@@ -1606,18 +1740,18 @@ p.readable = function() {
         var q = '';
         for (var i = 0, qp = uri._parts.query.split('&'), l = qp.length; i < l; i++) {
             var kv = (qp[i] || "").split('=');
-            q += '&' + URI.decodeQuery(kv[0])
+            q += '&' + URI.decodeQuery(kv[0], this._parts.escapeQuerySpace)
                 .replace(/&/g, '%26');
 
             if (kv[1] !== undefined) {
-                q += "=" + URI.decodeQuery(kv[1])
+                q += "=" + URI.decodeQuery(kv[1], this._parts.escapeQuerySpace)
                     .replace(/&/g, '%26');
             }
         }
         t += '?' + q.substring(1);
     }
 
-    t += uri.hash();
+    t += URI.decodeQuery(uri.hash(), true);
     return t;
 };
 
@@ -1628,7 +1762,7 @@ p.absoluteTo = function(base) {
     var basedir, i, p;
 
     if (this._parts.urn) {
-        throw new Error('URNs do not have any generally defined hierachical components');
+        throw new Error('URNs do not have any generally defined hierarchical components');
     }
 
     if (!(base instanceof URI)) {
@@ -1643,12 +1777,12 @@ p.absoluteTo = function(base) {
         return resolved;
     }
 
-    for (i = 0, p; p = properties[i]; i++) {
+    for (i = 0; p = properties[i]; i++) {
         resolved._parts[p] = base._parts[p];
     }
     
     properties = ['query', 'path'];
-    for (i = 0, p; p = properties[i]; i++) {
+    for (i = 0; p = properties[i]; i++) {
         if (!resolved._parts[p] && base._parts[p]) {
             resolved._parts[p] = base._parts[p];
         }
@@ -1664,70 +1798,66 @@ p.absoluteTo = function(base) {
     return resolved;
 };
 p.relativeTo = function(base) {
-    var relative = this.clone();
-    var properties = ['protocol', 'username', 'password', 'hostname', 'port'];
-    var common, _base, _this, _base_diff, _this_diff;
+    var relative = this.clone().normalize();
+    var relativeParts, baseParts, common, relativePath, basePath;
 
     if (relative._parts.urn) {
-        throw new Error('URNs do not have any generally defined hierachical components');
+        throw new Error('URNs do not have any generally defined hierarchical components');
     }
 
-    if (!(base instanceof URI)) {
-        base = new URI(base);
+    base = new URI(base).normalize();
+    relativeParts = relative._parts;
+    baseParts = base._parts;
+    relativePath = relative.path();
+    basePath = base.path();
+
+    if (relativePath.charAt(0) !== '/') {
+        throw new Error('URI is already relative');
     }
 
-    if (relative.path().charAt(0) !== '/' || base.path().charAt(0) !== '/') {
-        throw new Error('Cannot calculate common path from non-relative URLs');
+    if (basePath.charAt(0) !== '/') {
+        throw new Error('Cannot calculate a URI relative to another relative URI');
     }
 
-    // determine common sub path
-    common = URI.commonPath(relative.path(), base.path());
-    
-    // relative paths don't have authority
-    for (var i = 0, p; p = properties[i]; i++) {
-        relative._parts[p] = null;
+    if (relativeParts.protocol === baseParts.protocol) {
+        relativeParts.protocol = null;
     }
 
-    // no relation if there's nothing in common 
-    if (common === '/') {
-        return relative;
-    } else if (!common) {
-        // there's absolutely nothing in common here
-        return this.clone();
+    if (relativeParts.username !== baseParts.username || relativeParts.password !== baseParts.password) {
+        return relative.build();
     }
-    
-    _base = base.directory();
-    _this = relative.directory();
 
-    // base and this are on the same level
-    if (_base === _this) {
-        relative._parts.path = relative.filename();
+    if (relativeParts.protocol !== null || relativeParts.username !== null || relativeParts.password !== null) {
         return relative.build();
     }
-    
-    _base_diff = _base.substring(common.length);
-    _this_diff = _this.substring(common.length);
-    
-    // this is a descendant of base
-    if (_base + '/' === common) {
-        if (_this_diff) {
-            _this_diff += '/';
-        }
-        
-        relative._parts.path = _this_diff + relative.filename();
+
+    if (relativeParts.hostname === baseParts.hostname && relativeParts.port === baseParts.port) {
+        relativeParts.hostname = null;
+        relativeParts.port = null;
+    } else {
         return relative.build();
-    } 
+    }
 
-    // this is a descendant of base
-    var parents = '../';
-    var _common = new RegExp('^' + escapeRegEx(common));
-    var _parents = _base.replace(_common, '/').match(/\//g).length -1;
+    if (relativePath === basePath) {
+        relativeParts.path = '';
+        return relative.build();
+    }
+    
+    // determine common sub path
+    common = URI.commonPath(relative.path(), base.path());
 
-    while (_parents--) {
-        parents += '../';
+    // If the paths have nothing in common, return a relative URL with the absolute path.
+    if (!common) {
+        return relative.build();
     }
 
-    relative._parts.path = relative._parts.path.replace(_common, parents);
+    var parents = baseParts.path
+        .substring(common.length)
+        .replace(/[^\/]*$/, '')
+        .replace(/.*?\//g, '../');
+
+    relativeParts.path = parents + relativeParts.path.substring(common.length);
+
     return relative.build();
 };
 
@@ -1759,13 +1889,13 @@ p.equals = function(uri) {
         return false;
     }
 
-    // query parameters have the same length, even if they're permutated
+    // query parameters have the same length, even if they're permuted
     if (one_query.length !== two_query.length) {
         return false;
     }
 
-    one_map = URI.parseQuery(one_query);
-    two_map = URI.parseQuery(two_query);
+    one_map = URI.parseQuery(one_query, this._parts.escapeQuerySpace);
+    two_map = URI.parseQuery(two_query, this._parts.escapeQuerySpace);
 
     for (key in one_map) {
         if (hasOwn.call(one_map, key)) {
@@ -1799,5 +1929,10 @@ p.duplicateQueryParameters = function(v) {
     return this;
 };
 
+p.escapeQuerySpace = function(v) {
+    this._parts.escapeQuerySpace = !!v;
+    return this;
+};
+
 return URI;
-}));
+}));

data/vendor/assets/javascripts/jquery.URI.js

@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * jQuery Plugin
  *
- * Version: 1.10.2
+ * Version: 1.11.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.com/URI.js/jquery-uri-plugin.html
@@ -67,30 +67,16 @@ function escapeRegEx(string) {
 }
 
 function getUriProperty(elem) {
-    var property;
-    
-    // Note: IE9 will report img.href, so check img.src first (Issue #48)
-    $.each(['src', 'href', 'action'], function(k, v) {
-        if (v in elem ) {
-            property = v;
-            return false;
-        }
-    
-        return true;
-    });
-    
-    // compensate ambiguous <input>
-    if (elem.nodeName.toLowerCase() === 'input' && elem.type !== 'image') {
+    var nodeName = elem.nodeName.toLowerCase();
+    var property = URI.domAttributes[nodeName];
+    if (nodeName === 'input' && elem.type !== 'image') {
+        // compensate ambiguous <input> that is not an image
         return undefined;
     }
     
-    if (!property) {
-        // you can set any property you wish. So for elements that don't have
-        // either of [src, href, action] we simply return src.
-        // https://github.com/medialize/URI.js/issues/69
-        return 'src';
-    }
-    
+    // NOTE: as we use a static mapping from element to attribute,
+    // the HTML5 attribute issue should not come up again
+    // https://github.com/medialize/URI.js/issues/69
     return property;
 }
 
@@ -121,7 +107,7 @@ var _attrHooks = {
         return $(elem).uri().href(value).toString();
     }
 };
-$.each(['src', 'href', 'action', 'uri'], function(k, v) {
+$.each(['src', 'href', 'action', 'uri', 'cite'], function(k, v) {
     $.attrHooks[v] = {
         set: _attrHooks.set
     };
@@ -135,7 +121,7 @@ $.fn.uri = function(uri) {
     var property = getUriProperty(elem);
     
     if (!property) {
-        throw new Error('Element "' + elem.nodeName + '" does not have either property: href, src, action');
+        throw new Error('Element "' + elem.nodeName + '" does not have either property: href, src, action, cite');
     }
     
     if (uri !== undefined) {
@@ -145,14 +131,14 @@ $.fn.uri = function(uri) {
         }
         
         if (!(uri instanceof URI)) {
-            uri = URI(uri);
+            uri = URI(uri || '');
         }
     } else {
         uri = $this.data('uri');
         if (uri) {
             return uri;
         } else {
-            uri = URI($this.attr(property));
+            uri = URI($this.attr(property) || '');
         }
     }
     
@@ -243,4 +229,4 @@ $.expr[":"].uri = uriSizzle;
 
 // extending existing object rather than defining something new
 return {};
-}));
+}));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uri-js-rails
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.2
 platform: ruby
 authors:
 - Robin Wenglewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -47,9 +47,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: URI.js for rails
 test_files: []
-has_rdoc: