Some fixes

package.json

@@ -1,7 +1,7 @@
 {
   "title": "UA-Parser.JS",
   "name": "ua-parser-js",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [

readme.md

@@ -48,8 +48,9 @@ Extract detailed type of web browser, layout engine, operating system, and devic
                 version: ""
             },
             device: {
-                name: "",
+                model: "",
-                version: ""
+                type: "",
+                vendor: ""
             }
         }
     */
@@ -59,11 +60,14 @@ Extract detailed type of web browser, layout engine, operating system, and devic
     parser.setUA(uastr);
     
     console.log(parser.getResult().browser);    // {name: "Chromium", major: "15", version: "15.0.874.106"}
+    console.log(parser.getResult().device);     // {model: undefined, type: undefined, vendor: undefined}
     console.log(parser.getResult().engine);     // {name: "AppleWebKit", version: "535.2"}
     console.log(parser.getResult().os);         // {name: "Ubuntu", version: "11.10"}
     
     // let's take another test please
-    console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name); // "OpenBSD"
+    console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getBrowser().name); // "Konqueror"
+    console.log(parser.getOS());                // {name: "OpenBSD", version: undefined}
+    console.log(parser.getEngine());            // {name: "KHTML", version: "4.1.4"}
 </script>
 ```
 
@@ -74,7 +78,7 @@ var UAParser    = require('ua-parser');
 var parser      = new UAParser();
 var uaString    = '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';
 
-console.log(parser.setUA(uaString).getDevice().name);   // "PlayBook"
+console.log(parser.setUA(uaString).getDevice().model);  // "PlayBook"
 console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
 console.log(parser.getEngine().name);                   // "AppleWebKit"
 ```

ua-parser.js

@@ -1,4 +1,4 @@
-// UA-Parser.JS v0.4.0
+// UA-Parser.JS v0.4.3
 // Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
@@ -7,6 +7,8 @@
 
 (function (undefined) {
 
+    'use strict';
+    
     var mapper = {
     
         regex : function () {
@@ -43,7 +45,11 @@
                             if (typeof props[k] === 'object' && props[k].length === 2) {
                                 result[props[k][0]] = props[k][1];
                             } else if (typeof props[k] === 'object' && props[k].length === 3) {
+                                if (typeof props[k][1] === 'function') {
+                                    result[props[k][0]] = m ? props[k][1].call(this, m, props[k][2]) : undefined;
+                                } else {
                                     result[props[k][0]] = m ? m.replace(props[k][1], props[k][2]) : undefined;
+                                }
                             } else {
                                 result[props[k]] = m ? m : undefined;
                             }
@@ -63,11 +69,11 @@
                 if (map.hasOwnProperty(i)) {
                     if (typeof map[i] === 'object' && map[i].length > 0) {
                         for (var j = 0; j < map[i].length; j++) {
-                            if (str.toLowerCase().indexOf(map[i][j]) !== -1) {
+                            if (str.toLowerCase().indexOf(map[i][j].toLowerCase()) !== -1) {
                                 return i;
                             }
                         }
-                    } else if (str.toLowerCase().indexOf(map[i]) !== -1) {
+                    } else if (str.toLowerCase().indexOf(map[i].toLowerCase()) !== -1) {
                         return i;
                     }
                 }
@@ -79,17 +85,15 @@
     var maps = {
         os : {
             windows : {
-                version : function (match, str1) {
+                version : {
-                    return mapper.string(str1, {
                     'ME'        : '4.90',
-                        'NT 3.11'   : 'nt3.51',
+                    'NT 3.11'   : 'NT3.51',
-                        'NT 4.0'    : 'nt4.0',
+                    'NT 4.0'    : 'NT4.0',
-                        '2000'      : 'nt 5.0',
+                    '2000'      : 'NT 5.0',
-                        'XP'        : ['nt 5.1', 'nt 5.2'],
+                    'XP'        : ['NT 5.1', 'NT 5.2'],
-                        'Vista'     : 'nt 6.0',
+                    'Vista'     : 'NT 6.0',
-                        '7'         : 'nt 6.1',
+                    '7'         : 'NT 6.1',
-                        '8'         : 'nt 6.2'
+                    '8'         : 'NT 6.2'
-                    });
                 }
             }
         }
@@ -99,23 +103,25 @@
 
         browser : [[
 
-            // Mixed
-            /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
-            /(lunascape|maxthon|netfront|jasmine)[\/\s]?((\d+)?[\w\.]+)/i,      // Lunascape/Maxthon/Netfront/Jasmine
-            
             // Presto based
             /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
             /(opera\smobi)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mobile
-            /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera
+            /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera > 9.80
-            /(opera)[\/\s]+((\d+)?[\w\.]+)/i,
+            /(opera)[\/\s]+((\d+)?[\w\.]+)/i,                                   // Opera < 9.80
+            
+            // Mixed
+            /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
+            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)/i,
+                                                                                // Lunascape/Maxthon/Netfront/Jasmine/Blazer
             
             // Trident based
             /(avant\sbrowser|iemobile|slimbrowser)[\/\s]?((\d+)?[\w\.]*)/i,     // Avant/IEMobile/SlimBrowser
             /ms(ie)\s((\d+)?[\w\.]+)/i,                                         // Internet Explorer
 
             // Webkit/KHTML based
-            /(chromium|flock|rockmelt|midori|epiphany|silk)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany
+            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|series60|bolt)\/((\d+)?[\w\.]+)/i, 
-            /(chrome|omniweb|arora|dolfin|[tizenaok]{5}\s?browser)\/((\d+)?[\w\.]+)/i,
+                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/S60/Bolt
+            /(chrome|omniweb|arora|dolfin|[tizenoka]{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
@@ -131,51 +137,73 @@
             /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla
 
             // Other
-            /(lynx|dillo|icab)[\/\s]?((\d+)?[\w\.]+)/i,                         // Lynx/Dillo/iCab
+            /(lynx|dillo|icab|doris)[\/\s]?((\d+)?[\w\.]+)/i,                   // Lynx/Dillo/iCab/Doris
+            /(gobrowser)\/?[\d\.]*/i                                            // GoBrowser
             ], ['name', 'version', 'major']
         ],
         
         device : [[
 
-            /\((ip[honead]+|playbook);/i,                                       // iPod/iPhone/iPad/PlayBook
+            /\(((ipad|playbook));/i,                                            // iPad/PlayBook
-            /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-            /(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
+            /\s(nook)[\w\s]+build\/(\w+)/i,                                     // Nook
-            /(nintendo|playstation)\s([wids3portable]+)/i                       // Nintendo/Playstation
+            /(dell)\s(strea[kpr\s\d]*[\dko])/i                                  // Dell Streak
-            ], ['name', 'version'], [
+            ], ['vendor', 'model', ['type', 'Tablet']], [
 
-            /(htc)[;_\s-]+([\w\s]+(?=\))|[\w]+)*/i,                             // HTC
+            /\(((ip[honed]+));/i,                                               // iPod/iPhone
-            /(zte)-([\w]+)*/i
+            /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-            ], ['name', ['version', /_/g, ' ']], [
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|huawei|meizu|motorola)[\s_-]?([\w-]+)*/i,  
+                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Huawei/Meizu/Motorola
+            /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
+            /(asus)-?(\w+)/i                                                    // Asus
+            ], ['vendor', 'model', ['type', 'Mobile']], [
             
-            /\s((milestone|mz601|droid[2x]?|xoom))[globa\s]*\sbuild\//i,        // Motorola
+            /android.+((transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+))/i       // Asus Tablets
+            ], [['vendor', 'Asus'], 'model', ['type', 'Tablet']], [
+            
+            /(sony)\s(tablet\s[ps])/i                                           // Sony Tablets
+            ], ['vendor', 'model', ['type', 'Tablet']], [
+            
+            /(nintendo|playstation)\s([wids3portablev]+)/i                      // Nintendo/Playstation
+            ], ['vendor', 'model', ['type', 'Console']], [
+            
+            /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
+            /(zte)-(\w+)*/i                                                     // ZTE
+            ], ['vendor', ['model', /_/g, ' '], ['type', 'Mobile']], [
+                        
+            /\s((milestone|droid[2x]?))[globa\s]*\sbuild\//i,                   // Motorola
             /(mot)[\s-]?(\w+)*/i
-            ], [['name', 'Motorola'], 'version'], [
+            ], [['vendor', 'Motorola'], 'model', ['type', 'Mobile']], [            
+            /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i
+            ], [['vendor', 'Motorola'], 'model', ['type', 'Tablet']], [
             
-            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,                            // Samsung
+            /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9))/i
+            ], [['vendor', 'Samsung'], 'model', ['type', 'Tablet']], [          // Samsung
+            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,
             /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
             /sec-((sgh\w+))/i
-            ], [['name', 'Samsung'], 'version'], [
+            ], [['vendor', 'Samsung'], 'model', ['type', 'Mobile']], [
-            
-            /((transfo[prime\s]{4,10}\s\w+))|(?:android.*)((eeepc))/i           // Asus
-            ], [['name', 'Asus'], 'version'], [
-
             /(sie)-(\w+)*/i                                                     // Siemens
-            ], [['name', 'Siemens'], 'version'], [
+            ], [['vendor', 'Siemens'], 'model', ['type', 'Mobile']], [
             
             /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
             /(nokia)[\s_-]?([\w-]+)*/i
-            ], [['name', 'Nokia'], 'version']            
+            ], [['vendor', 'Nokia'], 'model', ['type', 'Mobile']], [
+            
+            /android\s3\.[\s\w-;]{10}((a\d{3}))/i                               // Acer
+            ], [['vendor', 'Acer'], 'model', ['type', 'Tablet']], [
+            
+            /android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i                     // LG
+            ], [['vendor', 'LG'], 'model', ['type', 'Tablet']], [
+            /(lg)[e;\s-\/]+(\w+)*/i
+            ], [['vendor', 'LG'], 'model', ['type', 'Mobile']]
         ],
         
         engine : [[
 
             /(presto)\/([\w\.]+)/i,                                             // Presto
-            /([aple]*webkit|trident)\/([\w\.]+)/i,                              // Webkit/Trident
+            /([aple]*webkit|trident|netfront)\/([\w\.]+)/i,                     // Webkit/Trident/NetFront
             /(khtml)\/([\w\.]+)/i                                               // KHTML
             ], ['name', 'version'], [
 
@@ -186,16 +214,20 @@
         os : [[
 
             // Windows based
-            /(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)/i                   // Windows
+            /(windows\sphone\sos|windows\s?[mobile]*)[\s\/]?([ntce\d\.\s]+\w)/i // Windows
-            ], ['name', ['version', /(.+)/gi, maps.os.windows.version]], [
+            ], ['name', ['version', mapper.string, maps.os.windows.version]], [
             /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
-            ], [['name', 'Windows'], ['version', /(.+)/gi, maps.os.windows.version]], [
+            ], [['name', 'Windows'], ['version', mapper.string, maps.os.windows.version]], [
             
             // Mobile/Embedded OS
             /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry
             /(tizen)\/([\w\.]+)/i,                                              // Tizen
-            /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i,
+            /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i
-                                                                                // Android/Symbian/WebOS/Palm/QNX/Bada/RIM/MeeGo
+                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo
+            ], ['name', 'version'], [
+            /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]+)*/i                 // Symbian
+            ], [['name', 'Symbian'], 'version'],[
+            
             /(nintendo|playstation)\s([wids3portable]+)/i,                      // Nintendo/Playstation
 
             // GNU/Linux based
@@ -206,7 +238,7 @@
             /(gnu|linux)\s?([\w\.]+)*/i                                         // Other GNU/Linux
             ], ['name', 'version'], [
 
-            /(cros)\s([\w\.\s]+\d)/i                                            // Chromium OS
+            /(cros)\s[\w]+\s([\w\.]+\w)/i                                       // Chromium OS
             ], [['name', 'Chromium OS'], 'version'],[
 
             // Solaris
@@ -218,7 +250,7 @@
             ], ['name', 'version'],[
 
             /(ip[honead]+).*os\s*([\w]+)*\slike\smac/i                          // iOS
-            ], [['name', /.+/g, 'iOS'], ['version', /_/g, '.']], [
+            ], [['name', 'iOS'], ['version', /_/g, '.']], [
 
             /(mac\sos\sx)\s([\w\s\.]+\w)/i,                                     // Mac OS
             ], ['name', ['version', /_/g, '.']], [
@@ -278,6 +310,6 @@
         }
         exports.UAParser = UAParser;
     } else {
-        this['UAParser'] = UAParser;
+        window['UAParser'] = UAParser;
     }
 })();