device_detector 1.0.6 → 1.0.7

data/lib/device_detector/device.rb

@@ -54,6 +54,7 @@ class DeviceDetector
       '1A' => 'Alba',
       'AL' => 'Alcatel',
       '20' => 'Alcor',
+      'XY' => 'Alps',
       '7L' => 'ALDI NORD',
       '6L' => 'ALDI SÜD',
       '3L' => 'Alfawise',
@@ -69,6 +70,7 @@ class DeviceDetector
       'AG' => 'AMGOO',
       '9A' => 'Amigoo',
       'AO' => 'Amoi',
+      '3J' => 'Amino',
       '54' => 'AMCV',
       '60' => 'Andowl',
       '7A' => 'Anry',
@@ -78,6 +80,7 @@ class DeviceDetector
       'O8' => 'AOC',
       'J2' => 'AOYODKG',
       '55' => 'AOpen',
+      '9Y' => 'Aocos',
       'AP' => 'Apple',
       'AR' => 'Archos',
       'AB' => 'Arian Space',
@@ -88,6 +91,7 @@ class DeviceDetector
       'AQ' => 'Aspera',
       '40' => 'Artel',
       '21' => 'Artizlee',
+      '59' => 'ArtLine',
       '8A' => 'Asano',
       '90' => 'Asanzo',
       '1U' => 'Astro',
@@ -105,11 +109,13 @@ class DeviceDetector
       'AY' => 'Axxion',
       'XA' => 'Axioo',
       'AM' => 'Azumi Mobile',
+      'WW' => 'Awow',
       'BO' => 'BangOlufsen',
       'BN' => 'Barnes & Noble',
       'BB' => 'BBK',
       '0B' => 'BB Mobile',
       'B6' => 'BDF',
+      'QD' => 'BDQ',
       'BE' => 'Becker',
       'B5' => 'Beeline',
       'B0' => 'Beelink',
@@ -156,6 +162,7 @@ class DeviceDetector
       'BJ' => 'BrightSign',
       'B1' => 'Bush',
       '4Q' => 'Bundy',
+      'Y8' => 'Bubblegum',
       'C9' => 'CAGI',
       'CT' => 'Capitel',
       'G3' => 'CG Mobile',
@@ -172,15 +179,16 @@ class DeviceDetector
       '34' => 'CellAllure',
       '7C' => 'Celcus',
       'CE' => 'Celkon',
+      'CG' => 'Cellution',
       '62' => 'Centric',
       'C2' => 'Changhong',
       'CH' => 'Cherry Mobile',
       'C3' => 'China Mobile',
       'CI' => 'Chico Mobile',
-      'HG' => 'CHIA',
       '1C' => 'Chuwi',
       'L8' => 'Clarmin',
       '25' => 'Claresta',
+      '1J' => 'Cloud',
       'CD' => 'Cloudfone',
       '6C' => 'Cloudpad',
       'C0' => 'Clout',
@@ -222,12 +230,14 @@ class DeviceDetector
       '7D' => 'Datamini',
       '6D' => 'Datalogic',
       'D1' => 'Datsun',
+      'DZ' => 'Dazen',
       'DB' => 'Dbtel',
       'DL' => 'Dell',
       'DE' => 'Denver',
       'DS' => 'Desay',
       'DW' => 'DeWalt',
       'DX' => 'DEXP',
+      '8D' => 'DF',
       'DG' => 'Dialog',
       'DI' => 'Dicam',
       'D4' => 'Digi',
@@ -235,6 +245,7 @@ class DeviceDetector
       'DH' => 'Digihome',
       'DD' => 'Digiland',
       'Q0' => 'DIGIFORS',
+      'DQ' => 'DISH',
       '9D' => 'Ditecma',
       'D2' => 'Digma',
       '1D' => 'Diva',
@@ -253,7 +264,9 @@ class DeviceDetector
       'DR' => 'Doro',
       'D8' => 'Droxio',
       'DJ' => 'Dragon Touch',
+      'DY' => 'Dreamgate',
       'DU' => 'Dune HD',
+      'UD' => 'DUNNS Mobile',
       'EB' => 'E-Boda',
       'EJ' => 'Engel',
       '2E' => 'E-Ceros',
@@ -268,6 +281,7 @@ class DeviceDetector
       'EK' => 'EKO',
       'EY' => 'Einstein',
       'EM' => 'Eks Mobility',
+      'UE' => 'Ematic',
       '4K' => 'EKT',
       '7E' => 'ELARI',
       '03' => 'Electroneum',
@@ -281,6 +295,7 @@ class DeviceDetector
       'E1' => 'Energy Sistem',
       '3E' => 'Enot',
       '8E' => 'Epik One',
+      'XP' => 'Epson',
       'E7' => 'Ergo',
       'EC' => 'Ericsson',
       '05' => 'Erisson',
@@ -296,6 +311,7 @@ class DeviceDetector
       'EV' => 'Evertek',
       'E3' => 'Evolio',
       'EO' => 'Evolveo',
+      '0Q' => 'Evoo',
       'E0' => 'EvroMedia',
       'XE' => 'ExMobile',
       '4Z' => 'Exmart',
@@ -315,7 +331,9 @@ class DeviceDetector
       'FB' => 'Fantec',
       'FE' => 'Fengxiang',
       'F7' => 'Fero',
+      '67' => 'FEONAL',
       'FI' => 'FiGO',
+      'F9' => 'FiiO',
       'F1' => 'FinePower',
       'FX' => 'Finlux',
       'F3' => 'FireFly Mobile',
@@ -352,14 +370,18 @@ class DeviceDetector
       'Q4' => 'Geotex',
       'GH' => 'Ghia',
       '2C' => 'Ghong',
+      'GJ' => 'Ghost',
       'GG' => 'Gigabyte',
       'GS' => 'Gigaset',
       'GZ' => 'Ginzzu',
       '1G' => 'Gini',
       'GI' => 'Gionee',
       'G4' => 'Globex',
+      '38' => 'GLONYX',
+      'U6' => 'Glofiish',
       'G7' => 'GoGEN',
       'GC' => 'GOCLEVER',
+      '5G' => 'Gocomma',
       'GB' => 'Gol Mobile',
       'GL' => 'Goly',
       'GX' => 'GLX',
@@ -375,12 +397,15 @@ class DeviceDetector
       'GF' => 'Gretel',
       '82' => 'Gresso',
       'GU' => 'Grundig',
+      'GV' => 'Gtel',
+      '9Z' => 'H96',
       'HF' => 'Hafury',
       'HA' => 'Haier',
       'HE' => 'HannSpree',
       'HK' => 'Hardkernel',
       'HS' => 'Hasee',
       'H6' => 'Helio',
+      'HQ' => 'HERO',
       'ZH' => 'Hezire',
       'HL' => 'Hi-Level',
       '3H' => 'Hi',
@@ -404,6 +429,7 @@ class DeviceDetector
       'HP' => 'HP',
       'HT' => 'HTC',
       'HD' => 'Huadoo',
+      'HG' => 'Huavi',
       'HU' => 'Huawei',
       'HX' => 'Humax',
       'HR' => 'Hurricane',
@@ -448,6 +474,7 @@ class DeviceDetector
       'IQ' => 'INQ',
       'QN' => 'iQ&T',
       'IS' => 'Insignia',
+      'YI' => 'INSYS',
       'IT' => 'Intek',
       'IX' => 'Intex',
       'IV' => 'Inverto',
@@ -478,6 +505,7 @@ class DeviceDetector
       'VJ' => 'Jivi',
       'JK' => 'JKL',
       'JO' => 'Jolla',
+      'UJ' => 'Juniper Systems',
       'J5' => 'Just5',
       'JV' => 'JVC',
       'JS' => 'Jesy',
@@ -490,6 +518,7 @@ class DeviceDetector
       'K5' => 'KATV1',
       'K0' => 'Kata',
       'KZ' => 'Kazam',
+      '9K' => 'Kazuna',
       'KD' => 'KDDI',
       'KS' => 'Kempler & Strauss',
       'K3' => 'Keneksi',
@@ -515,6 +544,7 @@ class DeviceDetector
       'K2' => 'KRONO',
       'KE' => 'Krüger&Matz',
       '5K' => 'KREZ',
+      'WK' => 'KRIP',
       'KH' => 'KT-Tech',
       'Z6' => 'KUBO',
       'K8' => 'Kuliao',
@@ -538,6 +568,7 @@ class DeviceDetector
       'L1' => 'LeEco',
       '4B' => 'Leff',
       'L4' => 'Lemhoov',
+      'W9' => 'LEMFO',
       'LN' => 'Lenco',
       'LE' => 'Lenovo',
       'LT' => 'Leotec',
@@ -547,10 +578,11 @@ class DeviceDetector
       'L3' => 'Lexand',
       'LX' => 'Lexibook',
       'LG' => 'LG',
+      '39' => 'Liberton',
+      '5L' => 'Linsar',
       'LF' => 'Lifemaxx',
-      'LJ' => 'L-Max',
       'LI' => 'Lingwin',
-      '5L' => 'Linsar',
+      'LJ' => 'L-Max',
       'LW' => 'Linnex',
       'LO' => 'Loewe',
       'YL' => 'Loview',
@@ -568,6 +600,7 @@ class DeviceDetector
       'XM' => 'Macoox',
       '92' => 'MAC AUDIO',
       'MJ' => 'Majestic',
+      'FQ' => 'Mafe',
       '23' => 'Magnus',
       'NH' => 'Manhattan',
       '5M' => 'Mann',
@@ -584,7 +617,9 @@ class DeviceDetector
       'M0' => 'Maze',
       'YM' => 'Maze Speed',
       '87' => 'Malata',
+      '28' => 'MBOX',
       '3D' => 'MDC Store',
+      '1Y' => 'MDTV',
       '09' => 'meanIT',
       'M3' => 'Mecer',
       '0M' => 'Mecool',
@@ -605,9 +640,11 @@ class DeviceDetector
       '1X' => 'Minix',
       'OM' => 'Mintt',
       'MO' => 'Mio',
+      'X7' => 'Mione',
       'M7' => 'Miray',
       '8M' => 'Mito',
       'MT' => 'Mitsubishi',
+      '0Y' => 'Mitsui',
       'M5' => 'MIXC',
       '2D' => 'MIVO',
       '1Z' => 'MiXzo',
@@ -617,6 +654,7 @@ class DeviceDetector
       'M6' => 'Mobiistar',
       'MH' => 'Mobiola',
       'MB' => 'Mobistel',
+      'ID' => 'MobiIoT',
       '6W' => 'MobiWire',
       '9M' => 'Mobo',
       'M4' => 'Modecom',
@@ -639,17 +677,20 @@ class DeviceDetector
       '3T' => 'MyTab',
       'MG' => 'MyWigo',
       'J3' => 'Mymaga',
+      '07' => 'MyGica',
       '08' => 'Nabi',
       'N7' => 'National',
       'NC' => 'Navcity',
       '6N' => 'Navitech',
       '7V' => 'Navitel',
       'N3' => 'Navon',
+      '7R' => 'NavRoad',
       'NP' => 'Naomi Phone',
       'NE' => 'NEC',
       '8N' => 'Necnot',
       'NF' => 'Neffos',
       '1N' => 'Neomi',
+      '7Q' => 'Neon IQ',
       'NA' => 'Netgear',
       'NU' => 'NeuImage',
       'NW' => 'Newgen',
@@ -674,6 +715,7 @@ class DeviceDetector
       '57' => 'Nubia',
       'JN' => 'NOBUX',
       'NB' => 'Noblex',
+      'OG' => 'NOGA',
       'NK' => 'Nokia',
       'NM' => 'Nomi',
       '2N' => 'Nomu',
@@ -692,6 +734,7 @@ class DeviceDetector
       'O7' => 'Oale',
       'OC' => 'OASYS',
       'OB' => 'Obi',
+      'OQ' => 'Oculus',
       'O1' => 'Odys',
       'O9' => 'Ok',
       'OA' => 'Okapia',
@@ -706,10 +749,12 @@ class DeviceDetector
       'OO' => 'Opsson',
       'OR' => 'Orange',
       'O5' => 'Orbic',
+      'Y6' => 'Orbita',
       'OS' => 'Ordissimo',
       'OK' => 'Ouki',
       '0O' => 'OINOM',
       'QK' => 'OKWU',
+      '56' => 'OKSI',
       'OE' => 'Oukitel',
       'OU' => 'OUYA',
       'OV' => 'Overmax',
@@ -719,11 +764,13 @@ class DeviceDetector
       'O6' => 'Oyyu',
       'OZ' => 'OzoneHD',
       '7P' => 'P-UP',
+      'YP' => 'Paladin',
       'PM' => 'Palm',
       'PN' => 'Panacom',
       'PA' => 'Panasonic',
       'PT' => 'Pantech',
       '94' => 'Packard Bell',
+      'H9' => 'Parrot Mobile',
       'PB' => 'PCBOX',
       'PC' => 'PCD',
       'PD' => 'PCD Argentina',
@@ -750,12 +797,16 @@ class DeviceDetector
       '0P' => 'POCO',
       'PV' => 'Point of View',
       'PL' => 'Polaroid',
+      'Q6' => 'Polar',
+      '97' => 'PolarLine',
       'PP' => 'PolyPad',
       'P5' => 'Polytron',
       'P2' => 'Pomp',
       'P0' => 'Poppox',
+      '0X' => 'POPTEL',
       'PS' => 'Positivo',
       '3P' => 'Positivo BGH',
+      '3F' => 'Porsche',
       'P3' => 'PPTV',
       'FP' => 'Premio',
       'PR' => 'Prestigio',
@@ -764,15 +815,19 @@ class DeviceDetector
       '2P' => 'Prixton',
       'PF' => 'PROFiLO',
       'P6' => 'Proline',
+      '5O' => 'Prology',
       'P1' => 'ProScan',
       'P7' => 'Protruly',
       'R0' => 'ProVision',
+      '7O' => 'Polestar',
       'PU' => 'PULID',
+      'Q7' => 'Q-Box',
       'QH' => 'Q-Touch',
       'QB' => 'Q.Bell',
       'QI' => 'Qilive',
       'QM' => 'QMobile',
       'QT' => 'Qtek',
+      'Q9' => 'QTECH',
       'QA' => 'Quantum',
       'QU' => 'Quechua',
       'QO' => 'Qumo',
@@ -791,6 +846,7 @@ class DeviceDetector
       'R8' => 'RED',
       'RD' => 'Reeder',
       'Z9' => 'REGAL',
+      'RH' => 'Remdun',
       'RP' => 'Revo',
       'RI' => 'Rikomagic',
       'RM' => 'RIM',
@@ -815,6 +871,7 @@ class DeviceDetector
       'X5' => 'Saba',
       '8L' => 'S-TELL',
       '89' => 'Seatel',
+      'Y7' => 'Saiet',
       'X1' => 'Safaricom',
       'SG' => 'Sagem',
       '4L' => 'Salora',
@@ -828,6 +885,7 @@ class DeviceDetector
       'CZ' => 'Schneider',
       'G8' => 'SEG',
       'SD' => 'Sega',
+      '0U' => 'Selecline',
       '9G' => 'Selenga',
       'SV' => 'Selevision',
       'SL' => 'Selfix',
@@ -842,6 +900,7 @@ class DeviceDetector
       'SX' => 'SFR',
       'SH' => 'Sharp',
       '7S' => 'Shift Phones',
+      '78' => 'Shivaki',
       'RS' => 'Shtrikh-M',
       '3S' => 'Shuttle',
       '13' => 'Sico',
@@ -866,6 +925,8 @@ class DeviceDetector
       '80' => 'SMARTEC',
       'SC' => 'Smartfren',
       'S7' => 'Smartisan',
+      '3Y' => 'Smarty',
+      'HH' => 'Smooth Mobile',
       '1Q' => 'Smotreshka',
       'SF' => 'Softbank',
       '9L' => 'SOLE',
@@ -877,6 +938,7 @@ class DeviceDetector
       'X2' => 'Soundmax',
       '8S' => 'Soyes',
       '77' => 'SONOS',
+      '68' => 'Soho Style',
       'PK' => 'Spark',
       'FS' => 'SPC',
       '6S' => 'Spectrum',
@@ -895,6 +957,7 @@ class DeviceDetector
       'S2' => 'Stonex',
       'ST' => 'Storex',
       '71' => 'StrawBerry',
+      '96' => 'STRONG',
       '69' => 'Stylo',
       '9S' => 'Sugar',
       '06' => 'Subor',
@@ -903,10 +966,12 @@ class DeviceDetector
       'S3' => 'SunVan',
       '5S' => 'Sunvell',
       '5Y' => 'Sunny',
+      'W8' => 'SUNWIND',
       'SU' => 'SuperSonic',
       '79' => 'SuperTab',
       'S5' => 'Supra',
       'ZS' => 'Suzuki',
+      '2J' => 'Sunmi',
       '0W' => 'Swipe',
       'SS' => 'SWISSMOBILITY',
       '1W' => 'Swisstone',
@@ -917,6 +982,8 @@ class DeviceDetector
       'TK' => 'Takara',
       '73' => 'Tambo',
       '9N' => 'Tanix',
+      'U5' => 'Taiga System',
+      '7G' => 'TAG Tech',
       'T5' => 'TB Touch',
       'TC' => 'TCL',
       'T0' => 'TD Systems',
@@ -935,6 +1002,7 @@ class DeviceDetector
       'T2' => 'Telenor',
       'TE' => 'Telit',
       '65' => 'Telia',
+      'PW' => 'Telpo',
       'TD' => 'Tesco',
       'TA' => 'Tesla',
       '9T' => 'Tetratab',
@@ -954,6 +1022,7 @@ class DeviceDetector
       '0T' => 'Tone',
       'TY' => 'Tooky',
       'T9' => 'Top House',
+      'DK' => 'Topelotek',
       '42' => 'Topway',
       'TO' => 'Toplux',
       '7T' => 'Torex',
@@ -963,6 +1032,7 @@ class DeviceDetector
       'T6' => 'TrekStor',
       'T3' => 'Trevi',
       'TJ' => 'Trifone',
+      'Q5' => 'Trident',
       '4T' => 'Tronsmart',
       '11' => 'True',
       'JT' => 'True Slim',
@@ -973,6 +1043,9 @@ class DeviceDetector
       'TR' => 'Turbo-X',
       '5X' => 'TurboPad',
       '5T' => 'TurboKids',
+      'UR' => 'Turkcell',
+      '4U' => 'TuCEL',
+      '2U' => 'Türk Telekom',
       'TV' => 'TVC',
       'TW' => 'TWM',
       'Z1' => 'TWZ',
@@ -997,12 +1070,15 @@ class DeviceDetector
       '3U' => 'IUNI',
       'UT' => 'UTStarcom',
       '6U' => 'UTime',
+      '9U' => 'Urovo',
       '5V' => 'VAIO',
       'WV' => 'VAVA',
       'VA' => 'Vastking',
       'VP' => 'Vargo',
+      'VC' => 'Vankyo',
       'VB' => 'VC',
       'VN' => 'Venso',
+      'UV' => 'Venturer',
       'VQ' => 'Vega',
       '4V' => 'Verico',
       'V4' => 'Verizon',
@@ -1020,6 +1096,7 @@ class DeviceDetector
       'V7' => 'Vinga',
       'V3' => 'Vinsoc',
       '0V' => 'Vipro',
+      'ZV' => 'Virzo',
       'VI' => 'Vitelcom',
       '8V' => 'Viumee',
       'V5' => 'Vivax',
@@ -1066,6 +1143,7 @@ class DeviceDetector
       'W4' => 'WIWA',
       'WL' => 'Wolder',
       'WG' => 'Wolfgang',
+      'WQ' => 'Wolki',
       'WO' => 'Wonu',
       'W1' => 'Woo',
       'WR' => 'Wortmann',
@@ -1114,6 +1192,7 @@ class DeviceDetector
       'ZT' => 'ZTE',
       'ZU' => 'Zuum',
       'ZY' => 'Zync',
+      'ZR' => 'Zyrex',
       'ZQ' => 'ZYQ',
       'Z4' => 'ZH&K',
       'OW' => 'öwn',

data/lib/device_detector/os.rb

@@ -108,12 +108,14 @@ class DeviceDetector
       'OS2' => 'OS/2',
       'T64' => 'OSF1',
       'OBS' => 'OpenBSD',
+      'OWR' => 'OpenWrt',
       'ORD' => 'Ordissimo',
       'PCL' => 'PCLinuxOS',
       'PSP' => 'PlayStation Portable',
       'PS3' => 'PlayStation',
       'RHT' => 'Red Hat',
       'ROS' => 'RISC OS',
+      'ROK' => 'Roku OS',
       'RSO' => 'Rosa',
       'REM' => 'Remix OS',
       'REX' => 'REX',
@@ -145,7 +147,7 @@ class DeviceDetector
       'WRT' => 'Windows RT',
       'XBX' => 'Xbox',
       'XBT' => 'Xubuntu',
-      'YNS' => 'YunOs',
+      'YNS' => 'YunOS',
       'IOS' => 'iOS',
       'POS' => 'palmOS',
       'WOS' => 'webOS'
@@ -172,7 +174,7 @@ class DeviceDetector
         LIN ARL DEB KNO MIN UBT KBT XBT LBT FED
         RHT VLN MDR GNT SAB SLW SSE CES BTR SAF
         ORD TOS RSO DEE FRE MAG FEN CAI PCL HAS
-        LOS DVK
+        LOS DVK ROK OWR
       ],
       'Mac' => ['MAC'],
       'Mobile Gaming Console' => %w[PSP NDS XBX],

data/lib/device_detector/parser.rb

@@ -85,7 +85,7 @@ class DeviceDetector
     end
 
     def build_regex(src)
-      Regexp.new('(?:^|[^A-Z0-9\-_]|[^A-Z0-9\-]_|sprd-)(?:' + src + ')', Regexp::IGNORECASE)
+      Regexp.new('(?:^|[^A-Z0-9\-_]|[^A-Z0-9\-]_|sprd-|MZ-)(?:' + src + ')', Regexp::IGNORECASE)
     end
 
     def from_cache(key)

data/lib/device_detector/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class DeviceDetector
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/device_detector/version_extractor.rb

@@ -8,11 +8,30 @@ class DeviceDetector
     MAJOR_VERSION_8 = Gem::Version.new('8.0')
 
     def call
-      super&.chomp('.')
+      simple_version = super&.chomp('.')
+
+      return simple_version unless simple_version&.empty?
+
+      os_version_by_regexes
     end
 
     private
 
+    def os_version_by_regexes
+      version_matches = regex_meta[:versions]
+      return '' unless version_matches
+
+      version_matches.detect do |matcher|
+        user_agent.match(matcher[:regex]) do |match_data|
+          return matcher[:version].gsub(/\$(\d)/) do
+            match_data[Regexp.last_match(1).to_i].to_s
+          end.strip
+        end
+      end
+
+      ''
+    end
+
     def metadata_string
       String(regex_meta[:version])
     end