fixes #5522 - adds detection for new iPhone / iPad Models

matomo-org · Aug 27, 2016 · 63bdb28 · 63bdb28
1 parent 913aaea
commit 63bdb28
Show file tree

Hide file tree

Showing 9 changed files with 163 additions and 131 deletions.
diff --git a/Tests/fixtures/bots.yml b/Tests/fixtures/bots.yml
@@ -1212,7 +1212,7 @@
       name: Netcraft
       url: http://www.netcraft.com
 - 
-  user_agent: Netcraft SSL Server Survey - contact info@netcraft.com
+  user_agent: 'Netcraft SSL Server Survey - contact info@netcraft.com'
   bot:
     name: Netcraft Survey Bot
     category: Search bot
@@ -1544,22 +1544,16 @@
     producer:
       name: QueryEye Inc.
       url: http://queryeye.com
--
-  user_agent: Mozilla/5.0 (compatible; Qwantify/2.2w; +https://www.qwant.com/)/*
+- 
+  user_agent: 'Mozilla/5.0 (compatible; Qwantify/2.2w; +https://www.qwant.com/)/*'
   bot:
     name: Qwantify
     category: Crawler
     url: https://www.qwant.com/
     producer:
       name: Qwant Corporation
       url: https://www.qwant.com/
--
-  user_agent: Rainmeter WebParser plugin
-  bot:
-    name: Rainmeter
-    category: Crawler
-    url: https://www.rainmeter.net
--
+- 
   user_agent: ROI Hunter; https://api-dev.roihunter.com
   bot:
     name: ROI Hunter
@@ -1568,6 +1562,12 @@
     producer:
       name: Roihunter a.s.
       url: http://roihunter.com/
+- 
+  user_agent: Rainmeter WebParser plugin
+  bot:
+    name: Rainmeter
+    category: Crawler
+    url: https://www.rainmeter.net
 - 
   user_agent: Mozilla/5.0 (compatible; redditbot/1.0; +http://www.reddit.com/feedback)
   bot:

diff --git a/Tests/fixtures/smartphone-1.yml b/Tests/fixtures/smartphone-1.yml
@@ -1,4 +1,23 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; fr-at; HTC_Desire_500/1.17.112.2 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.2"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+  device:
+    type: smartphone
+    brand: HT
+    model: Desire 500
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; fr-ch; HTC Desire 500 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 GSA/3.3.11.1069658.arm
   os:
@@ -9448,22 +9467,3 @@
     model: P705g
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; ru-ru; LG-P713 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.1.2"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-  device:
-    type: smartphone
-    brand: LG
-    model: P713
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml
@@ -1,4 +1,23 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; ru-ru; LG-P713 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: "4.1.2"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+  device:
+    type: smartphone
+    brand: LG
+    model: P713
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; ru-ru; LG-P725 Build/GRK39F) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   os:
@@ -9393,22 +9412,3 @@
     model: GALAXY S Advance
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; fr-ch; SAMSUNG GT-I9070/I9070BULK1 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-  os:
-    name: Android
-    short_name: AND
-    version: "2.3.6"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-  device:
-    type: smartphone
-    brand: SA
-    model: GALAXY S Advance
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml
@@ -1,4 +1,23 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; fr-ch; SAMSUNG GT-I9070/I9070BULK1 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: "2.3.6"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+  device:
+    type: smartphone
+    brand: SA
+    model: GALAXY S Advance
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 2.3.6; fr-fr; GT-I9070P-ORANGE/I9070PBVLD3 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   os:
@@ -9375,22 +9394,3 @@
     model: StarNaute 2
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 2.2.2; fr-fr; Starshine Build/HuaweiU8180) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-  os:
-    name: Android
-    short_name: AND
-    version: "2.2.2"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-  device:
-    type: smartphone
-    brand: SX
-    model: StarShine
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/smartphone-4.yml b/Tests/fixtures/smartphone-4.yml
@@ -1,4 +1,23 @@
 ---
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.2.2; fr-fr; Starshine Build/HuaweiU8180) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: "2.2.2"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+  device:
+    type: smartphone
+    brand: SX
+    model: StarShine
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; fr-fr; STARSHINE II Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
   os:

diff --git a/Tests/fixtures/smartphone.yml b/Tests/fixtures/smartphone.yml
@@ -1480,6 +1480,23 @@
     model: iPhone 5S
   os_family: iOS
   browser_family: Unknown
+- 
+  user_agent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3_3 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G34 [FBAN/FBIOS;FBAV/61.0.0.53.158;FBBV/35251526;FBRV/0;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iPhone OS;FBSV/9.3.3;FBSS/2;FBCR/T-Mobile;FBID/phone;FBLC/en_US;FBOP/5] '
+  os:
+    name: iOS
+    short_name: IOS
+    version: "9.3.3"
+    platform:
+  client:
+    type: mobile app
+    name: Facebook
+    version: "61.0.0.53.158"
+  device:
+    type: smartphone
+    brand: AP
+    model: iPhone SE
+  os_family: iOS
+  browser_family: Unknown
 - 
   user_agent: Mozilla/5.0 (Linux; Android 4.2.2; Archos 40 Titanium Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.94 Mobile Safari/537.36
   os:
@@ -9390,22 +9407,3 @@
     model: Desire 500
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; fr-at; HTC_Desire_500/1.17.112.2 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-  os:
-    name: Android
-    short_name: AND
-    version: "4.1.2"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-  device:
-    type: smartphone
-    brand: HT
-    model: Desire 500
-  os_family: Android
-  browser_family: Android Browser
diff --git a/Tests/fixtures/tablet.yml b/Tests/fixtures/tablet.yml
@@ -1880,25 +1880,6 @@
     model: One Touch TAB 7HD
   os_family: Android
   browser_family: Android Browser
-- 
-  user_agent: Mozilla/5.0 (Linux; U; Android 1.0.3; fr-fr; A80KSC Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17
-  os:
-    name: Android
-    short_name: AND
-    version: "1.0.3"
-    platform:
-  client:
-    type: browser
-    name: Android Browser
-    short_name: AN
-    version:
-    engine: WebKit
-  device:
-    type: tablet
-    brand: AN
-    model: 8
-  os_family: Android
-  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 2.2.1; fr-fr; A101B Build/MASTER) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
   os:
@@ -2355,6 +2336,25 @@
     model: 7h G3
   os_family: Android
   browser_family: Chrome
+- 
+  user_agent: Mozilla/5.0 (Linux; U; Android 1.0.3; fr-fr; A80KSC Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17
+  os:
+    name: Android
+    short_name: AND
+    version: "1.0.3"
+    platform:
+  client:
+    type: browser
+    name: Android Browser
+    short_name: AN
+    version:
+    engine: WebKit
+  device:
+    type: tablet
+    brand: AN
+    model: 8
+  os_family: Android
+  browser_family: Android Browser
 - 
   user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; fr-fr; AN8G2I Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
   os:

diff --git a/Tests/fixtures/unknown.yml b/Tests/fixtures/unknown.yml
@@ -24,6 +24,19 @@
     model:
   os_family: Unknown
   browser_family: Unknown
+- 
+  user_agent: BashPodder
+  os: [ ]
+  client:
+    type: feed reader
+    name: BashPodder
+    version:
+  device:
+    type:
+    brand:
+    model:
+  os_family: Unknown
+  browser_family: Unknown
 - 
   user_agent: Dillo/0.8.5-i18n-misc
   os: [ ]
@@ -39,6 +52,19 @@
     model:
   os_family: Unknown
   browser_family: Unknown
+- 
+  user_agent: gPodder/3.5.2 (+http://gpodder.org/)
+  os: [ ]
+  client:
+    type: feed reader
+    name: gPodder
+    version: "3.5.2"
+  device:
+    type:
+    brand:
+    model:
+  os_family: Unknown
+  browser_family: Unknown
 - 
   user_agent: HotJava/1.1.2 FCS
   os: [ ]
@@ -3194,29 +3220,3 @@
     model:
   os_family: iOS
   browser_family: Unknown
--
-  user_agent: gPodder/3.5.2 (+http://gpodder.org/)
-  os: [ ]
-  client:
-    type: feed reader
-    name: gPodder
-    version: "3.5.2"
-  device:
-    type:
-    brand:
-    model:
-  os_family: Unknown
-  browser_family: Unknown
--
-  user_agent: BashPodder
-  os: []
-  client:
-    type: feed reader
-    name: BashPodder
-    version:
-  device:
-    type:
-    brand:
-    model:
-  os_family: Unknown
-  browser_family: Unknown