mobileesp_converted 0.2.2 → 0.2.3

data/lib/mobileesp_converted/user_agent_info.rb

@@ -1,40 +1,30 @@
 # This file has been automatically converted to Ruby from Java source code.
-#
-#
-#
+
+
 =begin
- *******************************************
-# Copyright 2010-2012, Anthony Hand
-#
-# File version date: April 23, 2012
-#        Update:
-#        - Updated DetectAmazonSilk(): Fixed an issue in the detection logic.
-#
-# File version date: April 22, 2012 - Second update
-#        Update: To address additional Kindle issues...
-#        - Updated DetectRichCSS(): Excluded e-Ink Kindle devices.
-#        - Created DetectAmazonSilk(): Created to detect Kindle Fire devices in Silk mode.
-#        - Updated DetectMobileQuick(): Updated to include e-Ink Kindle devices and the Kindle Fire in Silk mode.
-#
-# File version date: April 11, 2012
-#        Update:
-#        - Added a new variable for the new BlackBerry Curve Touch (9380): deviceBBCurveTouch.
-#        - Updated DetectBlackBerryTouch() to support the new BlackBerry Curve Touch (9380).
+*******************************************
+# Copyright 2010-2013, Anthony Hand
 #
-# File version date: January 21, 2012
-#        Update:
-#        - Moved Windows Phone 7 to the iPhone Tier. WP7.5's IE 9-based browser is good enough now.
-#        - Added a new variable for 2 versions of the new BlackBerry Bold Touch (9900 and 9930): deviceBBBoldTouch.
-#        - Updated DetectBlackBerryTouch() to support the 2 versions of the new BlackBerry Bold Touch (9900 and 9930).
-#        - Updated DetectKindle() to focus on eInk devices only. The Kindle Fire should be detected as a regular Android device.
+# File version 2013.08.01 (August 1, 2013)
+#    Updates:
+#    - Updated DetectMobileQuick(). Moved the 'Exclude Tablets' logic to the top of the method to fix a logic bug.
 #
-# File version date: August 22, 2011
-#        Update:
-#        - Updated DetectAndroidTablet() to fix a bug I introduced in the last fix!
+# File version 2013.07.13 (July 13, 2013)
+#    Updates:
+#    - Added support for Tizen: variable and DetectTizen().
+#    - Added support for Meego: variable and DetectMeego().
+#    - Added support for Windows Phone 8: variable and DetectWindowsPhone8().
+#    - Added a generic Windows Phone method: DetectWindowsPhone().
+#    - Added support for BlackBerry 10 OS: variable and DetectBlackBerry10Phone().
+#    - Added support for PlayStation Vita handheld: variable and DetectGamingHandheld().
+#    - Updated DetectTierIphone(). Added Tizen; updated the Windows Phone, BB10, and PS Vita support.
+#    - Updated DetectWindowsMobile(). Uses generic DetectWindowsPhone() method rather than WP7.
+#    - Updated DetectSmartphone(). Uses the detect_tier_iphone() method.
+#    - Updated DetectSonyMylo() with more efficient code.
+#    - Removed DetectGarminNuvifone() from DetectTierIphone(). How many are left in market in 2013? It is detected as a RichCSS Tier device.
+#    - Removed the deviceXoom variable. It was unused.
+#    - Added detection support for the Obigo mobile browser to DetectMobileQuick().
 #
-# File version date: August 16, 2011
-#        Update:
-#        - Updated DetectAndroidTablet() to exclude Opera Mini, which was falsely reporting as running on a tablet device when on a phone.
 #
 #
 # LICENSE INFORMATION
@@ -65,14 +55,14 @@
 
 =begin
 *
- * The DetectSmartPhone class encapsulates information about
- *   a browser's connection to your web site.
- *   You can use it to find out whether the browser asking for
- *   your site's content is probably running on a mobile device.
- *   The methods were written so you can be as granular as you want.
- *   For example, enquiring whether it's as specific as an iPod Touch or
- *   as general as a smartphone class device.
- *   The object's methods return true, or false.
+* The DetectSmartPhone class encapsulates information about
+*   a browser's connection to your web site.
+*   You can use it to find out whether the browser asking for
+*   your site's content is probably running on a mobile device.
+*   The methods were written so you can be as granular as you want.
+*   For example, enquiring whether it's as specific as an iPod Touch or
+*   as general as a smartphone class device.
+*   The object's methods return true, or false.
 
 =end
 module MobileESPConverted
@@ -83,7 +73,11 @@ module MobileESPConverted
     attr_reader :http_accept
 
 
+    attr_reader :init_completed
+    attr_reader :is_webkit
+    attr_reader :is_mobile_phone
     attr_reader :is_iphone
+    attr_reader :is_android
     attr_reader :is_android_phone
     attr_reader :is_tier_tablet
     attr_reader :is_tier_iphone
@@ -93,96 +87,102 @@ module MobileESPConverted
 
     ENGINE_WEB_KIT = "webkit"
 
-    DEVICE_IPHONE = "iphone"
-    DEVICE_IPOD = "ipod"
-    DEVICE_IPAD = "ipad"
+    DEVICE_IPHONE  = "iphone"
+    DEVICE_IPOD    = "ipod"
+    DEVICE_IPAD    = "ipad"
     DEVICE_MAC_PPC = "macintosh"
 
-    DEVICE_ANDROID = "android"
+    DEVICE_ANDROID    = "android"
     DEVICE_GOOGLE_T_V = "googletv"
-    DEVICE_XOOM = "xoom"
-    DEVICE_HTC_FLYER = "htc_flyer"
-
-    DEVICE_SYMBIAN = "symbian"
-    DEVICE_S60 = "series60"
-    DEVICE_S70 = "series70"
-    DEVICE_S80 = "series80"
-    DEVICE_S90 = "series90"
+    DEVICE_HTC_FLYER  = "htc_flyer"
 
     DEVICE_WIN_PHONE7 = "windows phone os 7"
-    DEVICE_WIN_MOB = "windows ce"
-    DEVICE_WINDOWS = "windows"
-    DEVICE_IE_MOB = "iemobile"
-    DEVICE_PPC = "ppc"
-    ENGINE_PIE = "wm5 pie"
-
-    DEVICE_B_B = "blackberry"
-    VND_R_I_M = "vnd.rim"
-    DEVICE_B_B_STORM = "blackberry95"
-    DEVICE_B_B_BOLD = "blackberry97"
-    DEVICE_B_B_BOLD_TOUCH = "blackberry 99"
-    DEVICE_B_B_TOUR = "blackberry96"
-    DEVICE_B_B_CURVE = "blackberry89"
+    DEVICE_WIN_PHONE8 = "windows phone 8"
+    DEVICE_WIN_MOB    = "windows ce"
+    DEVICE_WINDOWS    = "windows"
+    DEVICE_IE_MOB     = "iemobile"
+    DEVICE_PPC        = "ppc"
+    ENGINE_PIE        = "wm5 pie"
+
+    DEVICE_B_B             = "blackberry"
+    DEVICE_B_B10           = "bb10"
+    VND_R_I_M              = "vnd.rim"
+    DEVICE_B_B_STORM       = "blackberry95"
+    DEVICE_B_B_BOLD        = "blackberry97"
+    DEVICE_B_B_BOLD_TOUCH  = "blackberry 99"
+    DEVICE_B_B_TOUR        = "blackberry96"
+    DEVICE_B_B_CURVE       = "blackberry89"
     DEVICE_B_B_CURVE_TOUCH = "blackberry 938"
-    DEVICE_B_B_TORCH = "blackberry 98"
-    DEVICE_B_B_PLAYBOOK = "playbook"
+    DEVICE_B_B_TORCH       = "blackberry 98"
+    DEVICE_B_B_PLAYBOOK    = "playbook"
+
+    DEVICE_SYMBIAN = "symbian"
+    DEVICE_S60     = "series60"
+    DEVICE_S70     = "series70"
+    DEVICE_S80     = "series80"
+    DEVICE_S90     = "series90"
 
-    DEVICE_PALM = "palm"
-    DEVICE_WEB_O_S = "webos"
+    DEVICE_PALM      = "palm"
+    DEVICE_WEB_O_S   = "webos"
     DEVICE_WEB_O_SHP = "hpwos"
+    ENGINE_BLAZER    = "blazer"
+    ENGINE_XIINO     = "xiino"
 
-    ENGINE_BLAZER = "blazer"
-    ENGINE_XIINO = "xiino"
+    DEVICE_NUVIFONE = "nuvifone"
+    DEVICE_BADA     = "bada"
+    DEVICE_TIZEN    = "tizen"
+    DEVICE_MEEGO    = "meego"
 
     DEVICE_KINDLE = "kindle"
-    ENGINE_SILK = "silk"
-
-    DEVICE_NUVIFONE = "nuvifone"
+    ENGINE_SILK   = "silk-accelerated"
 
 
     VNDWAP = "vnd.wap"
-    WML = "wml"
-
-
-    DEVICE_TABLET = "tablet"
-    DEVICE_BREW = "brew"
-    DEVICE_DANGER = "danger"
-    DEVICE_HIPTOP = "hiptop"
-    DEVICE_PLAYSTATION = "playstation"
-    DEVICE_NINTENDO_DS = "nitro"
-    DEVICE_NINTENDO = "nintendo"
-    DEVICE_WII = "wii"
-    DEVICE_XBOX = "xbox"
-    DEVICE_ARCHOS = "archos"
-
-    ENGINE_OPERA = "opera"
-    ENGINE_NETFRONT = "netfront"
+    WML    = "wml"
+
+
+    DEVICE_TABLET           = "tablet"
+    DEVICE_BREW             = "brew"
+    DEVICE_DANGER           = "danger"
+    DEVICE_HIPTOP           = "hiptop"
+    DEVICE_PLAYSTATION      = "playstation"
+    DEVICE_PLAYSTATION_VITA = "vita"
+    DEVICE_NINTENDO_DS      = "nitro"
+    DEVICE_NINTENDO         = "nintendo"
+    DEVICE_WII              = "wii"
+    DEVICE_XBOX             = "xbox"
+    DEVICE_ARCHOS           = "archos"
+
+    ENGINE_OPERA      = "opera"
+    ENGINE_NETFRONT   = "netfront"
     ENGINE_UP_BROWSER = "up.browser"
-    ENGINE_OPEN_WEB = "openweb"
-    DEVICE_MIDP = "midp"
-    UPLINK = "up.link"
-    ENGINE_TELECA_Q = "teleca q"
+    ENGINE_OPEN_WEB   = "openweb"
+    DEVICE_MIDP       = "midp"
+    UPLINK            = "up.link"
+    ENGINE_TELECA_Q   = "teleca q"
+    ENGINE_OBIGO      = "obigo"
+
     DEVICE_PDA = "pda"
-    MINI = "mini"
-    MOBILE = "mobile"
-    MOBI = "mobi"
+    MINI       = "mini"
+    MOBILE     = "mobile"
+    MOBI       = "mobi"
 
 
-    MAEMO = "maemo"
-    LINUX = "linux"
+    MAEMO      = "maemo"
+    LINUX      = "linux"
     QTEMBEDDED = "qt embedded"
-    MYLOCOM2 = "com2"
+    MYLOCOM2   = "com2"
 
 
     MANU_SONY_ERICSSON = "sonyericsson"
-    MANUERICSSON = "ericsson"
-    MANU_SAMSUNG1 = "sec-sgh"
-    MANU_SONY = "sony"
-    MANU_HTC = "htc"
+    MANUERICSSON       = "ericsson"
+    MANU_SAMSUNG1      = "sec-sgh"
+    MANU_SONY          = "sony"
+    MANU_HTC           = "htc"
 
 
-    SVC_DOCOMO = "docomo"
-    SVC_KDDI = "kddi"
+    SVC_DOCOMO   = "docomo"
+    SVC_KDDI     = "kddi"
     SVC_VODAFONE = "vodafone"
 
 
@@ -190,7 +190,7 @@ module MobileESPConverted
 
 
 =begin
-*
+     *
      * Initialize the user_agent and http_accept variables
      *
      * @param user_agent the User-Agent header
@@ -210,7 +210,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return the lower case HTTP_USER_AGENT
      * @return user_agent
 
@@ -220,7 +220,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return the lower case HTTP_ACCEPT
      * @return http_accept
 
@@ -230,7 +230,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return whether the device is an Iphone or iPod Touch
      * @return is_iphone
 
@@ -240,7 +240,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return whether the device is in the Tablet Tier.
      * @return is_tier_tablet
 
@@ -250,7 +250,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return whether the device is in the Iphone Tier.
      * @return is_tier_iphone
 
@@ -260,7 +260,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return whether the device is in the 'Rich CSS' tier of mobile devices.
      * @return is_tier_rich_css
 
@@ -270,7 +270,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Return whether the device is a generic, less-capable mobile device.
      * @return is_tier_generic_mobile
 
@@ -280,26 +280,41 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Initialize Key Stored Values.
 
 =end
     def init_device_scan()
-      @is_iphone = detect_iphone_or_ipod()
+
+      @is_webkit        = detect_webkit()
+      @is_iphone        = detect_iphone()
+      @is_android       = detect_android()
       @is_android_phone = detect_android_phone()
-      @is_tier_tablet = detect_tier_tablet()
-      @is_tier_iphone = detect_tier_iphone()
-      @is_tier_rich_css = detect_tier_rich_css()
+
+
+      @is_mobile_phone = detect_mobile_quick()
+      @is_tier_tablet  = detect_tier_tablet()
+      @is_tier_iphone  = detect_tier_iphone()
+
+
+      @is_tier_rich_css       = detect_tier_rich_css()
       @is_tier_generic_mobile = detect_tier_other_phones()
+
+      @init_completed = true
     end
 
 =begin
-*
+     *
      * Detects if the current device is an iPhone.
      * @return detection of an iPhone
 
 =end
     def detect_iphone()
+      if ((@init_completed == true) ||
+          (@is_iphone == true))
+        return @is_iphone
+      end
+
 
       if (user_agent.include?(DEVICE_IPHONE) &&
           !detect_ipad() &&
@@ -310,7 +325,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is an iPod Touch.
      * @return detection of an iPod Touch
 
@@ -323,7 +338,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is an iPad tablet.
      * @return detection of an iPad
 
@@ -336,7 +351,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is an iPhone or iPod Touch.
      * @return detection of an iPhone or iPod Touch
 
@@ -350,7 +365,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects *any* iOS device: iPhone, iPod Touch, iPad.
      * @return detection of an Apple iOS device
 
@@ -364,13 +379,18 @@ module MobileESPConverted
 
 
 =begin
-*
+     *
      * Detects *any* Android OS-based device: phone, tablet, and multi-media player.
      * Also detects Google TV.
      * @return detection of an Android device
 
 =end
     def detect_android()
+      if ((@init_completed == true) ||
+          (@is_android == true))
+        return @is_android
+      end
+
       if ((user_agent.include?(DEVICE_ANDROID)) ||
           detect_google_t_v())
         return true
@@ -383,7 +403,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is a (small-ish) Android OS-based device
      * used for calling and/or multi-media (like a Samsung Galaxy Player).
      * Google says these devices will have 'Android' AND 'mobile' in user agent.
@@ -392,6 +412,11 @@ module MobileESPConverted
 
 =end
     def detect_android_phone()
+      if ((@init_completed == true) ||
+          (@is_android_phone == true))
+        return @is_android_phone
+      end
+
       if (detect_android() && (user_agent.include?(MOBILE)))
         return true
       end
@@ -407,7 +432,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is a (self-reported) Android tablet.
      * Google says these devices will have 'Android' and NOT 'mobile' in their user agent.
      * @return detection of an Android tablet
@@ -437,7 +462,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is an Android OS-based device and
      * the browser is based on WebKit.
      * @return detection of an Android WebKit browser
@@ -451,7 +476,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is a GoogleTV.
      * @return detection of GoogleTV
 
@@ -464,78 +489,77 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current browser is based on WebKit.
      * @return detection of a WebKit browser
 
 =end
     def detect_webkit()
+      if ((@init_completed == true) ||
+          (@is_webkit == true))
+        return @is_webkit
+      end
+
       if (user_agent.include?(ENGINE_WEB_KIT))
         return true
       end
       return false
     end
 
+
 =begin
-*
-     * Detects if the current browser is the Symbian S60 Open Source Browser.
-     * @return detection of Symbian S60 Browser
+     *
+     * Detects if the current browser is EITHER a Windows Phone 7.x OR 8 device
+     * @return detection of Windows Phone 7.x OR 8
 
 =end
-    def detect_s60_oss_browser()
-
-      if (detect_webkit() && (user_agent.include?(DEVICE_SYMBIAN) || user_agent.include?(DEVICE_S60)))
+    def detect_windows_phone()
+      if (detect_windows_phone7() || detect_windows_phone8())
         return true
       end
       return false
     end
 
 =begin
-*
      *
-     * Detects if the current device is any Symbian OS-based device,
-     *   including older S60, Series 70, Series 80, Series 90, and UIQ,
-     *   or other browsers running on these devices.
-     * @return detection of SymbianOS
+     * Detects a Windows Phone 7.x device (in mobile browsing mode).
+     * @return detection of Windows Phone 7
 
 =end
-    def detect_symbian_o_s()
-      if (user_agent.include?(DEVICE_SYMBIAN) || user_agent.include?(DEVICE_S60) || user_agent.include?(DEVICE_S70) || user_agent.include?(DEVICE_S80) || user_agent.include?(DEVICE_S90))
+    def detect_windows_phone7()
+      if (user_agent.include?(DEVICE_WIN_PHONE7))
         return true
       end
       return false
     end
 
 =begin
-*
-     * Detects if the current browser is a
-     * Windows Phone 7 device.
-     * @return detection of Windows Phone 7
+     *
+     * Detects a Windows Phone 8 device (in mobile browsing mode).
+     * @return detection of Windows Phone 8
 
 =end
-    def detect_windows_phone7()
-      if (user_agent.include?(DEVICE_WIN_PHONE7))
+    def detect_windows_phone8()
+      if (user_agent.include?(DEVICE_WIN_PHONE8))
         return true
       end
       return false
     end
 
 =begin
-*
+     *
      * Detects if the current browser is a Windows Mobile device.
-     * Excludes Windows Phone 7 devices.
+     * Excludes Windows Phone 7.x and 8 devices.
      * Focuses on Windows Mobile 6.xx and earlier.
      * @return detection of Windows Mobile
 
 =end
     def detect_windows_mobile()
-
-      if (detect_windows_phone7())
+      if (detect_windows_phone())
         return false
       end
 
 
-
       if (user_agent.include?(DEVICE_WIN_MOB) || user_agent.include?(DEVICE_WIN_MOB) || user_agent.include?(DEVICE_IE_MOB) || user_agent.include?(ENGINE_PIE) || (user_agent.include?(MANU_HTC) && user_agent.include?(DEVICE_WINDOWS)) || (detect_wap_wml() && user_agent.include?(DEVICE_WINDOWS)))
         return true
       end
@@ -549,10 +573,11 @@ module MobileESPConverted
       return false
     end
 
+
 =begin
-*
+     *
      * Detects if the current browser is any BlackBerry.
-     * Includes the PlayBook.
+     * Includes BB10 OS, but excludes the PlayBook.
      * @return detection of Blackberry
 
 =end
@@ -561,11 +586,31 @@ module MobileESPConverted
           http_accept.include?(VND_R_I_M))
         return true
       end
+
+      if (detect_black_berry10_phone())
+        return true
+      end
+
       return false
     end
 
 =begin
-*
+     *
+     * Detects if the current browser is a BlackBerry 10 OS phone.
+     * Excludes tablets.
+     * @return detection of a Blackberry 10 device
+
+=end
+    def detect_black_berry10_phone()
+      if (user_agent.include?(DEVICE_B_B10) &&
+          user_agent.include?(MOBILE))
+        return true
+      end
+      return false
+    end
+
+=begin
+     *
      * Detects if the current browser is on a BlackBerry tablet device.
      *    Example: PlayBook
      * @return detection of a Blackberry Tablet
@@ -579,7 +624,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current browser is a BlackBerry device AND uses a
      *    WebKit-based browser. These are signatures for the new BlackBerry OS 6.
      *    Examples: Torch. Includes the Playbook.
@@ -587,15 +632,14 @@ module MobileESPConverted
 
 =end
     def detect_black_berry_web_kit()
-      if (detect_black_berry() &&
-          user_agent.include?(ENGINE_WEB_KIT))
+      if (detect_black_berry() && detect_webkit())
         return true
       end
       return false
     end
 
 =begin
-*
+     *
      * Detects if the current browser is a BlackBerry Touch
      * device, such as the Storm, Torch, and Bold Touch. Excludes the Playbook.
      * @return detection of a Blackberry touchscreen device
@@ -606,14 +650,14 @@ module MobileESPConverted
           (user_agent.include?(DEVICE_B_B_STORM) ||
            user_agent.include?(DEVICE_B_B_TORCH) ||
            user_agent.include?(DEVICE_B_B_BOLD_TOUCH) ||
-           user_agent.include?(DEVICE_B_B_CURVE_TOUCH) ))
+           user_agent.include?(DEVICE_B_B_CURVE_TOUCH)) )
         return true
       end
       return false
     end
 
 =begin
-*
+     *
      * Detects if the current browser is a BlackBerry device AND
      *   has a more capable recent browser. Excludes the Playbook.
      *   Examples, Storm, Bold, Tour, Curve2
@@ -638,7 +682,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current browser is a BlackBerry device AND
      *   has an older, less capable browser.
      *   Examples: Pearl, 8800, Curve1
@@ -658,106 +702,87 @@ module MobileESPConverted
       end
     end
 
+
 =begin
-*
-     * Detects if the current browser is on a PalmOS device.
-     * @return detection of a PalmOS device
+     *
+     * Detects if the current browser is the Symbian S60 Open Source Browser.
+     * @return detection of Symbian S60 Browser
 
 =end
-    def detect_palm_o_s()
-
-      if (user_agent.include?(DEVICE_PALM) || user_agent.include?(ENGINE_BLAZER) || user_agent.include?(ENGINE_XIINO))
+    def detect_s60_oss_browser()
 
-        if (detect_palm_web_o_s())
-          return false
-        else
-          return true
-        end
+      if (detect_webkit() && (user_agent.include?(DEVICE_SYMBIAN) || user_agent.include?(DEVICE_S60)))
+        return true
       end
       return false
     end
 
 =begin
-*
-     * Detects if the current browser is on a Palm device
-     *    running the new WebOS.
-     * @return detection of a Palm WebOS device
+     *
+     *
+     * Detects if the current device is any Symbian OS-based device,
+     *   including older S60, Series 70, Series 80, Series 90, and UIQ,
+     *   or other browsers running on these devices.
+     * @return detection of SymbianOS
 
 =end
-    def detect_palm_web_o_s()
-      if (user_agent.include?(DEVICE_WEB_O_S))
+    def detect_symbian_o_s()
+      if (user_agent.include?(DEVICE_SYMBIAN) || user_agent.include?(DEVICE_S60) || user_agent.include?(DEVICE_S70) || user_agent.include?(DEVICE_S80) || user_agent.include?(DEVICE_S90))
         return true
       end
       return false
     end
 
+
 =begin
-*
-     * Detects if the current browser is on an HP tablet running WebOS.
-     * @return detection of an HP WebOS tablet
+     *
+     * Detects if the current browser is on a PalmOS device.
+     * @return detection of a PalmOS device
 
 =end
-    def detect_web_o_s_tablet()
-      if (user_agent.include?(DEVICE_WEB_O_SHP) &&
-          user_agent.include?(DEVICE_TABLET))
-        return true
+    def detect_palm_o_s()
+
+      if (detect_palm_web_o_s())
+        return false
       end
-      return false
-    end
 
-=begin
-*
-     * Detects if the current browser is a
-     *    Garmin Nuvifone.
-     * @return detection of a Garmin Nuvifone
 
-=end
-    def detect_garmin_nuvifone()
-      if (user_agent.include?(DEVICE_NUVIFONE))
+      if (user_agent.include?(DEVICE_PALM) || user_agent.include?(ENGINE_BLAZER) || user_agent.include?(ENGINE_XIINO))
         return true
       end
       return false
     end
 
 =begin
-*
-     * Check to see whether the device is any device
-     *   in the 'smartphone' category.
-     * @return detection of a general smartphone device
-
-=end
-    def detect_smartphone()
-      return (is_iphone || is_android_phone || is_tier_iphone || detect_s60_oss_browser() || detect_symbian_o_s() || detect_windows_mobile() || detect_windows_phone7() || detect_black_berry() || detect_palm_web_o_s() || detect_palm_o_s() || detect_garmin_nuvifone())
-    end
-
-=begin
-*
-     * Detects whether the device is a Brew-powered device.
-     * @return detection of a Brew device
+     *
+     * Detects if the current browser is on a Palm device
+     *    running the new WebOS.
+     * @return detection of a Palm WebOS device
 
 =end
-    def detect_brew_device()
-      if (user_agent.include?(DEVICE_BREW))
+    def detect_palm_web_o_s()
+      if (user_agent.include?(DEVICE_WEB_O_S))
         return true
       end
       return false
     end
 
 =begin
-*
-     * Detects the Danger Hiptop device.
-     * @return detection of a Danger Hiptop
+     *
+     * Detects if the current browser is on an HP tablet running WebOS.
+     * @return detection of an HP WebOS tablet
 
 =end
-    def detect_danger_hiptop()
-      if (user_agent.include?(DEVICE_DANGER) || user_agent.include?(DEVICE_HIPTOP))
+    def detect_web_o_s_tablet()
+      if (user_agent.include?(DEVICE_WEB_O_SHP) &&
+          user_agent.include?(DEVICE_TABLET))
         return true
       end
       return false
     end
 
 =begin
-*
+     *
      * Detects Opera Mobile or Opera Mini.
      * @return detection of an Opera browser for a mobile device
 
@@ -770,7 +795,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects Opera Mobile on an Android phone.
      * @return detection of an Opera browser on an Android phone
 
@@ -783,7 +808,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects Opera Mobile on an Android tablet.
      * @return detection of an Opera browser on an Android tablet
 
@@ -796,20 +821,7 @@ module MobileESPConverted
     end
 
 =begin
-*
-     * Detects whether the device supports WAP or WML.
-     * @return detection of a WAP- or WML-capable device
-
-=end
-    def detect_wap_wml()
-      if (http_accept.include?(VNDWAP) || http_accept.include?(WML))
-        return true
-      end
-      return false
-    end
-
-=begin
-*
+     *
      * Detects if the current device is an Amazon Kindle (eInk devices only).
      * Note: For the Kindle Fire, use the normal Android methods.
      * @return detection of a Kindle
@@ -824,7 +836,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current Amazon device is using the Silk Browser.
      * Note: Typically used by the the Kindle Fire.
      * @return detection of an Amazon Kindle Fire in Silk mode.
@@ -838,53 +850,128 @@ module MobileESPConverted
     end
 
 =begin
-*
-     *    Detects if the current device is a mobile device.
-     *  This method catches most of the popular modern devices.
-     *  Excludes Apple iPads and other modern tablets.
-     * @return detection of any mobile device using the quicker method
+     *
+     * Detects if the current browser is a
+     *    Garmin Nuvifone.
+     * @return detection of a Garmin Nuvifone
 
 =end
-    def detect_mobile_quick()
-
-      if (is_tier_tablet)
-        return false
+    def detect_garmin_nuvifone()
+      if (user_agent.include?(DEVICE_NUVIFONE))
+        return true
       end
+      return false
+    end
 
-      if (detect_smartphone())
+=begin
+     *
+     * Detects a device running the Bada smartphone OS from Samsung.
+     * @return detection of a Bada device
+
+=end
+    def detect_bada()
+      if (user_agent.include?(DEVICE_BADA))
         return true
       end
+      return false
+    end
 
-      if (detect_wap_wml() || detect_brew_device() || detect_opera_mobile())
+=begin
+     *
+     * Detects a device running the Tizen smartphone OS.
+     * @return detection of a Tizen device
+
+=end
+    def detect_tizen()
+      if (user_agent.include?(DEVICE_TIZEN))
         return true
       end
+      return false
+    end
 
-      if ((user_agent.include?(ENGINE_NETFRONT)) || (user_agent.include?(ENGINE_UP_BROWSER)) || (user_agent.include?(ENGINE_OPEN_WEB)))
+=begin
+     *
+     * Detects a device running the Meego OS.
+     * @return detection of a Meego device
+
+=end
+    def detect_meego()
+      if (user_agent.include?(DEVICE_MEEGO))
         return true
       end
+      return false
+    end
 
-      if (detect_danger_hiptop() || detect_midp_capable() || detect_maemo_tablet() || detect_archos())
+=begin
+     *
+     * Detects the Danger Hiptop device.
+     * @return detection of a Danger Hiptop
+
+=end
+    def detect_danger_hiptop()
+      if (user_agent.include?(DEVICE_DANGER) || user_agent.include?(DEVICE_HIPTOP))
         return true
       end
+      return false
+    end
 
-      if ((user_agent.include?(DEVICE_PDA)) &&
-          (!user_agent.include?(DIS_UPDATE)))
+=begin
+     *
+     * Detects if the current browser is a Sony Mylo device.
+     * @return detection of a Sony Mylo device
+
+=end
+    def detect_sony_mylo()
+      if (user_agent.include?(MANU_SONY) && (user_agent.include?(QTEMBEDDED) || user_agent.include?(MYLOCOM2)))
         return true
       end
-      if (user_agent.include?(MOBILE))
+      return false
+    end
+
+=begin
+     *
+     * Detects if the current device is on one of the Maemo-based Nokia Internet Tablets.
+     * @return detection of a Maemo OS tablet
+
+=end
+    def detect_maemo_tablet()
+      if (user_agent.include?(MAEMO))
+        return true
+      elsif (user_agent.include?(LINUX) && user_agent.include?(DEVICE_TABLET) && !detect_web_o_s_tablet() && !detect_android())
         return true
       end
+      return false
+    end
 
+=begin
+     *
+     * Detects if the current device is an Archos media player/Internet tablet.
+     * @return detection of an Archos media player
 
-      if (detect_kindle() || detect_amazon_silk())
+=end
+    def detect_archos()
+      if (user_agent.include?(DEVICE_ARCHOS))
         return true
       end
+      return false
+    end
+
+=begin
+     *
+     * Detects if the current device is an Internet-capable game console.
+     * Includes many handheld consoles.
+     * @return detection of any Game Console
 
+=end
+    def detect_game_console()
+      if (detect_sony_playstation() || detect_nintendo() || detect_xbox())
+        return true
+      end
       return false
     end
 
 =begin
-*
+     *
      * Detects if the current device is a Sony Playstation.
      * @return detection of Sony Playstation
 
@@ -897,7 +984,22 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
+     * Detects if the current device is a handheld gaming device with
+     * a touchscreen and modern iPhone-class browser. Includes the Playstation Vita.
+     * @return detection of a handheld gaming device
+
+=end
+    def detect_gaming_handheld()
+      if ((user_agent.include?(DEVICE_PLAYSTATION)) &&
+          (user_agent.include?(DEVICE_PLAYSTATION_VITA)))
+        return true
+      end
+      return false
+    end
+
+=begin
+     *
      * Detects if the current device is a Nintendo game device.
      * @return detection of Nintendo
 
@@ -910,7 +1012,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * Detects if the current device is a Microsoft Xbox.
      * @return detection of Xbox
 
@@ -923,74 +1025,112 @@ module MobileESPConverted
     end
 
 =begin
-*
-     * Detects if the current device is an Internet-capable game console.
-     * @return detection of any Game Console
+     *
+     * Detects whether the device is a Brew-powered device.
+     * @return detection of a Brew device
 
 =end
-    def detect_game_console()
-      if (detect_sony_playstation() || detect_nintendo() || detect_xbox())
+    def detect_brew_device()
+      if (user_agent.include?(DEVICE_BREW))
         return true
       end
       return false
     end
 
 =begin
-*
-     * Detects if the current device supports MIDP, a mobile Java technology.
-     * @return detection of a MIDP mobile Java-capable device
+     *
+     * Detects whether the device supports WAP or WML.
+     * @return detection of a WAP- or WML-capable device
 
 =end
-    def detect_midp_capable()
-      if (user_agent.include?(DEVICE_MIDP) || http_accept.include?(DEVICE_MIDP))
+    def detect_wap_wml()
+      if (http_accept.include?(VNDWAP) || http_accept.include?(WML))
         return true
       end
       return false
     end
 
 =begin
-*
-     * Detects if the current device is on one of the Maemo-based Nokia Internet Tablets.
-     * @return detection of a Maemo OS tablet
+     *
+     * Detects if the current device supports MIDP, a mobile Java technology.
+     * @return detection of a MIDP mobile Java-capable device
 
 =end
-    def detect_maemo_tablet()
-      if (user_agent.include?(MAEMO))
-        return true
-      elsif (user_agent.include?(LINUX) && user_agent.include?(DEVICE_TABLET) && !detect_web_o_s_tablet() && !detect_android())
+    def detect_midp_capable()
+      if (user_agent.include?(DEVICE_MIDP) || http_accept.include?(DEVICE_MIDP))
         return true
       end
       return false
     end
 
+
 =begin
-*
-     * Detects if the current device is an Archos media player/Internet tablet.
-     * @return detection of an Archos media player
+     *
+     * Check to see whether the device is any device
+     *   in the 'smartphone' category.
+     * @return detection of a general smartphone device
 
 =end
-    def detect_archos()
-      if (user_agent.include?(DEVICE_ARCHOS))
-        return true
-      end
-      return false
+    def detect_smartphone()
+
+      return (detect_tier_iphone() || detect_s60_oss_browser() || detect_symbian_o_s() || detect_windows_mobile() || detect_black_berry() || detect_palm_o_s())
     end
 
 =begin
-*
-     * Detects if the current browser is a Sony Mylo device.
-     * @return detection of a Sony Mylo device
+     *
+     *    Detects if the current device is a mobile device.
+     *  This method catches most of the popular modern devices.
+     *  Excludes Apple iPads and other modern tablets.
+     * @return detection of any mobile device using the quicker method
 
 =end
-    def detect_sony_mylo()
-      if (user_agent.include?(MANU_SONY) && (user_agent.include?(QTEMBEDDED) || user_agent.include?(MYLOCOM2)))
+    def detect_mobile_quick()
+
+      if (detect_tier_tablet())
+        return false
+      end
+
+      if ((init_completed == true) ||
+          (is_mobile_phone == true))
+        return is_mobile_phone
+      end
+
+
+      if (detect_smartphone())
         return true
       end
+
+      if (detect_wap_wml() || detect_brew_device() || detect_opera_mobile())
+        return true
+      end
+
+      if ((user_agent.include?(ENGINE_OBIGO)) || (user_agent.include?(ENGINE_NETFRONT)) || (user_agent.include?(ENGINE_UP_BROWSER)) || (user_agent.include?(ENGINE_OPEN_WEB)))
+        return true
+      end
+
+      if (detect_danger_hiptop() || detect_midp_capable() || detect_maemo_tablet() || detect_archos())
+        return true
+      end
+
+      if ((user_agent.include?(DEVICE_PDA)) &&
+          (!user_agent.include?(DIS_UPDATE)))
+        return true
+      end
+
+      if (user_agent.include?(MOBILE))
+        return true
+      end
+
+
+      if (detect_kindle() || detect_amazon_silk())
+        return true
+      end
+
       return false
     end
 
 =begin
-*
+     *
      * The longer and more thorough way to detect for a mobile device.
      *   Will probably detect most feature phones,
      *   smartphone-class devices, Internet Tablets,
@@ -1033,11 +1173,8 @@ module MobileESPConverted
     end
 
 
-
-
-
 =begin
-*
+     *
      * The quick way to detect for a tier of devices.
      *   This method detects for the new generation of
      *   HTML 5 capable, larger screen tablets.
@@ -1046,6 +1183,11 @@ module MobileESPConverted
 
 =end
     def detect_tier_tablet()
+      if ((@init_completed == true) ||
+          (@is_tier_tablet == true))
+        return @is_tier_tablet
+      end
+
       if (detect_ipad() || detect_android_tablet() || detect_black_berry_tablet() || detect_web_o_s_tablet())
         return true
       end
@@ -1053,23 +1195,28 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * The quick way to detect for a tier of devices.
      *   This method detects for devices which can
      *   display iPhone-optimized web content.
-     *   Includes iPhone, iPod Touch, Android, Windows Phone 7, Palm WebOS, etc.
-     * @return detection of any device in the iPhone/Android/WP7/WebOS Tier
+     *   Includes iPhone, iPod Touch, Android, Windows Phone 7 and 8, BB10, WebOS, Playstation Vita, etc.
+     * @return detection of any device in the iPhone/Android/Windows Phone/BlackBerry/WebOS Tier
 
 =end
     def detect_tier_iphone()
-      if (is_iphone || is_android_phone || (detect_black_berry_web_kit() && detect_black_berry_touch()) || detect_windows_phone7() || detect_palm_web_o_s() || detect_garmin_nuvifone())
+      if ((@init_completed == true) ||
+          (@is_tier_iphone == true))
+        return @is_tier_iphone
+      end
+
+      if (detect_iphone_or_ipod() || detect_android_phone() || detect_windows_phone() || detect_black_berry10_phone() || (detect_black_berry_web_kit() && detect_black_berry_touch()) || detect_palm_web_o_s() || detect_bada() || detect_tizen() || detect_gaming_handheld())
         return true
       end
       return false
     end
 
 =begin
-*
+     *
      * The quick way to detect for a tier of devices.
      *   This method detects for devices which are likely to be capable
      *   of viewing CSS content optimized for the iPhone,
@@ -1079,6 +1226,11 @@ module MobileESPConverted
 
 =end
     def detect_tier_rich_css()
+      if ((@init_completed == true) ||
+          (@is_tier_rich_css == true))
+        return @is_tier_rich_css
+      end
+
       result = false
 
 
@@ -1088,8 +1240,6 @@ module MobileESPConverted
         if (!detect_tier_iphone() && !detect_kindle())
 
 
-
-
           if (detect_webkit() || detect_s60_oss_browser() || detect_black_berry_high() || detect_windows_mobile() || user_agent.include?(ENGINE_TELECA_Q))
             result= true
           end
@@ -1099,7 +1249,7 @@ module MobileESPConverted
     end
 
 =begin
-*
+     *
      * The quick way to detect for a tier of devices.
      *   This method detects for all other types of phones,
      *   but excludes the iPhone and RichCSS Tier devices.
@@ -1107,10 +1257,16 @@ module MobileESPConverted
 
 =end
     def detect_tier_other_phones()
+      if ((@init_completed == true) ||
+          (@is_tier_generic_mobile == true))
+        return @is_tier_generic_mobile
+      end
+
 
       if (detect_mobile_long() && !detect_tier_iphone() && !detect_tier_rich_css())
         return true
       end
+
       return false
     end
   end