browser 2.5.2 → 5.3.1

data/lib/browser/device/android.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Browser
+  class Device
+    class Android < Base
+      def id
+        :unknown
+      end
+
+      def name
+        ua[/\(Linux.*?; Android.*?; ([-_a-z0-9 ]+) Build[^)]+\)/i, 1] ||
+          "Unknown"
+      end
+
+      def match?
+        ua.include?("Android")
+      end
+    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

data/lib/browser/device/playstation4.rb

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

data/lib/browser/device/psp.rb

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

data/lib/browser/device/psvita.rb

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

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

@@ -12,12 +12,10 @@ module Browser
       end
 
       def match?
-        platform.windows_rt? && ua =~ /Touch/
+        platform.windows_rt? && ua.include?("Touch")
       end
 
-      private
-
-      def platform
+      private def platform
         @platform ||= Platform.new(ua)
       end
     end

data/lib/browser/device/switch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Browser
+  class Device
+    class Switch < Base
+      def id
+        :switch
+      end
+
+      def name
+        "Nintendo Switch"
+      end
+
+      def match?
+        ua.match?(/Nintendo Switch/i)
+      end
+    end
+  end
+end

data/lib/browser/device/tv.rb

@@ -12,7 +12,7 @@ module Browser
       end
 
       def match?
-        ua =~ /(tv|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,23 +1,26 @@
 # frozen_string_literal: true
 
-require "browser/device/base"
-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/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
@@ -27,6 +30,7 @@ module Browser
     # Order is important.
     def self.matchers
       @matchers ||= [
+        Samsung,
         XboxOne,
         Xbox360,
         Surface,
@@ -34,6 +38,7 @@ module Browser
         BlackBerryPlaybook,
         WiiU,
         Wii,
+        Switch,
         KindleFire,
         Kindle,
         PlayStation4,
@@ -43,6 +48,7 @@ module Browser
         Ipad,
         Iphone,
         IpodTouch,
+        Android,
         Unknown
       ]
     end
@@ -84,7 +90,7 @@ module Browser
     end
 
     def unknown?
-      id == :unknown
+      id == :unknown_device
     end
 
     def ipod_touch?
@@ -134,6 +140,11 @@ module Browser
     end
     alias_method :wiiu?, :nintendo_wiiu?
 
+    def nintendo_switch?
+      id == :switch
+    end
+    alias_method :switch?, :nintendo_switch?
+
     def blackberry_playbook?
       id == :playbook
     end
@@ -149,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.
@@ -174,7 +185,7 @@ module Browser
 
     # Detect if browser is Nintendo.
     def nintendo?
-      wii? || wiiu?
+      wii? || wiiu? || switch?
     end
 
     # Detect if browser is console (currently Xbox, PlayStation, or Nintendo).
@@ -182,20 +193,26 @@ module Browser
       xbox? || playstation? || nintendo?
     end
 
-    private
+    # Detect if device is a Samsung.
+    def samsung?
+      id == :samsung
+    end
 
     # Regex taken from http://detectmobilebrowsers.com
-    # rubocop:disable Metrics/LineLength
-    def detect_mobile?
+    # rubocop:disable Layout/LineLength
+    private def detect_mobile?
       psp? ||
-        /zunewp7/i.match(ua) ||
-        /(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) ||
-        /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])
+      /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])
     end
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
 
-    def platform
+    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,11 +11,15 @@ module Browser
     end
 
     def full_version
-      ua[%r[Edge/([\d.]+)], 1] || super
+      ua[%r{(?:Edge|Edg|EdgiOS|EdgA)/([\d.]+)}, 1] || super
     end
 
     def match?
-      ua =~ %r[(Edge/[\d.]+|Trident/8)]
+      ua.match?(%r{((?:Edge|Edg|EdgiOS|EdgA)/[\d.]+|Trident/8)})
+    end
+
+    def chrome_based?
+      match? && ua.match?(/\bEdg\b/)
     end
   end
 end

data/lib/browser/electron.rb

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

data/lib/browser/facebook.rb

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

data/lib/browser/firefox.rb

@@ -11,11 +11,11 @@ module Browser
     end
 
     def full_version
-      ua[%r[(?:Firefox|FxiOS)/([\d.]+)], 1] || "0.0"
+      ua[%r{(?:Firefox|FxiOS)/([\d.]+)}, 1] || "0.0"
     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

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

data/lib/browser/internet_explorer.rb

@@ -24,7 +24,8 @@ module Browser
     end
 
     def msie_full_version
-      (ua.match(%r{MSIE ([\d.]+)|Trident/.*?; rv:([\d.]+)}) && ($1 || $2)) ||
+      (ua.match(%r{MSIE ([\d.]+)|Trident/.*?; rv:([\d.]+)}) &&
+        (Regexp.last_match(1) || Regexp.last_match(2))) ||
         "0.0"
     end
 
@@ -41,23 +42,21 @@ module Browser
       trident_version && msie_version.to_i < (trident_version.to_i + 4)
     end
 
-    private
-
-    def ie_version
+    private def ie_version
       TRIDENT_MAPPING[trident_version] || msie_version
     end
 
     # Return the trident version.
-    def trident_version
-      ua.match(%r[Trident/([0-9.]+)]) && $1
+    private def trident_version
+      ua.match(%r{Trident/([0-9.]+)}) && Regexp.last_match(1)
     end
 
-    def msie?
-      ua =~ /MSIE/ && ua !~ /Opera/
+    private def msie?
+      ua.include?("MSIE") && !ua.include?("Opera")
     end
 
-    def modern_ie?
-      ua =~ %r[Trident/.*?; rv:(.*?)]
+    private def modern_ie?
+      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/generic_browser.rb

@@ -7,9 +7,7 @@ module Browser
         "#{browser.id} #{browser.id}#{browser.version}" if generic?
       end
 
-      private
-
-      def generic?
+      private def generic?
         !browser.safari? && !browser.chrome?
       end
     end