browser 2.5.2 → 5.3.1

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

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[(?:MicroMessenger)/([\d.]+)]i, 1] || "0.0"
+      ua[%r{(?:MicroMessenger)/([\d.]+)}i, 1] || "0.0"
     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,15 +1,16 @@
 # frozen_string_literal: true
 
 require "uri"
-require "browser/middleware/context"
+require_relative "middleware/context"
 
 module Browser
   class Middleware
     # Detect the most common assets.
-    ASSETS_REGEX = /\.(css|png|jpe?g|gif|js|svg|ico|flv|mov|m4v|ogg|swf)\z/i
+    ASSETS_REGEX =
+      /\.(css|png|jpe?g|gif|js|svg|ico|flv|mov|m4v|ogg|swf)\z/i.freeze
 
     # Detect the ACCEPT header. IE8 send */*.
-    ACCEPT_REGEX = %r[(text/html|\*/\*)]
+    ACCEPT_REGEX = %r{(text/html|\*/\*)}.freeze
 
     def initialize(app, &block)
       raise ArgumentError, "Browser::Middleware requires a block" unless block

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

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[S40OviBrowser/([\d.]+)], 1] || "0.0"
+      ua[%r{S40OviBrowser/([\d.]+)}, 1] || "0.0"
     end
 
     def match?
-      ua =~ /S40OviBrowser/
+      ua.include?("S40OviBrowser")
     end
   end
 end

data/lib/browser/opera.rb

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[OPR/([\d.]+)], 1] || ua[%r[Version/([\d.]+)], 1] || "0.0"
+      ua[%r{OPR/([\d.]+)}, 1] || ua[%r{Version/([\d.]+)}, 1] || "0.0"
     end
 
     def match?
-      ua =~ /(Opera|OPR\/)/
+      ua.match?(%r{(Opera|OPR/)})
     end
   end
 end

data/lib/browser/otter.rb

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[Otter/([\d.]+)], 1] || "0.0"
+      ua[%r{Otter/([\d.]+)}, 1] || "0.0"
     end
 
     def match?
-      ua =~ /Otter/
+      ua.include?("Otter")
     end
   end
 end

data/lib/browser/phantom_js.rb

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[PhantomJS/([\d.]+)], 1] || "0.0"
+      ua[%r{PhantomJS/([\d.]+)}, 1] || "0.0"
     end
 
     def match?
-      ua =~ /PhantomJS/
+      ua.include?("PhantomJS")
     end
   end
 end

data/lib/browser/platform/adobe_air.rb

@@ -4,11 +4,11 @@ module Browser
   class Platform
     class AdobeAir < Base
       def match?
-        ua =~ /AdobeAIR/
+        ua.include?("AdobeAIR")
       end
 
       def version
-        ua[%r[AdobeAIR/([\d.]+)], 1]
+        ua[%r{AdobeAIR/([\d.]+)}, 1]
       end
 
       def name

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
@@ -16,7 +16,7 @@ module Browser
       end
 
       def version
-        ua[%r[(?:Version|BlackBerry[\da-z]+)/([\d.]+)], 1]
+        ua[%r{(?:Version|BlackBerry[\da-z]+)/([\d.]+)}, 1]
       end
     end
   end

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

@@ -3,11 +3,24 @@
 module Browser
   class Platform
     class IOS < Base
-      MATCHER = /(iPhone|iPad|iPod)/
-      VERSION_MATCHER = /OS ([\d.]+)/
+      MATCHER = /(iPhone|iPad|iPod)/.freeze
+      VERSION_MATCHER =
+        /OS (?<major>\d+)_(?<minor>\d+)_?(?<patch>\d+)?/.freeze
 
       def version
-        ua[VERSION_MATCHER, 1] || "0"
+        matches = VERSION_MATCHER.match(ua)
+
+        return "0" unless matches
+
+        versions = [matches[:major]]
+
+        if matches[:patch]
+          versions.push(matches[:minor], matches[:patch])
+        else
+          versions.push(matches[:minor]) unless matches[:minor] == "0"
+        end
+
+        versions.join(".")
       end
 
       def name
@@ -19,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?

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
@@ -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/platform.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require "browser/platform/base"
-require "browser/platform/ios"
-require "browser/platform/linux"
-require "browser/platform/windows"
-require "browser/platform/mac"
-require "browser/platform/windows_phone"
-require "browser/platform/windows_mobile"
-require "browser/platform/firefox_os"
-require "browser/platform/blackberry"
-require "browser/platform/android"
-require "browser/platform/other"
-require "browser/platform/chrome_os"
-require "browser/platform/adobe_air"
+require_relative "platform/base"
+require_relative "platform/ios"
+require_relative "platform/linux"
+require_relative "platform/windows"
+require_relative "platform/mac"
+require_relative "platform/windows_phone"
+require_relative "platform/windows_mobile"
+require_relative "platform/firefox_os"
+require_relative "platform/blackberry"
+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,10 +33,11 @@ module Browser
         BlackBerry,
         IOS,
         Mac,
+        KaiOS,
         FirefoxOS,
         Windows,
         Linux,
-        Other
+        Unknown
       ]
     end
 
@@ -45,7 +47,7 @@ module Browser
 
     def subject
       @subject ||= self.class.matchers
-                       .map {|matcher| matcher.new(ua) }
+                       .map {|matcher| matcher.new(ua, self) }
                        .find(&:match?)
     end
 
@@ -61,8 +63,8 @@ module Browser
       id == :android && detect_version?(version, expected_version)
     end
 
-    def other?
-      id == :other
+    def unknown?
+      id == :unknown_platform
     end
 
     def 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,10 @@ module Browser
     end
 
     def windows_touchscreen_desktop?
-      windows? && ua =~ /Touch/
+      windows? && ua.include?("Touch")
     end
+
+    private :subject
+    private :ua
   end
 end

data/lib/browser/qq.rb

@@ -11,15 +11,15 @@ module Browser
     end
 
     def full_version
-      ua[%r[(?:Mobile MQQBrowser)/([\d.]+)]i, 1] ||
-        ua[%r[(?:QQBrowserLite)/([\d.]+)]i, 1] ||
-        ua[%r[(?:QQBrowser)/([\d.]+)]i, 1] ||
-        ua[%r[(?:QQ)/([\d.]+)]i, 1] ||
+      ua[%r{(?:Mobile MQQBrowser)/([\d.]+)}i, 1] ||
+        ua[%r{(?:QQBrowserLite)/([\d.]+)}i, 1] ||
+        ua[%r{(?:QQBrowser)/([\d.]+)}i, 1] ||
+        ua[%r{(?:QQ)/([\d.]+)}i, 1] ||
         "0.0"
     end
 
     def match?
-      ua =~ /QQ/i
+      ua.match?(%r{QQ/|QQBrowser}i)
     end
   end
 end

data/lib/browser/rails.rb

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
 require "rails/railtie"
-require "browser/action_controller"
-require "browser/middleware/context/additions"
+require_relative "action_controller"
+require_relative "middleware/context/additions"
 
 module Browser
   class Railtie < Rails::Railtie
     config.browser = ActiveSupport::OrderedOptions.new
 
     initializer "browser" do
-      ::ActionController::Base.send :include, Browser::ActionController
-      Browser::Middleware::Context.send :include,
-                                        Browser::Middleware::Context::Additions
+      ActiveSupport.on_load(:action_controller) do
+        ::ActionController::Base.include(Browser::ActionController)
+
+        ::ActionController::Metal.include(Browser::ActionController) if defined?(::ActionController::Metal) # rubocop:disable Layout/LineLength
+
+        Browser::Middleware::Context.include(
+          Browser::Middleware::Context::Additions
+        )
+      end
     end
   end
 end

data/lib/browser/safari.rb

@@ -11,14 +11,29 @@ module Browser
     end
 
     def full_version
-      ua[%r[Version/([\d.]+)], 1] ||
-        ua[%r[Safari/([\d.]+)], 1] ||
-        ua[%r[AppleWebKit/([\d.]+)], 1] ||
+      ua[%r{Version/([\d.]+)}, 1] ||
+        ua[%r{Safari/([\d.]+)}, 1] ||
+        ua[%r{AppleWebKit/([\d.]+)}, 1] ||
         "0.0"
     end
 
     def match?
-      ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS/
+      ua.include?("Safari") &&
+        !ua.match?(/PhantomJS|FxiOS/) &&
+        !edge? &&
+        !chrome? &&
+        !opera? &&
+        !samsung_browser? &&
+        !huawei_browser? &&
+        !miui_browser? &&
+        !duck_duck_go? &&
+        !yandex? &&
+        !sputnik? &&
+        !maxthon? &&
+        !qq? &&
+        !alipay? &&
+        !sougou_browser? &&
+        !google_search_app?
     end
   end
 end

data/lib/browser/samsung_browser.rb

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

data/lib/browser/snapchat.rb

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