device_detector 1.0.2 → 1.0.6

data/lib/device_detector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 require 'device_detector/version'
@@ -11,9 +13,9 @@ 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
 
   def initialize(user_agent)
@@ -45,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
@@ -54,21 +59,24 @@ class DeviceDetector
     # Chrome on Android passes the device type based on the keyword 'Mobile'
     # If it is present the device should be a smartphone, otherwise it's a tablet
     # See https://developer.chrome.com/multidevice/user-agent#chrome_for_android_user_agent
-    if t.nil? && os.family == 'Android' && ['Chrome', 'Chrome Mobile'].include?(name)
-      if user_agent =~ build_regex('Chrome\/[\.0-9]* Mobile')
+    # Note: We do not check for browser (family) here, as there might be mobile apps using Chrome,
+    # 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('(?: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
 
-    if t.nil? && android_tablet_fragment? || opera_tablet?
-      t = 'tablet'
-    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?
 
-    if t.nil? && android_mobile_fragment?
-      t = 'smartphone'
-    end
+    # 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,
     # which was tablet only, was published too late, there were a
@@ -78,46 +86,53 @@ 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
 
     # All detected feature phones running android are more likely a smartphone
-    if t == 'feature phone' && os.family == 'Android'
-      t = 'smartphone'
-    end
+    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).
+    # 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).
     # This UA string will be transmitted on a touch-enabled system running Windows 8 (RT)
     #
-    # 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.
+    # 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
 
-    if opera_tv_store?
-      t = 'tv'
-    end
+    # All devices running Opera TV Store are assumed to be a tv
+    t = 'tv' if opera_tv_store?
 
-    if t.nil? && ['Kylo', 'Espial TV Browser'].include?(client.name)
-      t = 'tv'
-    end
+    # All devices running Tizen TV or SmartTV are assumed to be a tv
+    t = 'tv' if t.nil? && tizen_samsung_tv?
 
-    # set device type to desktop for all devices running a desktop os that were
-    # not detected as an other device type
-    if t.nil? && os.desktop? && !puffin_browser?
-      t = 'desktop'
-    end
+    # 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)
 
-    t
+    has_desktop = t != 'desktop' && desktop_string? && desktop_fragment?
+    t = 'desktop' if has_desktop
+
+    # 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?
@@ -133,7 +148,6 @@ class DeviceDetector
   end
 
   class << self
-
     class Configuration
       attr_accessor :max_cache_keys
 
@@ -152,11 +166,10 @@ class DeviceDetector
       @cache ||= MemoryCache.new(config.to_hash)
     end
 
-    def configure(&block)
+    def configure
       @config = Configuration.new
       yield(config)
     end
-
   end
 
   private
@@ -185,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
@@ -197,13 +214,29 @@ 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)
     Regexp.new('(?:^|[^A-Z0-9\_\-])(?:' + src + ')', Regexp::IGNORECASE)
   end
-
 end