device_detector 1.0.5 → 1.0.6

data/spec/fixtures/detector/feed_reader.yml

@@ -3,7 +3,6 @@
   user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) akregator/4.11.5 Safari/537.21
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: x64
   client:
@@ -20,7 +19,6 @@
   user_agent: Akregator/4.12.3; syndication SUSE
   os:
     name: SUSE
-    short_name: SSE
     version: ""
     platform: ""
   client:
@@ -63,7 +61,6 @@
   user_agent: FeedDemon/4.5 (http://www.feeddemon.com/; Microsoft Windows)
   os:
     name: Windows
-    short_name: WIN
     version: ""
     platform: ""
   client:
@@ -80,7 +77,6 @@
   user_agent: FeedDemon/4.5 (http://www.feeddemon.com/; Microsoft Windows XP)
   os:
     name: Windows
-    short_name: WIN
     version: "XP"
     platform: ""
   client:
@@ -97,7 +93,6 @@
   user_agent: FeeddlerPro/2.4 CFNetwork/672.0.8 Darwin/14.0.0
   os:
     name: iOS
-    short_name: IOS
     version: "7.0"
     platform: ""
   client:
@@ -106,7 +101,7 @@
     version: "2.4"
   device:
     type: ""
-    brand: AP
+    brand: Apple
     model: ""
   os_family: iOS
   browser_family: Unknown
@@ -114,7 +109,6 @@
   user_agent: FeeddlerRSS/2.4 CFNetwork/548.1.4 Darwin/11.0.0
   os:
     name: iOS
-    short_name: IOS
     version: "5.1"
     platform: ""
   client:
@@ -123,7 +117,7 @@
     version: "2.4"
   device:
     type: ""
-    brand: AP
+    brand: Apple
     model: ""
   os_family: iOS
   browser_family: Unknown
@@ -131,7 +125,6 @@
   user_agent: FeeddlerRSS 2.4 (iPad; iPhone OS 5.1.1; en_US)
   os:
     name: iOS
-    short_name: IOS
     version: "5.1.1"
     platform: ""
   client:
@@ -140,15 +133,14 @@
     version: "2.4"
   device:
     type: tablet
-    brand: AP
+    brand: Apple
     model: iPad
   os_family: iOS
   browser_family: Unknown
--
+- 
   user_agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/602.1 (KHTML, like Gecko) QuiteRSS/0.18.12 Safari/602.1
   os:
     name: Windows
-    short_name: WIN
     version: "7"
     platform: ""
   client:
@@ -156,7 +148,7 @@
     name: QuiteRSS
     version: "0.18.12"
   device:
-    type: "desktop"
+    type: desktop
     brand: ""
     model: ""
   os_family: Windows
@@ -178,7 +170,6 @@
   user_agent: Liferea/1.6.4 (Linux; en_US.UTF-8; http://liferea.sf.net/)
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: ""
   client:
@@ -195,7 +186,6 @@
   user_agent: Liferea/1.10-RC1 (Linux; en_GB.UTF-8; http://liferea.sf.net/)
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: ""
   client:
@@ -212,7 +202,6 @@
   user_agent: Liferea/1.10.6 (Linux; en_US.UTF8; http://liferea.sf.net/) AppleWebKit (KHTML, like Gecko)
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: ""
   client:
@@ -229,7 +218,6 @@
   user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/6.0 NetNewsWire/4.0.0
   os:
     name: Mac
-    short_name: MAC
     version: "10.9.2"
     platform: ""
   client:
@@ -238,7 +226,7 @@
     version: "4.0.0"
   device:
     type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
@@ -246,7 +234,6 @@
   user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) NetNewsWire/3.3.2
   os:
     name: Mac
-    short_name: MAC
     version: "10.9.2"
     platform: ""
   client:
@@ -255,7 +242,7 @@
     version: "3.3.2"
   device:
     type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
@@ -276,7 +263,6 @@
   user_agent: NetNewsWire/4.0.0 (Mac OS X; http://netnewswireapp.com/mac/; gzip-happy)
   os:
     name: Mac
-    short_name: MAC
     version: ""
     platform: ""
   client:
@@ -285,49 +271,14 @@
     version: "4.0.0"
   device:
     type: desktop
-    brand: AP
-    model: ""
-  os_family: Mac
-  browser_family: Unknown
-- 
-  user_agent: Downcast/2.9.11 (Mac OS X Version 10.11.3 (Build 15D21))
-  os:
-    name: Mac
-    short_name: MAC
-    version: "10.11.3"
-    platform: ""
-  client:
-    type: feed reader
-    name: Downcast
-    version: "2.9.11"
-  device:
-    type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
-- 
-  user_agent: Downcast/2.9.11 (iPhone; iOS 9.2; Scale/2.00)
-  os:
-    name: iOS
-    short_name: IOS
-    version: "9.2"
-    platform: ""
-  client:
-    type: feed reader
-    name: Downcast
-    version: "2.9.11"
-  device:
-    type: smartphone
-    brand: AP
-    model: iPhone
-  os_family: iOS
-  browser_family: Unknown
 - 
   user_agent: newsbeuter/2.7 (Linux x86_64)
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: x64
   client:
@@ -344,7 +295,6 @@
   user_agent: NewsBlur iPhone App v3.6
   os:
     name: iOS
-    short_name: IOS
     version: ""
     platform: ""
   client:
@@ -353,7 +303,7 @@
     version: "3.6"
   device:
     type: smartphone
-    brand: AP
+    brand: Apple
     model: iPhone
   os_family: iOS
   browser_family: Unknown
@@ -361,7 +311,6 @@
   user_agent: NewsBlur iPad App v3.6
   os:
     name: iOS
-    short_name: IOS
     version: ""
     platform: ""
   client:
@@ -370,7 +319,7 @@
     version: "3.6"
   device:
     type: tablet
-    brand: AP
+    brand: Apple
     model: iPad
   os_family: iOS
   browser_family: Unknown
@@ -378,7 +327,6 @@
   user_agent: NewsBlur/4.0.1 CFNetwork/672.1.13 Darwin/14.0.0
   os:
     name: iOS
-    short_name: IOS
     version: "7.1"
     platform: ""
   client:
@@ -387,7 +335,7 @@
     version: "4.0.1"
   device:
     type: ""
-    brand: AP
+    brand: Apple
     model: ""
   os_family: iOS
   browser_family: Unknown
@@ -395,7 +343,6 @@
   user_agent: newsbeuter/2.4 (Linux 3.2.0-23-generic; i686; http://www.newsbeuter.org/) libcurl/7.22.0 GnuTLS/2.12.14 zlib/1.2.3.4 libidn/1.23 librtmp/2.3
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: x86
   client:
@@ -412,7 +359,6 @@
   user_agent: Pulp/1.5.2 (iPad; http://www.acrylicapps.com/pulp/)
   os:
     name: iOS
-    short_name: IOS
     version: ""
     platform: ""
   client:
@@ -421,7 +367,7 @@
     version: "1.5.2"
   device:
     type: tablet
-    brand: AP
+    brand: Apple
     model: iPad
   os_family: iOS
   browser_family: Unknown
@@ -429,7 +375,6 @@
   user_agent: ReadKit/2.4.0 (Mac OS X Version 10.9.2 (Build 13C64))
   os:
     name: Mac
-    short_name: MAC
     version: "10.9.2"
     platform: ""
   client:
@@ -438,16 +383,15 @@
     version: "2.4.0"
   device:
     type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
 - 
-  user_agent: 'ReadKit/7017 CFNetwork/673.2.1 Darwin/13.1.0 (x86_64) (MacBookPro10%2C1)'
+  user_agent: ReadKit/7017 CFNetwork/673.2.1 Darwin/13.1.0 (x86_64) (MacBookPro10%2C1)
   os:
     name: Mac
-    short_name: MAC
-    version: "10.9"
+    version: "10.9.2"
     platform: x64
   client:
     type: feed reader
@@ -455,15 +399,14 @@
     version: "7017"
   device:
     type: desktop
-    brand: AP
-    model: ""
+    brand: Apple
+    model: MacBook Pro 15" (2012-2013)
   os_family: Mac
   browser_family: Unknown
 - 
   user_agent: Reeder/3.2 CFNetwork/672.1.12 Darwin/14.0.0
   os:
     name: iOS
-    short_name: IOS
     version: "7.1"
     platform: ""
   client:
@@ -472,7 +415,7 @@
     version: "3.2"
   device:
     type: ""
-    brand: AP
+    brand: Apple
     model: ""
   os_family: iOS
   browser_family: Unknown
@@ -493,7 +436,6 @@
   user_agent: RssBandit/1.9.0.1002 (.NET CLR 2.0.50727.7512; WinNT 6.2.9200.0; http://www.rssbandit.org)
   os:
     name: Windows
-    short_name: WIN
     version: "NT"
     platform: ""
   client:
@@ -523,7 +465,6 @@
   user_agent: RSSOwl/2.2.1.201312301314 (Windows; U; en)
   os:
     name: Windows
-    short_name: WIN
     version: ""
     platform: ""
   client:
@@ -549,3 +490,35 @@
     model: ""
   os_family: Unknown
   browser_family: Unknown
+-
+  user_agent: Evergreen (macOS; RSS Reader; https://ranchero.com/evergreen/)
+  os:
+    name: Mac
+    version: ""
+    platform: ""
+  client:
+    type: feed reader
+    name: NetNewsWire
+    version: ""
+  device:
+    type: desktop
+    brand: Apple
+    model: ""
+  os_family: Mac
+  browser_family: Unknown
+-
+  user_agent: NetNewsWire (macOS; RSS Reader; https://ranchero.com/netnewswire/)
+  os:
+    name: Mac
+    version: ""
+    platform: ""
+  client:
+    type: feed reader
+    name: NetNewsWire
+    version: ""
+  device:
+    type: desktop
+    brand: Apple
+    model: ""
+  os_family: Mac
+  browser_family: Unknown

data/spec/fixtures/detector/mediaplayer.yml

@@ -16,7 +16,6 @@
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20130316 Songbird/1.12.1 (20140112193149)
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: x86
   client:
@@ -33,7 +32,6 @@
   user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20130316 Nightingale/1.12.2 (20140112193149)
   os:
     name: GNU/Linux
-    short_name: LIN
     version: ""
     platform: x86
   client:
@@ -50,7 +48,6 @@
   user_agent: iTunes/10.2.1 (Macintosh; Intel Mac OS X 10.7) AppleWebKit/534.20.8
   os:
     name: Mac
-    short_name: MAC
     version: "10.7"
     platform: ""
   client:
@@ -59,7 +56,7 @@
     version: "10.2.1"
   device:
     type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
@@ -67,7 +64,6 @@
   user_agent: iTunes/10.2.1 (Windows; Microsoft Windows 7 Enterprise Edition Service Pack 1 (Build 7601)) AppleWebKit/533.20.25
   os:
     name: Windows
-    short_name: WIN
     version: "7"
     platform: ""
   client:
@@ -82,23 +78,25 @@
   browser_family: Unknown
 - 
   user_agent: SAMSUNG-GT-S3850/S3850CXKD1 SHP/VPP/R5 Dolfin/2.0 NexPlayer/3.0 SMM-MMS/1.2.0 profile/MIDP-2.1 configuration/CLDC-1.1 OPN-B
-  os: [ ]
+  os:
+    name: Java ME
+    version: ""
+    platform: ""
   client:
     type: mediaplayer
     name: NexPlayer
     version: "3.0"
   device:
     type: smartphone
-    brand: SA
+    brand: Samsung
     model: GT-S3850
-  os_family: Unknown
+  os_family: Real-time OS
   browser_family: Unknown
 - 
   user_agent: Deezer/5.4.21.97 (Android; 6.0; Mobile; fr) WIKO U FEEL
   os:
     name: Android
-    short_name: AND
-    version: ""
+    version: "6.0"
     platform: ""
   client:
     type: mediaplayer
@@ -106,7 +104,7 @@
     version: "5.4.21.97"
   device:
     type: smartphone
-    brand: WI
+    brand: Wiko
     model: U Feel
   os_family: Android
   browser_family: Unknown
@@ -114,7 +112,6 @@
   user_agent: FlyCast/1.34 (BlackBerry; 8330/4.5.0.131 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/-1)
   os:
     name: BlackBerry OS
-    short_name: BLB
     version: ""
     platform: ""
   client:
@@ -123,7 +120,7 @@
     version: "1.34"
   device:
     type: smartphone
-    brand: RM
+    brand: RIM
     model: BlackBerry
   os_family: BlackBerry
   browser_family: Unknown
@@ -144,7 +141,6 @@
   user_agent: XBMC/9.04 r19840 (Mac OS X; Darwin 9.6.0; http://www.xbmc.org)
   os:
     name: Mac
-    short_name: MAC
     version: ""
     platform: ""
   client:
@@ -153,7 +149,7 @@
     version: "9.04"
   device:
     type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
@@ -161,7 +157,6 @@
   user_agent: SubStream/0.7 CFNetwork/485.12.30 Darwin/10.4.0
   os:
     name: iOS
-    short_name: IOS
     version: "4.2"
     platform: ""
   client:
@@ -170,7 +165,7 @@
     version: "0.7"
   device:
     type: ""
-    brand: AP
+    brand: Apple
     model: ""
   os_family: iOS
   browser_family: Unknown
@@ -178,7 +173,6 @@
   user_agent: Samsung GT-I9505 stagefright/1.2 (Linux;Android 4.4.2)
   os:
     name: Android
-    short_name: AND
     version: "4.4.2"
     platform: ""
   client:
@@ -187,15 +181,14 @@
     version: "1.2"
   device:
     type: smartphone
-    brand: SA
-    model: GALAXY S4
+    brand: Samsung
+    model: Galaxy S4
   os_family: Android
   browser_family: Unknown
 - 
   user_agent: Kodi/14.0 (Macintosh; Intel Mac OS X 10_10_3) App_Bitness/64 Version/14.0-Git:2014-12-23-ad747d9-dirty
   os:
     name: Mac
-    short_name: MAC
     version: "10.10.3"
     platform: ""
   client:
@@ -204,15 +197,14 @@
     version: "14.0"
   device:
     type: desktop
-    brand: AP
+    brand: Apple
     model: ""
   os_family: Mac
   browser_family: Unknown
--
+- 
   user_agent: GoogleChirp/1.0.1 (Linux; Android/5.0) GOOG/7 AppleWebKit/534.30 (KHTML, like Gecko)
   os:
     name: Android
-    short_name: AND
     version: "5.0"
     platform: ""
   client:
@@ -225,7 +217,7 @@
     model: ""
   os_family: Android
   browser_family: Unknown
--
+- 
   user_agent: Music Player Daemon 0.19.21
   os: [ ]
   client:
@@ -238,7 +230,7 @@
     model: ""
   os_family: Unknown
   browser_family: Unknown
--
+- 
   user_agent: mpv 0.29.1
   os: [ ]
   client:
@@ -251,3 +243,64 @@
     model: ""
   os_family: Unknown
   browser_family: Unknown
+-
+  user_agent: foobar2000/1.6.1
+  os: [ ]
+  client:
+    type: mediaplayer
+    name: Foobar2000
+    version: 1.6.1
+  device:
+    type: ""
+    brand: ""
+    model: ""
+  os_family: Unknown
+  browser_family: Unknown
+-
+  user_agent: Downcast/2.9.11 (Mac OS X Version 10.11.3 (Build 15D21))
+  os:
+    name: Mac
+    version: "10.11.3"
+    platform: ""
+  client:
+    type: mediaplayer
+    name: Downcast
+    version: "2.9.11"
+  device:
+    type: desktop
+    brand: Apple
+    model: ""
+  os_family: Mac
+  browser_family: Unknown
+-
+  user_agent: 'Downcast/1241 CFNetwork/673.4 Darwin/13.3.0 (x86_64) (MacBookAir4%2C2)'
+  os:
+    name: Mac
+    version: 10.9.4
+    platform: x64
+  client:
+    type: mediaplayer
+    name: Downcast
+    version: ""
+  device:
+    type: desktop
+    brand: Apple
+    model: MacBook Air 13" (2011)
+  os_family: Mac
+  browser_family: Unknown
+-
+  user_agent: MediaGo/3.2.0.191 (Windows NT 10.0; WOW64) PlaybackEngine/2.20.103.05220
+  os:
+    name: Windows
+    version: "10"
+    platform: x64
+  client:
+    type: mediaplayer
+    name: Sony Media Go
+    version: 3.2.0.191
+  device:
+    type: desktop
+    brand: ""
+    model: ""
+  os_family: Windows
+  browser_family: Unknown