browser 2.7.1 → 5.3.1

data/lib/browser/device/switch.rb

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

data/lib/browser/device/tv.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /(\btv|Android.*?ADT-1|Nexus Player)/i
+        ua.match?(/(\btv|Android.*?ADT-1|Nexus Player)/i)
       end
     end
   end

data/lib/browser/device/unknown.rb

@@ -4,7 +4,7 @@ module Browser
   class Device
     class Unknown < Base
       def id
-        :unknown
+        :unknown_device
       end
 
       def name

data/lib/browser/device/wii.rb

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

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/device.rb

@@ -1,25 +1,26 @@
 # frozen_string_literal: true
 
-require "browser/device/base"
-require "browser/device/android"
-require "browser/device/unknown"
-require "browser/device/ipad"
-require "browser/device/ipod_touch"
-require "browser/device/iphone"
-require "browser/device/playstation3"
-require "browser/device/playstation4"
-require "browser/device/psp"
-require "browser/device/psvita"
-require "browser/device/kindle"
-require "browser/device/kindle_fire"
-require "browser/device/wii"
-require "browser/device/wiiu"
-require "browser/device/blackberry_playbook"
-require "browser/device/surface"
-require "browser/device/switch"
-require "browser/device/tv"
-require "browser/device/xbox_one"
-require "browser/device/xbox_360"
+require_relative "device/base"
+require_relative "device/android"
+require_relative "device/unknown"
+require_relative "device/ipad"
+require_relative "device/ipod_touch"
+require_relative "device/iphone"
+require_relative "device/playstation3"
+require_relative "device/playstation4"
+require_relative "device/psp"
+require_relative "device/psvita"
+require_relative "device/kindle"
+require_relative "device/kindle_fire"
+require_relative "device/wii"
+require_relative "device/wiiu"
+require_relative "device/blackberry_playbook"
+require_relative "device/surface"
+require_relative "device/switch"
+require_relative "device/tv"
+require_relative "device/xbox_one"
+require_relative "device/xbox_360"
+require_relative "device/samsung"
 
 module Browser
   class Device
@@ -29,6 +30,7 @@ module Browser
     # Order is important.
     def self.matchers
       @matchers ||= [
+        Samsung,
         XboxOne,
         Xbox360,
         Surface,
@@ -88,7 +90,7 @@ module Browser
     end
 
     def unknown?
-      id == :unknown
+      id == :unknown_device
     end
 
     def ipod_touch?
@@ -158,12 +160,12 @@ module Browser
 
     # Detect if browser is Silk.
     def silk?
-      ua =~ /Silk/
+      ua.include?("Silk")
     end
 
     # Detect if browser is running under Xbox.
     def xbox?
-      ua =~ /Xbox/
+      ua.include?("Xbox")
     end
 
     # Detect if browser is running under Xbox 360.
@@ -191,18 +193,26 @@ module Browser
       xbox? || playstation? || nintendo?
     end
 
+    # Detect if device is a Samsung.
+    def samsung?
+      id == :samsung
+    end
+
     # Regex taken from http://detectmobilebrowsers.com
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     private def detect_mobile?
       psp? ||
-      /zunewp7/i.match(ua) ||
+      /zunewp7/i.match?(ua) ||
       %r{(android|bb\d+|meego).+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino}i.match(ua) ||
-      %r{1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-}i.match(ua[0..3])
+      %r{1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-}i.match?(ua[0..3])
     end
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
 
     private def platform
       @platform ||= Platform.new(ua)
     end
+
+    private :subject
+    private :ua
   end
 end

data/lib/browser/duck_duck_go.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Browser
+  class DuckDuckGo < Base
+    def id
+      :duckduckgo
+    end
+
+    def name
+      "DuckDuckGo"
+    end
+
+    def full_version
+      ua[%r{DuckDuckGo/([\d.]+)}, 1] ||
+        "0.0"
+    end
+
+    def match?
+      ua.include?("DuckDuckGo")
+    end
+  end
+end

data/lib/browser/edge.rb

@@ -11,15 +11,15 @@ module Browser
     end
 
     def full_version
-      ua[%r{(?:Edge|Edg)/([\d.]+)}, 1] || super
+      ua[%r{(?:Edge|Edg|EdgiOS|EdgA)/([\d.]+)}, 1] || super
     end
 
     def match?
-      ua =~ %r{((?:Edge|Edg)/[\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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class GoogleSearchApp < Chrome
+    def id
+      :google_search_app
+    end
+
+    def name
+      "Google Search App"
+    end
+
+    def full_version
+      ua[%r{GSA/([\d.]+\d)}, 1] || super
+    end
+
+    def match?
+      ua.include?("GSA")
+    end
+  end
+end

data/lib/browser/huawei_browser.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class HuaweiBrowser < Base
+    def id
+      :huawei_browser
+    end
+
+    def name
+      "Huawei Browser"
+    end
+
+    def full_version
+      ua[%r{(?:HuaweiBrowser)/([\d.]+)}i, 1] || "0.0"
+    end
+
+    def match?
+      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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class Maxthon < Base
+    def id
+      :maxthon
+    end
+
+    def name
+      "Maxthon"
+    end
+
+    def full_version
+      ua[%r{(?:Maxthon)/([\d.]+)}i, 1] || "0.0"
+    end
+
+    def match?
+      ua.match?(/Maxthon/i)
+    end
+  end
+end

data/lib/browser/meta/base.rb

@@ -10,7 +10,6 @@ module Browser
         IE,
         IOS,
         Mobile,
-        Modern,
         Platform,
         Proxy,
         Safari,

data/lib/browser/meta.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require "browser/meta/base"
-require "browser/meta/generic_browser"
-require "browser/meta/id"
-require "browser/meta/ie"
-require "browser/meta/ios"
-require "browser/meta/mobile"
-require "browser/meta/modern"
-require "browser/meta/platform"
-require "browser/meta/proxy"
-require "browser/meta/safari"
-require "browser/meta/webkit"
-require "browser/meta/tablet"
-require "browser/meta/device"
+require_relative "meta/base"
+require_relative "meta/generic_browser"
+require_relative "meta/id"
+require_relative "meta/ie"
+require_relative "meta/ios"
+require_relative "meta/mobile"
+require_relative "meta/platform"
+require_relative "meta/proxy"
+require_relative "meta/safari"
+require_relative "meta/webkit"
+require_relative "meta/tablet"
+require_relative "meta/device"

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/middleware/context/additions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "browser/middleware/context/url_methods"
+require_relative "url_methods"
 
 module Browser
   class Middleware

data/lib/browser/middleware.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "uri"
-require "browser/middleware/context"
+require_relative "middleware/context"
 
 module Browser
   class Middleware

data/lib/browser/miui_browser.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Browser
+  class MiuiBrowser < Base
+    def id
+      :miui_browser
+    end
+
+    def name
+      "Miui Browser"
+    end
+
+    def full_version
+      ua[%r{MiuiBrowser/([\d.]+)}, 1] || "0.0"
+    end
+
+    def match?
+      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/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/base.rb

@@ -3,10 +3,11 @@
 module Browser
   class Platform
     class Base
-      attr_reader :ua
+      attr_reader :ua, :platform
 
-      def initialize(ua)
+      def initialize(ua, platform = nil)
         @ua = ua
+        @platform = platform
       end
 
       def match?

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

@@ -5,7 +5,7 @@ module Browser
     class IOS < Base
       MATCHER = /(iPhone|iPad|iPod)/.freeze
       VERSION_MATCHER =
-        /OS ((?<major>\d+)_(?<minor>\d+)_?(?<patch>\d+)?)/.freeze
+        /OS (?<major>\d+)_(?<minor>\d+)_?(?<patch>\d+)?/.freeze
 
       def version
         matches = VERSION_MATCHER.match(ua)
@@ -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

@@ -4,11 +4,13 @@ module Browser
   class Platform
     class Mac < Base
       def version
-        (ua[/Mac OS X\s*([0-9_\.]+)?/, 1] || "0").tr("_", ".")
+        (ua[/Mac OS X\s*([0-9_.]+)?/, 1] || "0").tr("_", ".")
       end
 
       def name
-        "Macintosh"
+        return "macOS" if platform.mac?(">= 10.12")
+
+        "Mac OS X"
       end
 
       def id
@@ -16,7 +18,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Mac/
+        ua.include?("Mac")
       end
     end
   end

data/lib/browser/platform/{other.rb → unknown.rb}

@@ -2,17 +2,17 @@
 
 module Browser
   class Platform
-    class Other < Base
+    class Unknown < Base
       def version
         "0"
       end
 
       def name
-        "Other"
+        "Unknown"
       end
 
       def id
-        :other
+        :unknown_platform
       end
 
       def match?