browser 5.1.0 → 5.2.0

data/lib/browser/device/wiiu.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Nintendo WiiU/i
+        ua.match?(/Nintendo WiiU/i)
       end
     end
   end

data/lib/browser/device/xbox_360.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Xbox/i
+        ua.match?(/Xbox/i)
       end
     end
   end

data/lib/browser/device/xbox_one.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Xbox One/i
+        ua.match?(/Xbox One/i)
       end
     end
   end

data/lib/browser/duck_duck_go.rb

@@ -16,7 +16,7 @@ module Browser
     end
 
     def match?
-      ua =~ /DuckDuckGo/
+      ua.include?("DuckDuckGo")
     end
   end
 end

data/lib/browser/edge.rb

@@ -15,11 +15,11 @@ module Browser
     end
 
     def match?
-      ua =~ %r{((?:Edge|Edg|EdgiOS|EdgA)/[\d.]+|Trident/8)}
+      ua.match?(%r{((?:Edge|Edg|EdgiOS|EdgA)/[\d.]+|Trident/8)})
     end
 
     def chrome_based?
-      match? && ua =~ /\bEdg\b/
+      match? && ua.match?(/\bEdg\b/)
     end
   end
 end

data/lib/browser/electron.rb

@@ -16,7 +16,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Electron/
+      ua.include?("Electron")
     end
   end
 end

data/lib/browser/facebook.rb

@@ -17,7 +17,7 @@ module Browser
     end
 
     def match?
-      ua =~ /FBAV|FBAN/
+      ua.match?(/FBAV|FBAN/)
     end
   end
 end

data/lib/browser/firefox.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Firefox|FxiOS/
+      ua.match?(/Firefox|FxiOS/)
     end
   end
 end

data/lib/browser/google_search_app.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /GSA/
+      ua.include?("GSA")
     end
   end
 end

data/lib/browser/huawei_browser.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /HuaweiBrowser/i
+      ua.match?(/HuaweiBrowser/i)
     end
   end
 end

data/lib/browser/instagram.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Instagram/
+      ua.include?("Instagram")
     end
   end
 end

data/lib/browser/internet_explorer.rb

@@ -52,11 +52,11 @@ module Browser
     end
 
     private def msie?
-      ua =~ /MSIE/ && ua !~ /Opera/
+      ua.include?("MSIE") && !ua.include?("Opera")
     end
 
     private def modern_ie?
-      ua =~ %r{Trident/.*?; rv:(.*?)}
+      ua.match?(%r{Trident/.*?; rv:(.*?)})
     end
   end
 end

data/lib/browser/maxthon.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Maxthon/i
+      ua.match?(/Maxthon/i)
     end
   end
 end

data/lib/browser/micro_messenger.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /MicroMessenger/i
+      ua.match?(/MicroMessenger/i)
     end
   end
 end

data/lib/browser/miui_browser.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /MiuiBrowser/
+      ua.include?("MiuiBrowser")
     end
   end
 end

data/lib/browser/nokia.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /S40OviBrowser/
+      ua.include?("S40OviBrowser")
     end
   end
 end

data/lib/browser/opera.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ %r{(Opera|OPR/)}
+      ua.match?(%r{(Opera|OPR/)})
     end
   end
 end

data/lib/browser/otter.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /Otter/
+      ua.include?("Otter")
     end
   end
 end

data/lib/browser/phantom_js.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /PhantomJS/
+      ua.include?("PhantomJS")
     end
   end
 end

data/lib/browser/platform.rb

@@ -13,6 +13,7 @@ require_relative "platform/android"
 require_relative "platform/unknown"
 require_relative "platform/chrome_os"
 require_relative "platform/adobe_air"
+require_relative "platform/kai_os"
 
 module Browser
   class Platform
@@ -32,6 +33,7 @@ module Browser
         BlackBerry,
         IOS,
         Mac,
+        KaiOS,
         FirefoxOS,
         Windows,
         Linux,
@@ -81,6 +83,10 @@ module Browser
       id == :firefox_os
     end
 
+    def kai_os?
+      id == :kai_os
+    end
+
     def ios?(expected_version = nil)
       id == :ios && detect_version?(version, expected_version)
     end
@@ -130,46 +136,46 @@ module Browser
     # Detect if in an Android app webview (Lollipop and newer)
     # https://developer.chrome.com/multidevice/user-agent#webview_user_agent
     def android_app?
-      android? && ua =~ /\bwv\b/
+      android? && ua.match?(/\bwv\b/)
     end
     alias_method :android_webview?, :android_app?
 
     # http://msdn.microsoft.com/fr-FR/library/ms537503.aspx#PltToken
     def windows_xp?
-      windows? && ua =~ /Windows NT 5\.[12]/
+      windows? && ua.match?(/Windows NT 5\.[12]/)
     end
 
     def windows_vista?
-      windows? && ua =~ /Windows NT 6\.0/
+      windows? && ua.include?("Windows NT 6.0")
     end
 
     def windows7?
-      windows? && ua =~ /Windows NT 6\.1/
+      windows? && ua.include?("Windows NT 6.1")
     end
 
     def windows8?
-      windows? && ua =~ /Windows NT 6\.[2-3]/
+      windows? && ua.match?(/Windows NT 6\.[2-3]/)
     end
 
     def windows8_1?
-      windows? && ua =~ /Windows NT 6\.3/
+      windows? && ua.include?("Windows NT 6.3")
     end
 
     def windows10?
-      windows? && ua =~ /Windows NT 10/
+      windows? && ua.include?("Windows NT 10")
     end
 
     def windows_rt?
-      windows8? && ua =~ /ARM/
+      windows8? && ua.include?("ARM")
     end
 
     # Detect if current platform is Windows in 64-bit architecture.
     def windows_x64?
-      windows? && ua =~ /(Win64|x64|Windows NT 5\.2)/
+      windows? && ua.match?(/(Win64|x64|Windows NT 5\.2)/)
     end
 
     def windows_wow64?
-      windows? && ua =~ /WOW64/i
+      windows? && ua.match?(/WOW64/i)
     end
 
     def windows_x64_inclusive?
@@ -177,7 +183,7 @@ module Browser
     end
 
     def windows_touchscreen_desktop?
-      windows? && ua =~ /Touch/
+      windows? && ua.include?("Touch")
     end
 
     private :subject

data/lib/browser/platform/adobe_air.rb

@@ -4,7 +4,7 @@ module Browser
   class Platform
     class AdobeAir < Base
       def match?
-        ua =~ /AdobeAIR/
+        ua.include?("AdobeAIR")
       end
 
       def version

data/lib/browser/platform/android.rb

@@ -4,7 +4,7 @@ module Browser
   class Platform
     class Android < Base
       def match?
-        ua =~ /Android/
+        ua.include?("Android") && !ua.include?("KAIOS")
       end
 
       def name

data/lib/browser/platform/blackberry.rb

@@ -4,7 +4,7 @@ module Browser
   class Platform
     class BlackBerry < Base
       def match?
-        ua =~ /BB10|BlackBerry/
+        ua.match?(/BB10|BlackBerry/)
       end
 
       def name

data/lib/browser/platform/chrome_os.rb

@@ -4,7 +4,7 @@ module Browser
   class Platform
     class ChromeOS < Base
       def match?
-        ua =~ /CrOS/
+        ua.include?("CrOS")
       end
 
       def name

data/lib/browser/platform/firefox_os.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua !~ /(Android|Linux|BlackBerry|Windows|Mac)/ && ua =~ /Firefox/
+        ua !~ /(Android|Linux|BlackBerry|Windows|Mac)/ && ua.include?("Firefox")
       end
     end
   end

data/lib/browser/platform/ios.rb

@@ -32,7 +32,7 @@ module Browser
       end
 
       def match?
-        ua =~ MATCHER
+        ua.match?(MATCHER)
       end
 
       def device

data/lib/browser/platform/kai_os.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Browser
+  class Platform
+    class KaiOS < Base
+      def version
+        ua[%r{KAIOS/([\d.]+)}, 1]
+      end
+
+      def name
+        "KaiOS"
+      end
+
+      def id
+        :kai_os
+      end
+
+      def match?
+        ua.include?("KAIOS")
+      end
+    end
+  end
+end

data/lib/browser/platform/linux.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Linux/
+        ua.include?("Linux")
       end
     end
   end

data/lib/browser/platform/mac.rb

@@ -18,7 +18,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Mac/
+        ua.include?("Mac")
       end
     end
   end

data/lib/browser/platform/windows.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Windows/
+        ua.include?("Windows")
       end
     end
   end

data/lib/browser/platform/windows_mobile.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Windows CE/
+        ua.include?("Windows CE")
       end
     end
   end

data/lib/browser/platform/windows_phone.rb

@@ -16,7 +16,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Windows Phone/
+        ua.include?("Windows Phone")
       end
     end
   end

data/lib/browser/qq.rb

@@ -19,7 +19,7 @@ module Browser
     end
 
     def match?
-      ua =~ %r{QQ/|QQBrowser}i
+      ua.match?(%r{QQ/|QQBrowser}i)
     end
   end
 end

data/lib/browser/safari.rb

@@ -18,8 +18,8 @@ module Browser
     end
 
     def match?
-      ua =~ /Safari/ &&
-        ua !~ /PhantomJS|FxiOS/ &&
+      ua.include?("Safari") &&
+        !ua.match?(/PhantomJS|FxiOS/) &&
         !edge? &&
         !chrome? &&
         !opera? &&

data/lib/browser/samsung_browser.rb

@@ -15,7 +15,7 @@ module Browser
     end
 
     def match?
-      ua =~ /SamsungBrowser/
+      ua.include?("SamsungBrowser")
     end
   end
 end