device_detector 1.0.4 → 1.0.7

data/lib/device_detector/os.rb

@@ -30,7 +30,7 @@ class DeviceDetector
     def os_info
       from_cache(['os_info', self.class.name, user_agent]) do
         os_name = NameExtractor.new(user_agent, regex_meta).call
-        if os_name && short = DOWNCASED_OPERATING_SYSTEMS[os_name.downcase]
+        if os_name && (short = DOWNCASED_OPERATING_SYSTEMS[os_name.downcase])
           os_name = OPERATING_SYSTEMS[short]
         else
           short = 'UNK'
@@ -50,7 +50,7 @@ class DeviceDetector
       'AIX' => 'AIX',
       'AND' => 'Android',
       'AMG' => 'AmigaOS',
-      'ATV' => 'Apple TV',
+      'ATV' => 'tvOS',
       'ARL' => 'Arch Linux',
       'BTR' => 'BackTrack',
       'SBA' => 'Bada',
@@ -58,29 +58,42 @@ class DeviceDetector
       'BLB' => 'BlackBerry OS',
       'QNX' => 'BlackBerry Tablet OS',
       'BMP' => 'Brew',
+      'CAI' => 'Caixa Mágica',
       'CES' => 'CentOS',
       'COS' => 'Chrome OS',
       'CYN' => 'CyanogenMod',
       'DEB' => 'Debian',
+      'DEE' => 'Deepin',
       'DFB' => 'DragonFly',
+      'DVK' => 'DVKBuntu',
       'FED' => 'Fedora',
+      'FEN' => 'Fenix',
       'FOS' => 'Firefox OS',
       'FIR' => 'Fire OS',
+      'FRE' => 'Freebox',
       'BSD' => 'FreeBSD',
+      'FYD' => 'FydeOS',
       'GNT' => 'Gentoo',
+      'GRI' => 'GridOS',
       'GTV' => 'Google TV',
       'HPX' => 'HP-UX',
       'HAI' => 'Haiku OS',
+      'IPA' => 'iPadOS',
+      'HAR' => 'HarmonyOS',
+      'HAS' => 'HasCodingOS',
       'IRI' => 'IRIX',
       'INF' => 'Inferno',
+      'JME' => 'Java ME',
       'KOS' => 'KaiOS',
       'KNO' => 'Knoppix',
       'KBT' => 'Kubuntu',
       'LIN' => 'GNU/Linux',
       'LBT' => 'Lubuntu',
+      'LOS' => 'Lumin OS',
       'VLN' => 'VectorLinux',
       'MAC' => 'Mac',
       'MAE' => 'Maemo',
+      'MAG' => 'Mageia',
       'MDR' => 'Mandriva',
       'SMG' => 'MeeGo',
       'MCD' => 'MocorDroid',
@@ -89,21 +102,28 @@ class DeviceDetector
       'MOR' => 'MorphOS',
       'NBS' => 'NetBSD',
       'MTK' => 'MTK / Nucleus',
+      'MRE' => 'MRE',
       'WII' => 'Nintendo',
       'NDS' => 'Nintendo Mobile',
       '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',
       'RZD' => 'RazoDroiD',
       'SAB' => 'Sabayon',
       'SSE' => 'SUSE',
       'SAF' => 'Sailfish OS',
+      'SEE' => 'SeewoOS',
       'SLW' => 'Slackware',
       'SOS' => 'Solaris',
       'SYL' => 'Syllable',
@@ -116,7 +136,9 @@ class DeviceDetector
       'TIZ' => 'Tizen',
       'TOS' => 'TmaxOS',
       'UBT' => 'Ubuntu',
+      'WAS' => 'watchOS',
       'WTV' => 'WebTV',
+      'WHS' => 'Whale OS',
       'WIN' => 'Windows',
       'WCE' => 'Windows CE',
       'WIO' => 'Windows IoT',
@@ -125,7 +147,7 @@ class DeviceDetector
       'WRT' => 'Windows RT',
       'XBX' => 'Xbox',
       'XBT' => 'Xubuntu',
-      'YNS' => 'YunOs',
+      'YNS' => 'YunOS',
       'IOS' => 'iOS',
       'POS' => 'palmOS',
       'WOS' => 'webOS'
@@ -133,37 +155,42 @@ class DeviceDetector
 
     DOWNCASED_OPERATING_SYSTEMS = OPERATING_SYSTEMS.each_with_object({}) do |(short, long), h|
       h[long.downcase] = short
-    end
+    end.freeze
 
     OS_FAMILIES = {
-      'Android' => %w[AND CYN FIR REM RZD MLD MCD YNS],
+      'Android' => %w[AND CYN FIR REM RZD MLD MCD YNS GRI HAR],
       'AmigaOS' => %w[AMG MOR],
-      'Apple TV' => ['ATV'],
       'BlackBerry' => %w[BLB QNX],
       'Brew' => ['BMP'],
       'BeOS' => %w[BEO HAI],
-      'Chrome OS' => ['COS'],
+      'Chrome OS' => %w[COS FYD SEE],
       'Firefox OS' => %w[FOS KOS],
       'Gaming Console' => %w[WII PS3],
       'Google TV' => ['GTV'],
       'IBM' => ['OS2'],
-      'iOS' => ['IOS'],
+      'iOS' => %w[IOS ATV WAS IPA],
       'RISC OS' => ['ROS'],
-      'GNU/Linux' => %w[LIN ARL DEB KNO MIN UBT KBT XBT LBT FED RHT VLN MDR GNT SAB SLW SSE CES BTR SAF ORD TOS],
+      'GNU/Linux' => %w[
+        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 ROK OWR
+      ],
       'Mac' => ['MAC'],
       'Mobile Gaming Console' => %w[PSP NDS XBX],
-      'Real-time OS' => %w[MTK TDX],
+      'Real-time OS' => %w[MTK TDX MRE JME REX],
       'Other Mobile' => %w[WOS POS SBA TIZ SMG MAE],
       'Symbian' => %w[SYM SYS SY3 S60 S40],
       'Unix' => %w[SOS AIX HPX BSD NBS OBS DFB SYL IRI T64 INF],
       'WebTV' => ['WTV'],
       'Windows' => ['WIN'],
-      'Windows Mobile' => %w[WPH WMO WCE WRT WIO]
+      'Windows Mobile' => %w[WPH WMO WCE WRT WIO],
+      'Other Smart TV' => ['WHS']
     }.freeze
 
     FAMILY_TO_OS = OS_FAMILIES.each_with_object({}) do |(family, oss), h|
       oss.each { |os| h[os] = family }
-    end
+    end.freeze
 
     def filenames
       ['oss.yml']

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.4'
+  VERSION = '1.0.7'
 end

data/lib/device_detector/version_extractor.rb

@@ -2,8 +2,36 @@
 
 class DeviceDetector
   class VersionExtractor < MetadataExtractor
+    MAJOR_VERSION_2 = Gem::Version.new('2.0')
+    MAJOR_VERSION_3 = Gem::Version.new('3.0')
+    MAJOR_VERSION_4 = Gem::Version.new('4.0')
+    MAJOR_VERSION_8 = Gem::Version.new('8.0')
+
+    def call
+      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

data/lib/device_detector.rb

@@ -13,6 +13,7 @@ require 'device_detector/bot'
 require 'device_detector/client'
 require 'device_detector/device'
 require 'device_detector/os'
+require 'device_detector/browser'
 
 class DeviceDetector
   attr_reader :user_agent
@@ -46,7 +47,10 @@ class DeviceDetector
   end
 
   def device_brand
-    device.brand
+    # Assume all devices running iOS / Mac OS are from Apple
+    brand = device.brand
+    brand = 'Apple' if brand.nil? && ['Apple TV', 'iOS', 'Mac'].include?(os_name)
+    brand
   end
 
   def device_type
@@ -59,15 +63,19 @@ class DeviceDetector
     # that won't have a detected browser, but can still be detected. So we check the useragent for
     # Chrome instead.
     if t.nil? && os.family == 'Android' && user_agent =~ build_regex('Chrome\/[\.0-9]*')
-      if user_agent =~ build_regex('Chrome\/[\.0-9]* Mobile')
+      if user_agent =~ build_regex('(?:Mobile|eliboM) Safari\/')
         t = 'smartphone'
-      elsif user_agent =~ build_regex('Chrome\/[\.0-9]* (?!Mobile)')
+      elsif user_agent =~ build_regex('(?!Mobile )Safari\/')
         t = 'tablet'
       end
     end
 
+    # Some UA contain the fragment 'Android; Tablet;' or 'Opera Tablet', so we assume those devices
+    # as tablets
     t = 'tablet' if t.nil? && android_tablet_fragment? || opera_tablet?
 
+    # Some user agents simply contain the fragment 'Android; Mobile;', so we assume those devices
+    # as smartphones
     t = 'smartphone' if t.nil? && android_mobile_fragment?
 
     # Android up to 3.0 was designed for smartphones only. But as 3.0,
@@ -78,10 +86,12 @@ class DeviceDetector
     # So were are expecting that all devices running Android < 2 are
     # smartphones Devices running Android 3.X are tablets. Device type
     # of Android 2.X and 4.X+ are unknown
-    if t.nil? && os.short_name == 'AND' && os.full_version && !os.full_version.empty?
-      if os.full_version < '2'
+    if t.nil? && os_name == 'Android' && os.full_version && !os.full_version.empty?
+      full_version = Gem::Version.new(os.full_version)
+      if full_version < VersionExtractor::MAJOR_VERSION_2
         t = 'smartphone'
-      elsif os.full_version >= '3' && os.full_version < '4'
+      elsif full_version >= VersionExtractor::MAJOR_VERSION_3 && \
+            full_version < VersionExtractor::MAJOR_VERSION_4
         t = 'tablet'
       end
     end
@@ -89,6 +99,9 @@ class DeviceDetector
     # All detected feature phones running android are more likely a smartphone
     t = 'smartphone' if t == 'feature phone' && os.family == 'Android'
 
+    # All unknown devices under running Java ME are more likely a features phones
+    t = 'feature phone' if t.nil? && os_name == 'Java ME'
+
     # According to http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
     # Internet Explorer 10 introduces the "Touch" UA string token. If this token is present at the
     # end of the UA string, the computer has touch capability, and is running Windows 8 (or later).
@@ -97,19 +110,29 @@ class DeviceDetector
     # As most touch enabled devices are tablets and only a smaller part are desktops/notebooks we
     # assume that all Windows 8 touch devices are tablets.
     if t.nil? && touch_enabled? &&
-       (os.short_name == 'WRT' || (os.short_name == 'WIN' && os.full_version && os.full_version >= '8'))
+       (os_name == 'Windows RT' ||
+        (os_name == 'Windows' && os.full_version &&
+         Gem::Version.new(os.full_version) >= VersionExtractor::MAJOR_VERSION_8))
       t = 'tablet'
     end
 
+    # All devices running Opera TV Store are assumed to be a tv
     t = 'tv' if opera_tv_store?
 
+    # All devices running Tizen TV or SmartTV are assumed to be a tv
+    t = 'tv' if t.nil? && tizen_samsung_tv?
+
+    # Devices running Kylo or Espital TV Browsers are assumed to be a TV
     t = 'tv' if t.nil? && ['Kylo', 'Espial TV Browser'].include?(client.name)
 
-    # set device type to desktop for all devices running a desktop os that were
-    # not detected as an other device type
-    t = 'desktop' if t.nil? && os.desktop? && !puffin_browser?
+    has_desktop = t != 'desktop' && desktop_string? && desktop_fragment?
+    t = 'desktop' if has_desktop
 
-    t
+    # set device type to desktop for all devices running a desktop os that were not detected as
+    # another device type
+    return t if t || !desktop?
+
+    'desktop'
   end
 
   def known?
@@ -175,6 +198,10 @@ class DeviceDetector
     user_agent =~ build_regex('Android(?: \d.\d(?:.\d)?)?; Mobile;')
   end
 
+  def desktop_fragment?
+    user_agent =~ build_regex('Desktop (x(?:32|64)|WOW64);')
+  end
+
   def touch_enabled?
     user_agent =~ build_regex('Touch')
   end
@@ -187,9 +214,26 @@ class DeviceDetector
     user_agent =~ build_regex('Opera Tablet')
   end
 
+  def tizen_samsung_tv?
+    user_agent =~ build_regex('SmartTV|Tizen.+ TV .+$')
+  end
+
+  def uses_mobile_browser?
+    client.browser? && client.mobile_only_browser?
+  end
+
   # This is a workaround until we support detecting mobile only browsers
-  def puffin_browser?
-    client.name == 'Puffin'
+  def desktop_string?
+    user_agent =~ /Desktop/
+  end
+
+  def desktop?
+    return false if os_name.nil? || os_name == '' || os_name == 'UNK'
+
+    # Check for browsers available for mobile devices only
+    return false if uses_mobile_browser?
+
+    os.desktop?
   end
 
   def build_regex(src)