Merge pull request bestiejs#30 miketaylr/issue-27

Also fixes issues with bestiejs#28

Author: bnjmnt4n

platform.js

@@ -555,6 +555,10 @@
     if (/\bSimulator\b/i.test(ua)) {
       product = (product ? product + ' ' : '') + 'Simulator';
     }
+    // detect Firefox OS
+    if ((/\(Mobile|Tablet.*Firefox/i).test(ua)) {
+      os = 'Firefox OS';
+    }
     // detect iOS
     if (/^iP/.test(product)) {
       name || (name = 'Safari');
@@ -676,8 +680,8 @@
       version = version.replace(RegExp(data + '\\+?$'), '') +
         (prerelease == 'beta' ? beta : alpha) + (/\d+\+?/.exec(data) || '');
     }
-    // rename code name "Fennec"
-    if (name == 'Fennec') {
+    // detect Firefox Mobile
+    if (name == 'Fennec' || name == 'Firefox' && /Android|Firefox OS/.test(os)) {
       name = 'Firefox Mobile';
     }
     // obscure Maxthon's unreliable version

test/test.js

@@ -617,6 +617,22 @@
       'version': '24.0'
     },
 
+    'Firefox Mobile#{ }24.0 on Android': {
+      'ua': 'Mozilla/5.0 (Android; Tablet; rv:24.0) Gecko/24.0 Firefox/24.0',
+      'layout': 'Gecko',
+      'name': 'Firefox Mobile',
+      'os': 'Android',
+      'version': '24.0'
+    },
+
+    'Firefox Mobile 26.0 on Firefox OS': {
+      'ua': 'Mozilla/5.0 (Tablet; rv:26.0) Gecko/26.0 Firefox/26.0',
+      'layout': 'Gecko',
+      'name': 'Firefox Mobile',
+      'os': 'Firefox OS',
+      'version': '26.0'
+    },
+
     'Firefox Mobile 2.0#{beta}1 on Android': {
       'ua': 'Mozilla/5.0 (Android; Linux armv7l; rv:2.0b6pre) Gecko/20100907 Firefox/4.0b6pre Fennec/2.0b1pre',
       'layout': 'Gecko',
@@ -642,22 +658,6 @@
       'version': '10.0.5'
     },
 
-    'Firefox Mobile 24.0 on Android': {
-      'ua': 'Mozilla/5.0 (Android; Mobile; rv:24.0) Gecko/24.0 Firefox/24.0',
-      'layout': 'Gecko',
-      'name': 'Firefox Mobile',
-      'os': 'Android',
-      'version': '24.0'
-    },
-
-    'Firefox Mobile 24.0 on Android': {
-      'ua': 'Mozilla/5.0 (Android; Tablet; rv:24.0) Gecko/24.0 Firefox/24.0',
-      'layout': 'Gecko',
-      'name': 'Firefox Mobile',
-      'os': 'Android',
-      'version': '24.0'
-    },
-
     'Flock 2.0#{alpha}1 on Linux i686': {
       'ua': 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9pre) Gecko/2008051917 Firefox/3.0pre Flock/2.0a1pre',
       'layout': 'Gecko',