browser 4.2.0 → 5.1.0

data/lib/browser/browser.rb

@@ -15,7 +15,7 @@ require_relative "firefox"
 require_relative "edge"
 require_relative "opera"
 require_relative "blackberry"
-require_relative "generic"
+require_relative "unknown"
 require_relative "phantom_js"
 require_relative "uc_browser"
 require_relative "nokia"
@@ -32,6 +32,11 @@ require_relative "sputnik"
 require_relative "snapchat"
 require_relative "duck_duck_go"
 require_relative "samsung_browser"
+require_relative "huawei_browser"
+require_relative "miui_browser"
+require_relative "maxthon"
+require_relative "sougou_browser"
+require_relative "google_search_app"
 
 require_relative "bot"
 require_relative "bot/empty_user_agent_matcher"
@@ -46,10 +51,20 @@ require_relative "meta"
 module Browser
   EMPTY_STRING = ""
 
+  Error = Class.new(StandardError)
+
   def self.root
     @root ||= Pathname.new(File.expand_path("../..", __dir__))
   end
 
+  class << self
+    attr_accessor :user_agent_size_limit
+    attr_accessor :accept_language_size_limit
+  end
+
+  self.user_agent_size_limit = 2048
+  self.accept_language_size_limit = 2048
+
   # Hold the list of browser matchers.
   # Order is important.
   def self.matchers
@@ -75,9 +90,14 @@ module Browser
       Sputnik,              # must be placed before Chrome and Safari
       DuckDuckGo,           # must be placed before Chrome and Safari
       SamsungBrowser,       # must be placed before Chrome and Safari
+      HuaweiBrowser,        # must be placed before Chrome and Safari
+      MiuiBrowser,          # must be placed before Chrome and Safari
+      Maxthon,              # must be placed before Chrome and Safari
+      SougouBrowser,        # must be placed before Chrome and Safari
+      GoogleSearchApp,      # must be placed before Chrome and Safari
       Chrome,
       Safari,
-      Generic
+      Unknown
     ]
   end
 

data/lib/browser/chrome.rb

@@ -27,7 +27,13 @@ module Browser
         !duck_duck_go? &&
         !yandex? &&
         !sputnik? &&
-        !samsung_browser?
+        !samsung_browser? &&
+        !huawei_browser? &&
+        !miui_browser? &&
+        !maxthon? &&
+        !qq? &&
+        !sougou_browser? &&
+        !google_search_app?
     end
   end
 end

data/lib/browser/device.rb

@@ -20,6 +20,7 @@ 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?
@@ -191,13 +193,18 @@ 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 Layout/LineLength
     private def detect_mobile?
       psp? ||
       /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 Layout/LineLength
 

data/lib/browser/device/samsung.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Browser
+  class Device
+    class Samsung < Base
+      REGEX = /\(Linux.*?; Android.*?; (SAMSUNG )?(SM-[A-Z0-9]+).*?\)/i.freeze
+
+      def self.names
+        @names ||= YAML.load_file(Browser.root.join("samsung.yml").to_s)
+      end
+
+      def id
+        :samsung
+      end
+
+      def name
+        "Samsung #{self.class.names[code] || code}"
+      end
+
+      def code
+        matches && matches[2]
+      end
+
+      def matches
+        @matches ||= ua.match(REGEX)
+      end
+
+      def match?
+        !!matches
+      end
+    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/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 =~ /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 =~ /HuaweiBrowser/i
+    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 =~ /Maxthon/i
+    end
+  end
+end

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 =~ /MiuiBrowser/
+    end
+  end
+end

data/lib/browser/platform.rb

@@ -10,7 +10,7 @@ require_relative "platform/windows_mobile"
 require_relative "platform/firefox_os"
 require_relative "platform/blackberry"
 require_relative "platform/android"
-require_relative "platform/other"
+require_relative "platform/unknown"
 require_relative "platform/chrome_os"
 require_relative "platform/adobe_air"
 
@@ -35,7 +35,7 @@ module Browser
         FirefoxOS,
         Windows,
         Linux,
-        Other
+        Unknown
       ]
     end
 
@@ -61,8 +61,8 @@ module Browser
       id == :android && detect_version?(version, expected_version)
     end
 
-    def other?
-      id == :other
+    def unknown?
+      id == :unknown_platform
     end
 
     def linux?

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)

data/lib/browser/platform/mac.rb

@@ -4,7 +4,7 @@ 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

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?

data/lib/browser/platform/windows.rb

@@ -4,7 +4,7 @@ module Browser
   class Platform
     class Windows < Base
       def version
-        ua[/Windows NT\s*([0-9_\.]+)?/, 1] || "0"
+        ua[/Windows NT\s*([0-9_.]+)?/, 1] || "0"
       end
 
       def name

data/lib/browser/safari.rb

@@ -22,10 +22,18 @@ module Browser
         ua !~ /PhantomJS|FxiOS/ &&
         !edge? &&
         !chrome? &&
+        !opera? &&
         !samsung_browser? &&
+        !huawei_browser? &&
+        !miui_browser? &&
         !duck_duck_go? &&
         !yandex? &&
-        !sputnik?
+        !sputnik? &&
+        !maxthon? &&
+        !qq? &&
+        !alipay? &&
+        !sougou_browser? &&
+        !google_search_app?
     end
   end
 end

data/lib/browser/sougou_browser.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Browser
+  class SougouBrowser < Base
+    def id
+      :sougou_browser
+    end
+
+    def name
+      "Sougou Browser"
+    end
+
+    # We can't get the real version on desktop device from the ua string
+    def full_version
+      ua[%r{(?:SogouMobileBrowser)/([\d.]+)}, 1] || "0.0"
+    end
+
+    # SogouMobileBrowser for mobile device
+    # SE for desktop device
+    def match?
+      ua =~ /SogouMobileBrowser/i || ua =~ / SE /
+    end
+  end
+end

data/lib/browser/{generic.rb → unknown.rb}

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Browser
-  class Generic < Base
+  class Unknown < Base
     NAMES = {
       "QuickTime" => "QuickTime",
       "CoreMedia" => "Apple CoreMedia"
     }.freeze
 
     def id
-      :generic
+      :unknown_browser
     end
 
     def name
-      infer_name || "Generic Browser"
+      infer_name || "Unknown Browser"
     end
 
     def full_version

data/lib/browser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Browser
-  VERSION = "4.2.0"
+  VERSION = "5.1.0"
 end

data/samsung.yml

@@ -0,0 +1,138 @@
+# Source: https://en.wikipedia.org/wiki/Samsung_Galaxy
+SM-G900H: Galaxy S5 Exynos
+SM-A320FL: Galaxy A3
+SM-G780F: Galaxy S20 Fan Edition
+SM-G781B: Galaxy S20 Fan Edition
+SM-F196B: Galaxy Z Fold2 5G
+SM-G928A: Galaxy S6 Edge+
+SM-G928AZ: Galaxy S6 Edge+
+SM-G928D: Galaxy S6 Edge+
+SM-G928F: Galaxy S6 Edge+
+SM-G928FD: Galaxy S6 Edge+
+SM-G928I: Galaxy S6 Edge+
+SM-G928K: Galaxy S6 Edge+
+SM-G928L: Galaxy S6 Edge+
+SM-G928P: Galaxy S6 Edge+
+SM-G928PZ: Galaxy S6 Edge+
+SM-G928R4: Galaxy S6 Edge+
+SM-G928R7: Galaxy S6 Edge+
+SM-G928S: Galaxy S6 Edge+
+SM-G928T: Galaxy S6 Edge+
+SM-G928T1: Galaxy S6 Edge+
+SM-G928TR: Galaxy S6 Edge+
+SM-G928V: Galaxy S6 Edge+
+SM-G9280: Galaxy S6 Edge+
+SM-G9288: Galaxy S6 Edge+
+SM-G9289: Galaxy S6 Edge+
+SM-A8000: Galaxy A8
+SM-A800F: Galaxy A8
+SM-A800I: Galaxy A8
+SM-A800S: Galaxy A8
+SM-A800Y: Galaxy A8
+SM-N9200: Galaxy Note 5
+SM-N920C: Galaxy Note 5
+SM-N920T: Galaxy Note 5
+SM-N920A: Galaxy Note 5
+SM-N920I: Galaxy Note 5
+SM-N9208: Galaxy Note 5
+SM-G903FP: Galaxy S5 Neo
+SM-G903WP: Galaxy S5 Neo
+SM-G925A: Galaxy S6 Edge
+SM-G925AZ: Galaxy S6 Edge
+SM-G925F: Galaxy S6 Edge
+SM-G925I: Galaxy S6 Edge
+SM-G925K: Galaxy S6 Edge
+SM-G925L: Galaxy S6 Edge
+SM-G925P: Galaxy S6 Edge
+SM-G925PZ: Galaxy S6 Edge
+SM-G925R4: Galaxy S6 Edge
+SM-G925R7: Galaxy S6 Edge
+SM-G925S: Galaxy S6 Edge
+SM-G925T: Galaxy S6 Edge
+SM-G925T1: Galaxy S6 Edge
+SM-G925TR: Galaxy S6 Edge
+SM-G925V: Galaxy S6 Edge
+SM-G9250: Galaxy S6 Edge
+SM-G9258: Galaxy S6 Edge
+SM-G9259: Galaxy S6 Edge
+SM-G920A: Galaxy S6
+SM-G920AZ: Galaxy S6
+SM-G920D: Galaxy S6
+SM-G920F: Galaxy S6
+SM-G920FD: Galaxy S6
+SM-G920I: Galaxy S6
+SM-G920K: Galaxy S6
+SM-G920L: Galaxy S6
+SM-G920P: Galaxy S6
+SM-G920PZ: Galaxy S6
+SM-G920R4: Galaxy S6
+SM-G920R7: Galaxy S6
+SM-G920S: Galaxy S6
+SM-G920T: Galaxy S6
+SM-G920T1: Galaxy S6
+SM-G920TR: Galaxy S6
+SM-G920V: Galaxy S6
+SM-G9200: Galaxy S6
+SM-G9208: Galaxy S6
+SM-G9209: Galaxy S6
+SM-A700F: Galaxy A7
+SM-A700FD: Galaxy A7
+SM-A700FQ: Galaxy A7
+SM-A700H: Galaxy A7
+SM-A700K: Galaxy A7
+SM-A700L: Galaxy A7
+SM-A700M: Galaxy A7
+SM-A700S: Galaxy A7
+SM-A700X: Galaxy A7
+SM-A700YD: Galaxy A7
+SM-A700YZ: Galaxy A7
+SM-A7000: Galaxy A7
+SM-A7009: Galaxy A7
+SM-A7009W: Galaxy A7
+SM-G530BT: Galaxy Grand Prime
+SM-G530F: Galaxy Grand Prime
+SM-G530FQ: Galaxy Grand Prime
+SM-G530FZ: Galaxy Grand Prime
+SM-G530H: Galaxy Grand Prime
+SM-G530M: Galaxy Grand Prime
+SM-G530MU: Galaxy Grand Prime
+SM-G530P: Galaxy Grand Prime
+SM-G530R4: Galaxy Grand Prime
+SM-G530R7: Galaxy Grand Prime
+SM-G530T: Galaxy Grand Prime
+SM-G530W: Galaxy Grand Prime
+SM-G530Y: Galaxy Grand Prime
+SM-G5306W: Galaxy Grand Prime
+SM-G5308W: Galaxy Grand Prime
+SM-G5309W: Galaxy Grand Prime
+SM-J7109: Galaxy J7
+SM-J710F: Galaxy J7
+SM-J710FN: Galaxy J7
+SM-J710H: Galaxy J7
+SM-J710MN: Galaxy J7
+SM-J710FQ: Galaxy J7
+SM-J710K: Galaxy J7
+SM-J710K: Galaxy J7
+SM-J710GN: Galaxy J7
+SM-J5109: Galaxy J5
+SM-J510F: Galaxy J5
+SM-J510FN: Galaxy J5
+SM-J510H: Galaxy J5
+SM-J510G: Galaxy J5
+SM-J510MN: Galaxy J5
+SM-J510Y: Galaxy J5
+SM-J5108: Galaxy J5
+SM-J510K: Galaxy J5
+SM-J510L: Galaxy J5
+SM-J510S: Galaxy J5
+SM-J510UN: Galaxy J5
+SM-G570F: Galaxy J2 Prime
+SM-G570M: Galaxy J2 Prime
+SM-G532F: Galaxy J2 Prime
+SM-G532M: Galaxy J2 Prime
+SM-G532G: Galaxy J2 Prime
+SM-G610F: Galaxy J7 Prime
+SM-G610M: Galaxy J7 Prime
+SM-G975F: Galaxy S10+
+SM-G960F: Galaxy S9
+SM-F700F: Galaxy Z Flip