Modify mapper

package.json

@@ -1,43 +1,51 @@
 {
-  "title"       : "UA-Parser.js",
-  "name"        : "ua-parser-js",
-  "version"     : "0.3.0",
-  "author"      : {
-      "name"      : "Faisal Salman",
-      "email"     : "fyzlman@gmail.com",
-      "url"       : "http://faisalman.com"
-  },
-  "description" : "Lightweight JavaScript-based user-agent parser",
-  "keywords"    : [
-    "user-agent",
+  "title": "UA-Parser.js",
+  "name": "ua-parser-js",
+  "version": "0.3.2",
+  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
+  "description": "Lightweight JavaScript-based user-agent string parser",
+  "keywords": [
+    "user agent",
     "parser",
     "browser",
     "engine",
     "os",
     "device"
   ],
-  "homepage"    : "http://faisalman.github.com/ua-parser-js",
+  "homepage": "http://github.com/faisalman/ua-parser-js",
   "contributors": [
-    {
-      "name"    : "Faisal Salman",
-      "email"   : "fyzlman@gmail.com"
-    }
+    "Faisal Salman <fyzlman@gmail.com>"
   ],
-  "main"        : "ua-parser.js",
+  "main": "ua-parser",
   "repositories": [
     {
-      "type"    : "git",
-      "url"     : "https://github.com/faisalman/ua-parser-js.git"
+      "type": "git",
+      "url": "https://github.com/faisalman/ua-parser-js.git"
     }
   ],
-  "licenses"    : [
+  "repository" :
+  {
+    "type": "git",
+    "url": "https://github.com/faisalman/ua-parser-js.git"
+  },
+  "licenses": [
     {
-      "type"    : "GPLv2",
-      "url"     : "http://www.gnu.org/licenses/gpl-2.0.html" 
+      "type": "GPLv2",
+      "url": "http://www.gnu.org/licenses/gpl-2.0.html"
     },
     {
-      "type"    : "MIT",
-      "url"     : "http://www.opensource.org/licenses/mit-license.php" 
+      "type": "MIT",
+      "url": "http://www.opensource.org/licenses/mit-license.php"
     }
-  ]
+  ],
+  "engines": {
+    "node": "*"
+  },
+  "directories": {
+    "lib": "."
+  },
+  "files": [
+    ""
+  ],
+  "repository": "git://github.com/faisalman/ua-parser-js.git"
 }

readme.md

@@ -1,11 +1,11 @@
 # UA-Parser.js
 
-JavaScript-based user-agent parser
+Light-weight JavaScript-based all-in-one user-agent parser
 
 * Author    : Faisalman <<fyzlman@gmail.com>>
 * Home      : http://faisalman.github.com/ua-parser-js
-* Source	: https://github.com/faisalman/ua-parser-js
-* License	: GPLv2 & MIT
+* Source    : https://github.com/faisalman/ua-parser-js
+* License   : GPLv2 & MIT
 
 ## Features
 
@@ -29,8 +29,10 @@ Get detailed type and version of web browser, layout engine, operating system, a
 <script type="text/javascript" src="ua-parser.js"></script>
 <script type="text/javascript">
     
+	var parser = new UAParser();
+	
     // by default it takes ua string from current browser's window.navigator
-    console.log(UAParser.result);
+    console.log(parser.result);
     /*
         /// this will print an object structured like this:
         {
@@ -39,10 +41,6 @@ Get detailed type and version of web browser, layout engine, operating system, a
                 version: "",
                 major: ""
             },
-            device: {
-                name: "",
-                version: ""
-            },
             engine: {
                 name: "",
                 version: ""
@@ -60,30 +58,30 @@ Get detailed type and version of web browser, layout engine, operating system, a
 
     // let's test a custom user-agent string as an example
     var uastr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
-    UAParser.setUA(uastr);
+    parser.setUA(uastr);
     
-    console.log(UAParser.result.browser);  // {name: "Chromium", major: "15", version: "15.0.874.106"}
-    console.log(UAParser.result.engine);   // {name: "AppleWebKit", version: "535.2"}
-    console.log(UAParser.result.os);       // {name: "Ubuntu", version: "11.10"}
+    console.log(parser.result.browser);  // {name: "Chromium", major: "15", version: "15.0.874.106"}
+    console.log(parser.result.engine);   // {name: "AppleWebKit", version: "535.2"}
+    console.log(parser.result.os);       // {name: "Ubuntu", version: "11.10"}
     
     // let's take another test please
-    UAParser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name; // prints "OpenBSD"
+    console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name); // "OpenBSD"
 </script>
 ```
 
 ## Using node.js
 
 ```js
-var parser = require('ua-parser');
-
+var UAParser = require('ua-parser');
+var parser = new UAParser();
 var ua1 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
 var ua2 = 'Midori/0.2 (X11; Linux; U; cs-cz) WebKit/531.2+';
 
-parser.setUA(ua1).getDevice().name; // prints "PlayBook"
-parser.getOS()                      // prints {name: "RIM Tablet OS", version: "1.0.0"}
-parser.getOS(ua2)                   // prints {name: "Linux", version: undefined}
-parser.getOS()                      // prints {name: "RIM Tablet OS", version: "1.0.0"}
-parser.getEngine().name;            // prints "AppleWebKit"
+parser.setUA(ua1).getDevice().name; // "PlayBook"
+parser.getOS()                      // {name: "RIM Tablet OS", version: "1.0.0"}
+parser.getOS(ua2)                   // {name: "Linux", version: undefined}
+parser.getOS()                      // {name: "RIM Tablet OS", version: "1.0.0"}
+parser.getEngine().name;            // "AppleWebKit"
 ```
 
 ## License

ua-parser.js

@@ -1,28 +1,31 @@
-// UA-Parser.js v0.3.0
-// Lightweight JavaScript-based user-agent parser
+// UA-Parser.js v0.3.2
+// Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
 // Copyright © 2012 Faisalman
-// Licensed under GPLv2 & MIT
+// Dual licensed under GPLv2 & MIT
 
-(function () {
-    function UAParser (uastring) {
+(function (undefined) {
+    var parser = function UAParser (uastring) {
 
-        var ua = uastring || typeof window !== 'undefined' ? window.navigator.userAgent : "";
+        var ua = uastring || (typeof window !== 'undefined' ? window.navigator.userAgent : "");
 
         // regexp mapper
         var regxMap = function (ua) {
-            var result;
-            var i, j, k, l;
+            var result = {}, i, j, k, l;
             for (i = 1; i < arguments.length; i += 2) {
-                var regex = arguments[i];
-                var props = arguments[i + 1];
-                var isMatchFound = false;
+                var regex = arguments[i],       // odd sequence (2,4,6,..)
+                    props = arguments[i + 1];   // even sequence (3,5,7,..)
+                for (k = 0; k < props.length; k++) {
+                    if (typeof props[k] == 'object') {
+                        result[props[k][0]] = undefined;
+                    } else {
+                        result[props[k]] = undefined;
+                    }
+                }
                 for (j = 0; j < regex.length; j++) {
                     var match = regex[j].exec(ua);
-                    //console.log(match);
                     if (!!match) {
-                        result = {};
                         l = 1;
                         for (k = 0; k < props.length; k++) {
                             if (typeof props[k] === 'object' && props[k].length === 2) {
@@ -34,46 +37,37 @@
                                 result[props[k]] = (!!match[k + l]) ? match[k + l] : undefined;
                             }
                         }
-                        isMatchFound = true;
                         break;
                     }
                 }
-                if (!isMatchFound) {
-                    result = {};
-                    for (k in props) {
-                        if (props.hasOwnProperty(k)) {
-                            if (typeof props[k] == 'object') {
-                                result[props[k][0]] = undefined;
-                            } else {
-                                result[props[k]] = undefined;
-                            }
-                        }
-                    }
-                } else {
-                    return result;
-                }
+                if(!!l) break; // break the loop if match found
             }
             return result;
         };
 
         var mapper = {
+            check: function(str, map){
+                for (var i = 0; i < map.length; i++) {
+                    if (str.toLowerCase().indexOf(map[i][0]) !== -1) {
+                        return map[i][1];
+                    }
+                }
+                return str;
+            },
             os : {
-                win: function (str, match) {
-                    switch (match.toLowerCase()) {
-                        case 'nt 5.0':
-                            return '2000';
-                        case 'nt 5.1':
-                        case 'nt 5.2':
-                            return 'XP';
-                        case 'nt 6.0':
-                            return 'Vista';
-                        case 'nt 6.1':
-                            return '7';
-                        case 'nt 6.2':
-                            return '8';
-                        default:
-                            return match;
-                    };
+                win: function (match, str1) {
+                    var map = [
+                        ['4.90',     'ME'],
+                        ['nt3.51',   'NT 3.11'],
+                        ['nt4.0',    'NT 4.0'],
+                        ['nt 5.0',   '2000'],
+                        ['nt 5.1',   'XP'],
+                        ['nt 5.2',   'XP'],
+                        ['nt 6.0',   'Vista'],
+                        ['nt 6.1',   '7'],
+                        ['nt 6.2',   '8'],
+                    ];
+                    return mapper.check(str1, map);
                 }
             }
         };
@@ -96,8 +90,9 @@
                 /ms(ie)\s((\d+)?[\w\.]+)/i,                                         // Internet Explorer
 
                 // Webkit/KHTML based
-                /(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i,      // Chromium/Flock/RockMelt/Midori/Epiphany
-                /(chrome|omniweb|arora|dolfin)\/((\d+)?[\w\.]+)/i,                  // Chrome/OmniWeb/Arora/Dolphin
+                /(chromium|flock|rockmelt|midori|epiphany|silk)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany
+                /(chrome|omniweb|arora|dolfin|[tizenaok]{5}\s?browser)\/((\d+)?[\w\.]+)/i,
+                                                                                    // Chrome/OmniWeb/Arora/Dolphin/Tizen/Nokia
                 ], ['name', 'version', 'major'], [
                 /(?:android.+crmo|crios)\/((\d+)?[\w\.]+)/i,                        // Chrome for Android/iOS
                 ], [['name', 'Chrome'], 'version', 'major'], [
@@ -105,7 +100,8 @@
                 /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i,
 
                 // Gecko based
-                /(iceweasel|camino|fennec|maemo|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,  // Iceweasel/Camino/Fennec/Maemo/Minimo
+                /(iceweasel|camino|fennec|maemo\sbrowser|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,  
+                                                                                    // Iceweasel/Camino/Fennec/Maemo/Minimo
                 /(firefox|seamonkey|netscape|navigator|k-meleon|icecat|iceape)\/((\d+)?[\w\.]+)/i,
                                                                                     // Firefox/SeaMonkey/Netscape/K-Meleon/IceCat/IceApe
                 /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla
@@ -133,13 +129,16 @@
             return regxMap(uastring || ua, [
 
                 // Windows based
-                /(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i,                     // Windows
-                ], ['name', ['version', /(nt\s[\d\.]+)/gi, mapper.os.win]], [
+                /(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)/i                   // Windows
+                ], ['name', ['version', /(.+)/gi, mapper.os.win]], [
+                /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
+                ], [['name', 'Windows'], ['version', /(.+)/gi, mapper.os.win]], [
                 
                 // Mobile/Embedded OS
                 /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry
-                /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos)[\/\s-]?([\w\.]+)*/i,
-                                                                                    // Android/Symbian/WebOS/Palm/QNX/Bada/RIM
+                /(tizen)\/([\w\.]+)/i,                                              // Tizen
+                /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i,
+                                                                                    // Android/Symbian/WebOS/Palm/QNX/Bada/RIM/MeeGo
                 /(nintendo|playstation)\s([wids3portable]+)/i,                      // Nintendo/Playstation
 
                 // GNU/Linux based
@@ -150,11 +149,11 @@
                 /(gnu|linux)\s?([\w\.]+)*/i                                         // Other GNU/Linux
                 ], ['name', 'version'], [
 
-                /cros\s([\w\.\s]+)/i                                                // Chromium OS
+                /cros\s([\w\.\s]+\d)/i                                              // Chromium OS
                 ], [['name', 'Chromium OS'], 'version'],[
 
                 // Solaris
-                /sunos\s?([\w\.\s]+)*/i                                             // Solaris
+                /sunos\s?([\w\.\s]+\d)*/i                                           // Solaris
                 ], [['name', 'Solaris'], 'version'], [
 
                 // BSD based
@@ -164,11 +163,12 @@
                 /(ip[honead]+).*os\s*([\w]+)*\slike\smac/i                          // iOS
                 ], [['name', /.+/g, 'iOS'], ['version', /_/g, '.']], [
 
-                /(mac\sos)\sx\s([\w\s\.]+)/i,                                       // Mac OS
+                /(mac\sos\sx)\s([\w\s\.]+\w)/i,                                     // Mac OS
                 ], ['name', ['version', /_/g, '.']], [
 
                 // Other
-                /(macintosh|unix|minix|beos)[\/\s]?()*/i
+                /(haiku)\s(\w+)/i,                                                  // Haiku
+                /(macintosh|unix|minix|beos)[\/\s]?()*/i                            // UNIX/Minix/BeOS
                 ], ['name', 'version']);
         };
 
@@ -178,9 +178,9 @@
 
                 /\((ip[honead]+|playbook);/i,                                       // iPod/iPhone/iPad/PlayBook
                 /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-                /(blackberry|benq|nokia|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,  
-                                                                                    // BenQ/Nokia/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
-                /(hp)\s([\w\s]+)/i,                                                 // HP iPAQ
+                /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,  
+                                                                                    // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
+                /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
                 /(hp).+(touchpad)/i,                                                // HP TouchPad
                 /(kindle)\/([\w\.]+)/i,                                             // Kindle
                 /(lg)[e;\s-]+(\w+)*/i,                                              // LG
@@ -204,11 +204,19 @@
                 ], [['name', 'Asus'], 'version'], [
 
                 /sie-(\w+)*/i                                                       // Siemens
-                ], [['name', 'Siemens'], 'version']);
+                ], [['name', 'Siemens'], 'version'], [
+                
+                /(?=maemo|nokia).*(n900|lumia\s\d+)/i,                              // Nokia
+                /nokia[\s_-]?([\w-]+)*/i
+                ], [['name', 'Nokia'], 'version']);
+        };
+        
+        this.getUA = function() {
+            return ua;
         };
 
         this.setUA = function (uastring) {
-            ua = uastring || ua;
+            ua = uastring;
             this.result = {
                 browser : this.getBrowser(),
                 engine  : this.getEngine(),
@@ -221,8 +229,6 @@
         this.setUA(ua);
     };
         
-    var parser = new UAParser();
-    
     // check whether script is running inside node.js export as module
     if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') {
         if (typeof module !== 'undefined' && module.exports) {