parse-domain 0.2.1 → 0.2.2

package/.jshintignore

@@ -1,18 +1,18 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
-
-npm-debug.log
-node_modules
-coverage
-examples
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
+node_modules
+coverage
+examples
 .idea

package/.jshintrc

@@ -1,48 +1,48 @@
-{
-    "browser": false,
-    "node": true,
-    "expr": true,
-    "predef": [         // Extra globals.
-        "describe",
-        "it",
-        "before",
-        "after",
-        "beforeEach",
-        "afterEach"
-    ],
-
-    "curly": true,     // Require {} for every new block or scope.
-    "eqeqeq": true,     // Require triple equals i.e. `===`.
-    "forin": true,     // Tolerate `for in` loops without `hasOwnPrototype`.
-    "immed": true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-    "latedef": false,     // Prohibit variable use before definition.
-    "newcap": false,     // Require capitalization of all constructor functions e.g. `new F()`.
-    "noempty": true,     // Prohibit use of empty blocks.
-    "nonew": false,     // Prohibit use of constructors for side-effects.
-    "plusplus": false,     // Prohibit use of `++` & `--`.
-    "undef": true,     // Require all non-global variables be declared before they are used.
-    "strict": true,     // Require `use strict` pragma in every file.
-    "trailing": true,    // Prohibit trailing whitespaces.
-
-    "asi": false,    // Tolerate Automatic Semicolon Insertion (no semicolons).
-    "boss": false,    // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
-    "debug": false,    // Allow debugger statements e.g. browser breakpoints.
-    "eqnull": false,    // Tolerate use of `== null`.
-    "esnext": false,    // Allow ES.next specific features such as `const` and `let`.
-    "evil": false,    // Tolerate use of `eval`.
-    "funcscope": false,    // Tolerate declarations of variables inside of control structures while accessing them later from the outside.
-    "globalstrict": false,    // Allow global "use strict" (also enables 'strict').
-    "iterator": false,    // Allow usage of __iterator__ property.
-    "lastsemic": false,    // Tolerat missing semicolons when the it is omitted for the last statement in a one-line block.
-    "laxbreak": false,    // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons.
-    "laxcomma": false,    // Suppress warnings about comma-first coding style.
-    "loopfunc": false,    // Allow functions to be defined within loops.
-    "multistr": false,    // Tolerate multi-line strings.
-    "proto": false,    // Tolerate __proto__ property. This property is deprecated.
-    "scripturl": false,    // Tolerate script-targeted URLs.
-    "smarttabs": false,    // Tolerate mixed tabs and spaces when the latter are used for alignmnent only.
-    "shadow": false,    // Allows re-define variables later in code e.g. `var x=1; x=2;`.
-    "sub": true,    // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
-    "supernew": false,    // Tolerate `new function () { ... };` and `new Object;`.
-    "validthis": false    // Tolerate strict violations when the code is running in strict mode and you use this in a non-constructor function
+{
+    "browser": false,
+    "node": true,
+    "expr": true,
+    "predef": [         // Extra globals.
+        "describe",
+        "it",
+        "before",
+        "after",
+        "beforeEach",
+        "afterEach"
+    ],
+
+    "curly": true,     // Require {} for every new block or scope.
+    "eqeqeq": true,     // Require triple equals i.e. `===`.
+    "forin": true,     // Tolerate `for in` loops without `hasOwnPrototype`.
+    "immed": true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
+    "latedef": false,     // Prohibit variable use before definition.
+    "newcap": false,     // Require capitalization of all constructor functions e.g. `new F()`.
+    "noempty": true,     // Prohibit use of empty blocks.
+    "nonew": false,     // Prohibit use of constructors for side-effects.
+    "plusplus": false,     // Prohibit use of `++` & `--`.
+    "undef": true,     // Require all non-global variables be declared before they are used.
+    "strict": true,     // Require `use strict` pragma in every file.
+    "trailing": true,    // Prohibit trailing whitespaces.
+
+    "asi": false,    // Tolerate Automatic Semicolon Insertion (no semicolons).
+    "boss": false,    // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
+    "debug": false,    // Allow debugger statements e.g. browser breakpoints.
+    "eqnull": false,    // Tolerate use of `== null`.
+    "esnext": false,    // Allow ES.next specific features such as `const` and `let`.
+    "evil": false,    // Tolerate use of `eval`.
+    "funcscope": false,    // Tolerate declarations of variables inside of control structures while accessing them later from the outside.
+    "globalstrict": false,    // Allow global "use strict" (also enables 'strict').
+    "iterator": false,    // Allow usage of __iterator__ property.
+    "lastsemic": false,    // Tolerat missing semicolons when the it is omitted for the last statement in a one-line block.
+    "laxbreak": false,    // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons.
+    "laxcomma": false,    // Suppress warnings about comma-first coding style.
+    "loopfunc": false,    // Allow functions to be defined within loops.
+    "multistr": false,    // Tolerate multi-line strings.
+    "proto": false,    // Tolerate __proto__ property. This property is deprecated.
+    "scripturl": false,    // Tolerate script-targeted URLs.
+    "smarttabs": false,    // Tolerate mixed tabs and spaces when the latter are used for alignmnent only.
+    "shadow": false,    // Allows re-define variables later in code e.g. `var x=1; x=2;`.
+    "sub": true,    // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
+    "supernew": false,    // Tolerate `new function () { ... };` and `new Object;`.
+    "validthis": false    // Tolerate strict violations when the code is running in strict mode and you use this in a non-constructor function
 }

package/.npmignore

@@ -1,20 +1,20 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-pids
-logs
-results
-
-npm-debug.log
-node_modules
-coverage
-examples
-test
-assets
-.idea
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
+node_modules
+coverage
+examples
+test
+assets
+.idea

package/.travis.yml

@@ -1,11 +1,11 @@
-language: node_js
-node_js:
-  - "0.10"
-  - "0.11"
-
-script:
-  - npm test
-after_success:
-  - npm install -g istanbul
-  - npm install coveralls
+language: node_js
+node_js:
+  - "0.10"
+  - "0.11"
+
+script:
+  - npm test
+after_success:
+  - npm install -g istanbul
+  - npm install coveralls
   - istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage

package/LICENSE

@@ -1,24 +1,24 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
 For more information, please refer to <http://unlicense.org>

package/lib/parseDomain.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var urlParts = /^(https?:\/\/)?(.+@)?(.+?)(:\d{2,5})?(\/.*)?$/,// 1 = protocol, 2 = auth, 3 = domain, 4 = port, 5 = path
+var urlParts = /^(https?:\/\/)?(.+@)?(.+?)(:\d{2,5})?([/?].*)?$/,// 1 = protocol, 2 = auth, 3 = domain, 4 = port, 5 = path
     knownTlds = require("./tld.js"),
     dot = /\./g;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "parse-domain",
-  "version": "0.2.1",
-  "description": "Splits an url into sub-domain, domain and top-level-domain",
+  "version": "0.2.2",
+  "description": "Splits an url into sub-domain, domain and effective top-level-domain",
   "main": "./lib/parseDomain.js",
   "scripts": {
     "test": "mocha -R spec",
@@ -29,6 +29,6 @@
   "dependencies": {},
   "devDependencies": {
     "chai": "^3.5.0",
-    "mocha": "^2.4.5"
+    "mocha": "^3.1.0"
   }
 }