device_detector 0.9.1 → 1.0.4

data/regexes/device/portable_media_player.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -19,10 +19,8 @@ Apple:
       model: 'iPod Touch 4'
     - regex: '(?:Apple-)?iPod5[C,]1'
       model: 'iPod Touch 5'
-    - regex: '(?:Apple-)?iPod1[C,]1'
-      model: 'iPod Touch'
-    - regex: '(?:Apple-)?iPod1[C,]1'
-      model: 'iPod Touch'
+    - regex: '(?:Apple-)?iPod7[C,]1'
+      model: 'iPod Touch 6'
     - regex: '(?:Apple-)?iPod'
       model: 'iPod Touch'
 
@@ -58,4 +56,4 @@ Samsung:
     - regex: 'YP-G50'
       model: 'Galaxy Player 50'
     - regex: 'YP-GB70D'
-      model: 'Galaxy Player 70 Plus'
+      model: 'Galaxy Player 70 Plus'

data/regexes/device/televisions.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 #
 #  ATTENTION: This file may only include tv user agents that contain 'HbbTV/([1-9]{1}(\.[0-9]{1}){1,2})'
@@ -56,6 +56,16 @@ Grundig:
   device: 'tv'
   model: ''
 
+# Hisense
+Hisense:
+  regex: 'Hisense'
+  device: 'tv'
+  models:
+    - regex: '(L[A-Z]{2,3}[0-9]{2}[A-Z][0-9]{3,4}[A-Z]{0,6}[0-9]?[A-Z]?)'
+      model: '$1'
+    - regex: '(H[A-Z]?[0-9]{2}[A-Z][0-9]{3,4}[A-Z]{0,4})'
+      model: '$1'
+
 # Humax
 Humax:
   regex: 'Humax'
@@ -101,6 +111,10 @@ LG:
   models:
     - regex: '(NetCast [0-9]{1}.[0-9]{1}|GLOBAL_PLAT3)'
       model: '$1'
+    - regex: '(OLED[0-9]{2}[A-Z][0-9][A-Z])'
+      model: '$1'
+    - regex: 'LGE;? ?([0-9]{2}[A-Z]{2}[0-9]{2,4}[A-Z]?)'
+      model: '$1'
 
 # Loewe
 Loewe:
@@ -165,7 +179,7 @@ Samsung:
   regex: 'Samsung|Maple_2011'
   device: 'tv'
   models:
-    - regex: 'SmartTV(2012|2013|2014|2015)'
+    - regex: 'SmartTV(201[2-9])'
       model: 'Smart TV $1'
     - regex: 'Maple_2011'
       model: 'Smart TV 2011'
@@ -213,7 +227,7 @@ Sony:
   regex: 'Sony'
   device: 'tv'
   models:
-    - regex: '(KDL[0-9]{2}[A-Z]{1,2}[0-9]{3})'
+    - regex: '(KDL?-?[0-9]{2}[A-Z]{1,2}[0-9]{1,5})'
       model: '$1'
 
 # TechniSat
@@ -279,4 +293,4 @@ Videoweb:
     - regex: '(tv2n)'
       model: '$1'
     - regex: '(videowebtv)'
-      model: 'VideoWeb TV'
+      model: 'VideoWeb TV'

data/regexes/oss.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -31,7 +31,7 @@
 ##########
 # Windows Mobile
 ##########
-- regex: 'Windows Phone (?:OS)?[ ]?(\d+[\.\d]+)'
+- regex: '(?:Windows Phone (?:OS)?|wds)[ ]?(\d+[\.\d]+)'
   name: 'Windows Phone'
   version: '$1'
   
@@ -45,7 +45,7 @@
   version: '$1'
   
   
-- regex: '(?:IEMobile|Windows Mobile)(?: (\d+[\.\d]+))?'
+- regex: '(?:IEMobile|Windows ?Mobile)(?: (\d+[\.\d]+))?'
   name: 'Windows Mobile'
   version: '$1'
   
@@ -58,6 +58,19 @@
   name: 'Windows RT'
   version: '8.1'
 
+##########
+# Windows IoT
+##########
+- regex: 'Windows IoT 10.0'
+  name: 'Windows IoT'
+  version: '10'
+
+##########
+# KaiOS
+##########
+- regex: 'KAIOS(?:/(\d+[\.\d]+))?'
+  name: 'KaiOS'
+  version: '$1'
 
 ##########
 # Custom Android Roms
@@ -78,10 +91,14 @@
   name: 'MocorDroid'
   version: '$1'
 
+- regex: 'Fire OS(?:/(\d+[\.\d]*))?'
+  name: 'Fire OS'
+  version: '$1'
+
 ##########
 # Android
 ##########
-- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]+)'
+- regex: '(?:(?:Orca-)?Android|Adr)[ /](?:[a-z]+ )?(\d+[\.\d]*)'
   name: 'Android'
   version: '$1'
   
@@ -89,6 +106,18 @@
 - regex: 'Android|Silk-Accelerated=[a-z]{4,5}'
   name: 'Android'
   version: ''
+
+- regex: '(?:TwitterAndroid).*[ /](?:[a-z]+ )?(\d+[\.\d]*)'
+  name: 'Android'
+  version: '$1'
+
+- regex: 'FB4A.*FBSV/(\d+[\.\d]*);'
+  name: 'Android'
+  version: '$1'
+
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe'
+  name: 'Android'
+  version: ''
   
   
 ##########
@@ -122,9 +151,17 @@
 ##########
 # Linux
 ##########
+- regex: '(Ordissimo|webissimo3)'
+  name: 'Ordissimo'
+  version: ''
+
+- regex: 'TOS; Linux'
+  name: 'TmaxOS'
+  version: ''
+
 - regex: 'Maemo'
   name: 'Maemo'
-  version: '$1'
+  version: ''
 
 - regex: 'Arch ?Linux(?:[ /\-](\d+[\.\d]+))?'
   name: 'Arch Linux'
@@ -239,12 +276,59 @@
 - regex: 'Windows'
   name: 'Windows'
   version: ''
-  
-  
+
+
+##########
+# Haiku OS
+##########
+- regex: 'Haiku'
+  name: 'Haiku OS'
+  version: ''
+
   
 ##########
 # iOS
 ##########
+- regex: 'CFNetwork/889'
+  name: 'iOS'
+  version: '11.1'
+
+- regex: 'CFNetwork/887.*(x86_64)'
+  name: 'Mac'
+  version: '10.13'
+
+- regex: 'CFNetwork/887'
+  name: 'iOS'
+  version: '11.0'
+
+- regex: 'CFNetwork/811.*(x86_64)'
+  name: 'Mac'
+  version: '10.12'
+
+- regex: 'CFNetwork/811'
+  name: 'iOS'
+  version: '10.3'
+
+- regex: 'CFNetwork/808\.3'
+  name: 'iOS'
+  version: '10.3'
+
+- regex: 'CFNetwork/808\.2'
+  name: 'iOS'
+  version: '10.2'
+
+- regex: 'CFNetwork/808\.1'
+  name: 'iOS'
+  version: '10.1'
+
+- regex: 'CFNetwork/808\.0'
+  name: 'iOS'
+  version: '10.0'
+
+- regex: 'CFNetwork/808'
+  name: 'iOS'
+  version: '10'
+
 - regex: 'CFNetwork/758\.4\.3'
   name: 'iOS'
   version: '9.3.2'
@@ -341,16 +425,31 @@
   name: 'iOS'
   version: '$1'
 
+- regex: 'FBIOS.*FBSV/(\d+[\.\d]*);'
+  name: 'iOS'
+  version: '$1'
+
 - regex: '(?:Apple-)?(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)?'
   name: 'iOS'
   version: '$1'
 
+- regex: 'Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|Overcast|Castro|Podcat|i[cC]atcher|RSSRadio/'
+  name: 'iOS'
+  version: ''
+
+- regex: 'iTunes-(iPod|iPad|iPhone)/(?:[\d\.]+)'
+  name: 'iOS'
+  version: ''
 
 
 ##########
 # Mac
 ##########
 
+- regex: 'CFNetwork/807'
+  name: 'Mac'
+  version: '10.12'
+
 - regex: 'CFNetwork/760'
   name: 'Mac'
   version: '10.11'
@@ -391,7 +490,7 @@
   name: 'Mac'
   version: '10.2'
 
-- regex: 'Mac OS X(?: (?:Version )?(\d+(?:[_\.]\d+)+))?'
+- regex: 'Mac[ +]OS[ +]X(?:[ /](?:Version )?(\d+(?:[_\.]\d+)+))?'
   name: 'Mac'
   version: '$1'
   
@@ -399,7 +498,7 @@
   name: 'Mac'
   version: '$1'
 
-- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC'
+- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC|iMac|MacBook'
   name: 'Mac'
   version: ''
   
@@ -408,7 +507,7 @@
 ##########
 # ChromeOS
 ##########
-- regex: 'CrOS [a-z0-9_]+ (\d+[\.\d]+)'
+- regex: 'CrOS [a-z0-9_]+ .* Chrome/(\d+[\.\d]+)'
   name: 'Chrome OS'
   version: '$1'
   
@@ -435,13 +534,9 @@
 - regex: 'BlackBerry'
   name: 'BlackBerry OS'
   version: ''
-
-
-##########
-# Haiku OS
-##########
-- regex: 'Haiku'
-  name: 'Haiku OS'
+  
+- regex: 'bPod'
+  name: 'BlackBerry OS'
   version: ''
 
 
@@ -645,11 +740,10 @@
 ##########
 # Gaming Console
 ##########
-- regex: 'Nintendo Wii'
+- regex: 'Nintendo (Wii|Switch)'
   name: 'Nintendo'
-  version: 'Wii'
-  
-  
+  version: '$1'
+
 - regex: 'PlayStation ?([3|4])'
   name: 'PlayStation'
   version: '$1'

data/regexes/vendorfragments.yml

@@ -1,7 +1,7 @@
 ###############
 # Device Detector - The Universal Device Detection library for parsing User Agents
 #
-# @link http://piwik.org
+# @link https://matomo.org
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
@@ -20,7 +20,7 @@ Sony:
 
 Asus:
   - 'MAAU'
-  - 'NP0[6789]'
+  - 'NP0[26789]'
   - 'ASJB'
   - 'ASU2(JS)?'
 
@@ -69,3 +69,7 @@ HP:
 
 Hyrican:
   - 'MANM(JS)?'
+
+Ordissimo:
+  - 'Ordissimo'
+  - 'webissimo3'

data/spec/device_detector/concrete_user_agent_spec.rb

@@ -13,7 +13,7 @@ describe DeviceDetector do
     describe '#device_name' do
 
       it 'returns device name' do
-        client.device_name.must_equal 'iPhone 5S'
+        value(client.device_name).must_equal 'iPhone 5S'
       end
 
     end
@@ -21,7 +21,7 @@ describe DeviceDetector do
     describe '#device_type' do
 
       it 'returns the device type' do
-        client.device_type.must_equal 'smartphone'
+        value(client.device_type).must_equal 'smartphone'
       end
 
     end
@@ -35,7 +35,7 @@ describe DeviceDetector do
     describe '#os_name' do
 
       it 'returns the OS name' do
-        client.os_name.must_equal 'Ubuntu'
+        value(client.os_name).must_equal 'Ubuntu'
       end
 
     end
@@ -49,7 +49,7 @@ describe DeviceDetector do
     describe '#full_version' do
 
       it 'returns the correct OS version' do
-        client.os_full_version.must_equal '10.10.1'
+        value(client.os_full_version).must_equal '10.10.1'
       end
 
     end
@@ -63,15 +63,15 @@ describe DeviceDetector do
       let(:user_agent) { 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.103 Safari/537.36' }
 
       it 'returns the correct client name' do
-        client.name.must_equal 'Chrome'
+        value(client.name).must_equal 'Chrome'
       end
 
       it 'recognizes the device name' do
-        client.device_name.must_be_nil
+        value(client.device_name).must_be_nil
       end
 
       it 'recognizes the device type' do
-        client.device_type.must_equal "desktop"
+        value(client.device_type).must_equal "desktop"
       end
 
     end
@@ -81,15 +81,15 @@ describe DeviceDetector do
       let(:user_agent) { 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36' }
 
       it 'returns the correct client name' do
-        client.name.must_equal 'Chrome'
+        value(client.name).must_equal 'Chrome'
       end
 
       it 'recognizes the device name' do
-        client.device_name.must_be_nil
+        value(client.device_name).must_be_nil
       end
 
       it 'recognizes the device type' do
-        client.device_type.must_equal "desktop"
+        value(client.device_type).must_equal "desktop"
       end
 
     end
@@ -101,15 +101,15 @@ describe DeviceDetector do
     let(:user_agent) { 'sprd-Galaxy-S5/1.0 Linux/2.6.35.7 Android/4.4.4 Release/11.29.2014 Browser/AppleWebKit533.1 (KHTML, like Gecko) Mozilla/5.0 Mobile' }
 
     it 'returns the correct client name' do
-      client.name.must_equal "Android Browser"
+      value(client.name).must_equal "Android Browser"
     end
 
     it 'recognizes the device name' do
-      client.device_name.must_equal "GALAXY S5"
+      value(client.device_name).must_equal "GALAXY S5"
     end
 
     it 'recognizes the device type' do
-      client.device_type.must_equal "smartphone"
+      value(client.device_type).must_equal "smartphone"
     end
 
   end
@@ -119,18 +119,17 @@ describe DeviceDetector do
     let(:user_agent) { 'Lenovo-A398t+_TD/S100 Linux/3.4.5 Android/4.1.2 Release/09.10.2013 Browser/AppleWebKit534.30 Mobile Safari/534.30' }
 
     it 'returns the correct client name' do
-      client.name.must_equal "Android Browser"
+      value(client.name).must_equal "Android Browser"
     end
 
     it 'recognizes the device name' do
-      client.device_name.must_equal "A398t+"
+      value(client.device_name).must_equal "A398t+"
     end
 
     it 'recognizes the device type' do
-      client.device_type.must_equal "smartphone"
+      value(client.device_type).must_equal "smartphone"
     end
 
   end
 
 end
-