browser 4.1.0 → 5.3.0

data/browser.gemspec

@@ -8,13 +8,14 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.authors               = ["Nando Vieira"]
   s.email                 = ["fnando.vieira@gmail.com"]
-  s.homepage              = "http://github.com/fnando/browser"
+  s.homepage              = "https://github.com/fnando/browser"
   s.summary               = "Do some browser detection with Ruby."
   s.description           = s.summary
   s.license               = "MIT"
+  s.required_ruby_version = ">= 2.5.0"
+
+  s.metadata["changelog_uri"] = "https://github.com/fnando/browser/blob/main/CHANGELOG.md"
 
-  s.metadata["changelog_uri"] = "https://github.com/fnando/browser/blob/master/CHANGELOG.md"
-  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- exe/*`
@@ -31,6 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails"
   s.add_development_dependency "rake"
   s.add_development_dependency "rubocop"
-  s.add_development_dependency "rubocop-fnando", "~> 0.0.3"
+  s.add_development_dependency "rubocop-fnando"
   s.add_development_dependency "simplecov"
 end

data/lib/browser/accept_language.rb

@@ -48,15 +48,15 @@ module Browser
     def quality
       @quality ||= begin
         Float(quality_value || 1.0)
-                   rescue ArgumentError
-                     0.1
+      rescue ArgumentError
+        0.1
       end
     end
 
     private def quality_value
       qvalue = part[/;q=([\d.]+)/, 1]
-      qvalue = qvalue =~ /\A0\.0?\z/ ? "0.0" : qvalue
-      qvalue = qvalue.gsub(/\.+/, ".") if qvalue
+      qvalue = /\A0\.0?\z/.match?(qvalue) ? "0.0" : qvalue
+      qvalue = qvalue.squeeze(".") if qvalue
       qvalue
     end
   end

data/lib/browser/alipay.rb

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

data/lib/browser/base.rb

@@ -6,12 +6,11 @@ module Browser
 
     attr_reader :ua
 
-    # Return an array with all preferred languages that this browser accepts.
-    attr_reader :accept_language
-
     def initialize(ua, accept_language: nil)
+      validate_size(:user_agent, ua.to_s)
+
       @ua = ua
-      @accept_language = AcceptLanguage.parse(accept_language)
+      @accept_language_raw = accept_language.to_s
     end
 
     # Return a meta info about this browser.
@@ -19,6 +18,14 @@ module Browser
       Meta.get(self)
     end
 
+    # Return an array with all preferred languages that this browser accepts.
+    def accept_language
+      @accept_language ||= begin
+        validate_size(:accept_language, @accept_language_raw)
+        AcceptLanguage.parse(@accept_language_raw)
+      end
+    end
+
     alias_method :to_a, :meta
 
     # Return meta representation as string.
@@ -99,19 +106,20 @@ module Browser
 
     # Detect if browser is WebKit-based.
     def webkit?(expected_version = nil)
-      ua =~ /AppleWebKit/i &&
+      ua.match?(/AppleWebKit/i) &&
         (!edge? || Edge.new(ua).chrome_based?) &&
         detect_version?(webkit_full_version, expected_version)
     end
 
     # Detect if browser is QuickTime
     def quicktime?(expected_version = nil)
-      ua =~ /QuickTime/i && detect_version?(full_version, expected_version)
+      ua.match?(/QuickTime/i) && detect_version?(full_version, expected_version)
     end
 
     # Detect if browser is Apple CoreMedia.
     def core_media?(expected_version = nil)
-      ua =~ /CoreMedia/ && detect_version?(full_version, expected_version)
+      ua.include?("CoreMedia") && detect_version?(full_version,
+                                                  expected_version)
     end
 
     # Detect if browser is PhantomJS
@@ -122,11 +130,11 @@ module Browser
 
     # Detect if browser is Safari.
     def safari?(expected_version = nil)
-      Safari.new(ua).match? && detect_version?(version, expected_version)
+      Safari.new(ua).match? && detect_version?(full_version, expected_version)
     end
 
     def safari_webapp_mode?
-      (device.ipad? || device.iphone?) && ua =~ /AppleWebKit/
+      (device.ipad? || device.iphone?) && ua.include?("AppleWebKit")
     end
 
     # Detect if browser is Firefox.
@@ -184,17 +192,53 @@ module Browser
 
     # Detect if browser is Opera Mini.
     def opera_mini?(expected_version = nil)
-      ua =~ /Opera Mini/ && detect_version?(full_version, expected_version)
+      ua.include?("Opera Mini") && detect_version?(full_version,
+                                                   expected_version)
     end
 
     # Detect if browser is DuckDuckGo.
     def duck_duck_go?(expected_version = nil)
-      ua =~ /DuckDuckGo/ && detect_version?(full_version, expected_version)
+      ua.include?("DuckDuckGo") && detect_version?(full_version,
+                                                   expected_version)
     end
 
     # Detect if browser is Samsung.
     def samsung_browser?(expected_version = nil)
-      ua =~ /SamsungBrowser/ && detect_version?(full_version, expected_version)
+      ua.include?("SamsungBrowser") && detect_version?(full_version,
+                                                       expected_version)
+    end
+
+    # Detect if browser is Huawei.
+    def huawei_browser?(expected_version = nil)
+      HuaweiBrowser.new(ua).match? &&
+        detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Xiaomi Miui.
+    def miui_browser?(expected_version = nil)
+      MiuiBrowser.new(ua).match? &&
+        detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Maxthon.
+    def maxthon?(expected_version = nil)
+      Maxthon.new(ua).match? && detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is QQ.
+    def qq?(expected_version = nil)
+      QQ.new(ua).match? && detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Sougou.
+    def sougou_browser?(expected_version = nil)
+      SougouBrowser.new(ua).match? &&
+        detect_version?(full_version, expected_version)
+    end
+
+    # Detect if browser is Google Search App
+    def google_search_app?(expected_version = nil)
+      ua.include?("GSA") && detect_version?(full_version, expected_version)
     end
 
     def webkit_full_version
@@ -202,7 +246,11 @@ module Browser
     end
 
     def known?
-      id != :generic
+      !unknown?
+    end
+
+    def unknown?
+      id == :unknown_browser
     end
 
     # Detect if browser is a proxy browser.
@@ -214,5 +262,16 @@ module Browser
     def electron?(expected_version = nil)
       Electron.new(ua).match? && detect_version?(full_version, expected_version)
     end
+
+    private def validate_size(subject, input)
+      actual_bytesize = input.bytesize
+      size_limit = Browser.public_send("#{subject}_size_limit")
+
+      return if actual_bytesize < size_limit
+
+      raise Error,
+            "#{subject} cannot be larger than #{size_limit} bytes; " \
+            "actual size is #{actual_bytesize} bytes"
+    end
   end
 end

data/lib/browser/blackberry.rb

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

data/lib/browser/bot/keyword_matcher.rb

@@ -4,7 +4,7 @@ module Browser
   class Bot
     class KeywordMatcher
       def self.call(ua, _browser)
-        ua =~ /crawl|fetch|search|monitoring|spider|bot/
+        ua.match?(/crawl|fetch|search|monitoring|spider|bot/)
       end
     end
   end

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,19 @@ 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, :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 +89,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

@@ -20,14 +20,20 @@ module Browser
     end
 
     def match?
-      ua =~ /Chrome|CriOS/ &&
-        ua !~ /PhantomJS|FxiOS|ArchiveBot/ &&
+      ua.match?(/Chrome|CriOS/) &&
+        !ua.match?(/PhantomJS|FxiOS|ArchiveBot/) &&
         !opera? &&
         !edge? &&
         !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?
@@ -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,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) ||
+      /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/android.rb

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

data/lib/browser/device/blackberry_playbook.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /PlayBook.*?RIM Tablet/
+        ua.match?(/PlayBook.*?RIM Tablet/)
       end
     end
   end

data/lib/browser/device/ipad.rb

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

data/lib/browser/device/iphone.rb

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

data/lib/browser/device/ipod_touch.rb

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

data/lib/browser/device/kindle.rb

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

data/lib/browser/device/kindle_fire.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /Kindle Fire|KFTT/
+        ua.match?(/Kindle Fire|KFTT/)
       end
     end
   end

data/lib/browser/device/playstation3.rb

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