version bump

medialize · Aug 14, 2013 · 2bdf950 · 2bdf950
2 parents fa3617c + 95c6147
commit 2bdf950
Show file tree

Hide file tree

Showing 13 changed files with 160 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -223,6 +223,11 @@ URI.js is published under the [MIT license](http://www.opensource.org/licenses/m
 
 ## Changelog ##
 
+### 1.11.2 (August 14th 2013) ###
+
+* fixing regression for Node.js introduced by `fixing unsafe eval by using UMD's root` - ([Issue #107](https://github.com/medialize/URI.js/issues/107))
+* fixing parser to accept malformed userinfo (non-encoded email address) - ([Issue #108](https://github.com/medialize/URI.js/issues/108))
+
 ### 1.11.1 (August 13th 2013) ###
 
 * fixing inconsistent [`.relativeTo()`](http://medialize.github.com/URI.js/docs.html#relativeto) results caused by inconsistent URI component handling - ([Issue #103](https://github.com/medialize/URI.js/issues/103))

diff --git a/URI.jquery.json b/URI.jquery.json
@@ -18,7 +18,7 @@
         "URI-manipulation",
         "URL-manipulation"
     ],
-    "version": "1.11.1",
+    "version": "1.11.2",
     "author": {
         "name": "Rodney Rehm",
         "url": "http://rodneyrehm.de/en/"

diff --git a/build.js b/build.js
@@ -29,7 +29,7 @@ function build(files) {
             output_format: "text",
             output_info: "compiled_code"
         }, function(data) {
-            var code = "/*! URI.js v1.11.1 http://medialize.github.com/URI.js/ */\n/* build contains: " + files.join(', ') + " */\n" + data;
+            var code = "/*! URI.js v1.11.2 http://medialize.github.com/URI.js/ */\n/* build contains: " + files.join(', ') + " */\n" + data;
             $progress.hide();
             $out.val(code).parent().show();
             $out.prev().find('a').remove();

diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
     "name": "URIjs",
-    "version": "1.11.1",
+    "version": "1.11.2",
     "main": [
         "src/URI.js",
         "src/IPv6.js",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "URIjs",
-    "version": "1.11.1",
+    "version": "1.11.2",
     "title": "URI.js - Mutating URLs",
     "author": {
         "name": "Rodney Rehm",

diff --git a/src/IPv6.js b/src/IPv6.js
@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * IPv6 Support
  *
- * Version: 1.11.1
+ * Version: 1.11.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.com/URI.js/
@@ -36,7 +36,7 @@ console.log(_in, _out, _expected, _out === _expected);
 */
 
 // save current IPv6 variable, if any
-var _IPv6 = root.IPv6;
+var _IPv6 = root && root.IPv6;
 
 function best(address) {
     // based on:
@@ -171,10 +171,11 @@ function best(address) {
 };
 
 function noConflict(){
-  if (root.IPv6 === this) {
-    root.IPv6 = _IPv6;
-  }
-  return this;
+    if (root.IPv6 === this) {
+        root.IPv6 = _IPv6;
+    }
+
+    return this;
 };
 
 return {

diff --git a/src/SecondLevelDomains.js b/src/SecondLevelDomains.js
@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * Second Level Domain (SLD) Support
  *
- * Version: 1.11.1
+ * Version: 1.11.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.com/URI.js/
@@ -29,7 +29,7 @@
 "use strict";
 
 // save current SecondLevelDomains variable, if any
-var _SecondLevelDomains = root.SecondLevelDomains;
+var _SecondLevelDomains = root && root.SecondLevelDomains;
 
 var hasOwn = Object.prototype.hasOwnProperty;
 var SLD = {

diff --git a/src/URI.js b/src/URI.js
@@ -1,7 +1,7 @@
 /*!
  * URI.js - Mutating URLs
  *
- * Version: 1.11.1
+ * Version: 1.11.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.com/URI.js/
@@ -27,7 +27,7 @@
 "use strict";
 
 // save current URI variable, if any
-var _URI = root.URI;
+var _URI = root && root.URI;
 
 function URI(url, base) {
     // Allow instantiation without the 'new' keyword
@@ -451,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
@@ -781,30 +783,29 @@ URI.ensureValidHostname = function(v) {
 
 // noConflict
 URI.noConflict = function(removeAll) {
-  if(removeAll){
-    var unconflicted = {
-      URI: this.noConflict()
-    };
+    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();
-    }
+        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 unconflicted;
+    } else if (root.URI === this) {
+        root.URI = _URI;
     }
 
     return this;
-  }
 };
 
 p.build = function(deferBuild) {